diff --git a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnAuthorInfoʸᴰ.java b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnAuthorInfoʸᴰ.java new file mode 100644 index 00000000..d4e2b02b --- /dev/null +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnAuthorInfoʸᴰ.java @@ -0,0 +1,16 @@ +package love.distributedrebirth.bassboonyd; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +public @interface BãßBȍőnAuthorInfoʸᴰ { + + String name(); + + String copyright(); +} 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 index 50e41215..6be2a424 100644 --- a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnCoffin.java +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnCoffin.java @@ -3,6 +3,7 @@ package love.distributedrebirth.bassboonyd; import java.util.List; import java.util.Map; +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public interface BãßBȍőnCoffin { Object GET_OBJ(T 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 index dc80b176..fb8e7ae9 100644 --- a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnCoffinOpen.java +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnCoffinOpen.java @@ -3,6 +3,7 @@ package love.distributedrebirth.bassboonyd; import java.util.HashMap; import java.util.Map; +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public interface BãßBȍőnCoffinOpen extends BãßBȍőnCoffin { Object PUT_OBJ(T key, Object 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 index fa19c008..838043e3 100644 --- a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnConstants.java +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnConstants.java @@ -1,8 +1,13 @@ package love.distributedrebirth.bassboonyd; +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class BãßBȍőnConstants { public static final String STR_VALUES = "values"; public static final String STR_DOT = "."; + + public static final int INT_ZERO = 0; + + public static final int INT_ONE = 1; } diff --git a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumInstanceʸᴰ.java b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumInstanceʸᴰ.java new file mode 100644 index 00000000..32e222d1 --- /dev/null +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumInstanceʸᴰ.java @@ -0,0 +1,15 @@ +package love.distributedrebirth.bassboonyd; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public interface BãßBȍőnEnumInstanceʸᴰ extends BãßBȍőnEnumʸᴰ { + + int ordinal(); + + default T BȍőnInstance() { + return BãßInstances()[ordinal()]; + } + + default T BãßInstance() { + return BãßInstances()[BãßBȍőnConstants.INT_ZERO]; + } +} diff --git a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumSetʸᴰ.java b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumSetʸᴰ.java index 17ce245d..366c7719 100644 --- a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumSetʸᴰ.java +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumSetʸᴰ.java @@ -6,47 +6,33 @@ import java.util.List; import java.util.function.Consumer; import java.util.stream.Stream; -/** - * Inject EnumSet methods. - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public interface BãßBȍőnEnumSetʸᴰ extends BãßBȍőnEnumʸᴰ { int ordinal(); - default int dingRangTelNul() { + default int BȍőnRangTelNul() { return ordinal(); } - default int dingRangTelEen() { + default int BȍőnRangTelEen() { return ordinal() + 1; } - @SuppressWarnings("unchecked") - default T[] staticInstances() { - try { - Object result = getClass().getMethod(BãßBȍőnConstants.STR_VALUES).invoke(null); - return (T[]) result; - } catch (Exception e) { - throw new RuntimeException(e); - } + default List BãßInstancesList() { + return Arrays.asList(BãßInstances()); } - default List staticInstancesList() { - return Arrays.asList(staticInstances()); + default Iterator BãßInstancesIterator() { + return BãßInstancesList().iterator(); } - default Iterator staticInstancesIterator() { - return staticInstancesList().iterator(); + default Stream BãßInstancesStream() { + return BãßInstancesList().stream(); } - default Stream staticInstancesStream() { - return staticInstancesList().stream(); - } - - default T volgende() { - T[] values = staticInstances(); + default T BȍőnVolgende() { + T[] values = BãßInstances(); int resultIndex = 0; for (int i=0;i extends BãßBȍőnEnumʸᴰ { return values[resultIndex]; } - default T vorige() { - T[] values = staticInstances(); + default T BȍőnVorige() { + T[] values = BãßInstances(); int resultIndex = 0; for (int i=0;i extends BãßBȍőnEnumʸᴰ { } default void staticVoorElk(Consumer consumer) { - for (T value:staticInstances()) { + for (T value:BãßInstances()) { consumer.accept(value); } } 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 index 2bb48310..f1056183 100644 --- a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumʸᴰ.java +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnEnumʸᴰ.java @@ -1,10 +1,6 @@ package love.distributedrebirth.bassboonyd; -/** - * Inject Enum methods. - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public interface BãßBȍőnEnumʸᴰ { String name(); @@ -18,6 +14,16 @@ public interface BãßBȍőnEnumʸᴰ { } default String BãßNaam() { - return getClass().getAnnotation(BãßBȍőnNaamʸᴰ.class).value(); + return getClass().getAnnotation(BãßBȍőnInfoʸᴰ.class).name(); + } + + @SuppressWarnings("unchecked") + default T[] BãßInstances() { + try { + 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ȍőnNaamʸᴰ.java b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnInfoʸᴰ.java similarity index 62% rename from demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnNaamʸᴰ.java rename to demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnInfoʸᴰ.java index 43b43c13..b61be440 100644 --- a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnNaamʸᴰ.java +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnInfoʸᴰ.java @@ -5,14 +5,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * Defines the BaßBȍőn name. - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) -public @interface BãßBȍőnNaamʸᴰ { +public @interface BãßBȍőnInfoʸᴰ { - String value(); + String name(); + + String purpose(); } 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 index 24e4e75a..04373952 100644 --- a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnStore.java +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnStore.java @@ -1,10 +1,6 @@ package love.distributedrebirth.bassboonyd; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") 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 index 154da875..8e7ec0b6 100644 --- a/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnStoreKeyʸᴰ.java +++ b/demo4d-bassboonyd/src/main/love/distributedrebirth/bassboonyd/BãßBȍőnStoreKeyʸᴰ.java @@ -1,5 +1,6 @@ package love.distributedrebirth.bassboonyd; +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") 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 1798c960..c45a2f19 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.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; -import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBone; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; @@ -11,23 +12,24 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BãßBȍőnNaamʸᴰ("T02PartBinary") +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +@BãßBȍőnInfoʸᴰ(name = "T02PartBinary", purpose = "The distribution by 2.") public enum T02PartBinary implements BassBone { PART_1("˧","0", "低", "low"), PART_2("꜔","1", "高", "high"), ; - private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); - public BãßBȍőnCoffin GET_BBC() { return BBCO; } + 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) { - 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); + BBC.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBC.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBC.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBC.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 f084b504..1ccf67aa 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java @@ -2,7 +2,7 @@ package love.distributedrebirth.numberxd.base2t; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; -import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBone; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; @@ -11,7 +11,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BãßBȍőnNaamʸᴰ("T03PartTrit") +@BãßBȍőnInfoʸᴰ(name = "T03PartTrit", purpose = "The distribution by 3.") public enum T03PartTrit implements BassBone { PART_1("˦","0","一","1"), @@ -19,16 +19,16 @@ public enum T03PartTrit implements BassBone { PART_3("˨","2","三","3"), ; - private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); - public BãßBȍőnCoffin GET_BBC() { return BBCO; } + 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) { - 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); + BBC.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBC.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBC.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBC.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 6ceb178c..8bc4a7f4 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java @@ -2,7 +2,7 @@ package love.distributedrebirth.numberxd.base2t; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; -import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; @@ -12,7 +12,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BãßBȍőnNaamʸᴰ("T04PartQuad") +@BãßBȍőnInfoʸᴰ(name = "T04PartQuad", purpose = "The distribution by 4.") @BassBoneAlt1Info(name="Cardinal direction", website="https://simple.wikipedia.org/wiki/Cardinal_direction") public enum T04PartQuad implements BassBoneAlt1 { @@ -22,18 +22,18 @@ public enum T04PartQuad implements BassBoneAlt1 { PART_4("˩","3","南","south","S"), ; - private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); - public BãßBȍőnCoffin GET_BBC() { return BBCO; } + 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) { - 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); + BBC.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBC.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBC.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBC.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 69d7e27e..2a9108f7 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T05PartPental.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T05PartPental.java @@ -2,7 +2,7 @@ package love.distributedrebirth.numberxd.base2t; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; -import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt2; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt2Info; @@ -13,7 +13,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BãßBȍőnNaamʸᴰ("T05PartPental") +@BãßBȍőnInfoʸᴰ(name = "T05PartPental", purpose = "The distribution by 5 called Wuxing.") @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 { @@ -25,18 +25,18 @@ public enum T05PartPental implements BassBoneAlt2 { PART_5("˩","4","土","earth","G", "gaia"), ; - private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); - public BãßBȍőnCoffin GET_BBC() { return BBCO; } + 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) { - 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); + BBC.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBC.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_2_VALUE, alt2Value); + BBC.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBC.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 4541efbe..0a00ee89 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java @@ -2,7 +2,7 @@ package love.distributedrebirth.numberxd.base2t; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; -import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; @@ -14,7 +14,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BãßBȍőnNaamʸᴰ("T06PartSeximal") +@BãßBȍőnInfoʸᴰ(name = "T06PartSeximal", purpose = "The distribution by 6.") @BassBoneAlt1Info(name="ADFGVX cipher", website="https://en.wikipedia.org/wiki/ADFGVX_cipher") public enum T06PartSeximal implements BassBoneAlt1 { @@ -26,18 +26,18 @@ public enum T06PartSeximal implements BassBoneAlt1 { PART_6("꜏","5","九","9","X"), ; - private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); - public BãßBȍőnCoffin GET_BBC() { return BBCO; } + 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) { - 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); + BBC.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBC.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBC.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBC.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 bc924d48..bb4ddb40 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java @@ -2,7 +2,7 @@ package love.distributedrebirth.numberxd.base2t; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; -import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; @@ -12,7 +12,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BãßBȍőnNaamʸᴰ("T07PartPlanIt") +@BãßBȍőnInfoʸᴰ(name = "T07PartPlanIt", purpose = "The distribution by 7.") @BassBoneAlt1Info(name="Fallen sign", website="https://en.wikipedia.org/wiki/Classical_planet#Western_astrology") public enum T07PartPlanIt implements BassBoneAlt1 { @@ -25,17 +25,17 @@ public enum T07PartPlanIt implements BassBoneAlt1 { PART_7("˩","7","♈︎","aries", "白羊座"), ; - private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); - public BãßBȍőnCoffin GET_BBC() { return BBCO; } + 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) { - 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); + BBC.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBC.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBC.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBC.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 07ffdb92..26a074b0 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java @@ -3,7 +3,7 @@ package love.distributedrebirth.numberxd.base2t; import love.distributedrebirth.numberxd.base2t.bone.BassBoneShiftBits; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; -import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt2; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt2Info; @@ -14,7 +14,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BãßBȍőnNaamʸᴰ("T08PartOctal") +@BãßBȍőnInfoʸᴰ(name = "T08PartOctal", purpose = "The distribution by 8.") @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 { @@ -31,20 +31,20 @@ public enum T08PartOctal implements BassBoneAlt2,BassBoneShiftBits public static int BIT_COUNT = 3; private static final byte BITMASK = 0x07; - private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); - public BãßBȍőnCoffin GET_BBC() { return BBCO; } + 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 T08PartOctal(String identifierTone, String identifierLetter, String chinaKey, String chinaValue, String alt1Value, String alt2Value, int shiftBits) { - 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); + BBC.PUT_OBJ(BassBoneStoreKey.ID_TONE, identifierTone); + BBC.PUT_OBJ(BassBoneStoreKey.ID_LETTER, identifierLetter); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BassBoneStoreKey.SHIFT_BITS, Integer.valueOf(shiftBits)); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_2_VALUE, alt2Value); + BBC.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBC.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 52205021..6536822e 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java @@ -2,7 +2,7 @@ package love.distributedrebirth.numberxd.base2t; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; -import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt2Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt3Info; @@ -15,7 +15,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BãßBȍőnNaamʸᴰ("T10PartDecimal") +@BãßBȍőnInfoʸᴰ(name = "T10PartDecimal", purpose = "The distribution by 10.") @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") @@ -34,21 +34,21 @@ public enum T10PartDecimal implements BassBoneAlt4 { PART_10("꜖","θ","玖","nine", "구","\u1049","৯","෯"), ; - private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); - public BãßBȍőnCoffin GET_BBC() { return BBCO; } + 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, String alt1Value, String alt2Value, String alt3Value, String alt4Value) { - 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); + BBC.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBC.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_2_VALUE, alt2Value); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_3_VALUE, alt3Value); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_4_VALUE, alt4Value); + BBC.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBC.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 ab9caec8..c2ee51c0 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java @@ -2,7 +2,7 @@ package love.distributedrebirth.numberxd.base2t; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; -import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; @@ -12,7 +12,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BãßBȍőnNaamʸᴰ("T11PartUndecimal") +@BãßBȍőnInfoʸᴰ(name = "T11PartUndecimal", purpose = "The distribution by 11.") @BassBoneAlt1Info(name="Tamil numerals", website="https://en.wikipedia.org/wiki/Tamil_numerals") public enum T11PartUndecimal implements BassBoneAlt1 { @@ -29,17 +29,17 @@ public enum T11PartUndecimal implements BassBoneAlt1 { PART_11("˩","=","耦","mate", "௰"), ; - private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); - public BãßBȍőnCoffin GET_BBC() { return BBCO; } + 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) { - 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); + BBC.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBC.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBC.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBC.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 058c2765..1d961f2c 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java @@ -2,7 +2,7 @@ package love.distributedrebirth.numberxd.base2t; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; -import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; @@ -12,7 +12,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BãßBȍőnNaamʸᴰ("T12PartUncial") +@BãßBȍőnInfoʸᴰ(name = "T12PartUncial", purpose = "The distribution by 12.") @BassBoneAlt1Info(name="Transdecimal symbols", website="https://en.wikipedia.org/wiki/Duodecimal#Transdecimal_symbols") public enum T12PartUncial implements BassBoneAlt1 { @@ -30,17 +30,17 @@ public enum T12PartUncial implements BassBoneAlt1 { PART_12("꜑","B","亞","nozero", "\u218b"), // TURNED DIGIT THREE ; - private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); - public BãßBȍőnCoffin GET_BBC() { return BBCO; } + 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) { - 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); + BBC.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBC.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBC.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBC.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 8967c784..a1170ade 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java @@ -2,7 +2,7 @@ package love.distributedrebirth.numberxd.base2t; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; -import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; @@ -12,7 +12,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BãßBȍőnNaamʸᴰ("T16PartHex") +@BãßBȍőnInfoʸᴰ(name = "T16PartHex", purpose = "The distribution by 16.") @BassBoneAlt1Info(name="Dual-tone multi-frequency signaling", website="https://en.wikipedia.org/wiki/Dual-tone_multi-frequency_signaling") public enum T16PartHex implements BassBoneAlt1 { @@ -34,18 +34,18 @@ public enum T16PartHex implements BassBoneAlt1 { PART_16("꜑","F","硫","sulfur", "D"), ; - private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); - public BãßBȍőnCoffin GET_BBC() { return BBCO; } + 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, String alt1Value) { - 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); + BBC.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBC.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBC.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBC.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 b58e1631..78cf59b6 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java @@ -7,7 +7,7 @@ import java.util.stream.Collectors; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; -import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt2Info; import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt3; @@ -19,7 +19,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BãßBȍőnNaamʸᴰ("T20PartScore") +@BãßBȍőnInfoʸᴰ(name = "T20PartScore", purpose = "The distribution by 20.") @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") @@ -49,21 +49,21 @@ public enum T20PartScore implements BassBoneAlt3 { 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; } + 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 T20PartScore(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value, String alt2Value, String alt3Value) { - 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); + BBC.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBC.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_2_VALUE, alt2Value); + BBC.PUT_OBJ(BassBoneStoreKey.ALT_3_VALUE, alt3Value); + BBC.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBC.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 1d067d54..eaf88490 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60PartSexagesimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60PartSexagesimal.java @@ -2,7 +2,7 @@ package love.distributedrebirth.numberxd.base2t; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffin; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpen; -import love.distributedrebirth.bassboonyd.BãßBȍőnNaamʸᴰ; +import love.distributedrebirth.bassboonyd.BãßBȍőnInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.bone.BassBone; import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; @@ -11,7 +11,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * * @author willemtsade ©Δ∞ 仙上主天 */ -@BãßBȍőnNaamʸᴰ("T60Sexagesimal") +@BãßBȍőnInfoʸᴰ(name = "T60Sexagesimal", purpose = "The distribution by 60.") public enum T60PartSexagesimal implements BassBone { PART_1 ("˧˩˥","ια","牛","cow"), @@ -79,16 +79,16 @@ public enum T60PartSexagesimal implements BassBone { PART_60("꜑꜑꜏","οϚ","蘋","apple"), ; - private final BãßBȍőnCoffinOpen BBCO = BãßBȍőnCoffinOpen.newInstance(); - public BãßBȍőnCoffin GET_BBC() { return BBCO; } + 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) { - 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); + BBC.PUT_OBJ(BassBoneStoreKey.ID_TONE, idTone); + BBC.PUT_OBJ(BassBoneStoreKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BassBoneStoreKey.CHINA_VALUE, chinaValue); + BBC.PUT_MAP(BassBoneStoreKey.MAP_TONE); + BBC.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 a6b16221..3dbdc17b 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBone.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBone.java @@ -33,7 +33,7 @@ public interface BassBone> extends BãßBȍőnEnumSetʸᴰ default T staticValueOfTone(String identifierTone) { Map mapTone = GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); if (mapTone.isEmpty()) { - mapTone.putAll(staticInstancesStream().collect(Collectors.toMap(v -> v.getIdentifierTone(), v -> v))); + mapTone.putAll(BãßInstancesStream().collect(Collectors.toMap(v -> v.getIdentifierTone(), v -> v))); } return (T) mapTone.get(identifierTone); } @@ -42,7 +42,7 @@ public interface BassBone> extends BãßBȍőnEnumSetʸᴰ default T staticValueOfChina(String chinaKey) { Map mapChina = GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); if (mapChina.isEmpty()) { - mapChina.putAll(staticInstancesStream().collect(Collectors.toMap(v -> v.getChinaKey(), v -> v))); + mapChina.putAll(BãßInstancesStream().collect(Collectors.toMap(v -> v.getChinaKey(), v -> v))); } return (T) mapChina.get(chinaKey); } diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T04PartQuadTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T04PartQuadTest.java index 80cc3166..f786c0ce 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T04PartQuadTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T04PartQuadTest.java @@ -25,18 +25,18 @@ public class T04PartQuadTest { @Test public void testVolgende() { - Assertions.assertEquals(T04PartQuad.PART_1, T04PartQuad.PART_4.volgende()); - Assertions.assertEquals(T04PartQuad.PART_2, T04PartQuad.PART_1.volgende()); - Assertions.assertEquals(T04PartQuad.PART_3, T04PartQuad.PART_2.volgende()); - Assertions.assertEquals(T04PartQuad.PART_4, T04PartQuad.PART_3.volgende()); + Assertions.assertEquals(T04PartQuad.PART_1, T04PartQuad.PART_4.BȍőnVolgende()); + Assertions.assertEquals(T04PartQuad.PART_2, T04PartQuad.PART_1.BȍőnVolgende()); + Assertions.assertEquals(T04PartQuad.PART_3, T04PartQuad.PART_2.BȍőnVolgende()); + Assertions.assertEquals(T04PartQuad.PART_4, T04PartQuad.PART_3.BȍőnVolgende()); } @Test public void testVorige() { - Assertions.assertEquals(T04PartQuad.PART_1, T04PartQuad.PART_2.vorige()); - Assertions.assertEquals(T04PartQuad.PART_2, T04PartQuad.PART_3.vorige()); - Assertions.assertEquals(T04PartQuad.PART_3, T04PartQuad.PART_4.vorige()); - Assertions.assertEquals(T04PartQuad.PART_4, T04PartQuad.PART_1.vorige()); + Assertions.assertEquals(T04PartQuad.PART_1, T04PartQuad.PART_2.BȍőnVorige()); + Assertions.assertEquals(T04PartQuad.PART_2, T04PartQuad.PART_3.BȍőnVorige()); + Assertions.assertEquals(T04PartQuad.PART_3, T04PartQuad.PART_4.BȍőnVorige()); + Assertions.assertEquals(T04PartQuad.PART_4, T04PartQuad.PART_1.BȍőnVorige()); } @Test