diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java index 6ae2e7ba..7f0447d6 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java @@ -7,6 +7,7 @@ import java.util.function.Consumer; import java.util.stream.Collectors; import love.distributedrebirth.numberxd.base2t.facet.BasePart; +import love.distributedrebirth.numberxd.base2t.facet.BasePartAlt4; import love.distributedrebirth.numberxd.base2t.facet.BaseFacetKey; import love.distributedrebirth.numberxd.base2t.facet.BaseFacetMap; @@ -15,32 +16,53 @@ import love.distributedrebirth.numberxd.base2t.facet.BaseFacetMap; * * @author willemtsade ©Δ∞ 仙上主天 */ -public enum T10PartDecimal implements BasePart { - - PART_1 ("˥","0","零","zero"), - PART_2 ("˦","1","壹","one"), - PART_3 ("˧","2","貳","two"), - PART_4 ("˨","3","參","three"), - PART_5 ("˩","4","肆","four"), - PART_6 ("꜒","5","伍","five"), - PART_7 ("꜓","6","陸","six"), - PART_8 ("꜔","7","柒","seven"), - PART_9 ("꜕","8","捌","eight"), - PART_10("꜖","9","玖","nine"), +public enum T10PartDecimal implements BasePart,BasePartAlt4 { + + PART_1 ("˥","ō","零","zero", "영", "\u1040","০", "෦"), + PART_2 ("˦","α","壹","one", "일","\u1041","১", "෧"), + PART_3 ("˧","β","貳","two", "이","\u1042","২","෨"), + PART_4 ("˨","γ","參","three","삼","\u1043","৩","෩"), + PART_5 ("˩","δ","肆","four", "사","\u1044","৪","෪"), + PART_6 ("꜒","ε","伍","five", "오","\u1045","৫","෫"), + PART_7 ("꜓","ϝ","陸","six", "육","\u1046","৬","෬"), + PART_8 ("꜔","ζ","柒","seven","칠","\u1047","৭","෭"), + PART_9 ("꜕","η","捌","eight","팔","\u1048","৮","෮"), + PART_10("꜖","θ","玖","nine", "구","\u1049","৯","෯"), ; public static int LENGTH() { return values().length; }; private final BaseFacetMap bfm = BaseFacetMap.newInstance(); + private static final String ALT_1_NAME = "Korean numerals"; + private static final String ALT_1_WIKI = "https://en.wikipedia.org/wiki/Korean_numerals"; + private static final String ALT_2_NAME = "Burmese numerals"; // Escaped to keep stable line height + private static final String ALT_2_WIKI = "https://en.wikipedia.org/wiki/Burmese_numerals"; + private static final String ALT_3_NAME = "Bengali numerals"; + private static final String ALT_3_WIKI = "https://en.wikipedia.org/wiki/Bengali_numerals"; + private static final String ALT_4_NAME = "Sinhala Lith Illakkam"; + private static final String ALT_4_WIKI = "https://en.wikipedia.org/wiki/Sinhala_numerals#Numerals"; private static final Map TONE_MAP = Collections.unmodifiableMap( Arrays.asList(values()).stream().collect(Collectors.toMap(v -> v.getIdentifierTone(), v -> v))); private static final Map CHINA_MAP = Collections.unmodifiableMap( Arrays.asList(values()).stream().collect(Collectors.toMap(v -> v.getChinaKey(), v -> v))); - private T10PartDecimal(String idTone, String idLetter, String chinaKey, String chinaValue) { + private T10PartDecimal(String idTone, String idLetter, String chinaKey, String chinaValue, + String alt1Value, String alt2Value, String alt3Value, String alt4Value) { this.getBFM().putInit(BaseFacetKey.ID_TONE, idTone); this.getBFM().putInit(BaseFacetKey.ID_LETTER, idLetter); this.getBFM().putInit(BaseFacetKey.CHINA_KEY, chinaKey); this.getBFM().putInit(BaseFacetKey.CHINA_VALUE, chinaValue); + this.getBFM().putInit(BaseFacetKey.ALT_1_VALUE, alt1Value); + this.getBFM().putInit(BaseFacetKey.ALT_1_NAME, ALT_1_NAME); + this.getBFM().putInit(BaseFacetKey.ALT_1_WIKI, ALT_1_WIKI); + this.getBFM().putInit(BaseFacetKey.ALT_2_VALUE, alt2Value); + this.getBFM().putInit(BaseFacetKey.ALT_2_NAME, ALT_2_NAME); + this.getBFM().putInit(BaseFacetKey.ALT_2_WIKI, ALT_2_WIKI); + this.getBFM().putInit(BaseFacetKey.ALT_3_VALUE, alt3Value); + this.getBFM().putInit(BaseFacetKey.ALT_3_NAME, ALT_3_NAME); + this.getBFM().putInit(BaseFacetKey.ALT_3_WIKI, ALT_3_WIKI); + this.getBFM().putInit(BaseFacetKey.ALT_4_VALUE, alt4Value); + this.getBFM().putInit(BaseFacetKey.ALT_4_NAME, ALT_4_NAME); + this.getBFM().putInit(BaseFacetKey.ALT_4_WIKI, ALT_4_WIKI); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java index d7bf3fe2..d4fca94c 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java @@ -7,6 +7,7 @@ import java.util.function.Consumer; import java.util.stream.Collectors; import love.distributedrebirth.numberxd.base2t.facet.BasePart; +import love.distributedrebirth.numberxd.base2t.facet.BasePartAlt1; import love.distributedrebirth.numberxd.base2t.facet.BaseFacetKey; import love.distributedrebirth.numberxd.base2t.facet.BaseFacetMap; @@ -15,33 +16,38 @@ import love.distributedrebirth.numberxd.base2t.facet.BaseFacetMap; * * @author willemtsade ©Δ∞ 仙上主天 */ -public enum T11PartUndecimal implements BasePart { +public enum T11PartUndecimal implements BasePart,BasePartAlt1 { - 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 ("˥","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", "௰"), ; public static int LENGTH() { return values().length; }; private final BaseFacetMap bfm = BaseFacetMap.newInstance(); + private static final String ALT_1_NAME = "Tamil numerals"; + private static final String ALT_1_WIKI = "https://en.wikipedia.org/wiki/Tamil_numerals"; private static final Map TONE_MAP = Collections.unmodifiableMap( Arrays.asList(values()).stream().collect(Collectors.toMap(v -> v.getIdentifierTone(), v -> v))); private static final Map CHINA_MAP = Collections.unmodifiableMap( Arrays.asList(values()).stream().collect(Collectors.toMap(v -> v.getChinaKey(), v -> v))); - private T11PartUndecimal(String idTone, String idLetter, String chinaKey, String chinaValue) { + private T11PartUndecimal(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { this.getBFM().putInit(BaseFacetKey.ID_TONE, idTone); this.getBFM().putInit(BaseFacetKey.ID_LETTER, idLetter); this.getBFM().putInit(BaseFacetKey.CHINA_KEY, chinaKey); this.getBFM().putInit(BaseFacetKey.CHINA_VALUE, chinaValue); + this.getBFM().putInit(BaseFacetKey.ALT_1_VALUE, alt1Value); + this.getBFM().putInit(BaseFacetKey.ALT_1_NAME, ALT_1_NAME); + this.getBFM().putInit(BaseFacetKey.ALT_1_WIKI, ALT_1_WIKI); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java index cfb1bbfe..edda750f 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java @@ -18,18 +18,18 @@ import love.distributedrebirth.numberxd.base2t.facet.BasePartAlt1; */ public enum T12PartUncial implements BasePart,BasePartAlt1 { - PART_1 ("˥","0","日","sun","0"), - PART_2 ("˧","1","月","moon","1"), - PART_3 ("˩","2","星","star","2"), + 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_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_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 ; public static int LENGTH() { return values().length; };