Synced to current nx01 snapshot and removed EL tomcat dep

gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/GlyphDemoComponent.java

@@ -34,7 +34,7 @@ import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Reference;
 
-import love.distributedrebirth.gdxapp4d.app.glyphdemo.apps.DemoUnicodePlaneDeskApp;
+import love.distributedrebirth.gdxapp4d.app.glyphdemo.apps.DemoUnicodeBlockDeskApp;
 import love.distributedrebirth.gdxapp4d.app.glyphdemo.apps.DemoUnitConverterDeskApp;
 import love.distributedrebirth.gdxapp4d.app.glyphdemo.apps.DemoGlyphSetDeskApp;
 import love.distributedrebirth.gdxapp4d.app.glyphdemo.apps.DemoNumberMatrixDeskApp;
@@ -75,7 +75,7 @@ public class GlyphDemoComponent {
 	private final DeskAppLauncher unitConverterLauncher;
 	
 	public GlyphDemoComponent() {
-		unicodeLauncher = new DeskAppLauncher(DeskAppMenuSection.PROGRAMMING, "Unicode Plane", () -> new DemoUnicodePlaneDeskApp(createBundle(), unicode4DService));
+		unicodeLauncher = new DeskAppLauncher(DeskAppMenuSection.PROGRAMMING, "Unicode Blocks", () -> new DemoUnicodeBlockDeskApp(createBundle(), unicode4DService));
 		baseGlyphLauncher = new DeskAppLauncher(DeskAppMenuSection.PROGRAMMING, "Glyph Set", () -> new DemoGlyphSetDeskApp(createBundle()));
 		basePartLauncher = new DeskAppLauncher(DeskAppMenuSection.EDUCATION, "Number Parts", () -> new DemoNumberPartDeskApp(createBundle()));
 		numberMatrixLauncher = new DeskAppLauncher(DeskAppMenuSection.EDUCATION, "Number Matrix", () -> new DemoNumberMatrixDeskApp(createBundle()));

gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoNumberPartDeskApp.java

@@ -43,8 +43,8 @@ import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᐪᓫᣗᔿᑊᣕᣔᐪ
 import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᐪᓫᣗᔿᑊᣕᣔᐪᐤᣗ.ᐦ.TerminatorGun;
 import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᐪᓫᣗᔿᑊᣕᣔᐪᐤᣗ.ᐦ.Terminator𓄯;
 import ᒢᐩᐩ.ᔆʸᔆᐪᓫᔿ.ᒃᣔᒃᓫᒻ.ᑊᐣᓑᖮᐪᔆ.DuytsDocAuthor注;
-import ᒢᣘᐧᐧ.ᑊᑉᣔᣔᔆ.ᐪᣔᒻᑊᑉ.嘴ᗮᙿᗮ;
 import ᒢᣘᐧᐧ.ᒼᐤᒻᒻᓫᒼᐪᑊᐤᣕᔆᒾ.Ladder;
+import ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᒼᣔᑊᑉᓫ.ᐪᣔᒻᑊᑉ.嘴ᗮᙿᗮ;
 
 @DuytsDocAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天")
 public class DemoNumberPartDeskApp extends AbstractDeskApp implements DeskAppRenderer {
@@ -148,40 +148,40 @@ public class DemoNumberPartDeskApp extends AbstractDeskApp implements DeskAppRen
 			ImGui.tableNextColumn();
 			ImGui.text(part.abacusRȧñkName());
 			ImGui.tableNextColumn();
-			ImGui.text(Long.toString(part.zerdinal()));
+			ImGui.text(Long.toString(part.odeur()));
 			ImGui.tableNextColumn();
 			ImGui.text(part.abacusRȧñkRingTone());
 			if (showBase10.get()) {
 				ImGui.tableNextColumn();
-				ImGui.text(BaseGlyphSet.TONE_SCRIPT.BȍőnPrintNumber10((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
+				ImGui.text(BaseGlyphSet.TONE_SCRIPT.BȍőnPrintNumber10((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
 				ImGui.tableNextColumn();
-				ImGui.text(BaseGlyphSet.KOREAN.BȍőnPrintNumber10((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
+				ImGui.text(BaseGlyphSet.KOREAN.BȍőnPrintNumber10((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
 				ImGui.tableNextColumn();
-				ImGui.text(BaseGlyphSet.BENGALI.BȍőnPrintNumber10((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
+				ImGui.text(BaseGlyphSet.BENGALI.BȍőnPrintNumber10((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
 				ImGui.tableNextColumn();
-				ImGui.text(BaseGlyphSet.ARABIC.BȍőnPrintNumber10((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
+				ImGui.text(BaseGlyphSet.ARABIC.BȍőnPrintNumber10((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
 			}
 			if (showBase16.get()) {
 				ImGui.tableNextColumn();
-				ImGui.text(BaseGlyphSet.TONE_SCRIPT.BȍőnPrintNumber16((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
+				ImGui.text(BaseGlyphSet.TONE_SCRIPT.BȍőnPrintNumber16((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
 				ImGui.tableNextColumn();
-				ImGui.text(BaseGlyphSet.HIERO.BȍőnPrintNumber16((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
+				ImGui.text(BaseGlyphSet.HIERO.BȍőnPrintNumber16((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
 				ImGui.tableNextColumn();
-				ImGui.text(BaseGlyphSet.RUNIC.BȍőnPrintNumber16((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
+				ImGui.text(BaseGlyphSet.RUNIC.BȍőnPrintNumber16((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
 				ImGui.tableNextColumn();
-				ImGui.text(BaseGlyphSet.LATIN_BASIC.BȍőnPrintNumber16((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
+				ImGui.text(BaseGlyphSet.LATIN_BASIC.BȍőnPrintNumber16((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
 			}
 			if (showBase27.get()) {
 				ImGui.tableNextColumn();
-				ImGui.text(BaseGlyphSet.TONE_SCRIPT.BȍőnPrintNumber27((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
+				ImGui.text(BaseGlyphSet.TONE_SCRIPT.BȍőnPrintNumber27((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
 				ImGui.tableNextColumn();
-				ImGui.text(BaseGlyphSet.KOREAN.BȍőnPrintNumber27((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
+				ImGui.text(BaseGlyphSet.KOREAN.BȍőnPrintNumber27((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
 				ImGui.tableNextColumn();
-				ImGui.text(BaseGlyphSet.LATIN_BASIC.BȍőnPrintNumber27((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
+				ImGui.text(BaseGlyphSet.LATIN_BASIC.BȍőnPrintNumber27((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
 				ImGui.tableNextColumn();
-				ImGui.text(BaseGlyphSet.GREEK.BȍőnPrintNumber27((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
+				ImGui.text(BaseGlyphSet.GREEK.BȍőnPrintNumber27((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
 				ImGui.tableNextColumn();
-				ImGui.text(BaseGlyphSet.MALAYALAM.BȍőnPrintNumber27((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
+				ImGui.text(BaseGlyphSet.MALAYALAM.BȍőnPrintNumber27((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
 			}
 //			ImGui.tableNextColumn();
 //			String chinaKey = part.abacusRȧñkChinaKey();

gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoUnicodeBlockDeskApp.java

@@ -37,23 +37,23 @@ import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.AbstractDeskApp;
 import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppContourSection;
 import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppRenderer;
 import love.distributedrebirth.unicode4d.draw.ImCharacter;
-import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodePlane;
+import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodeBlock;
 import ᒢᐩᐩ.ᔆʸᔆᐪᓫᔿ.ᒃᣔᒃᓫᒻ.ᑊᐣᓑᖮᐪᔆ.DuytsDocAuthor注;
 
 @DuytsDocAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天")
-public class DemoUnicodePlaneDeskApp extends AbstractDeskApp implements DeskAppRenderer {
+public class DemoUnicodeBlockDeskApp extends AbstractDeskApp implements DeskAppRenderer {
 	
 	private final VrGem4Unicode4DService unicode4DService;
 	private final ResourceBundle bundle;
 	private final ImBoolean render4DPlane0 = new ImBoolean(false);
 	
-	public DemoUnicodePlaneDeskApp(ResourceBundle bundle, VrGem4Unicode4DService unicode4DService) {
+	public DemoUnicodeBlockDeskApp(ResourceBundle bundle, VrGem4Unicode4DService unicode4DService) {
 		this.unicode4DService = unicode4DService;
 		this.bundle = bundle;
 	}
 	
 	private String getTxt(String key) {
-		return bundle.getString(DemoUnicodePlaneDeskApp.class.getSimpleName()+"."+key);
+		return bundle.getString(DemoUnicodeBlockDeskApp.class.getSimpleName()+"."+key);
 	}
 	
 	public void create() {
@@ -69,27 +69,27 @@ public class DemoUnicodePlaneDeskApp extends AbstractDeskApp implements DeskAppR
 		ImGui.tableSetupColumn(getTxt("colPlane"));
 		ImGui.tableSetupColumn(getTxt("colText"));
 		ImGui.tableHeadersRow();
-		for (UnicodePlane plane:UnicodePlane.values()) {
+		for (UnicodeBlock block : UnicodeBlock.values()) {
-			if (!plane.isPlaneValid()) {
+			if (!block.isPlaneValid()) {
 				continue;
 			}
 			StringBuilder buf = new StringBuilder();
 			int offset = 33;
-			for (int i=plane.getStart()+offset;i<plane.getStart()+33+offset;i++) {
+			for (int i = block.getStart()+offset; i < block.getStart()+33+offset;i++) {
 				buf.appendCodePoint(i);
-				if (plane.isPlane0() && render4DPlane0.get() == false) {
+				if (block.isPlane0() && render4DPlane0.get() == false) {
 					buf.append(" ");
 				}
 			}
 			
 			ImGui.tableNextRow();
 			ImGui.tableNextColumn();
-			ImGui.text(plane.name());
+			ImGui.text(block.name());
 			ImGui.tableNextColumn();
-			if (plane.isPlane0() && render4DPlane0.get() == false) {
+			if (block.isPlane0() && render4DPlane0.get() == false) {
 				ImGui.text(buf.toString());
 			} else {
-				ImCharacter.render("row"+plane.name(), buf.toString(), '?', v -> unicode4DService.getCharacterForUnicode(v));
+				ImCharacter.render("row"+block.name(), buf.toString(), '?', v -> unicode4DService.getCharacterForUnicode(v));
 			}
 		}
 		ImGui.endTable();

gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages.properties

@@ -13,7 +13,7 @@ DemoNumberPartDeskApp.showBase10=Show base10
 DemoNumberPartDeskApp.showBase16=Show base16
 DemoNumberPartDeskApp.showBase27=Show base27
 
-DemoUnicodePlaneDeskApp.title=Demo Unicode Plane
+DemoUnicodeBlockDeskApp.title=Demo Unicode Blocks
-DemoUnicodePlaneDeskApp.colPlane=Unicode Plane
+DemoUnicodeBlockDeskApp.colPlane=Unicode Blocks
-DemoUnicodePlaneDeskApp.colText=Example
+DemoUnicodeBlockDeskApp.colText=Example
-DemoUnicodePlaneDeskApp.render4DPlane0=Show all in unicode4D
+DemoUnicodeBlockDeskApp.render4DPlane0=Show all in unicode4D

gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_chn.properties

@@ -13,7 +13,7 @@ DemoNumberPartDeskApp.showBase10=\u663E\u793A \u57FA\u657010
 DemoNumberPartDeskApp.showBase16=\u663E\u793A \u57FA\u657016
 DemoNumberPartDeskApp.showBase27=\u663E\u793A \u57FA\u657027
 
-DemoUnicodePlaneDeskApp.title=\u6F14\u793A \u7EDF\u4E00\u7801 \u98DE\u673A
+DemoUnicodeBlockDeskApp.title=\u6F14\u793A \u7EDF\u4E00\u7801 \u98DE\u673A
-DemoUnicodePlaneDeskApp.colPlane=\u7EDF\u4E00\u7801\u5E73\u9762
+DemoUnicodeBlockDeskApp.colPlane=\u7EDF\u4E00\u7801\u5E73\u9762
-DemoUnicodePlaneDeskApp.colText=\u4F8B\u5B50
+DemoUnicodeBlockDeskApp.colText=\u4F8B\u5B50
-DemoUnicodePlaneDeskApp.render4DPlane0=\u5168\u90E8\u663E\u793A \u7EDF\u4E00\u78014D
+DemoUnicodeBlockDeskApp.render4DPlane0=\u5168\u90E8\u663E\u793A \u7EDF\u4E00\u78014D

gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_hiero.properties

@@ -13,7 +13,7 @@ DemoNumberPartDeskApp.showBase10=\uE219\u2005\uE362\u2005\uE0C0\u2005\uE13F\u200
 DemoNumberPartDeskApp.showBase16=\uE219\u2005\uE362\u2005\uE0C0\u2005\uE13F\u2005\uE2F4\u2005\uE386\u2005\uE3FF
 DemoNumberPartDeskApp.showBase27=\uE219\u2005\uE362\u2005\uE0C0\u2005\uE13F\u2005\uE2F4\u2005\uE387\u2005\uE400
 
-DemoUnicodePlaneDeskApp.title=Unicode Plane
+DemoUnicodeBlockDeskApp.title=Unicode Plane
-DemoUnicodePlaneDeskApp.colPlane=Unicode Plane
+DemoUnicodeBlockDeskApp.colPlane=Unicode Plane
-DemoUnicodePlaneDeskApp.colText=Example
+DemoUnicodeBlockDeskApp.colText=Example
-DemoUnicodePlaneDeskApp.render4DPlane0=Show all in unicode4D
+DemoUnicodeBlockDeskApp.render4DPlane0=Show all in unicode4D

gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_nl.properties

@@ -13,7 +13,7 @@ DemoNumberPartDeskApp.showBase10=Toon basis10
 DemoNumberPartDeskApp.showBase16=Toon basis16
 DemoNumberPartDeskApp.showBase27=Toon basis27
 
-DemoUnicodePlaneDeskApp.title=Unicode Vlak
+DemoUnicodeBlockDeskApp.title=Unicode Vlak
-DemoUnicodePlaneDeskApp.colPlane=Unicode Vlak
+DemoUnicodeBlockDeskApp.colPlane=Unicode Vlak
-DemoUnicodePlaneDeskApp.colText=Voorbeeld
+DemoUnicodeBlockDeskApp.colText=Voorbeeld
-DemoUnicodePlaneDeskApp.render4DPlane0=Toon alles in unicode4D
+DemoUnicodeBlockDeskApp.render4DPlane0=Toon alles in unicode4D

gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_runic.properties

@@ -13,7 +13,7 @@ DemoNumberPartDeskApp.showBase10=\u16CB\u16BA\u16DF\u16B9 \u16D2\u16A8\u16CB\u16
 DemoNumberPartDeskApp.showBase16=\u16CB\u16BA\u16DF\u16B9 \u16D2\u16A8\u16CB\u16D616
 DemoNumberPartDeskApp.showBase27=\u16CB\u16BA\u16DF\u16B9 \u16D2\u16A8\u16CB\u16D627
 
-DemoUnicodePlaneDeskApp.title=\u16DE\u16D6\u16D7\u16DF \u16A2\u16BE\u16C1\u16B2\u16DF\u16DE\u16D6 \u16C8\u16DA\u16A8\u16BE\u16D6
+DemoUnicodeBlockDeskApp.title=\u16DE\u16D6\u16D7\u16DF \u16A2\u16BE\u16C1\u16B2\u16DF\u16DE\u16D6 \u16C8\u16DA\u16A8\u16BE\u16D6
-DemoUnicodePlaneDeskApp.colPlane=\u16A2\u16BE\u16C1\u16B2\u16DF\u16DE\u16D6 \u16C8\u16DA\u16A8\u16BE\u16D6
+DemoUnicodeBlockDeskApp.colPlane=\u16A2\u16BE\u16C1\u16B2\u16DF\u16DE\u16D6 \u16C8\u16DA\u16A8\u16BE\u16D6
-DemoUnicodePlaneDeskApp.colText=\u16D6\u16EA\u16A8\u16D7\u16C8\u16DA\u16D6
+DemoUnicodeBlockDeskApp.colText=\u16D6\u16EA\u16A8\u16D7\u16C8\u16DA\u16D6
-DemoUnicodePlaneDeskApp.render4DPlane0=\u16CB\u16BA\u16DF\u16B9 \u16A8\u16DA\u16DA \u16C1\u16BE \u16A2\u16BE\u16C1\u16B2\u16DF\u16DE\u16D64\u16DE
+DemoUnicodeBlockDeskApp.render4DPlane0=\u16CB\u16BA\u16DF\u16B9 \u16A8\u16DA\u16DA \u16C1\u16BE \u16A2\u16BE\u16C1\u16B2\u16DF\u16DE\u16D64\u16DE

gdxapp4d-app-notepad/src/main/java/love/distributedrebirth/gdxapp4d/app/notepad/NotepadDeskApp.java

@@ -51,7 +51,7 @@ import ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒄᓫᣔᐪᑋ.ᔆᣖᑊᒄᓫᣗ.Bã
 import ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒼᒻᣔᙆᙆ.ᣖᑊᣗᣔᐪᓫ.BãßBȍőnꝐḯŕ₳₮ḕʸᴰ;
 import ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᔿᓑᔿᔿᔋᐝᣚ.BãßᛗᚢᛗᛗᛉBoneBabe𓄯;
 import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᒢℭỗᶇṧⱦᶏꬼȶʂ;
-import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodePlane;
+import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodeBlock;
 import ᒢᐩᐩ.ᔆʸᔆᐪᓫᔿ.ᒃᣔᒃᓫᒻ.ᑊᐣᓑᖮᐪᔆ.DuytsDocAuthor注;
 
 @DuytsDocAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天")
@@ -67,20 +67,20 @@ public class NotepadDeskApp extends AbstractDeskApp implements DeskAppRenderer,
 	private final ImInt runSpeed = new ImInt(ᒢℭỗᶇṧⱦᶏꬼȶʂ.INTᣟᐧᣟTEN);
 	private final ImBoolean runChina = new ImBoolean(false);
 	private final static char DEFAULT_CHAR = '亞';
-	private final static UnicodePlane[] GRID_PLANES = {
+	private final static UnicodeBlock[] GRID_PLANES = {
-			UnicodePlane.BRAHMI,
+			UnicodeBlock.BRAHMI,
-			UnicodePlane.UGARITIC,
+			UnicodeBlock.UGARITIC,
-			UnicodePlane.BAMUM_SUPPLEMENT,
+			UnicodeBlock.BAMUM_SUPPLEMENT,
-			UnicodePlane.TAI_XUAN_JING_SYMBOLS
+			UnicodeBlock.TAI_XUAN_JING_SYMBOLS
 		};
-	private final static UnicodePlane[] GRID_PLANES_CHINA = {
+	private final static UnicodeBlock[] GRID_PLANES_CHINA = {
-			UnicodePlane.CJK_UNIFIED_IDEOGRAPHS,
+			UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS,
-			UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A,
+			UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A,
-			UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B,
+			UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B,
-			UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C,
+			UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C,
-			UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D,
+			UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D,
-			UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E,
+			UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E,
-			UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F
+			UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F
 	};
 	private final static int Y_LINE_COLOR = ImColor.intToColor(200, 10, 10);
 	private String gridChars;
@@ -185,11 +185,11 @@ public class NotepadDeskApp extends AbstractDeskApp implements DeskAppRenderer,
 	
 	private String createGridChars() {
 		StringBuilder buf = new StringBuilder();
-		UnicodePlane[] planes = GRID_PLANES;
+		UnicodeBlock[] planes = GRID_PLANES;
 		if (runChina.get()) {
 			planes = GRID_PLANES_CHINA;
 		}
-		for (UnicodePlane plane:planes) {
+		for (UnicodeBlock plane:planes) {
 			for (int i=plane.getStart();i<plane.getStop();i++) {
 				buf.appendCodePoint(i);
 			}

gdxapp4d-chain-boot-ship-engine/pom.xml

@@ -49,8 +49,6 @@
 										<pathelement location="../gdxapp4d-lib-warpme/target/gdxapp4d-lib-warpme.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-driver-${nx01.version}.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-sax3-${nx01.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/jasper-el-${jasper-el.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/el-api-${jasper-el.version}.jar" />
 									</classpath>
 								</java>
 							</target>

gdxapp4d-chain-boot-warp-sea/pom.xml

@@ -63,8 +63,6 @@
 										<pathelement location="../gdxapp4d-lib-warpme/target/gdxapp4d-lib-warpme.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-driver-${nx01.version}.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-sax3-${nx01.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/jasper-el-${jasper-el.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/el-api-${jasper-el.version}.jar" />
 									</classpath>
 								</java>
 							</target>

gdxapp4d-chain-default-apps/pom.xml

@@ -72,8 +72,6 @@
 										<pathelement location="../gdxapp4d-lib-warpme/target/gdxapp4d-lib-warpme.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-driver-${nx01.version}.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-sax3-${nx01.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/jasper-el-${jasper-el.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/el-api-${jasper-el.version}.jar" />
 									</classpath>
 								</java>
 							</target>

gdxapp4d-chain-default-music/pom.xml

@@ -26,8 +26,6 @@
 										<pathelement location="../gdxapp4d-lib-warpme/target/gdxapp4d-lib-warpme.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-driver-${nx01.version}.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-sax3-${nx01.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/jasper-el-${jasper-el.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/el-api-${jasper-el.version}.jar" />
 									</classpath>
 								</java>
 							</target>

gdxapp4d-chain-dep-osgi-lib/pom.xml

@@ -89,8 +89,6 @@
 										<pathelement location="../gdxapp4d-lib-warpme/target/gdxapp4d-lib-warpme.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-driver-${nx01.version}.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-sax3-${nx01.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/jasper-el-${jasper-el.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/el-api-${jasper-el.version}.jar" />
 									</classpath>
 								</java>
 							</target>

gdxapp4d-chain-dep-osgi-scr/pom.xml

@@ -26,8 +26,6 @@
 										<pathelement location="../gdxapp4d-lib-warpme/target/gdxapp4d-lib-warpme.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-driver-${nx01.version}.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-sax3-${nx01.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/jasper-el-${jasper-el.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/el-api-${jasper-el.version}.jar" />
 									</classpath>
 								</java>
 							</target>

gdxapp4d-chain-font-unicode4d/pom.xml

@@ -26,8 +26,6 @@
 										<pathelement location="../gdxapp4d-lib-warpme/target/gdxapp4d-lib-warpme.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-driver-${nx01.version}.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-sax3-${nx01.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/jasper-el-${jasper-el.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/el-api-${jasper-el.version}.jar" />
 									</classpath>
 								</java>
 							</target>

gdxapp4d-chain-mod-unitxc/pom.xml

@@ -37,8 +37,6 @@
 										<pathelement location="../gdxapp4d-lib-warpme/target/gdxapp4d-lib-warpme.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-driver-${nx01.version}.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-sax3-${nx01.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/jasper-el-${jasper-el.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/el-api-${jasper-el.version}.jar" />
 									</classpath>
 								</java>
 							</target>

gdxapp4d-chain-mod-vrgem4/pom.xml

@@ -37,8 +37,6 @@
 										<pathelement location="../gdxapp4d-lib-warpme/target/gdxapp4d-lib-warpme.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-driver-${nx01.version}.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-sax3-${nx01.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/jasper-el-${jasper-el.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/el-api-${jasper-el.version}.jar" />
 									</classpath>
 								</java>
 <echo>

gdxapp4d-chain-mod-vrsys5/pom.xml

@@ -37,8 +37,6 @@
 										<pathelement location="../gdxapp4d-lib-warpme/target/gdxapp4d-lib-warpme.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-driver-${nx01.version}.jar" />
 										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/nx01-x4o-sax3-${nx01.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/jasper-el-${jasper-el.version}.jar" />
-										<pathelement location="../gdxapp4d-lib-warpme/target/dependency/el-api-${jasper-el.version}.jar" />
 									</classpath>
 								</java>
 							</target>

gdxapp4d-lib-unicodezd/src/test/java/love/distributedrebirth/unicode4d/TestConvFont.java

@@ -46,7 +46,7 @@ import love.distributedrebirth.unicode4d.atlas.FontAtlas;
 import love.distributedrebirth.unicode4d.atlas.FontAtlasDriver;
 import love.distributedrebirth.unicode4d.atlas.FontAtlasStore;
 import love.distributedrebirth.unicode4d.atlas.FontAtlasStoreGlyph;
-import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodePlane;
+import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodeBlock;
 import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᐪᓫᣗᔿᑊᣕᣔᐪᐤᣗ.T002ᖟ;
 import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᒢᓫᑊᐣᑊ.ᔿᓫᒻᓫᓫ.V072Tong;
 import ᒢᐩᐩ.ᔆʸᔆᐪᓫᔿ.ᒃᣔᒃᓫᒻ.ᑊᐣᓑᖮᐪᔆ.DuytsDocAuthor注;
@@ -173,7 +173,7 @@ public class TestConvFont {
 		private boolean startPoint = false;
 		private V072Tong point = null;
 		private int unicode = -1;
-		private UnicodePlane unicodePlane2;
+		private UnicodeBlock unicodePlane2;
 		
 		
 		public FontContentHandler(FontAtlasStore fontStore, String inputName) {
@@ -251,7 +251,7 @@ public class TestConvFont {
 					unicodeStr = unicodeStr.substring(7);
 				}
 				unicode = Integer.parseInt(unicodeStr, 16);
-				unicodePlane2 = UnicodePlane.valueOfUnicode(unicode);
+				unicodePlane2 = UnicodeBlock.valueOfUnicode(unicode);
 				int xMax = Integer.parseInt(atts.getValue("xMax"));
 				int yMax = Integer.parseInt(atts.getValue("yMax"));
 				int xMin = Integer.parseInt(atts.getValue("xMin"));

gdxapp4d-lib-unicodezd/src/test/java/love/distributedrebirth/unicode4d/TestSwingPlane.java

@@ -36,7 +36,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.SwingUtilities;
 
-import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodePlane;
+import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodeBlock;
 import ᒢᐩᐩ.ᔆʸᔆᐪᓫᔿ.ᒃᣔᒃᓫᒻ.ᑊᐣᓑᖮᐪᔆ.DuytsDocAuthor注;
 
 @DuytsDocAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天")
@@ -49,10 +49,10 @@ public class TestSwingPlane extends JPanel {
 
 		String[] columnNames = { "Plane", "Example"};
 
-		Object[][] data = new Object[UnicodePlane.values().length][2];
+		Object[][] data = new Object[UnicodeBlock.values().length][2];
 		
 		int x=0;
-		for (UnicodePlane plane:UnicodePlane.values()) {
+		for (UnicodeBlock plane:UnicodeBlock.values()) {
 			data[x][0] = plane.name();
 			StringBuilder buf = new StringBuilder();
 			int offset = 33;

gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java

@@ -151,16 +151,11 @@ public class GDXAppTos4BootFactory {
 				"org.x4o.xml.lang.phase,"+
 				"org.x4o.xml.lang.task,"+
 				"org.x4o.xml.lang.task.run,"+
-				"javax.el,"+
-				"org.apache.el,"+
-				"org.apache.el.lang,"+
-				"org.apache.el.parser,"+
-				"org.apache.el.util,"+
 				"ᒢᣘᐧᐧ.ᑊᑉᣔᣔᔆ,"+
 				"ᒢᣘᐧᐧ.ᑊᑉᣔᣔᔆ.ᐤᑊᐣᓫᓑᣗ,"+
 				"ᒢᣘᐧᐧ.ᑊᑉᣔᣔᔆ.ᐤᑊᐣᓫᓑᣗ.ᣕᓑᔿᒃᓫᣗ,"+
+				"ᒢᣘᐧᐧ.ᑊᑉᣔᣔᔆ.ᐤᑊᐣᓫᓑᣗ.ᣘᒻᣔᕐ,"+
 				"ᒢᣘᐧᐧ.ᑊᑉᣔᣔᔆ.ᒻᣔᣕᒄ,"+
-				"ᒢᣘᐧᐧ.ᑊᑉᣔᣔᔆ.ᐪᣔᒻᑊᑉ,"+
 				"ᒢᣘᐧᐧ.ᒼᐤᒻᒻᓫᒼᐪᑊᐤᣕᔆᒾ,"+
 				"ᒢᣘᐧᐧ.ᒼᐤᒻᒻᓫᒼᐪᑊᐤᣕᔆᒾ.ᣗᐤᣖᓫ,"+
 				"ᒢᣘᐧᐧ.ᣕᓫᐪᑋᓫᣗ.ᐪᐤᣕᓫ,"+
@@ -181,6 +176,11 @@ public class GDXAppTos4BootFactory {
 				"ᒢᣘᐧᐧ.ᣕᓫᐪᑋᓫᣗ.ᒄᑊᣔᒻ.ᒻᑊᣕᕐᓑᣔᓫ.ᐞᐧᐧᣟᣟᐧᐧ,"+
 				"ᒢᣘᐧᐧ.ᣕᓫᐪᑋᓫᣗ.ᒄᑊᣔᒻ.ᒻᑊᣕᕐᓑᣔᓫ.ᐞᣟᣟᣟᣟᣟᣟ,"+
 				"ᒢᣘᐧᐧ.ᣕᓫᐪᑋᓫᣗ.ᒄᑊᣔᒻ.ᒃᣔᔆᓫᒄ,"+
+				"ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᒼᣔᑊᑉᓫ,"+
+				"ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᒼᣔᑊᑉᓫ.ᐪᣔᒻᑊᑉ,"+
+				"ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᒼᣔᑊᑉᓫ.ᐪᣔᔆᐪᓫ,"+
+				"ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᣘᣔᓑᒻᐪ,"+
+				"ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᣘᣔᓑᒻᐪ.ᑊᐣᓑᒼᑊᑉ,"+
 				"ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ,"+
 				"ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒃᐤᣔᐪ,"+
 				"ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒄᓫᣔᐪᑋ,"+

pom.xml

@@ -47,7 +47,6 @@
 		  'spifly' dep + asm-*.jar deps and make all class loading 20-40% slower, RM slf4j ? -->
 		<org.slf4j.version>2.1.0-alpha1</org.slf4j.version>
 		<nx01.version>5786.SHEVAT〄.1-SNAPSHOT</nx01.version>
-		<jasper-el.version>6.0.53</jasper-el.version>
 		<metamodel.version>5.3.6</metamodel.version>
 		<!-- TODO: Replace jackson dep with EE spec in meta-model-jdbc see: https://github.com/datacleaner/metamodel/blob/master/jdbc/pom.xml  -->
 		<jackson.version>2.19.1</jackson.version>
@@ -150,16 +149,11 @@
 			org.x4o.xml.lang.phase,
 			org.x4o.xml.lang.task,
 			org.x4o.xml.lang.task.run,
-			javax.el,
-			org.apache.el,
-			org.apache.el.lang,
-			org.apache.el.parser,
-			org.apache.el.util,
 			ᒢᣘᐧᐧ.ᑊᑉᣔᣔᔆ,
 			ᒢᣘᐧᐧ.ᑊᑉᣔᣔᔆ.ᐤᑊᐣᓫᓑᣗ,
 			ᒢᣘᐧᐧ.ᑊᑉᣔᣔᔆ.ᐤᑊᐣᓫᓑᣗ.ᣕᓑᔿᒃᓫᣗ,
+			ᒢᣘᐧᐧ.ᑊᑉᣔᣔᔆ.ᐤᑊᐣᓫᓑᣗ.ᣘᒻᣔᕐ,
 			ᒢᣘᐧᐧ.ᑊᑉᣔᣔᔆ.ᒻᣔᣕᒄ,
-			ᒢᣘᐧᐧ.ᑊᑉᣔᣔᔆ.ᐪᣔᒻᑊᑉ,
 			ᒢᣘᐧᐧ.ᒼᐤᒻᒻᓫᒼᐪᑊᐤᣕᔆᒾ,
 			ᒢᣘᐧᐧ.ᒼᐤᒻᒻᓫᒼᐪᑊᐤᣕᔆᒾ.ᣗᐤᣖᓫ,
 			ᒢᣘᐧᐧ.ᣕᓫᐪᑋᓫᣗ.ᐪᐤᣕᓫ,
@@ -180,6 +174,11 @@
 			ᒢᣘᐧᐧ.ᣕᓫᐪᑋᓫᣗ.ᒄᑊᣔᒻ.ᒻᑊᣕᕐᓑᣔᓫ.ᐞᐧᐧᣟᣟᐧᐧ,
 			ᒢᣘᐧᐧ.ᣕᓫᐪᑋᓫᣗ.ᒄᑊᣔᒻ.ᒻᑊᣕᕐᓑᣔᓫ.ᐞᣟᣟᣟᣟᣟᣟ,
 			ᒢᣘᐧᐧ.ᣕᓫᐪᑋᓫᣗ.ᒄᑊᣔᒻ.ᒃᣔᔆᓫᒄ,
+			ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᒼᣔᑊᑉᓫ,
+			ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᒼᣔᑊᑉᓫ.ᐪᣔᒻᑊᑉ,
+			ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᒼᣔᑊᑉᓫ.ᐪᣔᔆᐪᓫ,
+			ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᣘᣔᓑᒻᐪ,
+			ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᣘᣔᓑᒻᐪ.ᑊᐣᓑᒼᑊᑉ,
 			ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ,
 			ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒃᐤᣔᐪ,
 			ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒄᓫᣔᐪᑋ,
@@ -529,17 +528,17 @@
 			</dependency>
 			<dependency>
 				<groupId>love.distributedrebirth.nx01</groupId>
-				<artifactId>nx01-warp-core</artifactId>
+				<artifactId>nx01-jpp2-warp-core</artifactId>
 				<version>${nx01.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>love.distributedrebirth.nx01</groupId>
-				<artifactId>nx01-warp-fault</artifactId>
+				<artifactId>nx01-jpp1-klass-fault</artifactId>
 				<version>${nx01.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>love.distributedrebirth.nx01</groupId>
-				<artifactId>nx01-warp-manifestor</artifactId>
+				<artifactId>nx01-jpp2-warp-manifestor</artifactId>
 				<version>${nx01.version}</version>
 			</dependency>
 			<dependency>