From 4c9fdbd756bbc0e0194eb151779df9ce0576965e Mon Sep 17 00:00:00 2001 From: Willem Cazander Date: Wed, 2 Feb 2022 18:12:59 +0100 Subject: [PATCH] More Duytschen Code --- .../demo4d/screen/BasePartRenderer.java | 32 ++++++------- .../numberxd/alu/ŌctopǔsALU.java | 3 ++ .../numberxd/alu/ŌctopǔsBreukOpểrǟtiẻ.java | 3 ++ .../numberxd/alu/ŌctopǔsSnijOpểrǟtiẻ.java | 3 ++ .../numberxd/base2t/BasePartFactory.java | 4 +- .../numberxd/base2t/T02PartBinary.java | 22 ++++----- .../numberxd/base2t/T03PartTrit.java | 22 ++++----- .../numberxd/base2t/T04PartQuad.java | 28 +++++------ .../numberxd/base2t/T05PartPental.java | 34 +++++++------- .../numberxd/base2t/T06PartSeximal.java | 28 +++++------ .../numberxd/base2t/T07PartPlanIt.java | 28 +++++------ .../numberxd/base2t/T08PartOctal.java | 38 +++++++-------- .../numberxd/base2t/T10PartDecimal.java | 46 +++++++++---------- .../numberxd/base2t/T11PartUndecimal.java | 28 +++++------ .../numberxd/base2t/T12PartUncial.java | 28 +++++------ .../numberxd/base2t/T16PartHex.java | 28 +++++------ .../numberxd/base2t/T20PartScore.java | 40 ++++++++-------- .../numberxd/base2t/T60PartSexagesimal.java | 22 ++++----- .../numberxd/base2t/bone/BassBoneAlt1.java | 21 --------- .../numberxd/base2t/bone/BassBoneAlt2.java | 21 --------- .../numberxd/base2t/bone/BassBoneAlt3.java | 21 --------- .../numberxd/base2t/bone/BassBoneAlt4.java | 21 --------- .../base2t/bone/BassBoneShiftBits.java | 13 ------ .../BassBone.java => part/BãßBȍőnPart.java} | 16 +++---- .../numberxd/base2t/part/BãßBȍőnPartAlt1.java | 21 +++++++++ .../BãßBȍőnPartAlt1Info.java} | 4 +- .../numberxd/base2t/part/BãßBȍőnPartAlt2.java | 21 +++++++++ .../BãßBȍőnPartAlt2Info.java} | 4 +- .../numberxd/base2t/part/BãßBȍőnPartAlt3.java | 21 +++++++++ .../BãßBȍőnPartAlt3Info.java} | 4 +- .../numberxd/base2t/part/BãßBȍőnPartAlt4.java | 21 +++++++++ .../BãßBȍőnPartAlt4Info.java} | 4 +- .../BãßBȍőnPartKey.java} | 4 +- .../base2t/part/BãßBȍőnPartShiftBits.java | 13 ++++++ .../numberxd/base2t/BasePartFactoryTest.java | 10 ++-- 35 files changed, 343 insertions(+), 334 deletions(-) delete mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt1.java delete mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt2.java delete mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt3.java delete mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt4.java delete mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneShiftBits.java rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/{bone/BassBone.java => part/BãßBȍőnPart.java} (61%) create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt1.java rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/{bone/BassBoneAlt1Info.java => part/BãßBȍőnPartAlt1Info.java} (78%) create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt2.java rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/{bone/BassBoneAlt2Info.java => part/BãßBȍőnPartAlt2Info.java} (78%) create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt3.java rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/{bone/BassBoneAlt3Info.java => part/BãßBȍőnPartAlt3Info.java} (78%) create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt4.java rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/{bone/BassBoneAlt4Info.java => part/BãßBȍőnPartAlt4Info.java} (78%) rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/{bone/BassBoneStoreKey.java => part/BãßBȍőnPartKey.java} (68%) create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartShiftBits.java diff --git a/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java b/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java index f987c333..854ccb29 100644 --- a/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java +++ b/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java @@ -11,11 +11,11 @@ import imgui.type.ImInt; import love.distributedrebirth.demo4d.Demo4DMain; import love.distributedrebirth.demo4d.ImGuiRendererMain; import love.distributedrebirth.numberxd.base2t.BasePartFactory; -import love.distributedrebirth.numberxd.base2t.bone.BassBone; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt2; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt3; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt4; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPart; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt2; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt3; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt4; /** * @@ -44,11 +44,11 @@ public class BasePartRenderer extends ImGuiRendererMain { items = bases.toArray(items); String selectedItem = items[selectedBasePart.get()]; Integer baseNumber = Integer.valueOf(selectedItem); - BassBone[] baseParts = BasePartFactory.buildBassBonesByBase(baseNumber); + BãßBȍőnPart[] baseParts = BasePartFactory.buildBassBonesByBase(baseNumber); ImGui.text("Base:"); ImGui.sameLine(); - ImGui.text(baseParts[0].staticBoneNaam()); + ImGui.text(baseParts[0].BãßNaam()); ImGui.sameLine(); ImGui.combo("Type", selectedBasePart, items); @@ -66,7 +66,7 @@ public class BasePartRenderer extends ImGuiRendererMain { ImGui.tableSetupColumn("Alt4"); ImGui.tableHeadersRow(); - for (BassBone part:baseParts) { + for (BãßBȍőnPart part:baseParts) { ImGui.tableNextRow(); ImGui.tableNextColumn(); ImGui.text(part.name()); @@ -82,26 +82,26 @@ public class BasePartRenderer extends ImGuiRendererMain { ImGui.text(part.getChinaValue()); ImGui.tableNextColumn(); - if (part instanceof BassBoneAlt1) { - ImGui.text(BassBoneAlt1.class.cast(part).getAlt1Value()); + if (part instanceof BãßBȍőnPartAlt1) { + ImGui.text(BãßBȍőnPartAlt1.class.cast(part).getAlt1Value()); } else { ImGui.text(""); } ImGui.tableNextColumn(); - if (part instanceof BassBoneAlt2) { - ImGui.text(BassBoneAlt2.class.cast(part).getAlt2Value()); + if (part instanceof BãßBȍőnPartAlt2) { + ImGui.text(BãßBȍőnPartAlt2.class.cast(part).getAlt2Value()); } else { ImGui.text(""); } ImGui.tableNextColumn(); - if (part instanceof BassBoneAlt3) { - ImGui.text(BassBoneAlt3.class.cast(part).getAlt3Value()); + if (part instanceof BãßBȍőnPartAlt3) { + ImGui.text(BãßBȍőnPartAlt3.class.cast(part).getAlt3Value()); } else { ImGui.text(""); } ImGui.tableNextColumn(); - if (part instanceof BassBoneAlt4) { - ImGui.text(BassBoneAlt4.class.cast(part).getAlt4Value()); + if (part instanceof BãßBȍőnPartAlt4) { + ImGui.text(BãßBȍőnPartAlt4.class.cast(part).getAlt4Value()); } else { ImGui.text(""); } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/alu/ŌctopǔsALU.java b/numberxd/src/main/love/distributedrebirth/numberxd/alu/ŌctopǔsALU.java index 1a1a906e..493fa820 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/alu/ŌctopǔsALU.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/alu/ŌctopǔsALU.java @@ -1,5 +1,8 @@ package love.distributedrebirth.numberxd.alu; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ŌctopǔsALU { } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/alu/ŌctopǔsBreukOpểrǟtiẻ.java b/numberxd/src/main/love/distributedrebirth/numberxd/alu/ŌctopǔsBreukOpểrǟtiẻ.java index 00fec81e..00255c2a 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/alu/ŌctopǔsBreukOpểrǟtiẻ.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/alu/ŌctopǔsBreukOpểrǟtiẻ.java @@ -1,5 +1,8 @@ package love.distributedrebirth.numberxd.alu; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public enum ŌctopǔsBreukOpểrǟtiẻ { OP_TEL, diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/alu/ŌctopǔsSnijOpểrǟtiẻ.java b/numberxd/src/main/love/distributedrebirth/numberxd/alu/ŌctopǔsSnijOpểrǟtiẻ.java index d01174bd..9f0467ea 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/alu/ŌctopǔsSnijOpểrǟtiẻ.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/alu/ŌctopǔsSnijOpểrǟtiẻ.java @@ -1,5 +1,8 @@ package love.distributedrebirth.numberxd.alu; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public enum ŌctopǔsSnijOpểrǟtiẻ { OP_TEL, diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BasePartFactory.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BasePartFactory.java index df148400..1b90e22c 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BasePartFactory.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BasePartFactory.java @@ -1,6 +1,6 @@ package love.distributedrebirth.numberxd.base2t; -import love.distributedrebirth.numberxd.base2t.bone.BassBone; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPart; public final class BasePartFactory { @@ -10,7 +10,7 @@ public final class BasePartFactory { return SUPPORTED_BASES; } - public static BassBone[] buildBassBonesByBase(int base) { + public static BãßBȍőnPart[] buildBassBonesByBase(int base) { switch (base) { case 2: return T02PartBinary.values(); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java index 2b6749e4..6395f865 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java @@ -4,8 +4,8 @@ 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ȍőnInfoʸᴰ; -import love.distributedrebirth.numberxd.base2t.bone.BassBone; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPart; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartKey; /** * The distribution by 2. @@ -14,22 +14,22 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") @BãßBȍőnInfoʸᴰ(name = "T02PartBinary", purpose = "The distribution by 2.") -public enum T02PartBinary implements BassBone { +public enum T02PartBinary implements BãßBȍőnPart { PART_1("˧","0", "低", "low"), PART_2("꜔","1", "高", "high"), ; - private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); - public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } + 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) { - 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); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_TONE, idTone); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_VALUE, chinaValue); + BBC.PUT_MAP(BãßBȍőnPartKey.MAP_TONE); + BBC.PUT_MAP(BãßBȍőnPartKey.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 8b498c71..4e52292e 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java @@ -3,8 +3,8 @@ 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ȍőnInfoʸᴰ; -import love.distributedrebirth.numberxd.base2t.bone.BassBone; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPart; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartKey; /** * The distribution by 3. @@ -12,23 +12,23 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * @author willemtsade ©Δ∞ 仙上主天 */ @BãßBȍőnInfoʸᴰ(name = "T03PartTrit", purpose = "The distribution by 3.") -public enum T03PartTrit implements BassBone { +public enum T03PartTrit implements BãßBȍőnPart { PART_1("˦","0","一","1"), PART_2("˧","1","二","2"), PART_3("˨","2","三","3"), ; - private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); - public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } + 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) { - 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); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_TONE, idTone); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_VALUE, chinaValue); + BBC.PUT_MAP(BãßBȍőnPartKey.MAP_TONE); + BBC.PUT_MAP(BãßBȍőnPartKey.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 36bd8c16..3ac00219 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java @@ -3,9 +3,9 @@ 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ȍőnInfoʸᴰ; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartKey; /** * The distribution by 4. @@ -13,8 +13,8 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * @author willemtsade ©Δ∞ 仙上主天 */ @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 { +@BãßBȍőnPartAlt1Info(name="Cardinal direction", website="https://simple.wikipedia.org/wiki/Cardinal_direction") +public enum T04PartQuad implements BãßBȍőnPartAlt1 { PART_1("˥","0","北","north","N"), PART_2("꜒","1","東","east", "E"), @@ -22,18 +22,18 @@ public enum T04PartQuad implements BassBoneAlt1 { PART_4("˩","3","南","south","S"), ; - private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); - public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } + 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) { - 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); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_TONE, idTone); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_1_VALUE, alt1Value); + BBC.PUT_MAP(BãßBȍőnPartKey.MAP_TONE); + BBC.PUT_MAP(BãßBȍőnPartKey.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 195ec437..d13661a2 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T05PartPental.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T05PartPental.java @@ -3,10 +3,10 @@ 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ȍőnInfoʸᴰ; -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.BassBoneStoreKey; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt2; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt2Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartKey; /** * The distribution by 5 called Wuxing. @@ -14,9 +14,9 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * @author willemtsade ©Δ∞ 仙上主天 */ @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 { +@BãßBȍőnPartAlt1Info(name="Pentagram", website="https://en.wikipedia.org/wiki/Pentagram") +@BãßBȍőnPartAlt2Info(name="Pythagorean Interpretations", website="http://wisdomofhypatia.com/OM/BA/PP.html") +public enum T05PartPental implements BãßBȍőnPartAlt2 { PART_1("˥","0","火","fire", "EI","heile"), PART_2("˦","1","水","water","U", "hudor"), @@ -25,18 +25,18 @@ public enum T05PartPental implements BassBoneAlt2 { PART_5("˩","4","土","earth","G", "gaia"), ; - private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); - public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } + 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) { - 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); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_TONE, idTone); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_1_VALUE, alt1Value); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_2_VALUE, alt2Value); + BBC.PUT_MAP(BãßBȍőnPartKey.MAP_TONE); + BBC.PUT_MAP(BãßBȍőnPartKey.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 5f55e54f..96de7a0c 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java @@ -3,9 +3,9 @@ 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ȍőnInfoʸᴰ; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartKey; /** * The distribution by 6. @@ -15,8 +15,8 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * @author willemtsade ©Δ∞ 仙上主天 */ @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 { +@BãßBȍőnPartAlt1Info(name="ADFGVX cipher", website="https://en.wikipedia.org/wiki/ADFGVX_cipher") +public enum T06PartSeximal implements BãßBȍőnPartAlt1 { PART_1("˦","0","四","4","A"), PART_2("˨","1","五","5","D"), @@ -26,18 +26,18 @@ public enum T06PartSeximal implements BassBoneAlt1 { PART_6("꜏","5","九","9","X"), ; - private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); - public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } + 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) { - 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); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_TONE, idTone); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_1_VALUE, alt1Value); + BBC.PUT_MAP(BãßBȍőnPartKey.MAP_TONE); + BBC.PUT_MAP(BãßBȍőnPartKey.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 75268ff3..75333679 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java @@ -3,9 +3,9 @@ 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ȍőnInfoʸᴰ; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartKey; /** * The distribution by 7. @@ -13,8 +13,8 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * @author willemtsade ©Δ∞ 仙上主天 */ @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 { +@BãßBȍőnPartAlt1Info(name="Fallen sign", website="https://en.wikipedia.org/wiki/Classical_planet#Western_astrology") +public enum T07PartPlanIt implements BãßBȍőnPartAlt1 { PART_1("˥","0","♎︎","libra", "天秤座"), PART_2("꜉","1","♏︎","scorpio", "天蠍座"), @@ -25,17 +25,17 @@ public enum T07PartPlanIt implements BassBoneAlt1 { PART_7("˩","7","♈︎","aries", "白羊座"), ; - private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); - public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } + 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) { - 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); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_TONE, idTone); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_1_VALUE, alt1Value); + BBC.PUT_MAP(BãßBȍőnPartKey.MAP_TONE); + BBC.PUT_MAP(BãßBȍőnPartKey.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 3a2f74bf..39c42c0c 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java @@ -1,13 +1,13 @@ 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ȍőnInfoʸᴰ; -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.BassBoneStoreKey; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt2; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt2Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartKey; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartShiftBits; /** * The distribution by 8. @@ -15,9 +15,9 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * @author willemtsade ©Δ∞ 仙上主天 */ @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 { +@BãßBȍőnPartAlt1Info(name="Absolute Tone Sequence", website="https://en.wikipedia.org/wiki/Tone_letter") +@BãßBȍőnPartAlt2Info(name="Relative Tone Sequence", website="https://en.wikipedia.org/wiki/Tone_letter") +public enum T08PartOctal implements BãßBȍőnPartAlt2,BãßBȍőnPartShiftBits { PART_1("˥","0","心","heart","˧˥˩","˥˩˧", 0), PART_2("˩","1","頭","head", "˧˩˥","˩˥˧", 3), @@ -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ʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); - public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } + 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) { - 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); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_TONE, identifierTone); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_LETTER, identifierLetter); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BãßBȍőnPartKey.SHIFT_BITS, Integer.valueOf(shiftBits)); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_1_VALUE, alt1Value); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_2_VALUE, alt2Value); + BBC.PUT_MAP(BãßBȍőnPartKey.MAP_TONE); + BBC.PUT_MAP(BãßBȍőnPartKey.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 3ddb0cc6..53e81ad4 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java @@ -3,12 +3,12 @@ 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ȍőnInfoʸᴰ; -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.BassBoneStoreKey; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt2Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt3Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt4; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt4Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartKey; /** * The distribution by 10. @@ -16,11 +16,11 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * @author willemtsade ©Δ∞ 仙上主天 */ @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") -@BassBoneAlt4Info(name="Sinhala Lith Illakkam", website="https://en.wikipedia.org/wiki/Sinhala_numerals#Numerals") -public enum T10PartDecimal implements BassBoneAlt4 { +@BãßBȍőnPartAlt1Info(name="Korean numerals", website="https://en.wikipedia.org/wiki/Korean_numerals") +@BãßBȍőnPartAlt2Info(name="Burmese numerals", website="https://en.wikipedia.org/wiki/Burmese_numerals") +@BãßBȍőnPartAlt3Info(name="Bengali numerals", website="https://en.wikipedia.org/wiki/Bengali_numerals") +@BãßBȍőnPartAlt4Info(name="Sinhala Lith Illakkam", website="https://en.wikipedia.org/wiki/Sinhala_numerals#Numerals") +public enum T10PartDecimal implements BãßBȍőnPartAlt4 { PART_1 ("˥","ō","零","zero", "영","\u1040","০", "෦"), PART_2 ("˦","α","壹","one", "일","\u1041","১", "෧"), @@ -34,21 +34,21 @@ public enum T10PartDecimal implements BassBoneAlt4 { PART_10("꜖","θ","玖","nine", "구","\u1049","৯","෯"), ; - private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); - public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } + 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) { - 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); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_TONE, idTone); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_1_VALUE, alt1Value); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_2_VALUE, alt2Value); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_3_VALUE, alt3Value); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_4_VALUE, alt4Value); + BBC.PUT_MAP(BãßBȍőnPartKey.MAP_TONE); + BBC.PUT_MAP(BãßBȍőnPartKey.MAP_CHINA); } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java index 613ac858..8608f2d5 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java @@ -3,9 +3,9 @@ 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ȍőnInfoʸᴰ; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartKey; /** * The distribution by 11. @@ -13,8 +13,8 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * @author willemtsade ©Δ∞ 仙上主天 */ @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 { +@BãßBȍőnPartAlt1Info(name="Tamil numerals", website="https://en.wikipedia.org/wiki/Tamil_numerals") +public enum T11PartUndecimal implements BãßBȍőnPartAlt1 { PART_1 ("˥","0","走","walk", "௦"), PART_2 ("꜈","1","跑","run", "௧"), @@ -29,17 +29,17 @@ public enum T11PartUndecimal implements BassBoneAlt1 { PART_11("˩","=","耦","mate", "௰"), ; - private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); - public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } + 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) { - 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); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_TONE, idTone); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_1_VALUE, alt1Value); + BBC.PUT_MAP(BãßBȍőnPartKey.MAP_TONE); + BBC.PUT_MAP(BãßBȍőnPartKey.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 db8ba75f..adada7f5 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java @@ -3,9 +3,9 @@ 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ȍőnInfoʸᴰ; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartKey; /** * The distribution by 12. @@ -13,8 +13,8 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * @author willemtsade ©Δ∞ 仙上主天 */ @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 { +@BãßBȍőnPartAlt1Info(name="Transdecimal symbols", website="https://en.wikipedia.org/wiki/Duodecimal#Transdecimal_symbols") +public enum T12PartUncial implements BãßBȍőnPartAlt1 { PART_1 ("˥","0","日","sun", "0"), PART_2 ("˧","1","月","moon", "1"), @@ -30,17 +30,17 @@ public enum T12PartUncial implements BassBoneAlt1 { PART_12("꜑","B","亞","nozero", "\u218b"), // TURNED DIGIT THREE ; - private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); - public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } + 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) { - 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); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_TONE, idTone); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_1_VALUE, alt1Value); + BBC.PUT_MAP(BãßBȍőnPartKey.MAP_TONE); + BBC.PUT_MAP(BãßBȍőnPartKey.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 de5c562f..d418e938 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java @@ -3,9 +3,9 @@ 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ȍőnInfoʸᴰ; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneAlt1Info; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartKey; /** * The distribution by 16. @@ -13,8 +13,8 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * @author willemtsade ©Δ∞ 仙上主天 */ @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 { +@BãßBȍőnPartAlt1Info(name="Dual-tone multi-frequency signaling", website="https://en.wikipedia.org/wiki/Dual-tone_multi-frequency_signaling") +public enum T16PartHex implements BãßBȍőnPartAlt1 { PART_1 ("˥","0","氫","hydrogen", "1"), PART_2 ("˦","1","氦","helium", "2"), @@ -34,18 +34,18 @@ public enum T16PartHex implements BassBoneAlt1 { PART_16("꜑","F","硫","sulfur", "D"), ; - private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); - public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } + 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) { - 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); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_TONE, idTone); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_1_VALUE, alt1Value); + BBC.PUT_MAP(BãßBȍőnPartKey.MAP_TONE); + BBC.PUT_MAP(BãßBȍőnPartKey.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 99a06995..d07e0673 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java @@ -8,11 +8,11 @@ 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ȍőnInfoʸᴰ; -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.BassBoneStoreKey; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt2Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt3; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt3Info; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartKey; /** * The distribution by 20. @@ -20,10 +20,10 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * @author willemtsade ©Δ∞ 仙上主天 */ @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") -public enum T20PartScore implements BassBoneAlt3 { +@BãßBȍőnPartAlt1Info(name="Vigesimal", website="https://en.wikipedia.org/wiki/Vigesimal#Places") +@BãßBȍőnPartAlt2Info(name="Vigesimal Alternative", website="https://en.wikipedia.org/wiki/Vigesimal#Places") +@BãßBȍőnPartAlt3Info(name="Open Location Code", website="https://en.wikipedia.org/wiki/Open_Location_Code") +public enum T20PartScore implements BãßBȍőnPartAlt3 { PART_1 ("˥","Y", "尧","yotta","0","0","2"), PART_2 ("˦","Z", "泽","zetta","1","1","3"), @@ -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ʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); - public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } + 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) { - 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); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_TONE, idTone); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_1_VALUE, alt1Value); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_2_VALUE, alt2Value); + BBC.PUT_OBJ(BãßBȍőnPartKey.ALT_3_VALUE, alt3Value); + BBC.PUT_MAP(BãßBȍőnPartKey.MAP_TONE); + BBC.PUT_MAP(BãßBȍőnPartKey.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 3b2ab6ed..ea515803 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60PartSexagesimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60PartSexagesimal.java @@ -3,8 +3,8 @@ 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ȍőnInfoʸᴰ; -import love.distributedrebirth.numberxd.base2t.bone.BassBone; -import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPart; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartKey; /** * The distribution by 60. @@ -12,7 +12,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * @author willemtsade ©Δ∞ 仙上主天 */ @BãßBȍőnInfoʸᴰ(name = "T60Sexagesimal", purpose = "The distribution by 60.") -public enum T60PartSexagesimal implements BassBone { +public enum T60PartSexagesimal implements BãßBȍőnPart { PART_1 ("˧˩˥","ια","牛","cow"), PART_2 ("˧˥˦","ιβ","鸡","chicken"), @@ -79,16 +79,16 @@ public enum T60PartSexagesimal implements BassBone { PART_60("꜑꜑꜏","οϚ","蘋","apple"), ; - private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); - public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } + 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) { - 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); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_TONE, idTone); + BBC.PUT_OBJ(BãßBȍőnPartKey.ID_LETTER, idLetter); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_KEY, chinaKey); + BBC.PUT_OBJ(BãßBȍőnPartKey.CHINA_VALUE, chinaValue); + BBC.PUT_MAP(BãßBȍőnPartKey.MAP_TONE); + BBC.PUT_MAP(BãßBȍőnPartKey.MAP_CHINA); } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt1.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt1.java deleted file mode 100644 index 03fc7b44..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt1.java +++ /dev/null @@ -1,21 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.bone; - -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ -public interface BassBoneAlt1> extends BassBone { - - default String getAlt1Value() { - return GET_BBC().GET_STR(BassBoneStoreKey.ALT_1_VALUE); - } - - default String staticAlt1Name() { - return getClass().getAnnotation(BassBoneAlt1Info.class).name(); - } - - default String staticAlt1Website() { - return getClass().getAnnotation(BassBoneAlt1Info.class).website(); - } -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt2.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt2.java deleted file mode 100644 index f2de63b0..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt2.java +++ /dev/null @@ -1,21 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.bone; - -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ -public interface BassBoneAlt2> extends BassBoneAlt1 { - - default String getAlt2Value() { - return GET_BBC().GET_STR(BassBoneStoreKey.ALT_2_VALUE); - } - - default String staticAlt2Name() { - return getClass().getAnnotation(BassBoneAlt2Info.class).name(); - } - - default String staticAlt2Website() { - return getClass().getAnnotation(BassBoneAlt2Info.class).website(); - } -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt3.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt3.java deleted file mode 100644 index 3b67fa42..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt3.java +++ /dev/null @@ -1,21 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.bone; - -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ -public interface BassBoneAlt3> extends BassBoneAlt2 { - - default String getAlt3Value() { - return GET_BBC().GET_STR(BassBoneStoreKey.ALT_3_VALUE); - } - - default String staticAlt3Name() { - return getClass().getAnnotation(BassBoneAlt3Info.class).name(); - } - - default String staticAlt3Website() { - return getClass().getAnnotation(BassBoneAlt3Info.class).website(); - } -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt4.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt4.java deleted file mode 100644 index 4e22f113..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt4.java +++ /dev/null @@ -1,21 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.bone; - -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ -public interface BassBoneAlt4> extends BassBoneAlt3 { - - default String getAlt4Value() { - return GET_BBC().GET_STR(BassBoneStoreKey.ALT_4_VALUE); - } - - default String staticAlt4Name() { - return getClass().getAnnotation(BassBoneAlt4Info.class).name(); - } - - default String staticAlt4Website() { - return getClass().getAnnotation(BassBoneAlt4Info.class).website(); - } -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneShiftBits.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneShiftBits.java deleted file mode 100644 index 3e012e9f..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneShiftBits.java +++ /dev/null @@ -1,13 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.bone; - -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ -public interface BassBoneShiftBits> extends BassBone { - - default Integer getShiftBits() { - return GET_BBC().GET_INT(BassBoneStoreKey.SHIFT_BITS); - } -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBone.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPart.java similarity index 61% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBone.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPart.java index e9a5d04b..4378f736 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBone.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPart.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.numberxd.base2t.bone; +package love.distributedrebirth.numberxd.base2t.part; import java.util.Map; import java.util.stream.Collectors; @@ -11,27 +11,27 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnEnumSetʸᴰ; * * @author willemtsade ©Δ∞ 仙上主天 */ -public interface BassBone> extends BãßBȍőnEnumSetʸᴰ, BãßBȍőnCoffinStoreʸᴰ { +public interface BãßBȍőnPart> extends BãßBȍőnEnumSetʸᴰ, BãßBȍőnCoffinStoreʸᴰ { default String getIdentifierTone() { - return GET_BBC().GET_STR(BassBoneStoreKey.ID_TONE); + return GET_BBC().GET_STR(BãßBȍőnPartKey.ID_TONE); } default String getIdentifierLetter() { - return GET_BBC().GET_STR(BassBoneStoreKey.ID_LETTER); + return GET_BBC().GET_STR(BãßBȍőnPartKey.ID_LETTER); } default String getChinaKey() { - return GET_BBC().GET_STR(BassBoneStoreKey.CHINA_KEY); + return GET_BBC().GET_STR(BãßBȍőnPartKey.CHINA_KEY); } default String getChinaValue() { - return GET_BBC().GET_STR(BassBoneStoreKey.CHINA_VALUE); + return GET_BBC().GET_STR(BãßBȍőnPartKey.CHINA_VALUE); } @SuppressWarnings("unchecked") default T staticValueOfTone(String identifierTone) { - Map mapTone = GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); + Map mapTone = GET_BBC().GET_MAP_OBJ(BãßBȍőnPartKey.MAP_TONE); if (mapTone.isEmpty()) { mapTone.putAll(BãßInstancesStream().collect(Collectors.toMap(v -> v.getIdentifierTone(), v -> v))); } @@ -40,7 +40,7 @@ public interface BassBone> extends BãßBȍőnEnumSetʸᴰ @SuppressWarnings("unchecked") default T staticValueOfChina(String chinaKey) { - Map mapChina = GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); + Map mapChina = GET_BBC().GET_MAP_OBJ(BãßBȍőnPartKey.MAP_CHINA); if (mapChina.isEmpty()) { mapChina.putAll(BãßInstancesStream().collect(Collectors.toMap(v -> v.getChinaKey(), v -> v))); } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt1.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt1.java new file mode 100644 index 00000000..923e75dc --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt1.java @@ -0,0 +1,21 @@ +package love.distributedrebirth.numberxd.base2t.part; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public interface BãßBȍőnPartAlt1> extends BãßBȍőnPart { + + default String getAlt1Value() { + return GET_BBC().GET_STR(BãßBȍőnPartKey.ALT_1_VALUE); + } + + default String staticAlt1Name() { + return getClass().getAnnotation(BãßBȍőnPartAlt1Info.class).name(); + } + + default String staticAlt1Website() { + return getClass().getAnnotation(BãßBȍőnPartAlt1Info.class).website(); + } +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt1Info.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt1Info.java similarity index 78% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt1Info.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt1Info.java index 3312eb14..78f27c70 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt1Info.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt1Info.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.numberxd.base2t.bone; +package love.distributedrebirth.numberxd.base2t.part; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -12,7 +12,7 @@ import java.lang.annotation.Target; */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) -public @interface BassBoneAlt1Info { +public @interface BãßBȍőnPartAlt1Info { String name(); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt2.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt2.java new file mode 100644 index 00000000..2c007cbc --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt2.java @@ -0,0 +1,21 @@ +package love.distributedrebirth.numberxd.base2t.part; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public interface BãßBȍőnPartAlt2> extends BãßBȍőnPartAlt1 { + + default String getAlt2Value() { + return GET_BBC().GET_STR(BãßBȍőnPartKey.ALT_2_VALUE); + } + + default String staticAlt2Name() { + return getClass().getAnnotation(BãßBȍőnPartAlt2Info.class).name(); + } + + default String staticAlt2Website() { + return getClass().getAnnotation(BãßBȍőnPartAlt2Info.class).website(); + } +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt2Info.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt2Info.java similarity index 78% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt2Info.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt2Info.java index 72763f66..30589d14 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt2Info.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt2Info.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.numberxd.base2t.bone; +package love.distributedrebirth.numberxd.base2t.part; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -12,7 +12,7 @@ import java.lang.annotation.Target; */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) -public @interface BassBoneAlt2Info { +public @interface BãßBȍőnPartAlt2Info { String name(); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt3.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt3.java new file mode 100644 index 00000000..91e99b80 --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt3.java @@ -0,0 +1,21 @@ +package love.distributedrebirth.numberxd.base2t.part; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public interface BãßBȍőnPartAlt3> extends BãßBȍőnPartAlt2 { + + default String getAlt3Value() { + return GET_BBC().GET_STR(BãßBȍőnPartKey.ALT_3_VALUE); + } + + default String staticAlt3Name() { + return getClass().getAnnotation(BãßBȍőnPartAlt3Info.class).name(); + } + + default String staticAlt3Website() { + return getClass().getAnnotation(BãßBȍőnPartAlt3Info.class).website(); + } +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt3Info.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt3Info.java similarity index 78% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt3Info.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt3Info.java index 546e7f3d..923c0948 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt3Info.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt3Info.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.numberxd.base2t.bone; +package love.distributedrebirth.numberxd.base2t.part; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -12,7 +12,7 @@ import java.lang.annotation.Target; */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) -public @interface BassBoneAlt3Info { +public @interface BãßBȍőnPartAlt3Info { String name(); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt4.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt4.java new file mode 100644 index 00000000..12fbdfbf --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt4.java @@ -0,0 +1,21 @@ +package love.distributedrebirth.numberxd.base2t.part; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public interface BãßBȍőnPartAlt4> extends BãßBȍőnPartAlt3 { + + default String getAlt4Value() { + return GET_BBC().GET_STR(BãßBȍőnPartKey.ALT_4_VALUE); + } + + default String staticAlt4Name() { + return getClass().getAnnotation(BãßBȍőnPartAlt4Info.class).name(); + } + + default String staticAlt4Website() { + return getClass().getAnnotation(BãßBȍőnPartAlt4Info.class).website(); + } +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt4Info.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt4Info.java similarity index 78% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt4Info.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt4Info.java index ccc5b2a6..ccca4e51 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt4Info.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartAlt4Info.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.numberxd.base2t.bone; +package love.distributedrebirth.numberxd.base2t.part; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -12,7 +12,7 @@ import java.lang.annotation.Target; */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) -public @interface BassBoneAlt4Info { +public @interface BãßBȍőnPartAlt4Info { String name(); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneStoreKey.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartKey.java similarity index 68% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneStoreKey.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartKey.java index a5891b50..f8a8b2a3 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneStoreKey.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartKey.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.numberxd.base2t.bone; +package love.distributedrebirth.numberxd.base2t.part; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinStoreKeyʸᴰ; @@ -7,7 +7,7 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinStoreKeyʸᴰ; * * @author willemtsade ©Δ∞ 仙上主天 */ -public enum BassBoneStoreKey implements BãßBȍőnCoffinStoreKeyʸᴰ { +public enum BãßBȍőnPartKey implements BãßBȍőnCoffinStoreKeyʸᴰ { ID_TONE, ID_LETTER, diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartShiftBits.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartShiftBits.java new file mode 100644 index 00000000..9967a536 --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartShiftBits.java @@ -0,0 +1,13 @@ +package love.distributedrebirth.numberxd.base2t.part; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public interface BãßBȍőnPartShiftBits> extends BãßBȍőnPart { + + default Integer getShiftBits() { + return GET_BBC().GET_INT(BãßBȍőnPartKey.SHIFT_BITS); + } +} diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/BasePartFactoryTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/BasePartFactoryTest.java index 0037e4fc..5c9cefd9 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/BasePartFactoryTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/BasePartFactoryTest.java @@ -6,7 +6,7 @@ import java.util.Map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import love.distributedrebirth.numberxd.base2t.bone.BassBone; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPart; /** * @@ -27,7 +27,7 @@ public class BasePartFactoryTest { public void testGlobalChinaKeyMap() { Map global = new HashMap<>(); for (int base:BasePartFactory.getSupportedBases()) { - for (BassBone part:BasePartFactory.buildBassBonesByBase(base)) { + for (BãßBȍőnPart part:BasePartFactory.buildBassBonesByBase(base)) { Assertions.assertFalse(global.containsKey(part.getChinaKey())); global.put(part.getChinaKey(), part.getChinaValue()); } @@ -39,7 +39,7 @@ public class BasePartFactoryTest { public void testGlobalChinaValueMap() { Map global = new HashMap<>(); for (int base:BasePartFactory.getSupportedBases()) { - for (BassBone part:BasePartFactory.buildBassBonesByBase(base)) { + for (BãßBȍőnPart part:BasePartFactory.buildBassBonesByBase(base)) { Assertions.assertFalse(global.containsKey(part.getChinaValue())); global.put(part.getChinaValue(), part.getChinaValue()); } @@ -52,7 +52,7 @@ public class BasePartFactoryTest { boolean duplicate = false; Map global = new HashMap<>(); for (int base:BasePartFactory.getSupportedBases()) { - for (BassBone part:BasePartFactory.buildBassBonesByBase(base)) { + for (BãßBȍőnPart part:BasePartFactory.buildBassBonesByBase(base)) { if (global.containsKey(part.getIdentifierTone())) { duplicate = true; break; @@ -69,7 +69,7 @@ public class BasePartFactoryTest { boolean duplicate = false; Map global = new HashMap<>(); for (int base:BasePartFactory.getSupportedBases()) { - for (BassBone part:BasePartFactory.buildBassBonesByBase(base)) { + for (BãßBȍőnPart part:BasePartFactory.buildBassBonesByBase(base)) { if (global.containsKey(part.getIdentifierLetter())) { duplicate = true; break;