From 2ae7e1f0a782d3bed328a1fcca0516c1a290c8b5 Mon Sep 17 00:00:00 2001 From: Willem Cazander Date: Wed, 2 Feb 2022 17:34:46 +0100 Subject: [PATCH] =?UTF-8?q?Added=20B=C3=A3=C3=9FB=C8=8D=C5=91nCoffinOpen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bassboonyd/BaßBȍőnEnumʸᴰ.java | 17 ----- .../bassboonyd/BãßBȍőnCoffin.java | 71 +++++++++++++++++++ .../bassboonyd/BãßBȍőnCoffinOpen.java | 33 +++++++++ .../bassboonyd/BãßBȍőnConstants.java | 8 +++ ...ȍőnEnumSetʸᴰ.java => BãßBȍőnEnumSetʸᴰ.java} | 14 +++- .../bassboonyd/BãßBȍőnEnumʸᴰ.java | 23 ++++++ ...{BaßBȍőnNaamʸᴰ.java => BãßBȍőnNaamʸᴰ.java} | 2 +- .../bassboonyd/BãßBȍőnStore.java | 11 +++ .../bassboonyd/BãßBȍőnStoreKeyʸᴰ.java | 6 ++ .../numberxd/base2t/T02PartBinary.java | 23 +++--- .../numberxd/base2t/T03PartTrit.java | 23 +++--- .../numberxd/base2t/T04PartQuad.java | 25 +++---- .../numberxd/base2t/T05PartPental.java | 27 +++---- .../numberxd/base2t/T06PartSeximal.java | 25 +++---- .../numberxd/base2t/T07PartPlanIt.java | 25 +++---- .../numberxd/base2t/T08PartOctal.java | 31 ++++---- .../numberxd/base2t/T10PartDecimal.java | 31 ++++---- .../numberxd/base2t/T11PartUndecimal.java | 25 +++---- .../numberxd/base2t/T12PartUncial.java | 25 +++---- .../numberxd/base2t/T16PartHex.java | 25 +++---- .../numberxd/base2t/T20PartScore.java | 31 ++++---- .../numberxd/base2t/T60PartSexagesimal.java | 23 +++--- .../numberxd/base2t/bone/BassBone.java | 10 +-- .../numberxd/base2t/bone/BassBoneCoffin.java | 59 --------------- .../numberxd/base2t/bone/BassBoneStore.java | 11 --- .../base2t/bone/BassBoneStoreKey.java | 4 +- 26 files changed, 347 insertions(+), 261 deletions(-) delete mode 100644 demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BaßBȍőnEnumʸᴰ.java create mode 100644 demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnCoffin.java create mode 100644 demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnCoffinOpen.java create mode 100644 demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnConstants.java rename demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/{BaßBȍőnEnumSetʸᴰ.java => BãßBȍőnEnumSetʸᴰ.java} (82%) create mode 100644 demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumʸᴰ.java rename demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/{BaßBȍőnNaamʸᴰ.java => BãßBȍőnNaamʸᴰ.java} (90%) create mode 100644 demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnStore.java create mode 100644 demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnStoreKeyʸᴰ.java delete mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneCoffin.java delete mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneStore.java diff --git a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BaßBȍőnEnumʸᴰ.java b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BaßBȍőnEnumʸᴰ.java deleted file mode 100644 index 96eba874..00000000 --- a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BaßBȍőnEnumʸᴰ.java +++ /dev/null @@ -1,17 +0,0 @@ -package love.distributedrebirth.bassboonyd; - -/** - * Inject Enum methods. - * - * @author willemtsade ©Δ∞ 仙上主天 - */ -public interface BaßBȍőnEnumʸᴰ { - - int ordinal(); - - String name(); - - default String naam() { - return name(); // Deutsche code - } -} diff --git a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnCoffin.java b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnCoffin.java new file mode 100644 index 00000000..50e41215 --- /dev/null +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnCoffin.java @@ -0,0 +1,71 @@ +package love.distributedrebirth.bassboonyd; + +import java.util.List; +import java.util.Map; + +public interface BãßBȍőnCoffin { + + Object GET_OBJ(T key); + + default String GET_STR(T key) { + return String.class.cast(GET_OBJ(key)); + } + + default Short GET_SHORT(T key) { + return Short.class.cast(GET_OBJ(key)); + } + + default Character GET_CHAR(T key) { + return Character.class.cast(GET_OBJ(key)); + } + + default Integer GET_INT(T key) { + return Integer.class.cast(GET_OBJ(key)); + } + + default Long GET_LONG(T key) { + return Long.class.cast(GET_OBJ(key)); + } + + default Boolean GET_BOOL(T key) { + return Boolean.class.cast(GET_OBJ(key)); + } + + default Float GET_FLOAT(T key) { + return Float.class.cast(GET_OBJ(key)); + } + + default Double GET_DOUBLE(T key) { + return Double.class.cast(GET_OBJ(key)); + } + + @SuppressWarnings("unchecked") + default Map GET_MAP_OBJ(T key) { + return Map.class.cast(GET_OBJ(key)); + } + + @SuppressWarnings("unchecked") + default Map GET_MAP_STR(T key) { + return Map.class.cast(GET_OBJ(key)); + } + + @SuppressWarnings("unchecked") + default Map GET_MAP_INT(T key) { + return Map.class.cast(GET_OBJ(key)); + } + + @SuppressWarnings("unchecked") + default List GET_LIST_OBJ(T key) { + return List.class.cast(GET_OBJ(key)); + } + + @SuppressWarnings("unchecked") + default List GET_LIST_STR(T key) { + return List.class.cast(GET_OBJ(key)); + } + + @SuppressWarnings("unchecked") + default List GET_LIST_INT(T key) { + return List.class.cast(GET_OBJ(key)); + } +} diff --git a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnCoffinOpen.java b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnCoffinOpen.java new file mode 100644 index 00000000..dc80b176 --- /dev/null +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnCoffinOpen.java @@ -0,0 +1,33 @@ +package love.distributedrebirth.bassboonyd; + +import java.util.HashMap; +import java.util.Map; + +public interface BãßBȍőnCoffinOpen extends BãßBȍőnCoffin { + + Object PUT_OBJ(T key, Object value); + + default void PUT_MAP(T key) { + PUT_OBJ(key, new HashMap<>()); + } + + default void PUT_LIST(T key) { + PUT_OBJ(key, new HashMap<>()); + } + + static BãßBȍőnCoffinOpen newInstance() { + return new BãßBȍőnCoffinOpen() { + final Map initMap = new HashMap<>(); + + @Override + public Object GET_OBJ(Y key) { + return initMap.get(key); + } + + @Override + public Object PUT_OBJ(Y key, Object value) { + return initMap.put(key, value); + } + }; + } +} diff --git a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnConstants.java b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnConstants.java new file mode 100644 index 00000000..fa19c008 --- /dev/null +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnConstants.java @@ -0,0 +1,8 @@ +package love.distributedrebirth.bassboonyd; + +public class BãßBȍőnConstants { + + public static final String STR_VALUES = "values"; + + public static final String STR_DOT = "."; +} diff --git a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BaßBȍőnEnumSetʸᴰ.java b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumSetʸᴰ.java similarity index 82% rename from demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BaßBȍőnEnumSetʸᴰ.java rename to demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumSetʸᴰ.java index 58990916..17ce245d 100644 --- a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BaßBȍőnEnumSetʸᴰ.java +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumSetʸᴰ.java @@ -11,12 +11,22 @@ import java.util.stream.Stream; * * @author willemtsade ©Δ∞ 仙上主天 */ -public interface BaßBȍőnEnumSetʸᴰ extends BaßBȍőnEnumʸᴰ { +public interface BãßBȍőnEnumSetʸᴰ extends BãßBȍőnEnumʸᴰ { + int ordinal(); + + default int dingRangTelNul() { + return ordinal(); + } + + default int dingRangTelEen() { + return ordinal() + 1; + } + @SuppressWarnings("unchecked") default T[] staticInstances() { try { - Object result = getClass().getMethod("values").invoke(null); + Object result = getClass().getMethod(BãßBȍőnConstants.STR_VALUES).invoke(null); return (T[]) result; } catch (Exception e) { throw new RuntimeException(e); diff --git a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumʸᴰ.java b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumʸᴰ.java new file mode 100644 index 00000000..2bb48310 --- /dev/null +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumʸᴰ.java @@ -0,0 +1,23 @@ +package love.distributedrebirth.bassboonyd; + +/** + * Inject Enum methods. + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public interface BãßBȍőnEnumʸᴰ { + + String name(); + + default String BȍőnNaam() { + return name(); + } + + default String BȍőnNaamI18N() { + return BãßNaam() + BãßBȍőnConstants.STR_DOT + name(); + } + + default String BãßNaam() { + return getClass().getAnnotation(BãßBȍőnNaamʸᴰ.class).value(); + } +} diff --git a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BaßBȍőnNaamʸᴰ.java b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnNaamʸᴰ.java similarity index 90% rename from demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BaßBȍőnNaamʸᴰ.java rename to demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnNaamʸᴰ.java index 5f515568..43b43c13 100644 --- a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BaßBȍőnNaamʸᴰ.java +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnNaamʸᴰ.java @@ -12,7 +12,7 @@ import java.lang.annotation.Target; */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) -public @interface BaßBȍőnNaamʸᴰ { +public @interface BãßBȍőnNaamʸᴰ { String value(); } diff --git a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnStore.java b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnStore.java new file mode 100644 index 00000000..24e4e75a --- /dev/null +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnStore.java @@ -0,0 +1,11 @@ +package love.distributedrebirth.bassboonyd; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public interface BãßBȍőnStore { + + BãßBȍőnCoffin GET_BBC(); +} diff --git a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnStoreKeyʸᴰ.java b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnStoreKeyʸᴰ.java new file mode 100644 index 00000000..154da875 --- /dev/null +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnStoreKeyʸᴰ.java @@ -0,0 +1,6 @@ +package love.distributedrebirth.bassboonyd; + +public interface BãßBȍőnStoreKeyʸᴰ { + + String name(); +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java index c10e158e..1798c960 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java @@ -1,8 +1,9 @@ package love.distributedrebirth.numberxd.base2t; -import love.distributedrebirth.bassboonyd.BaßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; +import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBone; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneCoffin; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; /** @@ -10,23 +11,23 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BaßBȍőnNaamʸᴰ("T02PartBinary") +@BãßBȍőnNaamʸᴰ("T02PartBinary") public enum T02PartBinary implements BassBone { PART_1("˧","0", "低", "low"), PART_2("꜔","1", "高", "high"), ; - public BassBoneCoffin GET_BBC() { return bbc; } + private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); + public BãßBȍőnCoffin GET_BBC() { return BBCO; } public static int LENGTH() { return values().length; }; - private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T02PartBinary(String idTone, String idLetter, String chinaKey, String chinaValue) { - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_CHINA); } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java index 605c7ee0..f084b504 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java @@ -1,8 +1,9 @@ package love.distributedrebirth.numberxd.base2t; -import love.distributedrebirth.bassboonyd.BaßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; +import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBone; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneCoffin; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; /** @@ -10,7 +11,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BaßBȍőnNaamʸᴰ("T03PartTrit") +@BãßBȍőnNaamʸᴰ("T03PartTrit") public enum T03PartTrit implements BassBone { PART_1("˦","0","一","1"), @@ -18,16 +19,16 @@ public enum T03PartTrit implements BassBone { PART_3("˨","2","三","3"), ; - public BassBoneCoffin GET_BBC() { return bbc; } + private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); + public BãßBȍőnCoffin GET_BBC() { return BBCO; } public static int LENGTH() { return values().length; }; - private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T03PartTrit(String idTone, String idLetter, String chinaKey, String chinaValue) { - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_CHINA); } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java index 6dea9fa1..6ceb178c 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java @@ -1,9 +1,10 @@ package love.distributedrebirth.numberxd.base2t; -import love.distributedrebirth.bassboonyd.BaßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; +import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneCoffin; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; /** @@ -11,7 +12,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BaßBȍőnNaamʸᴰ("T04PartQuad") +@BãßBȍőnNaamʸᴰ("T04PartQuad") @BassBoneAlt1Info(name="Cardinal direction", website="https://simple.wikipedia.org/wiki/Cardinal_direction") public enum T04PartQuad implements BassBoneAlt1 { @@ -21,18 +22,18 @@ public enum T04PartQuad implements BassBoneAlt1 { PART_4("˩","3","南","south","S"), ; - public BassBoneCoffin GET_BBC() { return bbc; } + private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); + public BãßBȍőnCoffin GET_BBC() { return BBCO; } public static int LENGTH() { return values().length; }; - private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T04PartQuad(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_CHINA); } public T02PartBinary splitPartBinary(T02PartBinary part) { diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T05PartPental.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T05PartPental.java index 7d73b703..69d7e27e 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T05PartPental.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T05PartPental.java @@ -1,10 +1,11 @@ package love.distributedrebirth.numberxd.base2t; -import love.distributedrebirth.bassboonyd.BaßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; +import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt2; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt2Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneCoffin; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; /** @@ -12,7 +13,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BaßBȍőnNaamʸᴰ("T05PartPental") +@BãßBȍőnNaamʸᴰ("T05PartPental") @BassBoneAlt1Info(name="Pentagram", website="https://en.wikipedia.org/wiki/Pentagram") @BassBoneAlt2Info(name="Pythagorean Interpretations", website="http://wisdomofhypatia.com/OM/BA/PP.html") public enum T05PartPental implements BassBoneAlt2 { @@ -24,18 +25,18 @@ public enum T05PartPental implements BassBoneAlt2 { PART_5("˩","4","土","earth","G", "gaia"), ; - public BassBoneCoffin GET_BBC() { return bbc; } + private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); + public BãßBȍőnCoffin GET_BBC() { return BBCO; } public static int LENGTH() { return values().length; }; - private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T05PartPental(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value, String alt2Value) { - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_2_VALUE, alt2Value); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_2_VALUE, alt2Value); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_CHINA); } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java index 26ea9a11..4541efbe 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java @@ -1,9 +1,10 @@ package love.distributedrebirth.numberxd.base2t; -import love.distributedrebirth.bassboonyd.BaßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; +import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneCoffin; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; /** @@ -13,7 +14,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BaßBȍőnNaamʸᴰ("T06PartSeximal") +@BãßBȍőnNaamʸᴰ("T06PartSeximal") @BassBoneAlt1Info(name="ADFGVX cipher", website="https://en.wikipedia.org/wiki/ADFGVX_cipher") public enum T06PartSeximal implements BassBoneAlt1 { @@ -25,18 +26,18 @@ public enum T06PartSeximal implements BassBoneAlt1 { PART_6("꜏","5","九","9","X"), ; - public BassBoneCoffin GET_BBC() { return bbc; } + private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); + public BãßBȍőnCoffin GET_BBC() { return BBCO; } public static int LENGTH() { return values().length; }; - private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T06PartSeximal(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_CHINA); } public T02PartBinary splitPartBinary() { diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java index e082054f..bc924d48 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java @@ -1,9 +1,10 @@ package love.distributedrebirth.numberxd.base2t; -import love.distributedrebirth.bassboonyd.BaßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; +import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneCoffin; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; /** @@ -11,7 +12,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BaßBȍőnNaamʸᴰ("T07PartPlanIt") +@BãßBȍőnNaamʸᴰ("T07PartPlanIt") @BassBoneAlt1Info(name="Fallen sign", website="https://en.wikipedia.org/wiki/Classical_planet#Western_astrology") public enum T07PartPlanIt implements BassBoneAlt1 { @@ -24,17 +25,17 @@ public enum T07PartPlanIt implements BassBoneAlt1 { PART_7("˩","7","♈︎","aries", "白羊座"), ; - public BassBoneCoffin GET_BBC() { return bbc; } + private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); + public BãßBȍőnCoffin GET_BBC() { return BBCO; } public static int LENGTH() { return values().length; }; - private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T07PartPlanIt(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_CHINA); } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java index f7e6d971..07ffdb92 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java @@ -1,11 +1,12 @@ package love.distributedrebirth.numberxd.base2t; import love.distributedrebirth.numberxd.base2t.bone.BassBoneShiftBits; -import love.distributedrebirth.bassboonyd.BaßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; +import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt2; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt2Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneCoffin; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; /** @@ -13,7 +14,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BaßBȍőnNaamʸᴰ("T08PartOctal") +@BãßBȍőnNaamʸᴰ("T08PartOctal") @BassBoneAlt1Info(name="Absolute Tone Sequence", website="https://en.wikipedia.org/wiki/Tone_letter") @BassBoneAlt2Info(name="Relative Tone Sequence", website="https://en.wikipedia.org/wiki/Tone_letter") public enum T08PartOctal implements BassBoneAlt2,BassBoneShiftBits { @@ -28,22 +29,22 @@ public enum T08PartOctal implements BassBoneAlt2,BassBoneShiftBits PART_8("꜑","7","腳","feet", "˧˩˩","˩˩˧", 21), ; - public BassBoneCoffin GET_BBC() { return bbc; } - public static int LENGTH() { return values().length; }; public static int BIT_COUNT = 3; private static final byte BITMASK = 0x07; - private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); + private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); + public BãßBȍőnCoffin GET_BBC() { return BBCO; } + public static int LENGTH() { return values().length; }; private T08PartOctal(String identifierTone, String identifierLetter, String chinaKey, String chinaValue, String alt1Value, String alt2Value, int shiftBits) { - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, identifierTone); - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, identifierLetter); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); - GET_BBC().PUT_INIT(BassBoneStoreKey.SHIFT_BITS, Integer.valueOf(shiftBits)); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_2_VALUE, alt2Value); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_TONE, identifierTone); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_LETTER, identifierLetter); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBCO.PUT_OBJ(BassBoneStoreKey.SHIFT_BITS, Integer.valueOf(shiftBits)); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_2_VALUE, alt2Value); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_CHINA); } public static T08PartOctal indexOf(T08PartOctal group, int value) { diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java index 10acf725..52205021 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java @@ -1,12 +1,13 @@ package love.distributedrebirth.numberxd.base2t; -import love.distributedrebirth.bassboonyd.BaßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; +import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt2Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt3Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt4; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt4Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneCoffin; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; /** @@ -14,7 +15,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BaßBȍőnNaamʸᴰ("T10PartDecimal") +@BãßBȍőnNaamʸᴰ("T10PartDecimal") @BassBoneAlt1Info(name="Korean numerals", website="https://en.wikipedia.org/wiki/Korean_numerals") @BassBoneAlt2Info(name="Burmese numerals", website="https://en.wikipedia.org/wiki/Burmese_numerals") @BassBoneAlt3Info(name="Bengali numerals", website="https://en.wikipedia.org/wiki/Bengali_numerals") @@ -33,21 +34,21 @@ public enum T10PartDecimal implements BassBoneAlt4 { PART_10("꜖","θ","玖","nine", "구","\u1049","৯","෯"), ; - public BassBoneCoffin GET_BBC() { return bbc; } + private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); + public BãßBȍőnCoffin GET_BBC() { return BBCO; } public static int LENGTH() { return values().length; }; - private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T10PartDecimal(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value, String alt2Value, String alt3Value, String alt4Value) { - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_2_VALUE, alt2Value); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_3_VALUE, alt3Value); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_4_VALUE, alt4Value); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_2_VALUE, alt2Value); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_3_VALUE, alt3Value); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_4_VALUE, alt4Value); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_CHINA); } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java index 89cc3299..ab9caec8 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java @@ -1,9 +1,10 @@ package love.distributedrebirth.numberxd.base2t; -import love.distributedrebirth.bassboonyd.BaßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; +import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneCoffin; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; /** @@ -11,7 +12,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BaßBȍőnNaamʸᴰ("T11PartUndecimal") +@BãßBȍőnNaamʸᴰ("T11PartUndecimal") @BassBoneAlt1Info(name="Tamil numerals", website="https://en.wikipedia.org/wiki/Tamil_numerals") public enum T11PartUndecimal implements BassBoneAlt1 { @@ -28,17 +29,17 @@ public enum T11PartUndecimal implements BassBoneAlt1 { PART_11("˩","=","耦","mate", "௰"), ; - public BassBoneCoffin GET_BBC() { return bbc; } + private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); + public BãßBȍőnCoffin GET_BBC() { return BBCO; } public static int LENGTH() { return values().length; }; - private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T11PartUndecimal(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_CHINA); } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java index c7a232d2..058c2765 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java @@ -1,9 +1,10 @@ package love.distributedrebirth.numberxd.base2t; -import love.distributedrebirth.bassboonyd.BaßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; +import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneCoffin; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; /** @@ -11,7 +12,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BaßBȍőnNaamʸᴰ("T12PartUncial") +@BãßBȍőnNaamʸᴰ("T12PartUncial") @BassBoneAlt1Info(name="Transdecimal symbols", website="https://en.wikipedia.org/wiki/Duodecimal#Transdecimal_symbols") public enum T12PartUncial implements BassBoneAlt1 { @@ -29,17 +30,17 @@ public enum T12PartUncial implements BassBoneAlt1 { PART_12("꜑","B","亞","nozero", "\u218b"), // TURNED DIGIT THREE ; - public BassBoneCoffin GET_BBC() { return bbc; } + private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); + public BãßBȍőnCoffin GET_BBC() { return BBCO; } public static int LENGTH() { return values().length; }; - private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T12PartUncial(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_CHINA); } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java index de8f5294..8967c784 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java @@ -1,9 +1,10 @@ package love.distributedrebirth.numberxd.base2t; -import love.distributedrebirth.bassboonyd.BaßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; +import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneCoffin; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; /** @@ -11,7 +12,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BaßBȍőnNaamʸᴰ("T16PartHex") +@BãßBȍőnNaamʸᴰ("T16PartHex") @BassBoneAlt1Info(name="Dual-tone multi-frequency signaling", website="https://en.wikipedia.org/wiki/Dual-tone_multi-frequency_signaling") public enum T16PartHex implements BassBoneAlt1 { @@ -33,18 +34,18 @@ public enum T16PartHex implements BassBoneAlt1 { PART_16("꜑","F","硫","sulfur", "D"), ; - public BassBoneCoffin GET_BBC() { return bbc; } + private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); + public BãßBȍőnCoffin GET_BBC() { return BBCO; } public static int LENGTH() { return values().length; }; - private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T16PartHex(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_CHINA); } public T02PartBinary splitPartBinary(T04PartQuad part) { diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java index f010cffe..b58e1631 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java @@ -5,12 +5,13 @@ import java.util.Collections; import java.util.Map; import java.util.stream.Collectors; -import love.distributedrebirth.bassboonyd.BaßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; +import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt2Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt3; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt3Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneCoffin; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; /** @@ -18,7 +19,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BaßBȍőnNaamʸᴰ("T20PartScore") +@BãßBȍőnNaamʸᴰ("T20PartScore") @BassBoneAlt1Info(name="Vigesimal", website="https://en.wikipedia.org/wiki/Vigesimal#Places") @BassBoneAlt2Info(name="Vigesimal Alternative", website="https://en.wikipedia.org/wiki/Vigesimal#Places") @BassBoneAlt3Info(name="Open Location Code", website="https://en.wikipedia.org/wiki/Open_Location_Code") @@ -46,23 +47,23 @@ public enum T20PartScore implements BassBoneAlt3 { PART_20("꜑","y", "幺","yocto","J","K","X"), ; - public BassBoneCoffin GET_BBC() { return bbc; } - public static int LENGTH() { return values().length; }; - private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private static final Map OPENLC_MAP = Collections.unmodifiableMap( Arrays.asList(values()).stream().collect(Collectors.toMap(v -> v.getAlt3Value(), v -> v))); + private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); + public BãßBȍőnCoffin GET_BBC() { return BBCO; } + public static int LENGTH() { return values().length; }; private T20PartScore(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value, String alt2Value, String alt3Value) { - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_2_VALUE, alt2Value); - GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_3_VALUE, alt3Value); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_2_VALUE, alt2Value); + BBCO.PUT_OBJ(BassBoneStoreKey.ALT_3_VALUE, alt3Value); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_CHINA); } public T20PartScore staticValueOfOpenLC(String openLCKey) { diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60PartSexagesimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60PartSexagesimal.java index bbe4c06b..1d067d54 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60PartSexagesimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60PartSexagesimal.java @@ -1,8 +1,9 @@ package love.distributedrebirth.numberxd.base2t; -import love.distributedrebirth.bassboonyd.BaßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; +import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; +import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBone; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneCoffin; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; /** @@ -10,7 +11,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BaßBȍőnNaamʸᴰ("T60Sexagesimal") +@BãßBȍőnNaamʸᴰ("T60Sexagesimal") public enum T60PartSexagesimal implements BassBone { PART_1 ("˧˩˥","ια","牛","cow"), @@ -78,16 +79,16 @@ public enum T60PartSexagesimal implements BassBone { PART_60("꜑꜑꜏","οϚ","蘋","apple"), ; - public BassBoneCoffin GET_BBC() { return bbc; } + private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); + public BãßBȍőnCoffin GET_BBC() { return BBCO; } public static int LENGTH() { return values().length; }; - private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T60PartSexagesimal(String idTone, String idLetter, String chinaKey, String chinaValue) { - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); - GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); - GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); - GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBCO.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBCO.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBCO.PUT_MAP(BassBoneStoreKey.MAP_CHINA); } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBone.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBone.java index d7b99323..a6b16221 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBone.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBone.java @@ -3,19 +3,15 @@ package love.distributedrebirth.numberxd.base2t.bone; import java.util.Map; import java.util.stream.Collectors; -import love.distributedrebirth.bassboonyd.BaßBȍőnNaamʸᴰ; -import love.distributedrebirth.bassboonyd.BaßBȍőnEnumSetʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnStore; +import love.distributedrebirth.bassboonyd.BãßBȍőnEnumSetʸᴰ; /** * * * @author willemtsade ©Δ∞ 仙上主天 */ -public interface BassBone> extends BaßBȍőnEnumSetʸᴰ, BassBoneStore { - - default String staticBoneNaam() { - return getClass().getAnnotation(BaßBȍőnNaamʸᴰ.class).value(); - } +public interface BassBone> extends BãßBȍőnEnumSetʸᴰ, BãßBȍőnStore { default String getIdentifierTone() { return GET_BBC().GET_STR(BassBoneStoreKey.ID_TONE); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneCoffin.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneCoffin.java deleted file mode 100644 index c940ae33..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneCoffin.java +++ /dev/null @@ -1,59 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.bone; - -import java.util.HashMap; -import java.util.Map; - -public interface BassBoneCoffin { - - Object PUT_INIT(BassBoneStoreKey key, Object value); - - Object GET(BassBoneStoreKey key); - - default String GET_STR(BassBoneStoreKey key) { - return String.class.cast(GET(key)); - } - - default Integer GET_INT(BassBoneStoreKey key) { - return Integer.class.cast(GET(key)); - } - - default Long GET_LONG(BassBoneStoreKey key) { - return Long.class.cast(GET(key)); - } - - default Boolean GET_BOOL(BassBoneStoreKey key) { - return Boolean.class.cast(GET(key)); - } - - @SuppressWarnings("unchecked") - default Map GET_MAP_OBJ(BassBoneStoreKey key) { - if (GET(key) == null) { - PUT_INIT(key, new HashMap<>()); - } - return Map.class.cast(GET(key)); - } - - @SuppressWarnings("unchecked") - default Map GET_MAP_STR(BassBoneStoreKey key) { - if (GET(key) == null) { - PUT_INIT(key, new HashMap<>()); - } - return Map.class.cast(GET(key)); - } - - static BassBoneCoffin newInstance() { - return new BassBoneCoffin() { - final Map initMap = new HashMap<>(); - - @Override - public Object GET(BassBoneStoreKey key) { - return initMap.get(key); - } - - @Override - public Object PUT_INIT(BassBoneStoreKey key, Object value) { - return initMap.put(key, value); - } - }; - } -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneStore.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneStore.java deleted file mode 100644 index 1b702e2b..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneStore.java +++ /dev/null @@ -1,11 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.bone; - -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ -public interface BassBoneStore { - - BassBoneCoffin GET_BBC(); -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneStoreKey.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneStoreKey.java index 1dbbd91b..f39a485f 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneStoreKey.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneStoreKey.java @@ -1,11 +1,13 @@ package love.distributedrebirth.numberxd.base2t.bone; +import love.distributedrebirth.bassboonyd.BãßBȍőnStoreKeyʸᴰ; + /** * * * @author willemtsade ©Δ∞ 仙上主天 */ -public enum BassBoneStoreKey { +public enum BassBoneStoreKey implements BãßBȍőnStoreKeyʸᴰ { ID_TONE, ID_LETTER,