From caf31e2f961d3032edf883086f73cac6c7cf59bd Mon Sep 17 00:00:00 2001 From: Willem Cazander Date: Tue, 1 Feb 2022 23:33:23 +0100 Subject: [PATCH] Split enum into set and uppercased bbc paths. --- .../numberxd/base2t/T02PartBinary.java | 14 ++-- .../numberxd/base2t/T03PartTrit.java | 14 ++-- .../numberxd/base2t/T04PartQuad.java | 16 ++-- .../numberxd/base2t/T05PartPental.java | 22 +++--- .../numberxd/base2t/T06PartSeximal.java | 16 ++-- .../numberxd/base2t/T07PartPlanIt.java | 16 ++-- .../numberxd/base2t/T08PartOctal.java | 20 ++--- .../numberxd/base2t/T10PartDecimal.java | 22 +++--- .../numberxd/base2t/T11PartUndecimal.java | 16 ++-- .../numberxd/base2t/T12PartUncial.java | 16 ++-- .../numberxd/base2t/T16PartHex.java | 16 ++-- .../numberxd/base2t/T20PartScore.java | 20 ++--- .../numberxd/base2t/T60Sexagesimal.java | 14 ++-- .../numberxd/base2t/bone/BassBone.java | 14 ++-- .../numberxd/base2t/bone/BassBoneAlt1.java | 2 +- .../numberxd/base2t/bone/BassBoneAlt2.java | 2 +- .../numberxd/base2t/bone/BassBoneAlt3.java | 2 +- .../numberxd/base2t/bone/BassBoneAlt4.java | 2 +- .../numberxd/base2t/bone/BassBoneCoffin.java | 40 +++++----- .../numberxd/base2t/bone/BassBoneEnum.java | 64 ---------------- .../numberxd/base2t/bone/BassBoneEnumSet.java | 73 +++++++++++++++++++ .../base2t/bone/BassBoneShiftBits.java | 2 +- .../numberxd/base2t/bone/BassBoneStore.java | 2 +- 23 files changed, 215 insertions(+), 210 deletions(-) create mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneEnumSet.java diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java index 2339605d..faa4a038 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java @@ -21,16 +21,16 @@ public enum T02PartBinary implements BassBone { private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T02PartBinary(String idTone, String idLetter, String chinaKey, String chinaValue) { - getBBC().putInit(BassBoneStoreKey.ID_TONE, idTone); - getBBC().putInit(BassBoneStoreKey.ID_LETTER, idLetter); - getBBC().putInit(BassBoneStoreKey.CHINA_KEY, chinaKey); - getBBC().putInit(BassBoneStoreKey.CHINA_VALUE, chinaValue); - getBBC().getMapObject(BassBoneStoreKey.MAP_TONE); - getBBC().getMapObject(BassBoneStoreKey.MAP_CHINA); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } @Override - public BassBoneCoffin getBBC() { + public BassBoneCoffin GET_BBC() { return bbc; } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java index 69fe8308..6ef5bdec 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java @@ -22,16 +22,16 @@ public enum T03PartTrit implements BassBone { private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T03PartTrit(String idTone, String idLetter, String chinaKey, String chinaValue) { - getBBC().putInit(BassBoneStoreKey.ID_TONE, idTone); - getBBC().putInit(BassBoneStoreKey.ID_LETTER, idLetter); - getBBC().putInit(BassBoneStoreKey.CHINA_KEY, chinaKey); - getBBC().putInit(BassBoneStoreKey.CHINA_VALUE, chinaValue); - getBBC().getMapObject(BassBoneStoreKey.MAP_TONE); - getBBC().getMapObject(BassBoneStoreKey.MAP_CHINA); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } @Override - public BassBoneCoffin getBBC() { + public BassBoneCoffin GET_BBC() { return bbc; } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java index 7bb0ff78..5c6da337 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java @@ -25,17 +25,17 @@ public enum T04PartQuad implements BassBoneAlt1 { private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T04PartQuad(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { - getBBC().putInit(BassBoneStoreKey.ID_TONE, idTone); - getBBC().putInit(BassBoneStoreKey.ID_LETTER, idLetter); - getBBC().putInit(BassBoneStoreKey.CHINA_KEY, chinaKey); - getBBC().putInit(BassBoneStoreKey.CHINA_VALUE, chinaValue); - getBBC().putInit(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - getBBC().getMapObject(BassBoneStoreKey.MAP_TONE); - getBBC().getMapObject(BassBoneStoreKey.MAP_CHINA); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } @Override - public BassBoneCoffin getBBC() { + public BassBoneCoffin GET_BBC() { return bbc; } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T05PartPental.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T05PartPental.java index f8913352..48db00f2 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T05PartPental.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T05PartPental.java @@ -24,22 +24,18 @@ public enum T05PartPental implements BassBoneAlt2 { PART_5("˩","4","土","earth","G", "gaia"), ; + public BassBoneCoffin GET_BBC() { return bbc; } public static int LENGTH() { return values().length; }; private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T05PartPental(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value, String alt2Value) { - getBBC().putInit(BassBoneStoreKey.ID_TONE, idTone); - getBBC().putInit(BassBoneStoreKey.ID_LETTER, idLetter); - getBBC().putInit(BassBoneStoreKey.CHINA_KEY, chinaKey); - getBBC().putInit(BassBoneStoreKey.CHINA_VALUE, chinaValue); - getBBC().putInit(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - getBBC().putInit(BassBoneStoreKey.ALT_2_VALUE, alt2Value); - getBBC().getMapObject(BassBoneStoreKey.MAP_TONE); - getBBC().getMapObject(BassBoneStoreKey.MAP_CHINA); - } - - @Override - public BassBoneCoffin getBBC() { - return bbc; + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_2_VALUE, alt2Value); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java index 4f3b28a6..1ab0232f 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java @@ -29,17 +29,17 @@ public enum T06PartSeximal implements BassBoneAlt1 { private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T06PartSeximal(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { - getBBC().putInit(BassBoneStoreKey.ID_TONE, idTone); - getBBC().putInit(BassBoneStoreKey.ID_LETTER, idLetter); - getBBC().putInit(BassBoneStoreKey.CHINA_KEY, chinaKey); - getBBC().putInit(BassBoneStoreKey.CHINA_VALUE, chinaValue); - getBBC().putInit(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - getBBC().getMapObject(BassBoneStoreKey.MAP_TONE); - getBBC().getMapObject(BassBoneStoreKey.MAP_CHINA); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } @Override - public BassBoneCoffin getBBC() { + public BassBoneCoffin GET_BBC() { return bbc; } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java index cf53332a..4fd2913b 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java @@ -28,17 +28,17 @@ public enum T07PartPlanIt implements BassBoneAlt1 { private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T07PartPlanIt(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { - getBBC().putInit(BassBoneStoreKey.ID_TONE, idTone); - getBBC().putInit(BassBoneStoreKey.ID_LETTER, idLetter); - getBBC().putInit(BassBoneStoreKey.CHINA_KEY, chinaKey); - getBBC().putInit(BassBoneStoreKey.CHINA_VALUE, chinaValue); - getBBC().putInit(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - getBBC().getMapObject(BassBoneStoreKey.MAP_TONE); - getBBC().getMapObject(BassBoneStoreKey.MAP_CHINA); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } @Override - public BassBoneCoffin getBBC() { + public BassBoneCoffin GET_BBC() { return bbc; } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java index e6924210..87636cfb 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java @@ -34,19 +34,19 @@ public enum T08PartOctal implements BassBoneAlt2,BassBoneShiftBits private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T08PartOctal(String identifierTone, String identifierLetter, String chinaKey, String chinaValue, String alt1Value, String alt2Value, int shiftBits) { - getBBC().putInit(BassBoneStoreKey.ID_TONE, identifierTone); - getBBC().putInit(BassBoneStoreKey.ID_LETTER, identifierLetter); - getBBC().putInit(BassBoneStoreKey.CHINA_KEY, chinaKey); - getBBC().putInit(BassBoneStoreKey.CHINA_VALUE, chinaValue); - getBBC().putInit(BassBoneStoreKey.SHIFT_BITS, Integer.valueOf(shiftBits)); - getBBC().putInit(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - getBBC().putInit(BassBoneStoreKey.ALT_2_VALUE, alt2Value); - getBBC().getMapObject(BassBoneStoreKey.MAP_TONE); - getBBC().getMapObject(BassBoneStoreKey.MAP_CHINA); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, identifierTone); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, identifierLetter); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); + GET_BBC().PUT_INIT(BassBoneStoreKey.SHIFT_BITS, Integer.valueOf(shiftBits)); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_2_VALUE, alt2Value); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } @Override - public BassBoneCoffin getBBC() { + public BassBoneCoffin GET_BBC() { return bbc; } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java index 3b1cea26..2d1c97ab 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java @@ -38,20 +38,20 @@ public enum T10PartDecimal implements BassBoneAlt4 { private T10PartDecimal(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value, String alt2Value, String alt3Value, String alt4Value) { - getBBC().putInit(BassBoneStoreKey.ID_TONE, idTone); - getBBC().putInit(BassBoneStoreKey.ID_LETTER, idLetter); - getBBC().putInit(BassBoneStoreKey.CHINA_KEY, chinaKey); - getBBC().putInit(BassBoneStoreKey.CHINA_VALUE, chinaValue); - getBBC().putInit(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - getBBC().putInit(BassBoneStoreKey.ALT_2_VALUE, alt2Value); - getBBC().putInit(BassBoneStoreKey.ALT_3_VALUE, alt3Value); - getBBC().putInit(BassBoneStoreKey.ALT_4_VALUE, alt4Value); - getBBC().getMapObject(BassBoneStoreKey.MAP_TONE); - getBBC().getMapObject(BassBoneStoreKey.MAP_CHINA); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_2_VALUE, alt2Value); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_3_VALUE, alt3Value); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_4_VALUE, alt4Value); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } @Override - public BassBoneCoffin getBBC() { + public BassBoneCoffin GET_BBC() { return bbc; } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java index f945a766..b426b90d 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java @@ -32,17 +32,17 @@ public enum T11PartUndecimal implements BassBoneAlt1 { private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T11PartUndecimal(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { - getBBC().putInit(BassBoneStoreKey.ID_TONE, idTone); - getBBC().putInit(BassBoneStoreKey.ID_LETTER, idLetter); - getBBC().putInit(BassBoneStoreKey.CHINA_KEY, chinaKey); - getBBC().putInit(BassBoneStoreKey.CHINA_VALUE, chinaValue); - getBBC().putInit(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - getBBC().getMapObject(BassBoneStoreKey.MAP_TONE); - getBBC().getMapObject(BassBoneStoreKey.MAP_CHINA); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } @Override - public BassBoneCoffin getBBC() { + public BassBoneCoffin GET_BBC() { return bbc; } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java index beb6ed4c..a2995724 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java @@ -33,17 +33,17 @@ public enum T12PartUncial implements BassBoneAlt1 { private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T12PartUncial(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { - getBBC().putInit(BassBoneStoreKey.ID_TONE, idTone); - getBBC().putInit(BassBoneStoreKey.ID_LETTER, idLetter); - getBBC().putInit(BassBoneStoreKey.CHINA_KEY, chinaKey); - getBBC().putInit(BassBoneStoreKey.CHINA_VALUE, chinaValue); - getBBC().putInit(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - getBBC().getMapObject(BassBoneStoreKey.MAP_TONE); - getBBC().getMapObject(BassBoneStoreKey.MAP_CHINA); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } @Override - public BassBoneCoffin getBBC() { + public BassBoneCoffin GET_BBC() { return bbc; } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java index f7d67ab6..f1eb6ba0 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java @@ -37,17 +37,17 @@ public enum T16PartHex implements BassBoneAlt1 { private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T16PartHex(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value) { - getBBC().putInit(BassBoneStoreKey.ID_TONE, idTone); - getBBC().putInit(BassBoneStoreKey.ID_LETTER, idLetter); - getBBC().putInit(BassBoneStoreKey.CHINA_KEY, chinaKey); - getBBC().putInit(BassBoneStoreKey.CHINA_VALUE, chinaValue); - getBBC().putInit(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - getBBC().getMapObject(BassBoneStoreKey.MAP_TONE); - getBBC().getMapObject(BassBoneStoreKey.MAP_CHINA); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } @Override - public BassBoneCoffin getBBC() { + public BassBoneCoffin GET_BBC() { return bbc; } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java index 6e2f7251..5f35ea48 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java @@ -53,19 +53,19 @@ public enum T20PartScore implements BassBoneAlt3 { private T20PartScore(String idTone, String idLetter, String chinaKey, String chinaValue, String alt1Value, String alt2Value, String alt3Value) { - getBBC().putInit(BassBoneStoreKey.ID_TONE, idTone); - getBBC().putInit(BassBoneStoreKey.ID_LETTER, idLetter); - getBBC().putInit(BassBoneStoreKey.CHINA_KEY, chinaKey); - getBBC().putInit(BassBoneStoreKey.CHINA_VALUE, chinaValue); - getBBC().putInit(BassBoneStoreKey.ALT_1_VALUE, alt1Value); - getBBC().putInit(BassBoneStoreKey.ALT_2_VALUE, alt2Value); - getBBC().putInit(BassBoneStoreKey.ALT_3_VALUE, alt3Value); - getBBC().getMapObject(BassBoneStoreKey.MAP_TONE); - getBBC().getMapObject(BassBoneStoreKey.MAP_CHINA); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_1_VALUE, alt1Value); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_2_VALUE, alt2Value); + GET_BBC().PUT_INIT(BassBoneStoreKey.ALT_3_VALUE, alt3Value); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } @Override - public BassBoneCoffin getBBC() { + public BassBoneCoffin GET_BBC() { return bbc; } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java index 825b54c5..cdd18316 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java @@ -82,16 +82,16 @@ public enum T60Sexagesimal implements BassBone { private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private T60Sexagesimal(String idTone, String idLetter, String chinaKey, String chinaValue) { - getBBC().putInit(BassBoneStoreKey.ID_TONE, idTone); - getBBC().putInit(BassBoneStoreKey.ID_LETTER, idLetter); - getBBC().putInit(BassBoneStoreKey.CHINA_KEY, chinaKey); - getBBC().putInit(BassBoneStoreKey.CHINA_VALUE, chinaValue); - getBBC().getMapObject(BassBoneStoreKey.MAP_TONE); - getBBC().getMapObject(BassBoneStoreKey.MAP_CHINA); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); + GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); + GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_VALUE, chinaValue); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); + GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } @Override - public BassBoneCoffin getBBC() { + public BassBoneCoffin GET_BBC() { return bbc; } } 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 d8dcb395..03df9e6d 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBone.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBone.java @@ -8,31 +8,31 @@ import java.util.stream.Collectors; * * @author willemtsade ©Δ∞ 仙上主天 */ -public interface BassBone> extends BassBoneEnum, BassBoneStore { +public interface BassBone> extends BassBoneEnumSet, BassBoneStore { default String staticBoneNaam() { return getClass().getAnnotation(BassBoneName.class).value(); } default String getIdentifierTone() { - return getBBC().getString(BassBoneStoreKey.ID_TONE); + return GET_BBC().GET_STR(BassBoneStoreKey.ID_TONE); } default String getIdentifierLetter() { - return getBBC().getString(BassBoneStoreKey.ID_LETTER); + return GET_BBC().GET_STR(BassBoneStoreKey.ID_LETTER); } default String getChinaKey() { - return getBBC().getString(BassBoneStoreKey.CHINA_KEY); + return GET_BBC().GET_STR(BassBoneStoreKey.CHINA_KEY); } default String getChinaValue() { - return getBBC().getString(BassBoneStoreKey.CHINA_VALUE); + return GET_BBC().GET_STR(BassBoneStoreKey.CHINA_VALUE); } @SuppressWarnings("unchecked") default T staticValueOfTone(String identifierTone) { - Map mapTone = getBBC().getMapObject(BassBoneStoreKey.MAP_TONE); + Map mapTone = GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); if (mapTone.isEmpty()) { mapTone.putAll(staticInstancesStream().collect(Collectors.toMap(v -> v.getIdentifierTone(), v -> v))); } @@ -41,7 +41,7 @@ public interface BassBone> extends BassBoneEnum, BassBo @SuppressWarnings("unchecked") default T staticValueOfChina(String chinaKey) { - Map mapChina = getBBC().getMapObject(BassBoneStoreKey.MAP_CHINA); + Map mapChina = GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); if (mapChina.isEmpty()) { mapChina.putAll(staticInstancesStream().collect(Collectors.toMap(v -> v.getChinaKey(), v -> v))); } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt1.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt1.java index f2b3b6f2..03fc7b44 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt1.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt1.java @@ -8,7 +8,7 @@ package love.distributedrebirth.numberxd.base2t.bone; public interface BassBoneAlt1> extends BassBone { default String getAlt1Value() { - return getBBC().getString(BassBoneStoreKey.ALT_1_VALUE); + return GET_BBC().GET_STR(BassBoneStoreKey.ALT_1_VALUE); } default String staticAlt1Name() { diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt2.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt2.java index 21ec6b91..f2de63b0 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt2.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt2.java @@ -8,7 +8,7 @@ package love.distributedrebirth.numberxd.base2t.bone; public interface BassBoneAlt2> extends BassBoneAlt1 { default String getAlt2Value() { - return getBBC().getString(BassBoneStoreKey.ALT_2_VALUE); + return GET_BBC().GET_STR(BassBoneStoreKey.ALT_2_VALUE); } default String staticAlt2Name() { diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt3.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt3.java index fa4aa7f8..3b67fa42 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt3.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt3.java @@ -8,7 +8,7 @@ package love.distributedrebirth.numberxd.base2t.bone; public interface BassBoneAlt3> extends BassBoneAlt2 { default String getAlt3Value() { - return getBBC().getString(BassBoneStoreKey.ALT_3_VALUE); + return GET_BBC().GET_STR(BassBoneStoreKey.ALT_3_VALUE); } default String staticAlt3Name() { diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt4.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt4.java index a3b629a2..4e22f113 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt4.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneAlt4.java @@ -8,7 +8,7 @@ package love.distributedrebirth.numberxd.base2t.bone; public interface BassBoneAlt4> extends BassBoneAlt3 { default String getAlt4Value() { - return getBBC().getString(BassBoneStoreKey.ALT_4_VALUE); + return GET_BBC().GET_STR(BassBoneStoreKey.ALT_4_VALUE); } default String staticAlt4Name() { diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneCoffin.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneCoffin.java index d592b39a..c940ae33 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneCoffin.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneCoffin.java @@ -5,40 +5,40 @@ import java.util.Map; public interface BassBoneCoffin { - Object putInit(BassBoneStoreKey key, Object value); + Object PUT_INIT(BassBoneStoreKey key, Object value); - Object get(BassBoneStoreKey key); + Object GET(BassBoneStoreKey key); - default String getString(BassBoneStoreKey key) { - return String.class.cast(get(key)); + default String GET_STR(BassBoneStoreKey key) { + return String.class.cast(GET(key)); } - default Integer getInteger(BassBoneStoreKey key) { - return Integer.class.cast(get(key)); + default Integer GET_INT(BassBoneStoreKey key) { + return Integer.class.cast(GET(key)); } - default Long getLong(BassBoneStoreKey key) { - return Long.class.cast(get(key)); + default Long GET_LONG(BassBoneStoreKey key) { + return Long.class.cast(GET(key)); } - default Boolean getBoolean(BassBoneStoreKey key) { - return Boolean.class.cast(get(key)); + default Boolean GET_BOOL(BassBoneStoreKey key) { + return Boolean.class.cast(GET(key)); } @SuppressWarnings("unchecked") - default Map getMapObject(BassBoneStoreKey key) { - if (get(key) == null) { - putInit(key, new HashMap<>()); + default Map GET_MAP_OBJ(BassBoneStoreKey key) { + if (GET(key) == null) { + PUT_INIT(key, new HashMap<>()); } - return Map.class.cast(get(key)); + return Map.class.cast(GET(key)); } @SuppressWarnings("unchecked") - default Map getMapString(BassBoneStoreKey key) { - if (get(key) == null) { - putInit(key, new HashMap<>()); + default Map GET_MAP_STR(BassBoneStoreKey key) { + if (GET(key) == null) { + PUT_INIT(key, new HashMap<>()); } - return Map.class.cast(get(key)); + return Map.class.cast(GET(key)); } static BassBoneCoffin newInstance() { @@ -46,12 +46,12 @@ public interface BassBoneCoffin { final Map initMap = new HashMap<>(); @Override - public Object get(BassBoneStoreKey key) { + public Object GET(BassBoneStoreKey key) { return initMap.get(key); } @Override - public Object putInit(BassBoneStoreKey key, Object value) { + public Object PUT_INIT(BassBoneStoreKey key, Object value) { return initMap.put(key, value); } }; diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneEnum.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneEnum.java index 3920b78d..721a726a 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneEnum.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneEnum.java @@ -1,11 +1,5 @@ package love.distributedrebirth.numberxd.base2t.bone; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.function.Consumer; -import java.util.stream.Stream; - /** * * @@ -20,62 +14,4 @@ public interface BassBoneEnum { default String naam() { return name(); // Deutsche code } - - @SuppressWarnings("unchecked") - default T[] staticInstances() { - try { - Object result = getClass().getMethod("values").invoke(null); - return (T[]) result; - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - default List staticInstancesList() { - return Arrays.asList(staticInstances()); - } - - default Iterator staticInstancesIterator() { - return staticInstancesList().iterator(); - } - - default Stream staticInstancesStream() { - return staticInstancesList().stream(); - } - - default T volgende() { - T[] values = staticInstances(); - int resultIndex = 0; - for (int i=0;i consumer) { - for (T value:staticInstances()) { - consumer.accept(value); - } - } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneEnumSet.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneEnumSet.java new file mode 100644 index 00000000..83cdfec1 --- /dev/null +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneEnumSet.java @@ -0,0 +1,73 @@ +package love.distributedrebirth.numberxd.base2t.bone; + +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.function.Consumer; +import java.util.stream.Stream; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public interface BassBoneEnumSet extends BassBoneEnum { + + @SuppressWarnings("unchecked") + default T[] staticInstances() { + try { + Object result = getClass().getMethod("values").invoke(null); + return (T[]) result; + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + default List staticInstancesList() { + return Arrays.asList(staticInstances()); + } + + default Iterator staticInstancesIterator() { + return staticInstancesList().iterator(); + } + + default Stream staticInstancesStream() { + return staticInstancesList().stream(); + } + + default T volgende() { + T[] values = staticInstances(); + int resultIndex = 0; + for (int i=0;i consumer) { + for (T value:staticInstances()) { + consumer.accept(value); + } + } +} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneShiftBits.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneShiftBits.java index 9d60bbb6..3e012e9f 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneShiftBits.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneShiftBits.java @@ -8,6 +8,6 @@ package love.distributedrebirth.numberxd.base2t.bone; public interface BassBoneShiftBits> extends BassBone { default Integer getShiftBits() { - return getBBC().getInteger(BassBoneStoreKey.SHIFT_BITS); + return GET_BBC().GET_INT(BassBoneStoreKey.SHIFT_BITS); } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneStore.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneStore.java index 318c5697..1b702e2b 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneStore.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/bone/BassBoneStore.java @@ -7,5 +7,5 @@ package love.distributedrebirth.numberxd.base2t.bone; */ public interface BassBoneStore { - BassBoneCoffin getBBC(); + BassBoneCoffin GET_BBC(); }