diff --git a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java b/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java index b69a74e2..0997888d 100644 --- a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java +++ b/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java @@ -53,14 +53,14 @@ public interface BãßBȍőnPartʸᴰ> extends } default String BȍőnPrintGlyphSetNumber10(BaseGlyphSet glyphSet) { - return glyphSet.BȍőnPrintGlyphSetNumber10(BȍőnRangTelNul(), BãßInstances().length - 1); + return glyphSet.BȍőnPrintNumber10(BȍőnRangTelNul(), BãßInstances().length - 1); } default String BȍőnPrintGlyphSetNumber16(BaseGlyphSet glyphSet) { - return glyphSet.BȍőnPrintGlyphSetNumber16(BȍőnRangTelNul(), BãßInstances().length - 1); + return glyphSet.BȍőnPrintNumber16(BȍőnRangTelNul(), BãßInstances().length - 1); } default String BȍőnPrintGlyphSetNumber27(BaseGlyphSet glyphSet) { - return glyphSet.BȍőnPrintGlyphSetNumber27(BȍőnRangTelNul(), BãßInstances().length - 1); + return glyphSet.BȍőnPrintNumber27(BȍőnRangTelNul(), BãßInstances().length - 1); } } diff --git a/lib-numberxd/src/main/love/distributedrebirth/numberxd/glyph/BaseGlyphSet.java b/lib-numberxd/src/main/love/distributedrebirth/numberxd/glyph/BaseGlyphSet.java index 84960765..8f303c83 100644 --- a/lib-numberxd/src/main/love/distributedrebirth/numberxd/glyph/BaseGlyphSet.java +++ b/lib-numberxd/src/main/love/distributedrebirth/numberxd/glyph/BaseGlyphSet.java @@ -25,7 +25,7 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnChinaValue()))).withSeperator(BãßBȍőnConstantsʸᴰ.STR_SPACE), new BaseGlyphSetNumber("1","2","3","A","4","5","6","B","7","8","9","C","*","0","#","D"), - LATIN_BASIC.BȍőnGlyphSetNumber27()), + LATIN_BASIC.BȍőnNumber27()), LATIN_TOP( new BaseGlyphSetNumber("⁰","¹","²","³","⁴","⁵","⁶","⁷","⁸","⁹"), new BaseGlyphSetNumber("⁰","¹","²","³","⁴","⁵","⁶","⁷","⁸","⁹","ᵃ","ᵇ","ᶜ","ᵈ","ᵉ","ᶠ"), @@ -35,9 +35,9 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnDialTone()))), @@ -46,19 +46,19 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt1Value()))), new BaseGlyphSetNumber("˧˥˩","˧˩˥","˧˥˦","˧˩˨","˧˦˦","˧˨˨","˧˥˥","˧˩˩","˥˩˧","˩˥˧","˥˦˧","˩˨˧","˦˦˧","˨˨˧","˥˥˧","˩˩˧").withAltGlyphSet(BaseGlyphSet.LATIN_TOP), - TONE_SCRIPT.BȍőnGlyphSetNumber27()), + TONE_SCRIPT.BȍőnNumber27()), DIPAVALI_LRPATH_SUBHEX( new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt1Value()))), new BaseGlyphSetNumber("˧˥˩","˧˩˥","˧˥˦","˧˩˨","˧˦˦","˧˨˨","˧˥˥","˧˩˩","˥˩˧","˩˥˧","˥˦˧","˩˨˧","˦˦˧","˨˨˧","˥˥˧","˩˩˧").withAltGlyphSet(BaseGlyphSet.LATIN_SUB), - TONE_SCRIPT.BȍőnGlyphSetNumber27()), + TONE_SCRIPT.BȍőnNumber27()), DIPAVALI_RLPATH_TOPHEX( new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt2Value()))), new BaseGlyphSetNumber("꜔꜒꜖","꜔꜖꜒","꜔꜒꜓","꜔꜖꜕","꜔꜓꜓","꜔꜕꜕","꜔꜒꜒","꜔꜖꜖","꜒꜖꜔","꜖꜒꜔","꜒꜓꜔","꜖꜕꜔","꜓꜓꜔","꜕꜕꜔","꜒꜒꜔","꜖꜖꜔").withAltGlyphSet(BaseGlyphSet.LATIN_TOP), - TONE_SCRIPT.BȍőnGlyphSetNumber27()), + TONE_SCRIPT.BȍőnNumber27()), DIPAVALI_RLPATH_SUBHEX( new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt2Value()))), new BaseGlyphSetNumber("꜔꜒꜖","꜔꜖꜒","꜔꜒꜓","꜔꜖꜕","꜔꜓꜓","꜔꜕꜕","꜔꜒꜒","꜔꜖꜖","꜒꜖꜔","꜖꜒꜔","꜒꜓꜔","꜖꜕꜔","꜓꜓꜔","꜕꜕꜔","꜒꜒꜔","꜖꜖꜔").withAltGlyphSet(BaseGlyphSet.LATIN_SUB), - TONE_SCRIPT.BȍőnGlyphSetNumber27()), + TONE_SCRIPT.BȍőnNumber27()), GREEK( new BaseGlyphSetNumber("ō","α","β","γ","δ","ε","ϝ","ζ","η","θ"), @@ -68,79 +68,82 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnChinaKey()))), - LATIN_BASIC.BȍőnGlyphSetNumber16(), + LATIN_BASIC.BȍőnNumber16(), null), CHINA_FORMAL_OLD( new BaseGlyphSetNumber("零","壹","貳","參","肆","伍","陸","柒","捌","玖"), - LATIN_BASIC.BȍőnGlyphSetNumber16(), + LATIN_BASIC.BȍőnNumber16(), null), JAPAN( - CHINA.BȍőnGlyphSetNumber10(), - LATIN_BASIC.BȍőnGlyphSetNumber16(), + CHINA.BȍőnNumber10(), + LATIN_BASIC.BȍőnNumber16(), null), JAPAN_FORMAL( new BaseGlyphSetNumber("零","壱","弐","参","四","五","六","七","八","九"), - LATIN_BASIC.BȍőnGlyphSetNumber16(), + LATIN_BASIC.BȍőnNumber16(), null), CYRILLIC( new BaseGlyphSetNumber("Ф","А","В","Г","Д","Є","Ѕ","З","И","Ѳ"), - LATIN_BASIC.BȍőnGlyphSetNumber16(), + LATIN_BASIC.BȍőnNumber16(), new BaseGlyphSetNumber("А","В","Г","Д","Є","Ѕ","З","И","Ѳ","І","К","Л","М","Н","Ѯ","Ѻ","П","Ч","Р","С","Т","Ѵ","Ф","Х","Ѱ","Ѿ","Ц")), ARABIC( new BaseGlyphSetNumber("٠","١","٢","٣","٤","٥","٦","٧","٨","٩"), - LATIN_BASIC.BȍőnGlyphSetNumber16(), + LATIN_BASIC.BȍőnNumber16(), new BaseGlyphSetNumber("ا","ب","ج","د","ه","و","ز","ح","ط","ي","ك","ل","م","ن","س","ع","ف","ص","ق","ر","ش","ت","ث","خ","ذ","ض","ظ"), true), HEBREW( new BaseGlyphSetNumber("אֶפֶס","אֶחָד","שְׁתַּיִם","שְׁלֹשָׁה","אַרְבַּע‎","חֲמִשָּׁה‎","שֵׁשׁ‎","שִׁבְעָה","שְׁמוֹנֶה","תִּשְׁעָה‎").withSeperator(BãßBȍőnConstantsʸᴰ.STR_SPACE), - LATIN_BASIC.BȍőnGlyphSetNumber16(), - new BaseGlyphSetNumber("א","ב","ג","ד","ה","ו","ז","ח","ט","י","כ","ל","מ","נ","ס ","ע","פ","צ","ק","ר","ש","ת","ך","ם","ן","ף","ץ"), + LATIN_BASIC.BȍőnNumber16(), + new BaseGlyphSetNumber("א","ב","ג","ד","ה","ו","ז","ח","ט","י","כ","ל","מ","נ","ס","ע","פ","צ","ק","ר","ש","ת","ך","ם","ן","ף","ץ"), true), ; - private final GuageCounterᴶᴹˣ printsGlyphSetNumber10; - private final GuageCounterᴶᴹˣ printsGlyphSetNumber16; - private final GuageCounterᴶᴹˣ printsGlyphSetNumber27; + private final GuageCounterᴶᴹˣ printNumber10Count; + private final GuageCounterᴶᴹˣ printNumber16Count; + private final GuageCounterᴶᴹˣ printNumber27Count; private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; @@ -160,24 +163,24 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ