diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BasePartFactory.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BasePartFactory.java index 2a81b74e..df148400 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BasePartFactory.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BasePartFactory.java @@ -39,7 +39,7 @@ public final class BasePartFactory { case 20: return T20PartScore.values(); case 60: - return T60Sexagesimal.values(); + return T60PartSexagesimal.values(); default: throw new IllegalArgumentException("Unsupported base: "+base); } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60PartSexagesimal.java similarity index 95% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60PartSexagesimal.java index b9fd05e0..4096b69d 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60PartSexagesimal.java @@ -11,7 +11,7 @@ import love.distributedrebirth.numberxd.base2t.bone.BassBoneStoreKey; * @author willemtsade ©Δ∞ 仙上主天 */ @BassBoneName("T60Sexagesimal") -public enum T60Sexagesimal implements BassBone { +public enum T60PartSexagesimal implements BassBone { PART_1 ("˧˩˥","ια","牛","cow"), PART_2 ("˧˥˦","ιβ","鸡","chicken"), @@ -82,7 +82,7 @@ public enum T60Sexagesimal implements BassBone { public static int LENGTH() { return values().length; }; private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); - private T60Sexagesimal(String idTone, String idLetter, String chinaKey, String chinaValue) { + private T60PartSexagesimal(String idTone, String idLetter, String chinaKey, String chinaValue) { GET_BBC().PUT_INIT(BassBoneStoreKey.ID_TONE, idTone); GET_BBC().PUT_INIT(BassBoneStoreKey.ID_LETTER, idLetter); GET_BBC().PUT_INIT(BassBoneStoreKey.CHINA_KEY, chinaKey); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V654Triz.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V654Triz.java index c3e37e82..8b5dc73b 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V654Triz.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V654Triz.java @@ -7,8 +7,8 @@ package love.distributedrebirth.numberxd.base2t; */ public class V654Triz implements BaseNumberTyte { - public static int BIT_COUNT = V01BTemvig.BIT_COUNT * T60Sexagesimal.LENGTH(); - private V01BTemvig[] values = new V01BTemvig[T60Sexagesimal.LENGTH()]; + public static int BIT_COUNT = V01BTemvig.BIT_COUNT * T60PartSexagesimal.LENGTH(); + private V01BTemvig[] values = new V01BTemvig[T60PartSexagesimal.LENGTH()]; public V654Triz() { for (int i=0;i { } } - public V01BTemvig getValue(T60Sexagesimal part) { + public V01BTemvig getValue(T60PartSexagesimal part) { return values[part.ordinal()]; } - public void setValue(T60Sexagesimal part, V01BTemvig value) { + public void setValue(T60PartSexagesimal part, V01BTemvig value) { values[part.ordinal()] = value; } @@ -42,11 +42,11 @@ public class V654Triz implements BaseNumberTyte { @Override public void fillOctalsByClone(T08PartOctalBaseAppender appender) { - T60Sexagesimal.PART_1.staticVoorElk(v -> getValue(v).fillOctalsByClone(appender)); + T60PartSexagesimal.PART_1.staticVoorElk(v -> getValue(v).fillOctalsByClone(appender)); } @Override public void fillTytesByReference(V009TyteBaseAppender appender) { - T60Sexagesimal.PART_1.staticVoorElk(v -> getValue(v).fillTytesByReference(appender)); + T60PartSexagesimal.PART_1.staticVoorElk(v -> getValue(v).fillTytesByReference(appender)); } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V9D8Traz.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V9D8Traz.java index 1481e894..b1786d84 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V9D8Traz.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V9D8Traz.java @@ -7,8 +7,8 @@ package love.distributedrebirth.numberxd.base2t; */ public class V9D8Traz implements BaseNumber { - public static int BIT_COUNT = V02ATraw.BIT_COUNT * T60Sexagesimal.LENGTH(); - private V02ATraw[] values = new V02ATraw[T60Sexagesimal.LENGTH()]; + public static int BIT_COUNT = V02ATraw.BIT_COUNT * T60PartSexagesimal.LENGTH(); + private V02ATraw[] values = new V02ATraw[T60PartSexagesimal.LENGTH()]; public V9D8Traz() { for (int i=0;i { } } - public V02ATraw getValue(T60Sexagesimal part) { + public V02ATraw getValue(T60PartSexagesimal part) { return values[part.ordinal()]; } - public void setValue(T60Sexagesimal part, V02ATraw value) { + public void setValue(T60PartSexagesimal part, V02ATraw value) { values[part.ordinal()] = value; } @@ -42,6 +42,6 @@ public class V9D8Traz implements BaseNumber { @Override public void fillOctalsByClone(T08PartOctalBaseAppender appender) { - T60Sexagesimal.PART_1.staticVoorElk(v -> getValue(v).fillOctalsByClone(appender)); + T60PartSexagesimal.PART_1.staticVoorElk(v -> getValue(v).fillOctalsByClone(appender)); } } diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T60SexagesimalTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T60SexagesimalTest.java index 420b5c43..20a59d99 100644 --- a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T60SexagesimalTest.java +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T60SexagesimalTest.java @@ -12,7 +12,7 @@ public class T60SexagesimalTest { @Test public void testBasePart() { - for (T60Sexagesimal value:T60Sexagesimal.values()) { + for (T60PartSexagesimal value:T60PartSexagesimal.values()) { Assertions.assertNotNull(value.getIdentifierTone()); Assertions.assertNotNull(value.getIdentifierLetter()); Assertions.assertNotNull(value.getChinaKey()); @@ -22,17 +22,17 @@ public class T60SexagesimalTest { @Test public void testToneMap() { - Assertions.assertEquals(T60Sexagesimal.PART_1, T60Sexagesimal.PART_1.staticValueOfTone("˧˩˥")); - Assertions.assertEquals(T60Sexagesimal.PART_2, T60Sexagesimal.PART_1.staticValueOfTone("˧˥˦")); - Assertions.assertEquals(T60Sexagesimal.PART_59, T60Sexagesimal.PART_1.staticValueOfTone("꜍꜍꜏")); - Assertions.assertEquals(T60Sexagesimal.PART_60, T60Sexagesimal.PART_1.staticValueOfTone("꜑꜑꜏")); + Assertions.assertEquals(T60PartSexagesimal.PART_1, T60PartSexagesimal.PART_1.staticValueOfTone("˧˩˥")); + Assertions.assertEquals(T60PartSexagesimal.PART_2, T60PartSexagesimal.PART_1.staticValueOfTone("˧˥˦")); + Assertions.assertEquals(T60PartSexagesimal.PART_59, T60PartSexagesimal.PART_1.staticValueOfTone("꜍꜍꜏")); + Assertions.assertEquals(T60PartSexagesimal.PART_60, T60PartSexagesimal.PART_1.staticValueOfTone("꜑꜑꜏")); } @Test public void testChinaMap() { - Assertions.assertEquals(T60Sexagesimal.PART_1, T60Sexagesimal.PART_1.staticValueOfChina("牛")); - Assertions.assertEquals(T60Sexagesimal.PART_2, T60Sexagesimal.PART_1.staticValueOfChina("鸡")); - Assertions.assertEquals(T60Sexagesimal.PART_59, T60Sexagesimal.PART_1.staticValueOfChina("薯")); - Assertions.assertEquals(T60Sexagesimal.PART_60, T60Sexagesimal.PART_1.staticValueOfChina("蘋")); + Assertions.assertEquals(T60PartSexagesimal.PART_1, T60PartSexagesimal.PART_1.staticValueOfChina("牛")); + Assertions.assertEquals(T60PartSexagesimal.PART_2, T60PartSexagesimal.PART_1.staticValueOfChina("鸡")); + Assertions.assertEquals(T60PartSexagesimal.PART_59, T60PartSexagesimal.PART_1.staticValueOfChina("薯")); + Assertions.assertEquals(T60PartSexagesimal.PART_60, T60PartSexagesimal.PART_1.staticValueOfChina("蘋")); } }