diff --git a/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/GlyphDemoComponent.java b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/GlyphDemoComponent.java index 9762674f..c9252614 100644 --- a/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/GlyphDemoComponent.java +++ b/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())); diff --git a/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoNumberPartDeskApp.java b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoNumberPartDeskApp.java index e42071b7..a2cca26d 100644 --- a/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoNumberPartDeskApp.java +++ b/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(); diff --git a/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoUnicodePlaneDeskApp.java b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoUnicodeBlockDeskApp.java similarity index 86% rename from gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoUnicodePlaneDeskApp.java rename to gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoUnicodeBlockDeskApp.java index 21992894..3a6af746 100644 --- a/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoUnicodePlaneDeskApp.java +++ b/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()) { - if (!plane.isPlaneValid()) { + for (UnicodeBlock block : UnicodeBlock.values()) { + if (!block.isPlaneValid()) { continue; } StringBuilder buf = new StringBuilder(); int offset = 33; - for (int i=plane.getStart()+offset;i unicode4DService.getCharacterForUnicode(v)); + ImCharacter.render("row"+block.name(), buf.toString(), '?', v -> unicode4DService.getCharacterForUnicode(v)); } } ImGui.endTable(); diff --git a/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages.properties b/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages.properties index d590498e..66204afa 100644 --- a/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages.properties +++ b/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 -DemoUnicodePlaneDeskApp.colPlane=Unicode Plane -DemoUnicodePlaneDeskApp.colText=Example -DemoUnicodePlaneDeskApp.render4DPlane0=Show all in unicode4D \ No newline at end of file +DemoUnicodeBlockDeskApp.title=Demo Unicode Blocks +DemoUnicodeBlockDeskApp.colPlane=Unicode Blocks +DemoUnicodeBlockDeskApp.colText=Example +DemoUnicodeBlockDeskApp.render4DPlane0=Show all in unicode4D \ No newline at end of file diff --git a/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_chn.properties b/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_chn.properties index 1ca63aae..aba0fe82 100644 --- a/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_chn.properties +++ b/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 -DemoUnicodePlaneDeskApp.colPlane=\u7EDF\u4E00\u7801\u5E73\u9762 -DemoUnicodePlaneDeskApp.colText=\u4F8B\u5B50 -DemoUnicodePlaneDeskApp.render4DPlane0=\u5168\u90E8\u663E\u793A \u7EDF\u4E00\u78014D \ No newline at end of file +DemoUnicodeBlockDeskApp.title=\u6F14\u793A \u7EDF\u4E00\u7801 \u98DE\u673A +DemoUnicodeBlockDeskApp.colPlane=\u7EDF\u4E00\u7801\u5E73\u9762 +DemoUnicodeBlockDeskApp.colText=\u4F8B\u5B50 +DemoUnicodeBlockDeskApp.render4DPlane0=\u5168\u90E8\u663E\u793A \u7EDF\u4E00\u78014D \ No newline at end of file diff --git a/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_hiero.properties b/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_hiero.properties index 88104cd8..dbfe1523 100644 --- a/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_hiero.properties +++ b/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 -DemoUnicodePlaneDeskApp.colPlane=Unicode Plane -DemoUnicodePlaneDeskApp.colText=Example -DemoUnicodePlaneDeskApp.render4DPlane0=Show all in unicode4D \ No newline at end of file +DemoUnicodeBlockDeskApp.title=Unicode Plane +DemoUnicodeBlockDeskApp.colPlane=Unicode Plane +DemoUnicodeBlockDeskApp.colText=Example +DemoUnicodeBlockDeskApp.render4DPlane0=Show all in unicode4D \ No newline at end of file diff --git a/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_nl.properties b/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_nl.properties index bd1906eb..199287c0 100644 --- a/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_nl.properties +++ b/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 -DemoUnicodePlaneDeskApp.colPlane=Unicode Vlak -DemoUnicodePlaneDeskApp.colText=Voorbeeld -DemoUnicodePlaneDeskApp.render4DPlane0=Toon alles in unicode4D \ No newline at end of file +DemoUnicodeBlockDeskApp.title=Unicode Vlak +DemoUnicodeBlockDeskApp.colPlane=Unicode Vlak +DemoUnicodeBlockDeskApp.colText=Voorbeeld +DemoUnicodeBlockDeskApp.render4DPlane0=Toon alles in unicode4D \ No newline at end of file diff --git a/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_runic.properties b/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_runic.properties index 576a8839..70f57866 100644 --- a/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Messages_runic.properties +++ b/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 -DemoUnicodePlaneDeskApp.colPlane=\u16A2\u16BE\u16C1\u16B2\u16DF\u16DE\u16D6 \u16C8\u16DA\u16A8\u16BE\u16D6 -DemoUnicodePlaneDeskApp.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 \ No newline at end of file +DemoUnicodeBlockDeskApp.title=\u16DE\u16D6\u16D7\u16DF \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 +DemoUnicodeBlockDeskApp.colText=\u16D6\u16EA\u16A8\u16D7\u16C8\u16DA\u16D6 +DemoUnicodeBlockDeskApp.render4DPlane0=\u16CB\u16BA\u16DF\u16B9 \u16A8\u16DA\u16DA \u16C1\u16BE \u16A2\u16BE\u16C1\u16B2\u16DF\u16DE\u16D64\u16DE \ No newline at end of file diff --git a/gdxapp4d-app-notepad/src/main/java/love/distributedrebirth/gdxapp4d/app/notepad/NotepadDeskApp.java b/gdxapp4d-app-notepad/src/main/java/love/distributedrebirth/gdxapp4d/app/notepad/NotepadDeskApp.java index 7bd1e02e..ccf08c89 100644 --- a/gdxapp4d-app-notepad/src/main/java/love/distributedrebirth/gdxapp4d/app/notepad/NotepadDeskApp.java +++ b/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 = { - UnicodePlane.BRAHMI, - UnicodePlane.UGARITIC, - UnicodePlane.BAMUM_SUPPLEMENT, - UnicodePlane.TAI_XUAN_JING_SYMBOLS + private final static UnicodeBlock[] GRID_PLANES = { + UnicodeBlock.BRAHMI, + UnicodeBlock.UGARITIC, + UnicodeBlock.BAMUM_SUPPLEMENT, + UnicodeBlock.TAI_XUAN_JING_SYMBOLS }; - private final static UnicodePlane[] GRID_PLANES_CHINA = { - UnicodePlane.CJK_UNIFIED_IDEOGRAPHS, - UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A, - UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B, - UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C, - UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D, - UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E, - UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F + private final static UnicodeBlock[] GRID_PLANES_CHINA = { + UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS, + UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A, + UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B, + UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C, + UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D, + UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E, + 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 - - diff --git a/gdxapp4d-chain-boot-warp-sea/pom.xml b/gdxapp4d-chain-boot-warp-sea/pom.xml index dd5fced3..cf125fe6 100644 --- a/gdxapp4d-chain-boot-warp-sea/pom.xml +++ b/gdxapp4d-chain-boot-warp-sea/pom.xml @@ -63,8 +63,6 @@ - - diff --git a/gdxapp4d-chain-default-apps/pom.xml b/gdxapp4d-chain-default-apps/pom.xml index 0c8f5920..0103c5c5 100644 --- a/gdxapp4d-chain-default-apps/pom.xml +++ b/gdxapp4d-chain-default-apps/pom.xml @@ -72,8 +72,6 @@ - - diff --git a/gdxapp4d-chain-default-music/pom.xml b/gdxapp4d-chain-default-music/pom.xml index 02069f3a..12c4301e 100644 --- a/gdxapp4d-chain-default-music/pom.xml +++ b/gdxapp4d-chain-default-music/pom.xml @@ -26,8 +26,6 @@ - - diff --git a/gdxapp4d-chain-dep-osgi-lib/pom.xml b/gdxapp4d-chain-dep-osgi-lib/pom.xml index 171bd368..aacb27a1 100644 --- a/gdxapp4d-chain-dep-osgi-lib/pom.xml +++ b/gdxapp4d-chain-dep-osgi-lib/pom.xml @@ -89,8 +89,6 @@ - - diff --git a/gdxapp4d-chain-dep-osgi-scr/pom.xml b/gdxapp4d-chain-dep-osgi-scr/pom.xml index 166b6bff..c2786432 100644 --- a/gdxapp4d-chain-dep-osgi-scr/pom.xml +++ b/gdxapp4d-chain-dep-osgi-scr/pom.xml @@ -26,8 +26,6 @@ - - diff --git a/gdxapp4d-chain-font-unicode4d/pom.xml b/gdxapp4d-chain-font-unicode4d/pom.xml index 2967ee90..0283d3e7 100644 --- a/gdxapp4d-chain-font-unicode4d/pom.xml +++ b/gdxapp4d-chain-font-unicode4d/pom.xml @@ -26,8 +26,6 @@ - - diff --git a/gdxapp4d-chain-mod-unitxc/pom.xml b/gdxapp4d-chain-mod-unitxc/pom.xml index 71acd792..3bc6a16d 100644 --- a/gdxapp4d-chain-mod-unitxc/pom.xml +++ b/gdxapp4d-chain-mod-unitxc/pom.xml @@ -37,8 +37,6 @@ - - diff --git a/gdxapp4d-chain-mod-vrgem4/pom.xml b/gdxapp4d-chain-mod-vrgem4/pom.xml index 34dbcbd7..48c22fc0 100644 --- a/gdxapp4d-chain-mod-vrgem4/pom.xml +++ b/gdxapp4d-chain-mod-vrgem4/pom.xml @@ -37,8 +37,6 @@ - - diff --git a/gdxapp4d-chain-mod-vrsys5/pom.xml b/gdxapp4d-chain-mod-vrsys5/pom.xml index d09e0c3d..63e2fd68 100644 --- a/gdxapp4d-chain-mod-vrsys5/pom.xml +++ b/gdxapp4d-chain-mod-vrsys5/pom.xml @@ -37,8 +37,6 @@ - - diff --git a/gdxapp4d-lib-unicodezd/src/test/java/love/distributedrebirth/unicode4d/TestConvFont.java b/gdxapp4d-lib-unicodezd/src/test/java/love/distributedrebirth/unicode4d/TestConvFont.java index e0f1e3ce..bdae5a27 100644 --- a/gdxapp4d-lib-unicodezd/src/test/java/love/distributedrebirth/unicode4d/TestConvFont.java +++ b/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")); diff --git a/gdxapp4d-lib-unicodezd/src/test/java/love/distributedrebirth/unicode4d/TestSwingPlane.java b/gdxapp4d-lib-unicodezd/src/test/java/love/distributedrebirth/unicode4d/TestSwingPlane.java index e8e6cbb3..3db7cde8 100644 --- a/gdxapp4d-lib-unicodezd/src/test/java/love/distributedrebirth/unicode4d/TestSwingPlane.java +++ b/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; diff --git a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java index 74096c04..f81a41e6 100644 --- a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java +++ b/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 { "ᒢᣘᐧᐧ.ᣕᓫᐪᑋᓫᣗ.ᒄᑊᣔᒻ.ᒻᑊᣕᕐᓑᣔᓫ.ᐞᐧᐧᣟᣟᐧᐧ,"+ "ᒢᣘᐧᐧ.ᣕᓫᐪᑋᓫᣗ.ᒄᑊᣔᒻ.ᒻᑊᣕᕐᓑᣔᓫ.ᐞᣟᣟᣟᣟᣟᣟ,"+ "ᒢᣘᐧᐧ.ᣕᓫᐪᑋᓫᣗ.ᒄᑊᣔᒻ.ᒃᣔᔆᓫᒄ,"+ + "ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᒼᣔᑊᑉᓫ,"+ + "ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᒼᣔᑊᑉᓫ.ᐪᣔᒻᑊᑉ,"+ + "ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᒼᣔᑊᑉᓫ.ᐪᣔᔆᐪᓫ,"+ + "ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᣘᣔᓑᒻᐪ,"+ + "ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᣘᣔᓑᒻᐪ.ᑊᐣᓑᒼᑊᑉ,"+ "ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ,"+ "ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒃᐤᣔᐪ,"+ "ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒄᓫᣔᐪᑋ,"+ diff --git a/pom.xml b/pom.xml index e6eba6f5..93b1a020 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,6 @@ 'spifly' dep + asm-*.jar deps and make all class loading 20-40% slower, RM slf4j ? --> 2.1.0-alpha1 5786.SHEVAT〄.1-SNAPSHOT - 6.0.53 5.3.6 2.19.1 @@ -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 @@ love.distributedrebirth.nx01 - nx01-warp-core + nx01-jpp2-warp-core ${nx01.version} love.distributedrebirth.nx01 - nx01-warp-fault + nx01-jpp1-klass-fault ${nx01.version} love.distributedrebirth.nx01 - nx01-warp-manifestor + nx01-jpp2-warp-manifestor ${nx01.version}