diff --git a/build.gradle b/build.gradle index 665b4f53..9baaed34 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ project(":lib-bassboonyd") { } } -project(":lib-numberxd") { +project(":lib-warpme") { apply plugin: "java-library" dependencies { api project(":lib-bassboonyd") @@ -56,6 +56,17 @@ project(":lib-numberxd") { } } +project(":lib-numberxd") { + apply plugin: "java-library" + dependencies { + api project(":lib-warpme") + testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion" + } + tasks.named('test') { + useJUnitPlatform() + } +} + project(":lib-unicodezd") { apply plugin: "java-library" dependencies { diff --git a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCore.java b/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCore.java index 739b6cfd..727a1c51 100644 --- a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCore.java +++ b/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCore.java @@ -16,6 +16,10 @@ import love.distributedrebirth.bassboonyd.jmx.StringAttributeᴶᴹˣ; import love.distributedrebirth.numberxd.base2t.Base2PartsFactory; import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartKeyʸᴰ; import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartʸᴰ; +import love.distributedrebirth.warpme.core.WaterBucket; +import love.distributedrebirth.warpme.core.WaterCipher; +import love.distributedrebirth.warpme.core.WaterCipherHeart; +import love.distributedrebirth.warpme.core.WaterCipherHeartTone; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") @BãßBȍőnClassInfoʸᴰ(name = "TOSWarpCore", purpose = "The warpcore writer and armor manager.") diff --git a/lib-numberxd/src/resources/META-INF/x4o-drivers.xml b/lib-numberxd/src/resources/META-INF/x4o-drivers.xml index 0de0be01..770bd81a 100644 --- a/lib-numberxd/src/resources/META-INF/x4o-drivers.xml +++ b/lib-numberxd/src/resources/META-INF/x4o-drivers.xml @@ -4,7 +4,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://language.x4o.org/xml/ns/drivers http://language.x4o.org/xml/ns/drivers-1.0.xsd" > - diff --git a/lib-numberxd/src/test/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCoreTest.java b/lib-numberxd/src/test/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCoreTest.java index 240f1b90..50310a70 100644 --- a/lib-numberxd/src/test/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCoreTest.java +++ b/lib-numberxd/src/test/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCoreTest.java @@ -4,6 +4,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.warpme.core.WaterBucket; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class TOSWarpCoreTest { diff --git a/lib-warpme/build.gradle b/lib-warpme/build.gradle new file mode 100644 index 00000000..84a26470 --- /dev/null +++ b/lib-warpme/build.gradle @@ -0,0 +1,7 @@ +sourceCompatibility = appJvmCode +[compileJava, compileTestJava]*.options*.encoding = appEncoding + +sourceSets.main.java.srcDirs = [ "src/main/"] +sourceSets.main.resources.srcDirs = [ "src/resources/" ] +sourceSets.test.java.srcDirs = [ "src/test/"] +sourceSets.test.resources.srcDirs = [ "src/test-resources/" ] diff --git a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCoreDriver.java b/lib-warpme/src/main/love/distributedrebirth/warpme/TOSWarpCoreDriver.java similarity index 88% rename from lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCoreDriver.java rename to lib-warpme/src/main/love/distributedrebirth/warpme/TOSWarpCoreDriver.java index 0e4e6488..e97159b9 100644 --- a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCoreDriver.java +++ b/lib-warpme/src/main/love/distributedrebirth/warpme/TOSWarpCoreDriver.java @@ -1,9 +1,10 @@ -package love.distributedrebirth.numberxd.base2t.part.warp; +package love.distributedrebirth.warpme; import org.x4o.xml.X4ODriver; import org.x4o.xml.X4ODriverManager; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.warpme.core.WaterBucket; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class TOSWarpCoreDriver extends X4ODriver { diff --git a/lib-warpme/src/main/love/distributedrebirth/warpme/chain/WaterTag.java b/lib-warpme/src/main/love/distributedrebirth/warpme/chain/WaterTag.java new file mode 100644 index 00000000..8e18b762 --- /dev/null +++ b/lib-warpme/src/main/love/distributedrebirth/warpme/chain/WaterTag.java @@ -0,0 +1,11 @@ +package love.distributedrebirth.warpme.chain; + +import java.util.List; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class WaterTag { + + private List tagChains; +} diff --git a/lib-warpme/src/main/love/distributedrebirth/warpme/chain/WaterTagChain.java b/lib-warpme/src/main/love/distributedrebirth/warpme/chain/WaterTagChain.java new file mode 100644 index 00000000..3d5e4091 --- /dev/null +++ b/lib-warpme/src/main/love/distributedrebirth/warpme/chain/WaterTagChain.java @@ -0,0 +1,38 @@ +package love.distributedrebirth.warpme.chain; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class WaterTagChain { + + private String path; + private String key; + private String tag; + + public WaterTagChain() { + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } +} diff --git a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/WaterBucket.java b/lib-warpme/src/main/love/distributedrebirth/warpme/core/WaterBucket.java similarity index 85% rename from lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/WaterBucket.java rename to lib-warpme/src/main/love/distributedrebirth/warpme/core/WaterBucket.java index 8af9e9f5..ac910dc1 100644 --- a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/WaterBucket.java +++ b/lib-warpme/src/main/love/distributedrebirth/warpme/core/WaterBucket.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.numberxd.base2t.part.warp; +package love.distributedrebirth.warpme.core; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; diff --git a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/WaterCipher.java b/lib-warpme/src/main/love/distributedrebirth/warpme/core/WaterCipher.java similarity index 94% rename from lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/WaterCipher.java rename to lib-warpme/src/main/love/distributedrebirth/warpme/core/WaterCipher.java index 7f6e38e2..2bf2204f 100644 --- a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/WaterCipher.java +++ b/lib-warpme/src/main/love/distributedrebirth/warpme/core/WaterCipher.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.numberxd.base2t.part.warp; +package love.distributedrebirth.warpme.core; import java.util.ArrayList; import java.util.List; diff --git a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/WaterCipherHeart.java b/lib-warpme/src/main/love/distributedrebirth/warpme/core/WaterCipherHeart.java similarity index 92% rename from lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/WaterCipherHeart.java rename to lib-warpme/src/main/love/distributedrebirth/warpme/core/WaterCipherHeart.java index 4cf966cf..10cdc561 100644 --- a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/WaterCipherHeart.java +++ b/lib-warpme/src/main/love/distributedrebirth/warpme/core/WaterCipherHeart.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.numberxd.base2t.part.warp; +package love.distributedrebirth.warpme.core; import java.util.ArrayList; import java.util.List; diff --git a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/WaterCipherHeartTone.java b/lib-warpme/src/main/love/distributedrebirth/warpme/core/WaterCipherHeartTone.java similarity index 93% rename from lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/WaterCipherHeartTone.java rename to lib-warpme/src/main/love/distributedrebirth/warpme/core/WaterCipherHeartTone.java index b719e4e4..bbdea89d 100644 --- a/lib-numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/warp/WaterCipherHeartTone.java +++ b/lib-warpme/src/main/love/distributedrebirth/warpme/core/WaterCipherHeartTone.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.numberxd.base2t.part.warp; +package love.distributedrebirth.warpme.core; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; diff --git a/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterPathApplication.java b/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterPathApplication.java new file mode 100644 index 00000000..bcef5653 --- /dev/null +++ b/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterPathApplication.java @@ -0,0 +1,14 @@ +package love.distributedrebirth.warpme.store; + +import java.util.List; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class WaterPathApplication { + + private String name; + private String description; + private String resources; + private List dependencies; +} diff --git a/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterPathDependency.java b/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterPathDependency.java new file mode 100644 index 00000000..44dcf439 --- /dev/null +++ b/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterPathDependency.java @@ -0,0 +1,10 @@ +package love.distributedrebirth.warpme.store; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class WaterPathDependency { + + private String name; + private String version; +} diff --git a/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterPathLibrary.java b/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterPathLibrary.java new file mode 100644 index 00000000..0b6a5c5e --- /dev/null +++ b/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterPathLibrary.java @@ -0,0 +1,14 @@ +package love.distributedrebirth.warpme.store; + +import java.util.List; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class WaterPathLibrary { + + private String name; + private String resources; + private List files; + private List dependencies; +} diff --git a/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterPathLibraryFile.java b/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterPathLibraryFile.java new file mode 100644 index 00000000..b3fa9244 --- /dev/null +++ b/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterPathLibraryFile.java @@ -0,0 +1,10 @@ +package love.distributedrebirth.warpme.store; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class WaterPathLibraryFile { + + private String name; + private String type; +} diff --git a/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterPathMedia.java b/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterPathMedia.java new file mode 100644 index 00000000..68ecdc3c --- /dev/null +++ b/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterPathMedia.java @@ -0,0 +1,14 @@ +package love.distributedrebirth.warpme.store; + +import java.util.List; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class WaterPathMedia { + + private String name; + private String description; + private String resources; + private List dependencies; +} diff --git a/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterStore.java b/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterStore.java new file mode 100644 index 00000000..c3fbbe90 --- /dev/null +++ b/lib-warpme/src/main/love/distributedrebirth/warpme/store/WaterStore.java @@ -0,0 +1,11 @@ +package love.distributedrebirth.warpme.store; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public class WaterStore { + + private WaterPathApplication application; + private WaterPathLibrary library; + private WaterPathMedia media; +} diff --git a/lib-numberxd/src/resources/META-INF/warpcore/warpcore-lang.eld b/lib-warpme/src/resources/META-INF/warpcore/warpcore-lang.eld similarity index 100% rename from lib-numberxd/src/resources/META-INF/warpcore/warpcore-lang.eld rename to lib-warpme/src/resources/META-INF/warpcore/warpcore-lang.eld diff --git a/lib-numberxd/src/resources/META-INF/warpcore/warpcore-modules.xml b/lib-warpme/src/resources/META-INF/warpcore/warpcore-modules.xml similarity index 100% rename from lib-numberxd/src/resources/META-INF/warpcore/warpcore-modules.xml rename to lib-warpme/src/resources/META-INF/warpcore/warpcore-modules.xml diff --git a/lib-warpme/src/resources/META-INF/x4o-drivers.xml b/lib-warpme/src/resources/META-INF/x4o-drivers.xml new file mode 100644 index 00000000..cf83c49b --- /dev/null +++ b/lib-warpme/src/resources/META-INF/x4o-drivers.xml @@ -0,0 +1,8 @@ + + + + diff --git a/main-gdxapp/src/main/love/distributedrebirth/gdxapp/GDXAppMain.java b/main-gdxapp/src/main/love/distributedrebirth/gdxapp/GDXAppMain.java index 436387bf..73b2d231 100644 --- a/main-gdxapp/src/main/love/distributedrebirth/gdxapp/GDXAppMain.java +++ b/main-gdxapp/src/main/love/distributedrebirth/gdxapp/GDXAppMain.java @@ -42,9 +42,9 @@ import love.distributedrebirth.gdxapp.screen.ScreenLoading; import love.distributedrebirth.numberxd.base2t.Base2PartsFactory; import love.distributedrebirth.numberxd.base2t.Base2Terminator; import love.distributedrebirth.numberxd.base2t.part.warp.TOSWarpCore; -import love.distributedrebirth.numberxd.base2t.part.warp.TOSWarpCoreDriver; -import love.distributedrebirth.numberxd.base2t.part.warp.WaterBucket; import love.distributedrebirth.numberxd.glyph.BaseGlyphSet; +import love.distributedrebirth.warpme.TOSWarpCoreDriver; +import love.distributedrebirth.warpme.core.WaterBucket; import net.spookygames.gdx.nativefilechooser.NativeFileChooser; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") diff --git a/settings.gradle b/settings.gradle index 23a58b1b..64694785 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include 'main-gdxapp-desktop', 'main-gdxapp', 'lib-bassboonyd', 'lib-numberxd', 'lib-unicodezd', 'lib-basicwd', 'lib-imxmi' \ No newline at end of file +include 'main-gdxapp-desktop', 'main-gdxapp', 'lib-bassboonyd', 'lib-numberxd', 'lib-unicodezd', 'lib-basicwd', 'lib-imxmi', 'lib-warpme' \ No newline at end of file