diff --git a/.gitignore b/.gitignore index a1986f10..0f8435f5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,11 +2,10 @@ # Ignore files in the demo4D project. # -# Ignore project resources -core/bin -desktop/bin - -# Ignore gradle work folder +# Ignore gradle resources +bin +build +.gitignore .gradle # Ignore binary files and formats diff --git a/build.gradle b/build.gradle index 8c7582db..53e56521 100644 --- a/build.gradle +++ b/build.gradle @@ -19,6 +19,7 @@ allprojects { gdxVersion = "1.10.0" spairVersion = "1.86.0" nativefilechooserVersion = "1.0.0" + junitVersion = "5.7.2" } repositories { mavenLocal() @@ -32,6 +33,17 @@ allprojects { } } +project(":numberxd") { + apply plugin: "java-library" + dependencies { + testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion" + //api "org.x4o:x4o-driver:$x4oVersion" + } + tasks.named('test') { + useJUnitPlatform() + } +} + project(":desktop") { apply plugin: "java-library" dependencies { @@ -46,6 +58,7 @@ project(":core") { apply plugin: "java-library" dependencies { //api "org.x4o:x4o-driver:$x4oVersion" + api project(":numberxd") api "com.badlogicgames.gdx:gdx:$gdxVersion" api "io.github.spair:imgui-java-binding:$spairVersion" api "io.github.spair:imgui-java-lwjgl3:$spairVersion" diff --git a/numberxd/build.gradle b/numberxd/build.gradle new file mode 100644 index 00000000..dec46f84 --- /dev/null +++ b/numberxd/build.gradle @@ -0,0 +1,6 @@ +sourceCompatibility = appJvmCode +[compileJava, compileTestJava]*.options*.encoding = appEncoding + +sourceSets.main.java.srcDirs = [ "src/main/", "src/resources/" ] + +eclipse.project.name = appName + "-numberxd" diff --git a/core/src/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java rename to numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java diff --git a/core/src/love/distributedrebirth/numberxd/GroßGetậl6ˢᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl6ˢᴰ.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/GroßGetậl6ˢᴰ.java rename to numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl6ˢᴰ.java diff --git a/core/src/love/distributedrebirth/numberxd/GroßGetậlŌṁ1ⁿᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậlŌṁ1ⁿᴰ.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/GroßGetậlŌṁ1ⁿᴰ.java rename to numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậlŌṁ1ⁿᴰ.java diff --git a/core/src/love/distributedrebirth/numberxd/GroßGetậlŌṁ6ˢᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậlŌṁ6ˢᴰ.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/GroßGetậlŌṁ6ˢᴰ.java rename to numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậlŌṁ6ˢᴰ.java diff --git a/core/src/love/distributedrebirth/numberxd/GroßGetậlŌṁDiamond1ⁿᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậlŌṁDiamond1ⁿᴰ.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/GroßGetậlŌṁDiamond1ⁿᴰ.java rename to numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậlŌṁDiamond1ⁿᴰ.java diff --git a/core/src/love/distributedrebirth/numberxd/GroßGetậlŌṁDiamond6ˢᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậlŌṁDiamond6ˢᴰ.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/GroßGetậlŌṁDiamond6ˢᴰ.java rename to numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậlŌṁDiamond6ˢᴰ.java diff --git a/core/src/love/distributedrebirth/numberxd/GroßGetậlŌṁHyperStar1ⁿᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậlŌṁHyperStar1ⁿᴰ.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/GroßGetậlŌṁHyperStar1ⁿᴰ.java rename to numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậlŌṁHyperStar1ⁿᴰ.java diff --git a/core/src/love/distributedrebirth/numberxd/GroßGetậlŌṁHyperStar6ˢᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậlŌṁHyperStar6ˢᴰ.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/GroßGetậlŌṁHyperStar6ˢᴰ.java rename to numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậlŌṁHyperStar6ˢᴰ.java diff --git a/core/src/love/distributedrebirth/numberxd/Gê̄ldGetậl.java b/numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậl.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/Gê̄ldGetậl.java rename to numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậl.java diff --git a/core/src/love/distributedrebirth/numberxd/Gê̄ldGetậlAtHebrew.java b/numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậlAtHebrew.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/Gê̄ldGetậlAtHebrew.java rename to numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậlAtHebrew.java diff --git a/core/src/love/distributedrebirth/numberxd/Gê̄ldGetậlAtHebrewLetter.java b/numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậlAtHebrewLetter.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/Gê̄ldGetậlAtHebrewLetter.java rename to numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậlAtHebrewLetter.java diff --git a/core/src/love/distributedrebirth/numberxd/Gê̄ldGetậlAtHebrewVowel.java b/numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậlAtHebrewVowel.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/Gê̄ldGetậlAtHebrewVowel.java rename to numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậlAtHebrewVowel.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/Base2Terminator.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/Base2Terminator.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/Base2Terminator.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/Base2Terminator.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/BaseAppender.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseAppender.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/BaseAppender.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseAppender.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/BaseNumber.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumber.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/BaseNumber.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumber.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/BaseNumberTyte.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberTyte.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/BaseNumberTyte.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberTyte.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T02PartBinary.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/T02PartBinary.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/T02PartBinary.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T03PartTrit.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/T03PartTrit.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/T03PartTrit.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T04PartQuad.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/T04PartQuad.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/T04PartQuad.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T05PartPental.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T05PartPental.java similarity index 85% rename from core/src/love/distributedrebirth/numberxd/base2t/T05PartPental.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/T05PartPental.java index d61b59a1..0e472291 100644 --- a/core/src/love/distributedrebirth/numberxd/base2t/T05PartPental.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T05PartPental.java @@ -28,6 +28,8 @@ public enum T05PartPental implements BasePart { private final Map facetStore = new HashMap<>(); private static final Map TONE_MAP = Collections.unmodifiableMap( Arrays.asList(values()).stream().collect(Collectors.toMap(v -> v.getIdentifierTone(), v -> v))); + private static final Map CHINA_MAP = Collections.unmodifiableMap( + Arrays.asList(values()).stream().collect(Collectors.toMap(v -> v.getChinaKey(), v -> v))); private T05PartPental(String idTone, String idLetter, String chinaKey, String chinaValue) { this.getFacetStore().put(BaseFacetKey.ID_TONE, idTone); @@ -50,4 +52,8 @@ public enum T05PartPental implements BasePart { public static T05PartPental valueOfTone(String identifierTone) { return TONE_MAP.get(identifierTone); } + + public static T05PartPental valueOfChina(String chinaKey) { + return CHINA_MAP.get(chinaKey); + } } diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T08PartOctal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/T08PartOctal.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctal.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T08PartOctalBaseAppender.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctalBaseAppender.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/T08PartOctalBaseAppender.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctalBaseAppender.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T08PartOctalBaseIterator.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctalBaseIterator.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/T08PartOctalBaseIterator.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/T08PartOctalBaseIterator.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T12PartUncial.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/T12PartUncial.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/T12PartUncial.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T16PartHex.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/T16PartHex.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/T16PartHex.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T20PartScore.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/T20PartScore.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/T20PartScore.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/V003Timble.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V003Timble.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/V003Timble.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/V003Timble.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/V006Tixte.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V006Tixte.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/V006Tixte.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/V006Tixte.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/V009Tyte.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V009Tyte.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/V009Tyte.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/V009Tyte.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/V009TyteBaseAppender.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V009TyteBaseAppender.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/V009TyteBaseAppender.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/V009TyteBaseAppender.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/V009TyteBaseIterator.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V009TyteBaseIterator.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/V009TyteBaseIterator.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/V009TyteBaseIterator.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/V012Tord.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V012Tord.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/V012Tord.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/V012Tord.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/V01BTemvig.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V01BTemvig.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/V01BTemvig.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/V01BTemvig.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/V024Teger.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V024Teger.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/V024Teger.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/V024Teger.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/V048Tong.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V048Tong.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/V048Tong.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/V048Tong.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/V090Tocta.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V090Tocta.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/V090Tocta.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/V090Tocta.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/V654Triz.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/V654Triz.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/V654Triz.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/V654Triz.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/VCA8Tath.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/VCA8Tath.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/VCA8Tath.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/VCA8Tath.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BaseFacetKey.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BaseFacetKey.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/facet/BaseFacetKey.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BaseFacetKey.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BaseFacetStore.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BaseFacetStore.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/facet/BaseFacetStore.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BaseFacetStore.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePart.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePart.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/facet/BasePart.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePart.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt1.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt1.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt1.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt1.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt2.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt2.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt2.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt2.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt3.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt3.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt3.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt3.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt4.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt4.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt4.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt4.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartShiftBits.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartShiftBits.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartShiftBits.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartShiftBits.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit16.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit16.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit16.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit16.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit4.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit4.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit4.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit4.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit6.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit6.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit6.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit6.java diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit8.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit8.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit8.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit8.java diff --git a/core/src/love/distributedrebirth/numberxd/ŌṁKaassGetậl4ˢᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/ŌṁKaassGetậl4ˢᴰ.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/ŌṁKaassGetậl4ˢᴰ.java rename to numberxd/src/main/love/distributedrebirth/numberxd/ŌṁKaassGetậl4ˢᴰ.java diff --git a/core/src/love/distributedrebirth/numberxd/ŌṁKlompGetậl4ˢᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/ŌṁKlompGetậl4ˢᴰ.java similarity index 100% rename from core/src/love/distributedrebirth/numberxd/ŌṁKlompGetậl4ˢᴰ.java rename to numberxd/src/main/love/distributedrebirth/numberxd/ŌṁKlompGetậl4ˢᴰ.java diff --git a/core/resources/META-INF/numberxd/numberxd-modules.xml b/numberxd/src/resources/META-INF/numberxd/numberxd-modules.xml similarity index 100% rename from core/resources/META-INF/numberxd/numberxd-modules.xml rename to numberxd/src/resources/META-INF/numberxd/numberxd-modules.xml diff --git a/core/resources/META-INF/x4o-drivers.xml b/numberxd/src/resources/META-INF/x4o-drivers.xml similarity index 100% rename from core/resources/META-INF/x4o-drivers.xml rename to numberxd/src/resources/META-INF/x4o-drivers.xml diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T02PartBinaryTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T02PartBinaryTest.java new file mode 100644 index 00000000..635e9e6f --- /dev/null +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T02PartBinaryTest.java @@ -0,0 +1,34 @@ +package love.distributedrebirth.numberxd.base2t; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public class T02PartBinaryTest { + + @Test + public void testBasePart() { + for (T02PartBinary value:T02PartBinary.values()) { + Assertions.assertNotNull(value.getIdentifierTone()); + Assertions.assertNotNull(value.getIdentifierLetter()); + Assertions.assertNotNull(value.getChinaKey()); + Assertions.assertNotNull(value.getChinaValue()); + } + } + + @Test + public void testToneMap() { + Assertions.assertEquals(T02PartBinary.PART_1, T02PartBinary.valueOfTone("˧")); + Assertions.assertEquals(T02PartBinary.PART_2, T02PartBinary.valueOfTone("꜔")); + } + + @Test + public void testChinaMap() { + Assertions.assertEquals(T02PartBinary.PART_1, T02PartBinary.valueOfChina("低")); + Assertions.assertEquals(T02PartBinary.PART_2, T02PartBinary.valueOfChina("高")); + } +} diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T03PartTritTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T03PartTritTest.java new file mode 100644 index 00000000..0d5bf014 --- /dev/null +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T03PartTritTest.java @@ -0,0 +1,36 @@ +package love.distributedrebirth.numberxd.base2t; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public class T03PartTritTest { + + @Test + public void testBasePart() { + for (T03PartTrit value:T03PartTrit.values()) { + Assertions.assertNotNull(value.getIdentifierTone()); + Assertions.assertNotNull(value.getIdentifierLetter()); + Assertions.assertNotNull(value.getChinaKey()); + Assertions.assertNotNull(value.getChinaValue()); + } + } + + @Test + public void testToneMap() { + Assertions.assertEquals(T03PartTrit.PART_1, T03PartTrit.valueOfTone("˦")); + Assertions.assertEquals(T03PartTrit.PART_2, T03PartTrit.valueOfTone("˧")); + Assertions.assertEquals(T03PartTrit.PART_3, T03PartTrit.valueOfTone("˨")); + } + + @Test + public void testChinaMap() { + Assertions.assertEquals(T03PartTrit.PART_1, T03PartTrit.valueOfChina("一")); + Assertions.assertEquals(T03PartTrit.PART_2, T03PartTrit.valueOfChina("二")); + Assertions.assertEquals(T03PartTrit.PART_3, T03PartTrit.valueOfChina("三")); + } +} diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T04PartQuadTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T04PartQuadTest.java new file mode 100644 index 00000000..f1092d9e --- /dev/null +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T04PartQuadTest.java @@ -0,0 +1,41 @@ +package love.distributedrebirth.numberxd.base2t; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public class T04PartQuadTest { + + @Test + public void testBasePart() { + for (T04PartQuad value:T04PartQuad.values()) { + Assertions.assertNotNull(value.getIdentifierTone()); + Assertions.assertNotNull(value.getIdentifierLetter()); + Assertions.assertNotNull(value.getChinaKey()); + Assertions.assertNotNull(value.getChinaValue()); + Assertions.assertNotNull(value.getAlt1Value()); + Assertions.assertNotNull(value.getAlt1Name()); + Assertions.assertNotNull(value.getAlt1Wiki()); + } + } + + @Test + public void testToneMap() { + Assertions.assertEquals(T04PartQuad.PART_1, T04PartQuad.valueOfTone("˥")); + Assertions.assertEquals(T04PartQuad.PART_2, T04PartQuad.valueOfTone("꜒")); + Assertions.assertEquals(T04PartQuad.PART_3, T04PartQuad.valueOfTone("꜖")); + Assertions.assertEquals(T04PartQuad.PART_4, T04PartQuad.valueOfTone("˩")); + } + + @Test + public void testChinaMap() { + Assertions.assertEquals(T04PartQuad.PART_1, T04PartQuad.valueOfChina("北")); + Assertions.assertEquals(T04PartQuad.PART_2, T04PartQuad.valueOfChina("東")); + Assertions.assertEquals(T04PartQuad.PART_3, T04PartQuad.valueOfChina("西")); + Assertions.assertEquals(T04PartQuad.PART_4, T04PartQuad.valueOfChina("南")); + } +} diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T05PartPentalTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T05PartPentalTest.java new file mode 100644 index 00000000..dc556419 --- /dev/null +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T05PartPentalTest.java @@ -0,0 +1,40 @@ +package love.distributedrebirth.numberxd.base2t; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public class T05PartPentalTest { + + @Test + public void testBasePart() { + for (T05PartPental value:T05PartPental.values()) { + Assertions.assertNotNull(value.getIdentifierTone()); + Assertions.assertNotNull(value.getIdentifierLetter()); + Assertions.assertNotNull(value.getChinaKey()); + Assertions.assertNotNull(value.getChinaValue()); + } + } + + @Test + public void testToneMap() { + Assertions.assertEquals(T05PartPental.PART_1, T05PartPental.valueOfTone("˥")); + Assertions.assertEquals(T05PartPental.PART_2, T05PartPental.valueOfTone("˦")); + Assertions.assertEquals(T05PartPental.PART_3, T05PartPental.valueOfTone("˧")); + Assertions.assertEquals(T05PartPental.PART_4, T05PartPental.valueOfTone("˨")); + Assertions.assertEquals(T05PartPental.PART_5, T05PartPental.valueOfTone("˩")); + } + + @Test + public void testChinaMap() { + Assertions.assertEquals(T05PartPental.PART_1, T05PartPental.valueOfChina("火")); + Assertions.assertEquals(T05PartPental.PART_2, T05PartPental.valueOfChina("水")); + Assertions.assertEquals(T05PartPental.PART_3, T05PartPental.valueOfChina("木")); + Assertions.assertEquals(T05PartPental.PART_4, T05PartPental.valueOfChina("金")); + Assertions.assertEquals(T05PartPental.PART_5, T05PartPental.valueOfChina("土")); + } +} diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T06PartSeximalTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T06PartSeximalTest.java new file mode 100644 index 00000000..6154e554 --- /dev/null +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T06PartSeximalTest.java @@ -0,0 +1,41 @@ +package love.distributedrebirth.numberxd.base2t; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public class T06PartSeximalTest { + + @Test + public void testBasePart() { + for (T06PartSeximal value:T06PartSeximal.values()) { + Assertions.assertNotNull(value.getIdentifierTone()); + Assertions.assertNotNull(value.getIdentifierLetter()); + Assertions.assertNotNull(value.getChinaKey()); + Assertions.assertNotNull(value.getChinaValue()); + Assertions.assertNotNull(value.getAlt1Value()); + Assertions.assertNotNull(value.getAlt1Name()); + Assertions.assertNotNull(value.getAlt1Wiki()); + } + } + + @Test + public void testToneMap() { + Assertions.assertEquals(T06PartSeximal.PART_1, T06PartSeximal.valueOfTone("˦")); + Assertions.assertEquals(T06PartSeximal.PART_2, T06PartSeximal.valueOfTone("˨")); + Assertions.assertEquals(T06PartSeximal.PART_5, T06PartSeximal.valueOfTone("꜊")); + Assertions.assertEquals(T06PartSeximal.PART_6, T06PartSeximal.valueOfTone("꜏")); + } + + @Test + public void testChinaMap() { + Assertions.assertEquals(T06PartSeximal.PART_1, T06PartSeximal.valueOfChina("四")); + Assertions.assertEquals(T06PartSeximal.PART_2, T06PartSeximal.valueOfChina("五")); + Assertions.assertEquals(T06PartSeximal.PART_5, T06PartSeximal.valueOfChina("八")); + Assertions.assertEquals(T06PartSeximal.PART_6, T06PartSeximal.valueOfChina("九")); + } +} diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T08PartOctalTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T08PartOctalTest.java new file mode 100644 index 00000000..25d014eb --- /dev/null +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T08PartOctalTest.java @@ -0,0 +1,44 @@ +package love.distributedrebirth.numberxd.base2t; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public class T08PartOctalTest { + + @Test + public void testBasePart() { + for (T08PartOctal value:T08PartOctal.values()) { + Assertions.assertNotNull(value.getIdentifierTone()); + Assertions.assertNotNull(value.getIdentifierLetter()); + Assertions.assertNotNull(value.getChinaKey()); + Assertions.assertNotNull(value.getChinaValue()); + Assertions.assertNotNull(value.getAlt1Value()); + Assertions.assertNotNull(value.getAlt1Name()); + Assertions.assertNotNull(value.getAlt1Wiki()); + Assertions.assertNotNull(value.getAlt2Value()); + Assertions.assertNotNull(value.getAlt2Name()); + Assertions.assertNotNull(value.getAlt2Wiki()); + } + } + + @Test + public void testToneMap() { + Assertions.assertEquals(T08PartOctal.PART_1, T08PartOctal.valueOfTone("˥")); + Assertions.assertEquals(T08PartOctal.PART_2, T08PartOctal.valueOfTone("˩")); + Assertions.assertEquals(T08PartOctal.PART_7, T08PartOctal.valueOfTone("꜍")); + Assertions.assertEquals(T08PartOctal.PART_8, T08PartOctal.valueOfTone("꜑")); + } + + @Test + public void testChinaMap() { + Assertions.assertEquals(T08PartOctal.PART_1, T08PartOctal.valueOfChina("心")); + Assertions.assertEquals(T08PartOctal.PART_2, T08PartOctal.valueOfChina("頭")); + Assertions.assertEquals(T08PartOctal.PART_7, T08PartOctal.valueOfChina("肢")); + Assertions.assertEquals(T08PartOctal.PART_8, T08PartOctal.valueOfChina("腳")); + } +} diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T12PartUncialTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T12PartUncialTest.java new file mode 100644 index 00000000..c0b24053 --- /dev/null +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T12PartUncialTest.java @@ -0,0 +1,41 @@ +package love.distributedrebirth.numberxd.base2t; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public class T12PartUncialTest { + + @Test + public void testBasePart() { + for (T12PartUncial value:T12PartUncial.values()) { + Assertions.assertNotNull(value.getIdentifierTone()); + Assertions.assertNotNull(value.getIdentifierLetter()); + Assertions.assertNotNull(value.getChinaKey()); + Assertions.assertNotNull(value.getChinaValue()); + Assertions.assertNotNull(value.getAlt1Value()); + Assertions.assertNotNull(value.getAlt1Name()); + Assertions.assertNotNull(value.getAlt1Wiki()); + } + } + + @Test + public void testToneMap() { + Assertions.assertEquals(T12PartUncial.PART_1, T12PartUncial.valueOfTone("˥")); + Assertions.assertEquals(T12PartUncial.PART_2, T12PartUncial.valueOfTone("˧")); + Assertions.assertEquals(T12PartUncial.PART_11, T12PartUncial.valueOfTone("꜏")); + Assertions.assertEquals(T12PartUncial.PART_12, T12PartUncial.valueOfTone("꜑")); + } + + @Test + public void testChinaMap() { + Assertions.assertEquals(T12PartUncial.PART_1, T12PartUncial.valueOfChina("日")); + Assertions.assertEquals(T12PartUncial.PART_2, T12PartUncial.valueOfChina("月")); + Assertions.assertEquals(T12PartUncial.PART_11, T12PartUncial.valueOfChina("黼")); + Assertions.assertEquals(T12PartUncial.PART_12, T12PartUncial.valueOfChina("亞")); + } +} diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T16PartHexTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T16PartHexTest.java new file mode 100644 index 00000000..9f6619c0 --- /dev/null +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T16PartHexTest.java @@ -0,0 +1,41 @@ +package love.distributedrebirth.numberxd.base2t; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public class T16PartHexTest { + + @Test + public void testBasePart() { + for (T16PartHex value:T16PartHex.values()) { + Assertions.assertNotNull(value.getIdentifierTone()); + Assertions.assertNotNull(value.getIdentifierLetter()); + Assertions.assertNotNull(value.getChinaKey()); + Assertions.assertNotNull(value.getChinaValue()); + Assertions.assertNotNull(value.getAlt1Value()); + Assertions.assertNotNull(value.getAlt1Name()); + Assertions.assertNotNull(value.getAlt1Wiki()); + } + } + + @Test + public void testToneMap() { + Assertions.assertEquals(T16PartHex.PART_1, T16PartHex.valueOfTone("˥")); + Assertions.assertEquals(T16PartHex.PART_2, T16PartHex.valueOfTone("˦")); + Assertions.assertEquals(T16PartHex.PART_15, T16PartHex.valueOfTone("꜐")); + Assertions.assertEquals(T16PartHex.PART_16, T16PartHex.valueOfTone("꜑")); + } + + @Test + public void testChinaMap() { + Assertions.assertEquals(T16PartHex.PART_1, T16PartHex.valueOfChina("氫")); + Assertions.assertEquals(T16PartHex.PART_2, T16PartHex.valueOfChina("氦")); + Assertions.assertEquals(T16PartHex.PART_15, T16PartHex.valueOfChina("磷")); + Assertions.assertEquals(T16PartHex.PART_16, T16PartHex.valueOfChina("硫")); + } +} diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T20PartScoreTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T20PartScoreTest.java new file mode 100644 index 00000000..06389b73 --- /dev/null +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T20PartScoreTest.java @@ -0,0 +1,41 @@ +package love.distributedrebirth.numberxd.base2t; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public class T20PartScoreTest { + + @Test + public void testBasePart() { + for (T20PartScore value:T20PartScore.values()) { + Assertions.assertNotNull(value.getIdentifierTone()); + Assertions.assertNotNull(value.getIdentifierLetter()); + Assertions.assertNotNull(value.getChinaKey()); + Assertions.assertNotNull(value.getChinaValue()); + Assertions.assertNotNull(value.getAlt1Value()); + Assertions.assertNotNull(value.getAlt1Name()); + Assertions.assertNotNull(value.getAlt1Wiki()); + } + } + + @Test + public void testToneMap() { + Assertions.assertEquals(T20PartScore.PART_1, T20PartScore.valueOfTone("˥")); + Assertions.assertEquals(T20PartScore.PART_2, T20PartScore.valueOfTone("˦")); + Assertions.assertEquals(T20PartScore.PART_19, T20PartScore.valueOfTone("꜐")); + Assertions.assertEquals(T20PartScore.PART_20, T20PartScore.valueOfTone("꜑")); + } + + @Test + public void testChinaMap() { + Assertions.assertEquals(T20PartScore.PART_1, T20PartScore.valueOfChina("尧")); + Assertions.assertEquals(T20PartScore.PART_2, T20PartScore.valueOfChina("泽")); + Assertions.assertEquals(T20PartScore.PART_19, T20PartScore.valueOfChina("仄")); + Assertions.assertEquals(T20PartScore.PART_20, T20PartScore.valueOfChina("幺")); + } +} diff --git a/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T60SexagesimalTest.java b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T60SexagesimalTest.java new file mode 100644 index 00000000..c7e05958 --- /dev/null +++ b/numberxd/src/test/love/distributedrebirth/numberxd/base2t/T60SexagesimalTest.java @@ -0,0 +1,38 @@ +package love.distributedrebirth.numberxd.base2t; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** + * + * + * @author willemtsade ©Δ∞ 仙上主天 + */ +public class T60SexagesimalTest { + + @Test + public void testBasePart() { + for (T60Sexagesimal value:T60Sexagesimal.values()) { + Assertions.assertNotNull(value.getIdentifierTone()); + Assertions.assertNotNull(value.getIdentifierLetter()); + Assertions.assertNotNull(value.getChinaKey()); + Assertions.assertNotNull(value.getChinaValue()); + } + } + + @Test + public void testToneMap() { + Assertions.assertEquals(T60Sexagesimal.PART_1, T60Sexagesimal.valueOfTone("˧˩˥")); + Assertions.assertEquals(T60Sexagesimal.PART_2, T60Sexagesimal.valueOfTone("˧˥˦")); + Assertions.assertEquals(T60Sexagesimal.PART_59, T60Sexagesimal.valueOfTone("꜍꜍꜏")); + Assertions.assertEquals(T60Sexagesimal.PART_60, T60Sexagesimal.valueOfTone("꜑꜑꜏")); + } + + @Test + public void testChinaMap() { + Assertions.assertEquals(T60Sexagesimal.PART_1, T60Sexagesimal.valueOfChina("牛")); + Assertions.assertEquals(T60Sexagesimal.PART_2, T60Sexagesimal.valueOfChina("鸡")); + Assertions.assertEquals(T60Sexagesimal.PART_59, T60Sexagesimal.valueOfChina("薯")); + Assertions.assertEquals(T60Sexagesimal.PART_60, T60Sexagesimal.valueOfChina("蘋")); + } +} diff --git a/settings.gradle b/settings.gradle index 74fc6522..c35818ca 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include 'desktop', 'core' \ No newline at end of file +include 'desktop', 'core', 'numberxd' \ No newline at end of file