From 3dae31e00740016ac91190e426bbedcc671c5248 Mon Sep 17 00:00:00 2001 From: Willem Date: Sat, 19 Mar 2022 12:40:15 +0100 Subject: [PATCH] Moved base glyph code to unicode --- .../glyphdemo/apps/DemoGlyphSetDeskApp.java | 2 +- .../glyphdemo/apps/DemoNumberPartDeskApp.java | 28 +++++++++---------- .../numberxd/base2t/part/BãßBȍőnPartʸᴰ.java | 13 --------- .../unicode4d}/BaseGlyphSet.java | 2 +- .../unicode4d}/BaseGlyphSetNumber.java | 2 +- .../unicode4d}/BãßBȍőnGlyphSetKeyʸᴰ.java | 2 +- .../vrgem4/GDXAppVrGem4Activator.java | 2 +- 7 files changed, 19 insertions(+), 32 deletions(-) rename {gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/glyph => gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d}/BaseGlyphSet.java (99%) rename {gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/glyph => gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d}/BaseGlyphSetNumber.java (99%) rename {gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/glyph => gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d}/BãßBȍőnGlyphSetKeyʸᴰ.java (88%) diff --git a/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoGlyphSetDeskApp.java b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoGlyphSetDeskApp.java index f8aead60..9ef7a0f6 100644 --- a/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoGlyphSetDeskApp.java +++ b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoGlyphSetDeskApp.java @@ -9,7 +9,7 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; 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.numberxd.glyph.BaseGlyphSet; +import love.distributedrebirth.unicode4d.BaseGlyphSet; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class DemoGlyphSetDeskApp extends AbstractDeskApp { 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 14c7af4c..5306278f 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 @@ -18,7 +18,7 @@ import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt2ʸᴰ; import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt3ʸᴰ; import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt4ʸᴰ; import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartʸᴰ; -import love.distributedrebirth.numberxd.glyph.BaseGlyphSet; +import love.distributedrebirth.unicode4d.BaseGlyphSet; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class DemoNumberPartDeskApp extends AbstractDeskApp implements DeskAppRenderer { @@ -124,35 +124,35 @@ public class DemoNumberPartDeskApp extends AbstractDeskApp implements DeskAppRen ImGui.text(part.BȍőnDialTone()); if (showBase10.get()) { ImGui.tableNextColumn(); - ImGui.text(part.BȍőnPrintGlyphSetNumber10(BaseGlyphSet.TONE_SCRIPT)); + ImGui.text(BaseGlyphSet.TONE_SCRIPT.BȍőnPrintNumber10(part.BȍőnRangTelNul(), part.BãßInstances().length - 1)); ImGui.tableNextColumn(); - ImGui.text(part.BȍőnPrintGlyphSetNumber10(BaseGlyphSet.KOREAN)); + ImGui.text(BaseGlyphSet.KOREAN.BȍőnPrintNumber10(part.BȍőnRangTelNul(), part.BãßInstances().length - 1)); ImGui.tableNextColumn(); - ImGui.text(part.BȍőnPrintGlyphSetNumber10(BaseGlyphSet.BENGALI)); + ImGui.text(BaseGlyphSet.BENGALI.BȍőnPrintNumber10(part.BȍőnRangTelNul(), part.BãßInstances().length - 1)); ImGui.tableNextColumn(); - ImGui.text(part.BȍőnPrintGlyphSetNumber10(BaseGlyphSet.ARABIC)); + ImGui.text(BaseGlyphSet.ARABIC.BȍőnPrintNumber10(part.BȍőnRangTelNul(), part.BãßInstances().length - 1)); } if (showBase16.get()) { ImGui.tableNextColumn(); - ImGui.text(part.BȍőnPrintGlyphSetNumber16(BaseGlyphSet.TONE_SCRIPT)); + ImGui.text(BaseGlyphSet.TONE_SCRIPT.BȍőnPrintNumber16(part.BȍőnRangTelNul(), part.BãßInstances().length - 1)); ImGui.tableNextColumn(); - ImGui.text(part.BȍőnPrintGlyphSetNumber16(BaseGlyphSet.KOREAN)); + ImGui.text(BaseGlyphSet.KOREAN.BȍőnPrintNumber16(part.BȍőnRangTelNul(), part.BãßInstances().length - 1)); ImGui.tableNextColumn(); - ImGui.text(part.BȍőnPrintGlyphSetNumber16(BaseGlyphSet.RUNIC)); + ImGui.text(BaseGlyphSet.RUNIC.BȍőnPrintNumber16(part.BȍőnRangTelNul(), part.BãßInstances().length - 1)); ImGui.tableNextColumn(); - ImGui.text(part.BȍőnPrintGlyphSetNumber16(BaseGlyphSet.LATIN_BASIC)); + ImGui.text(BaseGlyphSet.LATIN_BASIC.BȍőnPrintNumber16(part.BȍőnRangTelNul(), part.BãßInstances().length - 1)); } if (showBase27.get()) { ImGui.tableNextColumn(); - ImGui.text(part.BȍőnPrintGlyphSetNumber27(BaseGlyphSet.TONE_SCRIPT)); + ImGui.text(BaseGlyphSet.TONE_SCRIPT.BȍőnPrintNumber27(part.BȍőnRangTelNul(), part.BãßInstances().length - 1)); ImGui.tableNextColumn(); - ImGui.text(part.BȍőnPrintGlyphSetNumber27(BaseGlyphSet.KOREAN)); + ImGui.text(BaseGlyphSet.KOREAN.BȍőnPrintNumber27(part.BȍőnRangTelNul(), part.BãßInstances().length - 1)); ImGui.tableNextColumn(); - ImGui.text(part.BȍőnPrintGlyphSetNumber27(BaseGlyphSet.LATIN_BASIC)); + ImGui.text(BaseGlyphSet.LATIN_BASIC.BȍőnPrintNumber27(part.BȍőnRangTelNul(), part.BãßInstances().length - 1)); ImGui.tableNextColumn(); - ImGui.text(part.BȍőnPrintGlyphSetNumber27(BaseGlyphSet.GREEK)); + ImGui.text(BaseGlyphSet.GREEK.BȍőnPrintNumber27(part.BȍőnRangTelNul(), part.BãßInstances().length - 1)); ImGui.tableNextColumn(); - ImGui.text(part.BȍőnPrintGlyphSetNumber27(BaseGlyphSet.MALAYALAM)); + ImGui.text(BaseGlyphSet.MALAYALAM.BȍőnPrintNumber27(part.BȍőnRangTelNul(), part.BãßInstances().length - 1)); } ImGui.tableNextColumn(); ImGui.text(part.BȍőnChinaKey()); diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java index 0997888d..facc63b1 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java @@ -6,7 +6,6 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpenʸᴰ; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinStoreʸᴰ; import love.distributedrebirth.bassboonyd.DefaultEnumSetʸᴰ; -import love.distributedrebirth.numberxd.glyph.BaseGlyphSet; import love.distributedrebirth.bassboonyd.BãßBȍőnInitMethodʸᴰ; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") @@ -51,16 +50,4 @@ public interface BãßBȍőnPartʸᴰ> extends } return (T) mapChina.get(chinaKey); } - - default String BȍőnPrintGlyphSetNumber10(BaseGlyphSet glyphSet) { - return glyphSet.BȍőnPrintNumber10(BȍőnRangTelNul(), BãßInstances().length - 1); - } - - default String BȍőnPrintGlyphSetNumber16(BaseGlyphSet glyphSet) { - return glyphSet.BȍőnPrintNumber16(BȍőnRangTelNul(), BãßInstances().length - 1); - } - - default String BȍőnPrintGlyphSetNumber27(BaseGlyphSet glyphSet) { - return glyphSet.BȍőnPrintNumber27(BȍőnRangTelNul(), BãßInstances().length - 1); - } } diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/glyph/BaseGlyphSet.java b/gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d/BaseGlyphSet.java similarity index 99% rename from gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/glyph/BaseGlyphSet.java rename to gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d/BaseGlyphSet.java index d9d80b53..cb92332b 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/glyph/BaseGlyphSet.java +++ b/gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d/BaseGlyphSet.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.numberxd.glyph; +package love.distributedrebirth.unicode4d; import java.text.DecimalFormat; diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/glyph/BaseGlyphSetNumber.java b/gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d/BaseGlyphSetNumber.java similarity index 99% rename from gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/glyph/BaseGlyphSetNumber.java rename to gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d/BaseGlyphSetNumber.java index d899705a..050da3e7 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/glyph/BaseGlyphSetNumber.java +++ b/gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d/BaseGlyphSetNumber.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.numberxd.glyph; +package love.distributedrebirth.unicode4d; import java.util.ArrayList; import java.util.List; diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/glyph/BãßBȍőnGlyphSetKeyʸᴰ.java b/gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d/BãßBȍőnGlyphSetKeyʸᴰ.java similarity index 88% rename from gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/glyph/BãßBȍőnGlyphSetKeyʸᴰ.java rename to gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d/BãßBȍőnGlyphSetKeyʸᴰ.java index 9d627590..5263be95 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/glyph/BãßBȍőnGlyphSetKeyʸᴰ.java +++ b/gdxapp4d-lib-unicodezd/src/main/java/love/distributedrebirth/unicode4d/BãßBȍőnGlyphSetKeyʸᴰ.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.numberxd.glyph; +package love.distributedrebirth.unicode4d; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinStoreKeyʸᴰ; diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4Activator.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4Activator.java index 9a7b807c..37ea0f06 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4Activator.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4Activator.java @@ -33,7 +33,7 @@ import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4DeskAppService; import love.distributedrebirth.numberxd.base2t.Base2PartsFactory; import love.distributedrebirth.numberxd.base2t.Base2Terminator; import love.distributedrebirth.numberxd.base2t.part.warp.TOSWarpCore; -import love.distributedrebirth.numberxd.glyph.BaseGlyphSet; +import love.distributedrebirth.unicode4d.BaseGlyphSet; import love.distributedrebirth.warpme.ship.WaterShipOcean; public class GDXAppVrGem4Activator implements BundleActivator {