From 67d0ad3b4972b9a1ae9ad1d4b548173adf3787cb Mon Sep 17 00:00:00 2001 From: Willem Cazander Date: Tue, 1 Feb 2022 23:37:28 +0100 Subject: [PATCH] Limit bbc to one line --- .../distributedrebirth/numberxd/base2t/T02PartBinary.java | 6 +----- .../distributedrebirth/numberxd/base2t/T03PartTrit.java | 6 +----- .../distributedrebirth/numberxd/base2t/T04PartQuad.java | 6 +----- .../distributedrebirth/numberxd/base2t/T06PartSeximal.java | 6 +----- .../distributedrebirth/numberxd/base2t/T07PartPlanIt.java | 6 +----- .../distributedrebirth/numberxd/base2t/T08PartOctal.java | 6 +----- .../distributedrebirth/numberxd/base2t/T10PartDecimal.java | 6 +----- .../numberxd/base2t/T11PartUndecimal.java | 6 +----- .../distributedrebirth/numberxd/base2t/T12PartUncial.java | 6 +----- .../love/distributedrebirth/numberxd/base2t/T16PartHex.java | 6 +----- .../distributedrebirth/numberxd/base2t/T20PartScore.java | 6 +----- .../distributedrebirth/numberxd/base2t/T60Sexagesimal.java | 6 +----- 12 files changed, 12 insertions(+), 60 deletions(-) diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java index faa4a038..2897a2ae 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java @@ -17,6 +17,7 @@ public enum T02PartBinary implements BassBone { PART_2("꜔","1", "高", "high"), ; + public BassBoneCoffin GET_BBC() { return bbc; } public static int LENGTH() { return values().length; }; private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); @@ -28,9 +29,4 @@ public enum T02PartBinary implements BassBone { GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } - - @Override - 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 6ef5bdec..d41cb6d0 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java @@ -18,6 +18,7 @@ public enum T03PartTrit implements BassBone { PART_3("˨","2","三","3"), ; + public BassBoneCoffin GET_BBC() { return bbc; } public static int LENGTH() { return values().length; }; private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); @@ -29,9 +30,4 @@ public enum T03PartTrit implements BassBone { GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } - - @Override - 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 5c6da337..01780511 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java @@ -21,6 +21,7 @@ public enum T04PartQuad implements BassBoneAlt1 { PART_4("˩","3","南","south","S"), ; + public BassBoneCoffin GET_BBC() { return bbc; } public static int LENGTH() { return values().length; }; private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); @@ -34,11 +35,6 @@ public enum T04PartQuad implements BassBoneAlt1 { GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } - @Override - public BassBoneCoffin GET_BBC() { - return bbc; - } - public T02PartBinary splitPartBinary(T02PartBinary part) { return T02PartBinary.values()[(ordinal() >> part.ordinal()) & 1]; } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java index 1ab0232f..f297d432 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java @@ -25,6 +25,7 @@ public enum T06PartSeximal implements BassBoneAlt1 { PART_6("꜏","5","九","9","X"), ; + public BassBoneCoffin GET_BBC() { return bbc; } public static int LENGTH() { return values().length; }; private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); @@ -38,11 +39,6 @@ public enum T06PartSeximal implements BassBoneAlt1 { GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } - @Override - public BassBoneCoffin GET_BBC() { - return bbc; - } - public T02PartBinary splitPartBinary() { return T02PartBinary.values()[ordinal() & 1]; } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java index 4fd2913b..6c4d1797 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T07PartPlanIt.java @@ -24,6 +24,7 @@ public enum T07PartPlanIt implements BassBoneAlt1 { PART_7("˩","7","♈︎","aries","白羊座"), ; + public BassBoneCoffin GET_BBC() { return bbc; } public static int LENGTH() { return values().length; }; private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); @@ -36,9 +37,4 @@ public enum T07PartPlanIt implements BassBoneAlt1 { GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } - - @Override - 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 87636cfb..351d7bcf 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java @@ -28,6 +28,7 @@ public enum T08PartOctal implements BassBoneAlt2,BassBoneShiftBits PART_8("꜑","7","腳","feet", "˧˩˩","˩˩˧", 21), ; + public BassBoneCoffin GET_BBC() { return bbc; } public static int LENGTH() { return values().length; }; public static int BIT_COUNT = 3; private static final byte BITMASK = 0x07; @@ -45,11 +46,6 @@ public enum T08PartOctal implements BassBoneAlt2,BassBoneShiftBits GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } - @Override - public BassBoneCoffin GET_BBC() { - return bbc; - } - public static T08PartOctal indexOf(T08PartOctal group, int value) { return T08PartOctal.values()[(value >> group.getShiftBits()) & BITMASK]; } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java index 2d1c97ab..a1a79cfe 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T10PartDecimal.java @@ -33,6 +33,7 @@ public enum T10PartDecimal implements BassBoneAlt4 { PART_10("꜖","θ","玖","nine", "구","\u1049","৯","෯"), ; + public BassBoneCoffin GET_BBC() { return bbc; } public static int LENGTH() { return values().length; }; private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); @@ -49,9 +50,4 @@ public enum T10PartDecimal implements BassBoneAlt4 { GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } - - @Override - 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 b426b90d..ad2b2900 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T11PartUndecimal.java @@ -28,6 +28,7 @@ public enum T11PartUndecimal implements BassBoneAlt1 { PART_11("˩","=","耦","mate", "௰"), ; + public BassBoneCoffin GET_BBC() { return bbc; } public static int LENGTH() { return values().length; }; private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); @@ -40,9 +41,4 @@ public enum T11PartUndecimal implements BassBoneAlt1 { GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } - - @Override - 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 a2995724..09ecd62a 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java @@ -29,6 +29,7 @@ public enum T12PartUncial implements BassBoneAlt1 { PART_12("꜑","B","亞","nozero", "\u218b"), // TURNED DIGIT THREE ; + public BassBoneCoffin GET_BBC() { return bbc; } public static int LENGTH() { return values().length; }; private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); @@ -41,9 +42,4 @@ public enum T12PartUncial implements BassBoneAlt1 { GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } - - @Override - 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 f1eb6ba0..bf11b761 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java @@ -33,6 +33,7 @@ public enum T16PartHex implements BassBoneAlt1 { PART_16("꜑","F","硫","sulfur", "D"), ; + public BassBoneCoffin GET_BBC() { return bbc; } public static int LENGTH() { return values().length; }; private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); @@ -46,11 +47,6 @@ public enum T16PartHex implements BassBoneAlt1 { GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } - @Override - public BassBoneCoffin GET_BBC() { - return bbc; - } - public T02PartBinary splitPartBinary(T04PartQuad part) { return T02PartBinary.values()[(ordinal() >> part.ordinal()) & 1]; } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java index 5f35ea48..4333a062 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java @@ -46,6 +46,7 @@ public enum T20PartScore implements BassBoneAlt3 { PART_20("꜑","y", "幺","yocto","J","K","X"), ; + public BassBoneCoffin GET_BBC() { return bbc; } public static int LENGTH() { return values().length; }; private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private static final Map OPENLC_MAP = Collections.unmodifiableMap( @@ -64,11 +65,6 @@ public enum T20PartScore implements BassBoneAlt3 { GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } - @Override - public BassBoneCoffin GET_BBC() { - return bbc; - } - public T20PartScore staticValueOfOpenLC(String openLCKey) { return OPENLC_MAP.get(openLCKey); } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java index cdd18316..b9fd05e0 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java @@ -78,6 +78,7 @@ public enum T60Sexagesimal implements BassBone { PART_60("꜑꜑꜏","οϚ","蘋","apple"), ; + public BassBoneCoffin GET_BBC() { return bbc; } public static int LENGTH() { return values().length; }; private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); @@ -89,9 +90,4 @@ public enum T60Sexagesimal implements BassBone { GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); } - - @Override - public BassBoneCoffin GET_BBC() { - return bbc; - } }