From 0bd9a27ffa4bd034a5b63ca073ab8571b378a5e1 Mon Sep 17 00:00:00 2001 From: Willem Cazander Date: Thu, 3 Feb 2022 01:07:12 +0100 Subject: [PATCH] Moved part letter to BaseGlyphSet support --- .../demo4d/screen/BasePartRenderer.java | 4 +- .../base2t/part/BãßBȍőnPartKeyʸᴰ.java | 1 - .../numberxd/base2t/part/BãßBȍőnPartʸᴰ.java | 40 +++--- .../numberxd/base2t/part/T02PartBinary.java | 7 +- .../numberxd/base2t/part/T03PartTrit.java | 9 +- .../numberxd/base2t/part/T04PartQuad.java | 11 +- .../numberxd/base2t/part/T05PartPental.java | 13 +- .../numberxd/base2t/part/T06PartSeximal.java | 15 +-- .../numberxd/base2t/part/T07PartPlanIt.java | 17 ++- .../numberxd/base2t/part/T08PartOctal.java | 21 ++- .../numberxd/base2t/part/T10PartDecimal.java | 25 ++-- .../base2t/part/T11PartUndecimal.java | 25 ++-- .../numberxd/base2t/part/T12PartUncial.java | 27 ++-- .../numberxd/base2t/part/T16PartHex.java | 35 +++-- .../numberxd/base2t/part/T20PartScore.java | 55 ++++---- .../base2t/part/T60PartSexagesimal.java | 123 +++++++++--------- .../numberxd/base2t/BasePartFactoryTest.java | 17 --- .../numberxd/base2t/T02PartBinaryTest.java | 1 - .../numberxd/base2t/T03PartTritTest.java | 1 - .../numberxd/base2t/T04PartQuadTest.java | 1 - .../numberxd/base2t/T05PartPentalTest.java | 1 - .../numberxd/base2t/T06PartSeximalTest.java | 1 - .../numberxd/base2t/T07PartPlanItTest.java | 1 - .../numberxd/base2t/T08PartOctalTest.java | 1 - .../numberxd/base2t/T10PartDecimalTest.java | 1 - .../numberxd/base2t/T11PartUndecimalTest.java | 1 - .../numberxd/base2t/T12PartUncialTest.java | 1 - .../numberxd/base2t/T16PartHexTest.java | 1 - .../numberxd/base2t/T20PartScoreTest.java | 1 - .../numberxd/base2t/T60SexagesimalTest.java | 1 - 30 files changed, 206 insertions(+), 252 deletions(-) diff --git a/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java b/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java index 4c3f8b3b..0c2d9ee8 100644 --- a/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java +++ b/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java @@ -63,7 +63,7 @@ public class BasePartRenderer extends ImGuiRendererMain { ImGui.tableSetupColumn("16Korean"); ImGui.tableSetupColumn("36LBasic"); ImGui.tableSetupColumn("36Greek"); - ImGui.tableSetupColumn("36Arabic"); + ImGui.tableSetupColumn("36Hebrew"); ImGui.tableSetupColumn("ChinaK"); ImGui.tableSetupColumn("ChinaV"); ImGui.tableSetupColumn("Alt1"); @@ -93,7 +93,7 @@ public class BasePartRenderer extends ImGuiRendererMain { ImGui.tableNextColumn(); ImGui.text(part.BȍőnGlyphSetNumber36Greek()); ImGui.tableNextColumn(); - ImGui.text(part.BȍőnGlyphSetNumber36Arabic()); + ImGui.text(part.BȍőnGlyphSetNumber36Hebrew()); ImGui.tableNextColumn(); ImGui.text(part.BȍőnChinaKey()); ImGui.tableNextColumn(); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartKeyʸᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartKeyʸᴰ.java index 800e185f..fd3ebacf 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartKeyʸᴰ.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartKeyʸᴰ.java @@ -7,7 +7,6 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinStoreKeyʸᴰ; public enum BãßBȍőnPartKeyʸᴰ implements BãßBȍőnCoffinStoreKeyʸᴰ { ID_TONE, - ID_LETTER, CHINA_KEY, CHINA_VALUE, SHIFT_BITS, diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java index 94ae3a5a..87589b92 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java @@ -15,10 +15,6 @@ public interface BãßBȍőnPartʸᴰ> extends return GET_BBC().GET_STR(BãßBȍőnPartKeyʸᴰ.ID_TONE); } - default String BȍőnIdentifierLetter() { - return GET_BBC().GET_STR(BãßBȍőnPartKeyʸᴰ.ID_LETTER); - } - default String BȍőnChinaKey() { return GET_BBC().GET_STR(BãßBȍőnPartKeyʸᴰ.CHINA_KEY); } @@ -41,21 +37,21 @@ public interface BãßBȍőnPartʸᴰ> extends default String BȍőnGlyphSetNumber16(BaseGlyphSet glyphSet) { T[] values = BãßInstances(); - if (values.length < 10) { + if (values.length <= 16) { return glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul()); - } else if (values.length < 255) { + } else if (values.length <= 256) { StringBuilder buf = new StringBuilder(); buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul() >> 4)); buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul() & 0x0F)); return buf.toString(); - } else if (values.length < 10000) { + } else if (values.length <= 0xFFF+1) { StringBuilder buf = new StringBuilder(); buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor((BȍőnRangTelNul() >> 8) & 0x0F)); buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor((BȍőnRangTelNul() >> 4) & 0x0F)); buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul() & 0x0F)); return buf.toString(); } else { - throw new IllegalStateException("Can't handle more than 10000 values."); + throw new IllegalStateException("Can't handle more than 0xFFF values."); } } @@ -76,31 +72,31 @@ public interface BãßBȍőnPartʸᴰ> extends } default String BȍőnGlyphSetNumber36(BaseGlyphSet glyphSet) { + StringBuilder buf = new StringBuilder(); T[] values = BãßInstances(); - if (values.length < 10) { - return glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor(BȍőnRangTelEen()); - } else if (values.length < 100) { + if (values.length <= 9) { + buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor(BȍőnRangTelEen())); + } else if (values.length <= 99) { int count = BȍőnRangTelNul(); - int mod10 = count % 10 + 1; - int div10 = count / 10 + 1; - //System.out.println("count="+count+" div10="+div10+" mod10="+mod10); - StringBuilder buf = new StringBuilder(); + int mod10 = count % 9 + 1; + int div10 = count / 9 + 1; buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor(div10)); buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor(mod10)); - return buf.toString(); - } else if (values.length < 1000) { + } else if (values.length <= 999) { int count = BȍőnRangTelNul(); - int mod10 = count % 10 + 1; - int div10 = count / 10 + 1; - int div100 = count / 100 + 1; - StringBuilder buf = new StringBuilder(); + int mod10 = count % 9 + 1; + int div10 = count / 90 + 1; + int div100 = count / 900 + 1; buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(div10)); buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(div100)); buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(mod10)); - return buf.toString(); } else { throw new IllegalStateException("Can't handle more than 1000 values."); } + if (BaseGlyphSet.HEBREW.equals(glyphSet)) { + return buf.reverse().toString(); + } + return buf.toString(); } @SuppressWarnings("unchecked") diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T02PartBinary.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T02PartBinary.java index d3b8a5e1..9226a9b8 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T02PartBinary.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T02PartBinary.java @@ -9,17 +9,16 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; @BãßBȍőnClassInfoʸᴰ(name = "T02PartBinary", purpose = "The distribution by 2.") public enum T02PartBinary implements BãßBȍőnPartʸᴰ { - PART_1("˧","0", "低", "low"), - PART_2("꜔","1", "高", "high"), + PART_1("˧", "低", "low"), + PART_2("꜔", "高", "high"), ; 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; }; - private T02PartBinary(String idTone, String idLetter, String chinaKey, String chinaValue) { + private T02PartBinary(String idTone, String chinaKey, String chinaValue) { BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_LETTER, idLetter); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_MAP(BãßBȍőnPartKeyʸᴰ.MAP_TONE); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T03PartTrit.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T03PartTrit.java index 05c91f0a..5b0f9ccb 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T03PartTrit.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T03PartTrit.java @@ -9,18 +9,17 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; @BãßBȍőnClassInfoʸᴰ(name = "T03PartTrit", purpose = "The distribution by 3.") public enum T03PartTrit implements BãßBȍőnPartʸᴰ { - PART_1("˦","0","一","1"), - PART_2("˧","1","二","2"), - PART_3("˨","2","三","3"), + PART_1("˦","一","1"), + PART_2("˧","二","2"), + PART_3("˨","三","3"), ; 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; }; - private T03PartTrit(String idTone, String idLetter, String chinaKey, String chinaValue) { + private T03PartTrit(String idTone, String chinaKey, String chinaValue) { BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_LETTER, idLetter); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_MAP(BãßBȍőnPartKeyʸᴰ.MAP_TONE); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T04PartQuad.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T04PartQuad.java index 5bd5bd53..d09a8a58 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T04PartQuad.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T04PartQuad.java @@ -10,19 +10,18 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; @BãßBȍőnPartAlt1Infoʸᴰ(name = "Cardinal direction", website = "https://simple.wikipedia.org/wiki/Cardinal_direction") public enum T04PartQuad implements BãßBȍőnPartAlt1ʸᴰ { - PART_1("˥","0","北","north","N"), - PART_2("꜒","1","東","east", "E"), - PART_3("꜖","2","西","west", "W"), - PART_4("˩","3","南","south","S"), + PART_1("˥","北","north","N"), + PART_2("꜒","東","east", "E"), + PART_3("꜖","西","west", "W"), + PART_4("˩","南","south","S"), ; 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; }; - private T04PartQuad(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { + private T04PartQuad(String idTone, String chinaKey, String chinaValue, String alt1Value) { BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_LETTER, idLetter); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T05PartPental.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T05PartPental.java index 070ea0d6..e1351352 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T05PartPental.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T05PartPental.java @@ -11,20 +11,19 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; @BãßBȍőnPartAlt2Infoʸᴰ(name = "Pythagorean Interpretations", website = "http://wisdomofhypatia.com/OM/BA/PP.html") public enum T05PartPental implements BãßBȍőnPartAlt2ʸᴰ { - PART_1("˥","0","火","fire", "EI","heile"), - PART_2("˦","1","水","water","U", "hudor"), - PART_3("˧","2","木","wood" ,"I", "idea"), - PART_4("˨","3","金","gold", "A", "aer"), - PART_5("˩","4","土","earth","G", "gaia"), + PART_1("˥","火","fire", "EI","heile"), + PART_2("˦","水","water","U", "hudor"), + PART_3("˧","木","wood" ,"I", "idea"), + PART_4("˨","金","gold", "A", "aer"), + PART_5("˩","土","earth","G", "gaia"), ; 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; }; - private T05PartPental(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value, String alt2Value) { + private T05PartPental(String idTone, String chinaKey, String chinaValue, String alt1Value, String alt2Value) { BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_LETTER, idLetter); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T06PartSeximal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T06PartSeximal.java index 7e5632a0..da51e19e 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T06PartSeximal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T06PartSeximal.java @@ -10,21 +10,20 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; @BãßBȍőnPartAlt1Infoʸᴰ(name = "ADFGVX cipher", website = "https://en.wikipedia.org/wiki/ADFGVX_cipher") public enum T06PartSeximal implements BãßBȍőnPartAlt1ʸᴰ { - PART_1("˦","0","四","4","A"), - PART_2("˨","1","五","5","D"), - PART_3("꜓","2","六","6","F"), - PART_4("꜕","3","七","7","G"), - PART_5("꜊","4","八","8","V"), - PART_6("꜏","5","九","9","X"), + PART_1("˦","四","4","A"), + PART_2("˨","五","5","D"), + PART_3("꜓","六","6","F"), + PART_4("꜕","七","7","G"), + PART_5("꜊","八","8","V"), + PART_6("꜏","九","9","X"), ; 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; }; - private T06PartSeximal(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { + private T06PartSeximal(String idTone, String chinaKey, String chinaValue, String alt1Value) { BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_LETTER, idLetter); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T07PartPlanIt.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T07PartPlanIt.java index 87f65c5e..cd995d31 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T07PartPlanIt.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T07PartPlanIt.java @@ -10,22 +10,21 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; @BãßBȍőnPartAlt1Infoʸᴰ(name = "Fallen sign", website = "https://en.wikipedia.org/wiki/Classical_planet#Western_astrology") public enum T07PartPlanIt implements BãßBȍőnPartAlt1ʸᴰ { - PART_1("˥","0","♎︎","libra", "天秤座"), - PART_2("꜉","1","♏︎","scorpio", "天蠍座"), - PART_3("꜋","2","♓︎","pisces", "雙魚座"), - PART_4("꜔","3","♍︎","virgo", "處女座"), - PART_5("꜎","4","♋︎","cancer", "癌症"), - PART_6("꜐","5","♑︎","capricorn","摩羯座"), - PART_7("˩","7","♈︎","aries", "白羊座"), + PART_1("˥","♎︎","libra", "天秤座"), + PART_2("꜉","♏︎","scorpio", "天蠍座"), + PART_3("꜋","♓︎","pisces", "雙魚座"), + PART_4("꜔","♍︎","virgo", "處女座"), + PART_5("꜎","♋︎","cancer", "癌症"), + PART_6("꜐","♑︎","capricorn","摩羯座"), + PART_7("˩","♈︎","aries", "白羊座"), ; 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; }; - private T07PartPlanIt(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { + private T07PartPlanIt(String idTone, String chinaKey, String chinaValue, String alt1Value) { BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_LETTER, idLetter); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T08PartOctal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T08PartOctal.java index fcd5fcc7..0ffdfe3e 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T08PartOctal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T08PartOctal.java @@ -11,14 +11,14 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; @BãßBȍőnPartAlt2Infoʸᴰ(name = "Relative Tone Sequence", website = "https://en.wikipedia.org/wiki/Tone_letter") public enum T08PartOctal implements BãßBȍőnPartAlt2ʸᴰ,BãßBȍőnPartShiftBitsʸᴰ { - PART_1("˥","0","心","heart","˧˥˩","˥˩˧", 0), - PART_2("˩","1","頭","head", "˧˩˥","˩˥˧", 3), - PART_3("꜒","2","眼","eye", "˧˥˦","˥˦˧", 6), - PART_4("꜖","3","嘴","mouth","˧˩˨","˩˨˧", 9), - PART_5("꜈","4","臂","arm", "˧˦˦","˦˦˧", 12), - PART_6("꜌","5","手","hand", "˧˨˨","˨˨˧", 15), - PART_7("꜍","6","肢","leg", "˧˥˥","˥˥˧", 18), - PART_8("꜑","7","腳","feet", "˧˩˩","˩˩˧", 21), + PART_1("˥","心","heart","˧˥˩","˥˩˧", 0), + PART_2("˩","頭","head", "˧˩˥","˩˥˧", 3), + PART_3("꜒","眼","eye", "˧˥˦","˥˦˧", 6), + PART_4("꜖","嘴","mouth","˧˩˨","˩˨˧", 9), + PART_5("꜈","臂","arm", "˧˦˦","˦˦˧", 12), + PART_6("꜌","手","hand", "˧˨˨","˨˨˧", 15), + PART_7("꜍","肢","leg", "˧˥˥","˥˥˧", 18), + PART_8("꜑","腳","feet", "˧˩˩","˩˩˧", 21), ; public static int BIT_COUNT = 3; @@ -27,9 +27,8 @@ public enum T08PartOctal implements BãßBȍőnPartAlt2ʸᴰ,Bãß public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T08PartOctal(String identifierTone, String identifierLetter, String chinaKey, String chinaValue, String alt1Value, String alt2Value, int shiftBits) { - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, identifierTone); - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_LETTER, identifierLetter); + private T08PartOctal(String idTone, String chinaKey, String chinaValue, String alt1Value, String alt2Value, int shiftBits) { + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.SHIFT_BITS, Integer.valueOf(shiftBits)); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T10PartDecimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T10PartDecimal.java index af511384..3e412fb6 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T10PartDecimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T10PartDecimal.java @@ -7,27 +7,26 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") @BãßBȍőnClassInfoʸᴰ(name = "T10PartDecimal", purpose = "The distribution by 10.") -public enum T10PartDecimal implements BãßBȍőnPartAlt4ʸᴰ { +public enum T10PartDecimal implements BãßBȍőnPartʸᴰ { - PART_1 ("˥","ō","零","zero"), - PART_2 ("˦","α","壹","one"), - PART_3 ("˧","β","貳","two"), - PART_4 ("˨","γ","參","three"), - PART_5 ("˩","δ","肆","four"), - PART_6 ("꜒","ε","伍","five"), - PART_7 ("꜓","ϝ","陸","six"), - PART_8 ("꜔","ζ","柒","seven"), - PART_9 ("꜕","η","捌","eight"), - PART_10("꜖","θ","玖","nine"), + PART_1 ("˥","零","zero"), + PART_2 ("˦","壹","one"), + PART_3 ("˧","貳","two"), + PART_4 ("˨","參","three"), + PART_5 ("˩","肆","four"), + PART_6 ("꜒","伍","five"), + PART_7 ("꜓","陸","six"), + PART_8 ("꜔","柒","seven"), + PART_9 ("꜕","捌","eight"), + PART_10("꜖","玖","nine"), ; 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; }; - private T10PartDecimal(String idTone, String idLetter, String chinaKey, String chinaValue) { + private T10PartDecimal(String idTone, String chinaKey, String chinaValue) { BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_LETTER, idLetter); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_MAP(BãßBȍőnPartKeyʸᴰ.MAP_TONE); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T11PartUndecimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T11PartUndecimal.java index 6c2c8476..3c0ab97c 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T11PartUndecimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T11PartUndecimal.java @@ -10,26 +10,25 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; @BãßBȍőnPartAlt1Infoʸᴰ(name = "Tamil numerals", website = "https://en.wikipedia.org/wiki/Tamil_numerals") public enum T11PartUndecimal implements BãßBȍőnPartAlt1ʸᴰ { - PART_1 ("˥","0","走","walk", "௦"), - PART_2 ("꜈","1","跑","run", "௧"), - PART_3 ("꜉","2","坐","sit", "௨"), - PART_4 ("꜋","3","掛","hang", "௩"), - PART_5 ("꜌","4","鋪","lay", "௪"), - PART_6 ("꜔","5","跳","jump", "௫"), - PART_7 ("꜍","6","落","drop", "௬"), - PART_8 ("꜎","7","寂","lonely","௭"), - PART_9 ("꜏","8","談","talk", "௮"), - PART_10("꜐","9","春","life", "௯"), - PART_11("˩","=","耦","mate", "௰"), + PART_1 ("˥","走","walk", "௦"), + PART_2 ("꜈","跑","run", "௧"), + PART_3 ("꜉","坐","sit", "௨"), + PART_4 ("꜋","掛","hang", "௩"), + PART_5 ("꜌","鋪","lay", "௪"), + PART_6 ("꜔","跳","jump", "௫"), + PART_7 ("꜍","落","drop", "௬"), + PART_8 ("꜎","寂","lonely","௭"), + PART_9 ("꜏","談","talk", "௮"), + PART_10("꜐","春","life", "௯"), + PART_11("˩","耦","mate", "௰"), ; 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; }; - private T11PartUndecimal(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { + private T11PartUndecimal(String idTone, String chinaKey, String chinaValue, String alt1Value) { BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_LETTER, idLetter); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T12PartUncial.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T12PartUncial.java index 3ead320c..00c0ce0a 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T12PartUncial.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T12PartUncial.java @@ -10,27 +10,26 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; @BãßBȍőnPartAlt1Infoʸᴰ(name = "Transdecimal symbols", website = "https://en.wikipedia.org/wiki/Duodecimal#Transdecimal_symbols") public enum T12PartUncial implements BãßBȍőnPartAlt1ʸᴰ { - PART_1 ("˥","0","日","sun", "0"), - PART_2 ("˧","1","月","moon", "1"), - PART_3 ("˩","2","星","star", "2"), - PART_4 ("꜒","3","山","mountain","3"), - PART_5 ("꜔","4","龍","dragon", "4"), - PART_6 ("꜖","5","鳳","phoenix", "5"), - PART_7 ("꜈","6","杯","cup", "6"), - PART_8 ("꜊","7","藻","pondweed","7"), - PART_9 ("꜌","8","爐","furnace", "8"), - PART_10("꜍","9","種","seed", "9"), - PART_11("꜏","A","黼","axe", "\u218a"), // TURNED DIGIT TWO - PART_12("꜑","B","亞","nozero", "\u218b"), // TURNED DIGIT THREE + PART_1 ("˥","日","sun", "0"), + PART_2 ("˧","月","moon", "1"), + PART_3 ("˩","星","star", "2"), + PART_4 ("꜒","山","mountain","3"), + PART_5 ("꜔","龍","dragon", "4"), + PART_6 ("꜖","鳳","phoenix", "5"), + PART_7 ("꜈","杯","cup", "6"), + PART_8 ("꜊","藻","pondweed","7"), + PART_9 ("꜌","爐","furnace", "8"), + PART_10("꜍","種","seed", "9"), + PART_11("꜏","黼","axe", "\u218a"), // TURNED DIGIT TWO + PART_12("꜑","亞","nozero", "\u218b"), // TURNED DIGIT THREE ; 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; }; - private T12PartUncial(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { + private T12PartUncial(String idTone, String chinaKey, String chinaValue, String alt1Value) { BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_LETTER, idLetter); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T16PartHex.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T16PartHex.java index 5aa3c858..a3a28fbf 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T16PartHex.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T16PartHex.java @@ -9,31 +9,30 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; @BãßBȍőnClassInfoʸᴰ(name = "T16PartHex", purpose = "The distribution by 16.") public enum T16PartHex implements BãßBȍőnPartʸᴰ { - PART_1 ("˥","0","氫","hydrogen"), - PART_2 ("˦","1","氦","helium"), - PART_3 ("˨","2","鋰","lithium"), - PART_4 ("˩","3","鈹","beryllium"), - PART_5 ("꜒","4","硼","boron"), - PART_6 ("꜓","5","碳","carbon"), - PART_7 ("꜕","6","氮","nitrogen"), - PART_8 ("꜖","7","氧","oxygen"), - PART_9 ("꜈","8","氟","fluorine"), - PART_10("꜉","9","氖","neon"), - PART_11("꜋","A","鈉","sodium"), - PART_12("꜌","B","鎂","magnesium"), - PART_13("꜍","C","鋁","aluminium"), - PART_14("꜎","D","矽","silicon"), - PART_15("꜐","E","磷","phosphorus"), - PART_16("꜑","F","硫","sulfur"), + PART_1 ("˥","氫","hydrogen"), + PART_2 ("˦","氦","helium"), + PART_3 ("˨","鋰","lithium"), + PART_4 ("˩","鈹","beryllium"), + PART_5 ("꜒","硼","boron"), + PART_6 ("꜓","碳","carbon"), + PART_7 ("꜕","氮","nitrogen"), + PART_8 ("꜖","氧","oxygen"), + PART_9 ("꜈","氟","fluorine"), + PART_10("꜉","氖","neon"), + PART_11("꜋","鈉","sodium"), + PART_12("꜌","鎂","magnesium"), + PART_13("꜍","鋁","aluminium"), + PART_14("꜎","矽","silicon"), + PART_15("꜐","磷","phosphorus"), + PART_16("꜑","硫","sulfur"), ; 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; }; - private T16PartHex(String idTone, String idLetter, String chinaKey, String chinaValue) { + private T16PartHex(String idTone, String chinaKey, String chinaValue) { BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_LETTER, idLetter); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_MAP(BãßBȍőnPartKeyʸᴰ.MAP_TONE); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T20PartScore.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T20PartScore.java index e29670a3..260eebe2 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T20PartScore.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T20PartScore.java @@ -12,31 +12,32 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") @BãßBȍőnClassInfoʸᴰ(name = "T20PartScore", purpose = "The distribution by 20.") -@BãßBȍőnPartAlt1Infoʸᴰ(name = "Vigesimal", website = "https://en.wikipedia.org/wiki/Vigesimal#Places") -@BãßBȍőnPartAlt2Infoʸᴰ(name = "Vigesimal Alternative", website = "https://en.wikipedia.org/wiki/Vigesimal#Places") -@BãßBȍőnPartAlt3Infoʸᴰ(name = "Open Location Code", website = "https://en.wikipedia.org/wiki/Open_Location_Code") -public enum T20PartScore implements BãßBȍőnPartAlt3ʸᴰ { +@BãßBȍőnPartAlt1Infoʸᴰ(name = "SI-Unit Types", website = "https://en.wikipedia.org/wiki/Metric_prefix") +@BãßBȍőnPartAlt2Infoʸᴰ(name = "Vigesimal", website = "https://en.wikipedia.org/wiki/Vigesimal#Places") +@BãßBȍőnPartAlt3Infoʸᴰ(name = "Vigesimal Alternative", website = "https://en.wikipedia.org/wiki/Vigesimal#Places") +@BãßBȍőnPartAlt4Infoʸᴰ(name = "Open Location Code", website = "https://en.wikipedia.org/wiki/Open_Location_Code") +public enum T20PartScore implements BãßBȍőnPartAlt4ʸᴰ { - PART_1 ("˥","Y", "尧","yotta","0","0","2"), - PART_2 ("˦","Z", "泽","zetta","1","1","3"), - PART_3 ("˧","E", "艾","exa", "2","2","4"), - PART_4 ("˨","P", "拍","peta", "3","3","5"), - PART_5 ("˩","T", "太","tera", "4","4","6"), - PART_6 ("꜒","G", "吉","giga", "5","5","7"), - PART_7 ("꜓","M", "兆","mega", "6","6","8"), - PART_8 ("꜔","k", "千","kilo", "7","7","9"), - PART_9 ("꜕","h", "百","hecto","8","8","C"), - PART_10("꜖","da","十","deca", "9","9","F"), - PART_11("꜈","d", "分","deci", "A","A","G"), - PART_12("꜉","c", "厘","centi","B","B","H"), - PART_13("꜊","m", "毫","milli","C","C","J"), - PART_14("꜋","µ", "微","micro","D","D","M"), - PART_15("꜌","n", "纳","nano", "E","E","P"), - PART_16("꜍","p", "皮","pico", "F","F","Q"), - PART_17("꜎","f", "飞","femto","G","G","R"), - PART_18("꜏","a", "阿","atto", "H","H","V"), - PART_19("꜐","z", "仄","zepto","I","J","W"), - PART_20("꜑","y", "幺","yocto","J","K","X"), + PART_1 ("˥", "尧", "yotta", "Y", "0", "0", "2"), + PART_2 ("˦", "泽", "zetta", "Z", "1", "1", "3"), + PART_3 ("˧", "艾", "exa", "E", "2", "2", "4"), + PART_4 ("˨", "拍", "peta", "P", "3", "3", "5"), + PART_5 ("˩", "太", "tera", "T", "4", "4", "6"), + PART_6 ("꜒", "吉", "giga", "G", "5", "5", "7"), + PART_7 ("꜓", "兆", "mega", "M", "6", "6", "8"), + PART_8 ("꜔", "千", "kilo", "k", "7", "7", "9"), + PART_9 ("꜕", "百", "hecto", "h", "8", "8", "C"), + PART_10("꜖", "十", "deca", "da","9", "9", "F"), + PART_11("꜈", "分", "deci", "d", "A", "A", "G"), + PART_12("꜉", "厘", "centi", "c", "B", "B", "H"), + PART_13("꜊", "毫", "milli", "m", "C", "C", "J"), + PART_14("꜋", "微", "micro", "µ", "D", "D", "M"), + PART_15("꜌", "纳", "nano", "n", "E", "E", "P"), + PART_16("꜍", "皮", "pico", "p", "F", "F", "Q"), + PART_17("꜎", "飞", "femto", "f", "G", "G", "R"), + PART_18("꜏", "阿", "atto", "a", "H", "H", "V"), + PART_19("꜐", "仄", "zepto", "z", "I", "J", "W"), + PART_20("꜑", "幺", "yocto", "y", "J", "K", "X"), ; private static final Map OPENLC_MAP = Collections.unmodifiableMap( @@ -45,15 +46,15 @@ public enum T20PartScore implements BãßBȍőnPartAlt3ʸᴰ { public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T20PartScore(String idTone, String idLetter, String chinaKey, String chinaValue, - String alt1Value, String alt2Value, String alt3Value) { + private T20PartScore(String idTone, String chinaKey, String chinaValue, + String alt1Value, String alt2Value, String alt3Value, String alt4Value) { BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_LETTER, idLetter); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_2_VALUE, alt2Value); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_3_VALUE, alt3Value); + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_4_VALUE, alt4Value); BBC.PUT_MAP(BãßBȍőnPartKeyʸᴰ.MAP_TONE); BBC.PUT_MAP(BãßBȍőnPartKeyʸᴰ.MAP_CHINA); } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T60PartSexagesimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T60PartSexagesimal.java index a8f65121..21776323 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T60PartSexagesimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T60PartSexagesimal.java @@ -9,78 +9,77 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; @BãßBȍőnClassInfoʸᴰ(name = "T60Sexagesimal", purpose = "The distribution by 60.") public enum T60PartSexagesimal implements BãßBȍőnPartʸᴰ { - PART_1 ("˧˩˥","ια","牛","cow"), - PART_2 ("˧˥˦","ιβ","鸡","chicken"), - PART_3 ("˧˩˨","ιγ","羊","sheep"), - PART_4 ("˧˦˦","ιδ","狼","wolf"), - PART_5 ("˧˨˨","ιε","鼠","rat"), - PART_6 ("˧˥˥","ιϚ","貓","cat"), - PART_7 ("˧˩˩","ιζ","兔","rabbit"), - PART_8 ("˥˩˧","ιη","猿","ape"), - PART_9 ("˩˥˧","ιθ","蛇","snake"), - PART_10("˥˦˧","κα","马","horse"), - PART_11("˩˨˧","κβ","象","elepant"), - PART_12("˦˦˧","κγ","豹","leopard"), - PART_13("˨˨˧","κδ","鴉","crow"), - PART_14("˥˥˧","κε","豬","pig"), - PART_15("˩˩˧","κϚ","狗","dog"), + PART_1 ("˧˩˥","牛","cow"), + PART_2 ("˧˥˦","鸡","chicken"), + PART_3 ("˧˩˨","羊","sheep"), + PART_4 ("˧˦˦","狼","wolf"), + PART_5 ("˧˨˨","鼠","rat"), + PART_6 ("˧˥˥","貓","cat"), + PART_7 ("˧˩˩","兔","rabbit"), + PART_8 ("˥˩˧","猿","ape"), + PART_9 ("˩˥˧","蛇","snake"), + PART_10("˥˦˧","马","horse"), + PART_11("˩˨˧","象","elepant"), + PART_12("˦˦˧","豹","leopard"), + PART_13("˨˨˧","鴉","crow"), + PART_14("˥˥˧","豬","pig"), + PART_15("˩˩˧","狗","dog"), - PART_16("꜔꜒꜖","κζ","魚","fish"), - PART_17("꜔꜒꜓","κη","虾","shrimp"), - PART_18("꜔꜖꜕","κθ","鲸","whale"), - PART_19("꜔꜓꜓","λα","熊","bear"), - PART_20("꜔꜕꜕","λβ","鹿","deer"), - PART_21("꜔꜒꜒","λγ","驴","donkey"), - PART_22("꜔꜖꜖","λδ","貘","tapir"), - PART_23("꜒꜖꜔","λε","鸟","bird"), - PART_24("꜖꜒꜔","λϚ","鹤","crane"), - PART_25("꜒꜓꜔","λζ","鹰","eagle"), - PART_26("꜖꜕꜔","λη","隼","falcon"), - PART_27("꜓꜓꜔","λθ","鹅","goose"), - PART_28("꜕꜕꜔","μα","蝾","salamander"), - PART_29("꜒꜒꜔","μβ","龟","turtle"), - PART_30("꜖꜖꜔","μγ","蜈","centipede"), + PART_16("꜔꜒꜖","魚","fish"), + PART_17("꜔꜒꜓","虾","shrimp"), + PART_18("꜔꜖꜕","鲸","whale"), + PART_19("꜔꜓꜓","熊","bear"), + PART_20("꜔꜕꜕","鹿","deer"), + PART_21("꜔꜒꜒","驴","donkey"), + PART_22("꜔꜖꜖","貘","tapir"), + PART_23("꜒꜖꜔","鸟","bird"), + PART_24("꜖꜒꜔","鹤","crane"), + PART_25("꜒꜓꜔","鹰","eagle"), + PART_26("꜖꜕꜔","隼","falcon"), + PART_27("꜓꜓꜔","鹅","goose"), + PART_28("꜕꜕꜔","蝾","salamander"), + PART_29("꜒꜒꜔","龟","turtle"), + PART_30("꜖꜖꜔","蜈","centipede"), - PART_31("꜊꜌꜈","μδ","蝇","fly"), - PART_32("꜊꜈꜉","με","蝎","scorpion"), - PART_33("꜊꜌꜋","μϚ","虫","worm"), - PART_34("꜊꜉꜉","μζ","虎","tiger"), - PART_35("꜊꜋꜋","μη","駝","camel"), - PART_36("꜊꜈꜈","μθ","猴","monkey"), - PART_37("꜊꜌꜌","να","鯊","shark"), - PART_38("꜈꜌꜊","νβ","鴨","duck"), - PART_39("꜌꜈꜊","νγ","芥","mustard"), - PART_40("꜈꜉꜊","νδ","鹽","salt"), - PART_41("꜌꜋꜊","νε","椒","pepper"), - PART_42("꜉꜉꜊","νϚ","薑","ginger"), - PART_43("꜋꜋꜊","νζ","穀","corn"), - PART_44("꜈꜈꜊","νη","豆","beans"), - PART_45("꜌꜌꜊","νθ","柚","pomelos"), + PART_31("꜊꜌꜈","蝇","fly"), + PART_32("꜊꜈꜉","蝎","scorpion"), + PART_33("꜊꜌꜋","虫","worm"), + PART_34("꜊꜉꜉","虎","tiger"), + PART_35("꜊꜋꜋","駝","camel"), + PART_36("꜊꜈꜈","猴","monkey"), + PART_37("꜊꜌꜌","鯊","shark"), + PART_38("꜈꜌꜊","鴨","duck"), + PART_39("꜌꜈꜊","芥","mustard"), + PART_40("꜈꜉꜊","鹽","salt"), + PART_41("꜌꜋꜊","椒","pepper"), + PART_42("꜉꜉꜊","薑","ginger"), + PART_43("꜋꜋꜊","穀","corn"), + PART_44("꜈꜈꜊","豆","beans"), + PART_45("꜌꜌꜊","柚","pomelos"), - PART_46("꜏꜍꜑","ξα","棗","jujube"), - PART_47("꜏꜍꜎","ξβ","瓜","melon"), - PART_48("꜏꜑꜐","ξγ","葡","grape"), - PART_49("꜏꜎꜎","ξδ","梅","plum"), - PART_50("꜏꜐꜐","ξε","灰","lime"), - PART_51("꜏꜍꜍","ξϚ","梨","pear"), - PART_52("꜏꜑꜑","ξζ","蕉","banana"), - PART_53("꜍꜑꜏","ξη","檸","lemon"), - PART_54("꜑꜍꜏","ξθ","柿","persimmon"), - PART_55("꜍꜎꜏","οα","橙","orange"), - PART_56("꜑꜐꜏","οβ","桃","peach"), - PART_57("꜎꜎꜏","ογ","杏","apricot"), - PART_58("꜐꜐꜏","οδ","莓","strawberry"), - PART_59("꜍꜍꜏","οε","薯","patato"), - PART_60("꜑꜑꜏","οϚ","蘋","apple"), + PART_46("꜏꜍꜑","棗","jujube"), + PART_47("꜏꜍꜎","瓜","melon"), + PART_48("꜏꜑꜐","葡","grape"), + PART_49("꜏꜎꜎","梅","plum"), + PART_50("꜏꜐꜐","灰","lime"), + PART_51("꜏꜍꜍","梨","pear"), + PART_52("꜏꜑꜑","蕉","banana"), + PART_53("꜍꜑꜏","檸","lemon"), + PART_54("꜑꜍꜏","柿","persimmon"), + PART_55("꜍꜎꜏","橙","orange"), + PART_56("꜑꜐꜏","桃","peach"), + PART_57("꜎꜎꜏","杏","apricot"), + PART_58("꜐꜐꜏","莓","strawberry"), + PART_59("꜍꜍꜏","薯","patato"), + PART_60("꜑꜑꜏","蘋","apple"), ; 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; }; - private T60PartSexagesimal(String idTone, String idLetter, String chinaKey, String chinaValue) { + private T60PartSexagesimal(String idTone, String chinaKey, String chinaValue) { BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); - BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_LETTER, idLetter); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); BBC.PUT_MAP(BãßBȍőnPartKeyʸᴰ.MAP_TONE); diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/BasePartFactoryTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/BasePartFactoryTest.java index 2bbae370..bdc809a2 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/BasePartFactoryTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/BasePartFactoryTest.java @@ -60,21 +60,4 @@ public class BasePartFactoryTest { Assertions.assertTrue(global.size() > 1); Assertions.assertTrue(duplicate); } - - @Test - public void testGlobalLetterMap() { - boolean duplicate = false; - Map global = new HashMap<>(); - for (int base:BasePartFactory.INSTANCE.BãßBases()) { - for (BãßBȍőnPartʸᴰ part:BasePartFactory.INSTANCE.BãßBuildPartsByBase(base)) { - if (global.containsKey(part.BȍőnIdentifierLetter())) { - duplicate = true; - break; - } - global.put(part.BȍőnIdentifierLetter(), part.BȍőnChinaValue()); - } - } - Assertions.assertTrue(global.size() > 1); - Assertions.assertTrue(duplicate); - } } diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T02PartBinaryTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T02PartBinaryTest.java index 6c547f86..cdf42704 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T02PartBinaryTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T02PartBinaryTest.java @@ -13,7 +13,6 @@ public class T02PartBinaryTest { public void testBasePart() { for (T02PartBinary value:T02PartBinary.values()) { Assertions.assertNotNull(value.BȍőnIdentifierTone()); - Assertions.assertNotNull(value.BȍőnIdentifierLetter()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); } diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T03PartTritTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T03PartTritTest.java index 262b50a1..8ae58b9b 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T03PartTritTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T03PartTritTest.java @@ -13,7 +13,6 @@ public class T03PartTritTest { public void testBasePart() { for (T03PartTrit value:T03PartTrit.values()) { Assertions.assertNotNull(value.BȍőnIdentifierTone()); - Assertions.assertNotNull(value.BȍőnIdentifierLetter()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); } diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T04PartQuadTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T04PartQuadTest.java index 95bae788..5445ed04 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T04PartQuadTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T04PartQuadTest.java @@ -13,7 +13,6 @@ public class T04PartQuadTest { public void testBasePart() { for (T04PartQuad value:T04PartQuad.values()) { Assertions.assertNotNull(value.BȍőnIdentifierTone()); - Assertions.assertNotNull(value.BȍőnIdentifierLetter()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); Assertions.assertNotNull(value.BȍőnAlt1Value()); diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T05PartPentalTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T05PartPentalTest.java index 8123faf6..14d62c57 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T05PartPentalTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T05PartPentalTest.java @@ -13,7 +13,6 @@ public class T05PartPentalTest { public void testBasePart() { for (T05PartPental value:T05PartPental.values()) { Assertions.assertNotNull(value.BȍőnIdentifierTone()); - Assertions.assertNotNull(value.BȍőnIdentifierLetter()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); } diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T06PartSeximalTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T06PartSeximalTest.java index 39f60eeb..fde62742 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T06PartSeximalTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T06PartSeximalTest.java @@ -13,7 +13,6 @@ public class T06PartSeximalTest { public void testBasePart() { for (T06PartSeximal value:T06PartSeximal.values()) { Assertions.assertNotNull(value.BȍőnIdentifierTone()); - Assertions.assertNotNull(value.BȍőnIdentifierLetter()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); Assertions.assertNotNull(value.BȍőnAlt1Value()); diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T07PartPlanItTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T07PartPlanItTest.java index 4ea8db0e..623d3ca5 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T07PartPlanItTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T07PartPlanItTest.java @@ -13,7 +13,6 @@ public class T07PartPlanItTest { public void testBasePart() { for (T07PartPlanIt value:T07PartPlanIt.values()) { Assertions.assertNotNull(value.BȍőnIdentifierTone()); - Assertions.assertNotNull(value.BȍőnIdentifierLetter()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); Assertions.assertNotNull(value.BȍőnAlt1Value()); diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T08PartOctalTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T08PartOctalTest.java index 96d1ed3c..5c47713d 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T08PartOctalTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T08PartOctalTest.java @@ -13,7 +13,6 @@ public class T08PartOctalTest { public void testBasePart() { for (T08PartOctal value:T08PartOctal.values()) { Assertions.assertNotNull(value.BȍőnIdentifierTone()); - Assertions.assertNotNull(value.BȍőnIdentifierLetter()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); Assertions.assertNotNull(value.BȍőnAlt1Value()); diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T10PartDecimalTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T10PartDecimalTest.java index b9f1f076..59024d72 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T10PartDecimalTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T10PartDecimalTest.java @@ -13,7 +13,6 @@ public class T10PartDecimalTest { public void testBasePart() { for (T10PartDecimal value:T10PartDecimal.values()) { Assertions.assertNotNull(value.BȍőnIdentifierTone()); - Assertions.assertNotNull(value.BȍőnIdentifierLetter()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); } diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T11PartUndecimalTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T11PartUndecimalTest.java index 4eb33093..cb049755 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T11PartUndecimalTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T11PartUndecimalTest.java @@ -13,7 +13,6 @@ public class T11PartUndecimalTest { public void testBasePart() { for (T11PartUndecimal value:T11PartUndecimal.values()) { Assertions.assertNotNull(value.BȍőnIdentifierTone()); - Assertions.assertNotNull(value.BȍőnIdentifierLetter()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); } diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T12PartUncialTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T12PartUncialTest.java index 296ab52e..ca3e829c 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T12PartUncialTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T12PartUncialTest.java @@ -13,7 +13,6 @@ public class T12PartUncialTest { public void testBasePart() { for (T12PartUncial value:T12PartUncial.values()) { Assertions.assertNotNull(value.BȍőnIdentifierTone()); - Assertions.assertNotNull(value.BȍőnIdentifierLetter()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); Assertions.assertNotNull(value.BȍőnAlt1Value()); diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T16PartHexTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T16PartHexTest.java index cdc49f67..c448ce32 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T16PartHexTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T16PartHexTest.java @@ -13,7 +13,6 @@ public class T16PartHexTest { public void testBasePart() { for (T16PartHex value:T16PartHex.values()) { Assertions.assertNotNull(value.BȍőnIdentifierTone()); - Assertions.assertNotNull(value.BȍőnIdentifierLetter()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); } diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T20PartScoreTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T20PartScoreTest.java index 62e1f686..967196a2 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T20PartScoreTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T20PartScoreTest.java @@ -13,7 +13,6 @@ public class T20PartScoreTest { public void testBasePart() { for (T20PartScore value:T20PartScore.values()) { Assertions.assertNotNull(value.BȍőnIdentifierTone()); - Assertions.assertNotNull(value.BȍőnIdentifierLetter()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); Assertions.assertNotNull(value.BȍőnAlt1Value()); diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T60SexagesimalTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T60SexagesimalTest.java index 599842ae..e32c6c7f 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T60SexagesimalTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T60SexagesimalTest.java @@ -13,7 +13,6 @@ public class T60SexagesimalTest { public void testBasePart() { for (T60PartSexagesimal value:T60PartSexagesimal.values()) { Assertions.assertNotNull(value.BȍőnIdentifierTone()); - Assertions.assertNotNull(value.BȍőnIdentifierLetter()); Assertions.assertNotNull(value.BȍőnChinaKey()); Assertions.assertNotNull(value.BȍőnChinaValue()); }