rework gradle script (klib-script-v1.1)

KessokuTeaTime · Aug 20, 2024 · d01d3d3 · d01d3d3
1 parent e39c692
commit d01d3d3
Show file tree

Hide file tree

Showing 168 changed files with 86 additions and 67 deletions.
diff --git a/base-common/build.gradle → base/common/build.gradle b/base-common/build.gradle → base/common/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-common.gradle")
+apply from: rootProject.file("gradle/scripts/klib-common.gradle")
 
 group = "band.kessoku.lib.base"
 base.archivesName = rootProject.name + "-base"
diff --git a/...va/band/kessoku/lib/base/KessokuBase.java → ...va/band/kessoku/lib/base/KessokuBase.java b/...va/band/kessoku/lib/base/KessokuBase.java → ...va/band/kessoku/lib/base/KessokuBase.java
diff --git a/.../java/band/kessoku/lib/base/ModUtils.java → .../java/band/kessoku/lib/base/ModUtils.java b/.../java/band/kessoku/lib/base/ModUtils.java → .../java/band/kessoku/lib/base/ModUtils.java
diff --git a/base-common/src/main/resources/icon.png → base/common/src/main/resources/icon.png b/base-common/src/main/resources/icon.png → base/common/src/main/resources/icon.png
diff --git a/base-fabric/build.gradle → base/fabric/build.gradle b/base-fabric/build.gradle → base/fabric/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-fabric.gradle")
+apply from: rootProject.file("gradle/scripts/klib-fabric.gradle")
 
 group = "band.kessoku.lib.base"
 base.archivesName = rootProject.name + "-base"

diff --git a/...ssoku/lib/base/KessokuBaseEntrypoint.java → ...ssoku/lib/base/KessokuBaseEntrypoint.java b/...ssoku/lib/base/KessokuBaseEntrypoint.java → ...ssoku/lib/base/KessokuBaseEntrypoint.java
diff --git a/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json b/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json
diff --git a/base-neo/build.gradle → base/neo/build.gradle b/base-neo/build.gradle → base/neo/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-neo.gradle")
+apply from: rootProject.file("gradle/scripts/klib-neo.gradle")
 
 group = "band.kessoku.lib.base"
 base.archivesName = rootProject.name + "-base"

diff --git a/base-neo/gradle.properties → base/neo/gradle.properties b/base-neo/gradle.properties → base/neo/gradle.properties
diff --git a/...ssoku/lib/base/KessokuBaseEntrypoint.java → ...ssoku/lib/base/KessokuBaseEntrypoint.java b/...ssoku/lib/base/KessokuBaseEntrypoint.java → ...ssoku/lib/base/KessokuBaseEntrypoint.java
diff --git a/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ subprojects {
     assemble.dependsOn spotlessApply
 
     repositories {
-
+        maven { url "https://maven.neoforged.net/releases/" }
     }
 
     dependencies {

diff --git a/command-common/build.gradle → command/common/build.gradle b/command-common/build.gradle → command/common/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-common.gradle")
+apply from: rootProject.file("gradle/scripts/klib-common.gradle")
 
 group = "band.kessoku.lib.command"
 base.archivesName = rootProject.name + "-command"

diff --git a/...d/kessoku/lib/command/KessokuCommand.java → ...d/kessoku/lib/command/KessokuCommand.java b/...d/kessoku/lib/command/KessokuCommand.java → ...d/kessoku/lib/command/KessokuCommand.java
diff --git a/...mand/api/events/CommandRegistryEvent.java → ...mand/api/events/CommandRegistryEvent.java b/...mand/api/events/CommandRegistryEvent.java → ...mand/api/events/CommandRegistryEvent.java
diff --git a/command-common/src/main/resources/icon.png → command/common/src/main/resources/icon.png b/command-common/src/main/resources/icon.png → command/common/src/main/resources/icon.png
diff --git a/command-fabric/build.gradle → command/fabric/build.gradle b/command-fabric/build.gradle → command/fabric/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-fabric.gradle")
+apply from: rootProject.file("gradle/scripts/klib-fabric.gradle")
 
 group = "band.kessoku.lib.command"
 base.archivesName = rootProject.name + "-command"

diff --git a/...lib/command/KessokuCommandEntrypoint.java → ...lib/command/KessokuCommandEntrypoint.java b/...lib/command/KessokuCommandEntrypoint.java → ...lib/command/KessokuCommandEntrypoint.java
diff --git a/.../lib/command/impl/KessokuCommandImpl.java → .../lib/command/impl/KessokuCommandImpl.java b/.../lib/command/impl/KessokuCommandImpl.java → .../lib/command/impl/KessokuCommandImpl.java
diff --git a/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json b/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json
diff --git a/...ain/resources/kessoku_command.mixins.json → ...ain/resources/kessoku_command.mixins.json b/...ain/resources/kessoku_command.mixins.json → ...ain/resources/kessoku_command.mixins.json
diff --git a/command-neo/build.gradle → command/neo/build.gradle b/command-neo/build.gradle → command/neo/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-neo.gradle")
+apply from: rootProject.file("gradle/scripts/klib-neo.gradle")
 
 group = "band.kessoku.lib.command"
 base.archivesName = rootProject.name + "-command"

diff --git a/command-neo/gradle.properties → command/neo/gradle.properties b/command-neo/gradle.properties → command/neo/gradle.properties
diff --git a/...lib/command/KessokuCommandEntrypoint.java → ...lib/command/KessokuCommandEntrypoint.java b/...lib/command/KessokuCommandEntrypoint.java → ...lib/command/KessokuCommandEntrypoint.java
diff --git a/.../lib/command/impl/KessokuCommandImpl.java → .../lib/command/impl/KessokuCommandImpl.java b/.../lib/command/impl/KessokuCommandImpl.java → .../lib/command/impl/KessokuCommandImpl.java
diff --git a/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
diff --git a/config-common/build.gradle → config/common/build.gradle b/config-common/build.gradle → config/common/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-common.gradle")
+apply from: rootProject.file("gradle/scripts/klib-common.gradle")
 
 group = "band.kessoku.lib.config"
 base.archivesName = rootProject.name + "-config"

diff --git a/...and/kessoku/lib/config/KessokuConfig.java → ...and/kessoku/lib/config/KessokuConfig.java b/...and/kessoku/lib/config/KessokuConfig.java → ...and/kessoku/lib/config/KessokuConfig.java
diff --git a/...ssoku/lib/config/api/ModConfigHelper.java → ...ssoku/lib/config/api/ModConfigHelper.java b/...ssoku/lib/config/api/ModConfigHelper.java → ...ssoku/lib/config/api/ModConfigHelper.java
diff --git a/...pi/serializers/night/HoconSerializer.java → ...pi/serializers/night/HoconSerializer.java b/...pi/serializers/night/HoconSerializer.java → ...pi/serializers/night/HoconSerializer.java
diff --git a/...api/serializers/night/JsonSerializer.java → ...api/serializers/night/JsonSerializer.java b/...api/serializers/night/JsonSerializer.java → ...api/serializers/night/JsonSerializer.java
@@ -43,7 +43,7 @@ public String getFileExtension() {
     }
 
     @Override
-    public void serialize(Config config, OutputStream to) throws IOException {
+    public void serialize(Config config, OutputStream to) {
         this.writer.write(write(config, createUncommentedConfig(), config.nodes()), to);
     }
 

diff --git a/...api/serializers/night/TomlSerializer.java → ...api/serializers/night/TomlSerializer.java b/...api/serializers/night/TomlSerializer.java → ...api/serializers/night/TomlSerializer.java
diff --git a/...api/serializers/night/YamlSerializer.java → ...api/serializers/night/YamlSerializer.java b/...api/serializers/night/YamlSerializer.java → ...api/serializers/night/YamlSerializer.java
diff --git a/...pi/serializers/quilt/Json5Serializer.java → ...pi/serializers/quilt/Json5Serializer.java b/...pi/serializers/quilt/Json5Serializer.java → ...pi/serializers/quilt/Json5Serializer.java
diff --git a/.../lib/config/impl/ModConfigHelperImpl.java → .../lib/config/impl/ModConfigHelperImpl.java b/.../lib/config/impl/ModConfigHelperImpl.java → .../lib/config/impl/ModConfigHelperImpl.java
@@ -19,7 +19,6 @@
 public final class ModConfigHelperImpl {
     private static ConfigEnvironment ENV;
     private static final Path CONFIG_DIR = ModLoader.getInstance().getConfigFolder();
-    private static final Logger LOGGER = ModUtils.getLogger();
 
     public static void init() {
         Map<String, Serializer> serializerMap = new LinkedHashMap<>();

diff --git a/config-common/src/main/resources/icon.png → config/common/src/main/resources/icon.png b/config-common/src/main/resources/icon.png → config/common/src/main/resources/icon.png
diff --git a/config-fabric/build.gradle → config/fabric/build.gradle b/config-fabric/build.gradle → config/fabric/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-fabric.gradle")
+apply from: rootProject.file("gradle/scripts/klib-fabric.gradle")
 
 group = "band.kessoku.lib.config"
 base.archivesName = rootProject.name + "-config"

diff --git a/...u/lib/config/KessokuConfigEntrypoint.java → ...u/lib/config/KessokuConfigEntrypoint.java b/...u/lib/config/KessokuConfigEntrypoint.java → ...u/lib/config/KessokuConfigEntrypoint.java
diff --git a/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json b/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json
diff --git a/config-neo/build.gradle → config/neo/build.gradle b/config-neo/build.gradle → config/neo/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-neo.gradle")
+apply from: rootProject.file("gradle/scripts/klib-neo.gradle")
 
 group = "band.kessoku.lib.config"
 base.archivesName = rootProject.name + "-config"

diff --git a/config-neo/gradle.properties → config/neo/gradle.properties b/config-neo/gradle.properties → config/neo/gradle.properties
diff --git a/...u/lib/config/KessokuConfigEntrypoint.java → ...u/lib/config/KessokuConfigEntrypoint.java b/...u/lib/config/KessokuConfigEntrypoint.java → ...u/lib/config/KessokuConfigEntrypoint.java
diff --git a/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
diff --git a/event-base-common/build.gradle → event-base/common/build.gradle b/event-base-common/build.gradle → event-base/common/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-common.gradle")
+apply from: rootProject.file("gradle/scripts/klib-common.gradle")
 
 group = "band.kessoku.lib.event"
 base.archivesName = rootProject.name + "-event-base"

diff --git a/...d/kessoku/lib/event/KessokuEventBase.java → ...d/kessoku/lib/event/KessokuEventBase.java b/...d/kessoku/lib/event/KessokuEventBase.java → ...d/kessoku/lib/event/KessokuEventBase.java
diff --git a/...ava/band/kessoku/lib/event/api/Event.java → ...ava/band/kessoku/lib/event/api/Event.java b/...ava/band/kessoku/lib/event/api/Event.java → ...ava/band/kessoku/lib/event/api/Event.java
diff --git a/...and/kessoku/lib/event/api/EventPhase.java → ...and/kessoku/lib/event/api/EventPhase.java b/...and/kessoku/lib/event/api/EventPhase.java → ...and/kessoku/lib/event/api/EventPhase.java
diff --git a/...and/kessoku/lib/event/impl/EventImpl.java → ...and/kessoku/lib/event/impl/EventImpl.java b/...and/kessoku/lib/event/impl/EventImpl.java → ...and/kessoku/lib/event/impl/EventImpl.java
diff --git a/...t-base-common/src/main/resources/icon.png → ...t-base/common/src/main/resources/icon.png b/...t-base-common/src/main/resources/icon.png → ...t-base/common/src/main/resources/icon.png
diff --git a/event-base-fabric/build.gradle → event-base/fabric/build.gradle b/event-base-fabric/build.gradle → event-base/fabric/build.gradle
@@ -1,10 +1,11 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-fabric.gradle")
+apply from: rootProject.file("gradle/scripts/klib-fabric.gradle")
 
 group = "band.kessoku.lib.event"
 base.archivesName = rootProject.name + "-event-base"
 
 dependencies {
     moduleImplementation(project(":base-common"))
+
     common(project(path: ':event-base-common', configuration: 'namedElements')) { transitive false }
     shadowBundle project(path: ':event-base-common', configuration: 'transformProductionFabric')
 }
diff --git a/...lib/event/KessokuEventBaseEntrypoint.java → ...lib/event/KessokuEventBaseEntrypoint.java b/...lib/event/KessokuEventBaseEntrypoint.java → ...lib/event/KessokuEventBaseEntrypoint.java
diff --git a/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json b/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json
diff --git a/event-base-neo/build.gradle → event-base/neo/build.gradle b/event-base-neo/build.gradle → event-base/neo/build.gradle
@@ -1,10 +1,11 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-neo.gradle")
+apply from: rootProject.file("gradle/scripts/klib-neo.gradle")
 
 group = "band.kessoku.lib.event"
 base.archivesName = rootProject.name + "-event-base"
 
 dependencies {
     moduleImplementation(project(":base-common"))
+
     common(project(path: ':event-base-common', configuration: 'namedElements')) { transitive false }
     shadowBundle project(path: ':event-base-common', configuration: 'transformProductionNeoForge')
 }
diff --git a/event-base-neo/gradle.properties → event-base/neo/gradle.properties b/event-base-neo/gradle.properties → event-base/neo/gradle.properties
diff --git a/...lib/event/KessokuEventBaseEntrypoint.java → ...lib/event/KessokuEventBaseEntrypoint.java b/...lib/event/KessokuEventBaseEntrypoint.java → ...lib/event/KessokuEventBaseEntrypoint.java
diff --git a/...kessoku/lib/event/util/NeoEventUtils.java → ...kessoku/lib/event/util/NeoEventUtils.java b/...kessoku/lib/event/util/NeoEventUtils.java → ...kessoku/lib/event/util/NeoEventUtils.java
diff --git a/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
diff --git a/fabric/build.gradle b/fabric/build.gradle
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.parallel=true
-fabric.loom.multiProjectOptimisation=true
+#fabric.loom.multiProjectOptimisation=true
diff --git a/gradle/example/common/build.gradle b/gradle/example/common/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-common.gradle")
+apply from: rootProject.file("gradle/scripts/klib-common.gradle")
 
 group = "band.kessoku.lib.package"
 base.archivesName = rootProject.name + "-package"

diff --git a/gradle/example/fabric/build.gradle b/gradle/example/fabric/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-fabric.gradle")
+apply from: rootProject.file("gradle/scripts/klib-fabric.gradle")
 
 group = "band.kessoku.lib.package"
 base.archivesName = rootProject.name + "-package"

diff --git a/gradle/example/neo/build.gradle b/gradle/example/neo/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-neo.gradle")
+apply from: rootProject.file("gradle/scripts/klib-neo.gradle")
 
 group = "band.kessoku.lib.package"
 base.archivesName = rootProject.name + "-package"

diff --git a/gradle/scripts/kessokulib-common.gradle → gradle/scripts/klib-common.gradle b/gradle/scripts/kessokulib-common.gradle → gradle/scripts/klib-common.gradle
@@ -6,4 +6,4 @@ architectury {
 
 dependencies {
     modImplementation libs.fabric.loader
-}
+}
diff --git a/gradle/scripts/kessokulib-fabric.gradle → gradle/scripts/klib-fabric.gradle b/gradle/scripts/kessokulib-fabric.gradle → gradle/scripts/klib-fabric.gradle
@@ -41,4 +41,4 @@ shadowJar {
 
 remapJar {
     inputFile.set shadowJar.archiveFile
-}
+}
diff --git a/gradle/scripts/kessokulib-neo.gradle → gradle/scripts/klib-neo.gradle b/gradle/scripts/kessokulib-neo.gradle → gradle/scripts/klib-neo.gradle
@@ -44,4 +44,4 @@ shadowJar {
 
 remapJar {
     inputFile.set shadowJar.archiveFile
-}
+}
diff --git a/keybind-common/build.gradle → keybind/common/build.gradle b/keybind-common/build.gradle → keybind/common/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-common.gradle")
+apply from: rootProject.file("gradle/scripts/klib-common.gradle")
 
 group = "band.kessoku.lib.keybind"
 base.archivesName = rootProject.name + "-keybind"

diff --git a/...d/kessoku/lib/keybind/KessokuKeybind.java → ...d/kessoku/lib/keybind/KessokuKeybind.java b/...d/kessoku/lib/keybind/KessokuKeybind.java → ...d/kessoku/lib/keybind/KessokuKeybind.java
diff --git a/...soku/lib/keybind/api/KeyBindRegister.java → ...soku/lib/keybind/api/KeyBindRegister.java b/...soku/lib/keybind/api/KeyBindRegister.java → ...soku/lib/keybind/api/KeyBindRegister.java
diff --git a/...b/keybind/impl/KessokuKeyBindService.java → ...b/keybind/impl/KessokuKeyBindService.java b/...b/keybind/impl/KessokuKeyBindService.java → ...b/keybind/impl/KessokuKeyBindService.java
diff --git a/fabric/src/main/resources/icon.png → keybind/common/src/main/resources/icon.png b/fabric/src/main/resources/icon.png → keybind/common/src/main/resources/icon.png
diff --git a/keybind-fabric/build.gradle → keybind/fabric/build.gradle b/keybind-fabric/build.gradle → keybind/fabric/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-fabric.gradle")
+apply from: rootProject.file("gradle/scripts/klib-fabric.gradle")
 
 group = "band.kessoku.lib.keybind"
 base.archivesName = rootProject.name + "-keybind"

diff --git a/...lib/keybind/KessokuKeybindEntrypoint.java → ...lib/keybind/KessokuKeybindEntrypoint.java b/...lib/keybind/KessokuKeybindEntrypoint.java → ...lib/keybind/KessokuKeybindEntrypoint.java
diff --git a/...lib/keybind/impl/KeyBindRegisterImpl.java → ...lib/keybind/impl/KeyBindRegisterImpl.java b/...lib/keybind/impl/KeyBindRegisterImpl.java → ...lib/keybind/impl/KeyBindRegisterImpl.java
diff --git a/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json b/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json
diff --git a/keybind-neo/build.gradle → keybind/neo/build.gradle b/keybind-neo/build.gradle → keybind/neo/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-neo.gradle")
+apply from: rootProject.file("gradle/scripts/klib-neo.gradle")
 
 group = "band.kessoku.lib.keybind"
 base.archivesName = rootProject.name + "-keybind"

diff --git a/keybind-neo/gradle.properties → keybind/neo/gradle.properties b/keybind-neo/gradle.properties → keybind/neo/gradle.properties
diff --git a/...lib/keybind/KessokuKeyBindEntrypoint.java → ...lib/keybind/KessokuKeyBindEntrypoint.java b/...lib/keybind/KessokuKeyBindEntrypoint.java → ...lib/keybind/KessokuKeyBindEntrypoint.java
diff --git a/...lib/keybind/impl/KeyBindRegisterImpl.java → ...lib/keybind/impl/KeyBindRegisterImpl.java b/...lib/keybind/impl/KeyBindRegisterImpl.java → ...lib/keybind/impl/KeyBindRegisterImpl.java
diff --git a/...lib/keybind/mixin/KeyBindingAccessor.java → ...lib/keybind/mixin/KeyBindingAccessor.java b/...lib/keybind/mixin/KeyBindingAccessor.java → ...lib/keybind/mixin/KeyBindingAccessor.java
diff --git a/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
diff --git a/...ain/resources/kessoku-keybind.mixins.json → ...ain/resources/kessoku-keybind.mixins.json b/...ain/resources/kessoku-keybind.mixins.json → ...ain/resources/kessoku-keybind.mixins.json
diff --git a/lifecycle-events-common/build.gradle → lifecycle-events/common/build.gradle b/lifecycle-events-common/build.gradle → lifecycle-events/common/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-common.gradle")
+apply from: rootProject.file("gradle/scripts/klib-common.gradle")
 
 group = "band.kessoku.lib.events.lifecycle"
 base.archivesName = rootProject.name + "-lifecycle-events"

diff --git a/...nts/lifecycle/KessokuLifecycleEvents.java → ...nts/lifecycle/KessokuLifecycleEvents.java b/...nts/lifecycle/KessokuLifecycleEvents.java → ...nts/lifecycle/KessokuLifecycleEvents.java
diff --git a/.../events/lifecycle/api/LifecycleEvent.java → .../events/lifecycle/api/LifecycleEvent.java b/.../events/lifecycle/api/LifecycleEvent.java → .../events/lifecycle/api/LifecycleEvent.java
diff --git a/...lifecycle/api/ServerBlockEntityEvent.java → ...lifecycle/api/ServerBlockEntityEvent.java b/...lifecycle/api/ServerBlockEntityEvent.java → ...lifecycle/api/ServerBlockEntityEvent.java
diff --git a/...vents/lifecycle/api/ServerChunkEvent.java → ...vents/lifecycle/api/ServerChunkEvent.java b/...vents/lifecycle/api/ServerChunkEvent.java → ...vents/lifecycle/api/ServerChunkEvent.java
diff --git a/...ents/lifecycle/api/ServerEntityEvent.java → ...ents/lifecycle/api/ServerEntityEvent.java b/...ents/lifecycle/api/ServerEntityEvent.java → ...ents/lifecycle/api/ServerEntityEvent.java
diff --git a/...s/lifecycle/api/ServerLifecycleEvent.java → ...s/lifecycle/api/ServerLifecycleEvent.java b/...s/lifecycle/api/ServerLifecycleEvent.java → ...s/lifecycle/api/ServerLifecycleEvent.java
diff --git a/...events/lifecycle/api/ServerTickEvent.java → ...events/lifecycle/api/ServerTickEvent.java b/...events/lifecycle/api/ServerTickEvent.java → ...events/lifecycle/api/ServerTickEvent.java
diff --git a/...vents/lifecycle/api/ServerWorldEvent.java → ...vents/lifecycle/api/ServerWorldEvent.java b/...vents/lifecycle/api/ServerWorldEvent.java → ...vents/lifecycle/api/ServerWorldEvent.java
diff --git a/...le/api/client/ClientBlockEntityEvent.java → ...le/api/client/ClientBlockEntityEvent.java b/...le/api/client/ClientBlockEntityEvent.java → ...le/api/client/ClientBlockEntityEvent.java
diff --git a/...ifecycle/api/client/ClientChunkEvent.java → ...ifecycle/api/client/ClientChunkEvent.java b/...ifecycle/api/client/ClientChunkEvent.java → ...ifecycle/api/client/ClientChunkEvent.java
diff --git a/...fecycle/api/client/ClientEntityEvent.java → ...fecycle/api/client/ClientEntityEvent.java b/...fecycle/api/client/ClientEntityEvent.java → ...fecycle/api/client/ClientEntityEvent.java
diff --git a/...ycle/api/client/ClientLifecycleEvent.java → ...ycle/api/client/ClientLifecycleEvent.java b/...ycle/api/client/ClientLifecycleEvent.java → ...ycle/api/client/ClientLifecycleEvent.java
diff --git a/...lifecycle/api/client/ClientTickEvent.java → ...lifecycle/api/client/ClientTickEvent.java b/...lifecycle/api/client/ClientTickEvent.java → ...lifecycle/api/client/ClientTickEvent.java
diff --git a/...ycle/impl/KessokuLifecycleEventsImpl.java → ...ycle/impl/KessokuLifecycleEventsImpl.java b/...ycle/impl/KessokuLifecycleEventsImpl.java → ...ycle/impl/KessokuLifecycleEventsImpl.java
diff --git a/...nts/lifecycle/impl/LoadedChunksCache.java → ...nts/lifecycle/impl/LoadedChunksCache.java b/...nts/lifecycle/impl/LoadedChunksCache.java → ...nts/lifecycle/impl/LoadedChunksCache.java
diff --git a/...ib/events/lifecycle/mixin/WorldMixin.java → ...ib/events/lifecycle/mixin/WorldMixin.java b/...ib/events/lifecycle/mixin/WorldMixin.java → ...ib/events/lifecycle/mixin/WorldMixin.java
diff --git a/keybind-common/src/main/resources/icon.png → ...events/common/src/main/resources/icon.png b/keybind-common/src/main/resources/icon.png → ...events/common/src/main/resources/icon.png
diff --git a/...rces/kessoku-lifecycle-events.mixins.json → ...rces/kessoku-lifecycle-events.mixins.json b/...rces/kessoku-lifecycle-events.mixins.json → ...rces/kessoku-lifecycle-events.mixins.json
diff --git a/lifecycle-events-fabric/build.gradle → lifecycle-events/fabric/build.gradle b/lifecycle-events-fabric/build.gradle → lifecycle-events/fabric/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-fabric.gradle")
+apply from: rootProject.file("gradle/scripts/klib-fabric.gradle")
 
 group = "band.kessoku.lib.events.lifecycle"
 base.archivesName = rootProject.name + "-lifecycle-events"

diff --git a/...cle/KessokuLifecycleEventsEntrypoint.java → ...cle/KessokuLifecycleEventsEntrypoint.java b/...cle/KessokuLifecycleEventsEntrypoint.java → ...cle/KessokuLifecycleEventsEntrypoint.java
diff --git a/...mpl/KessokuLifecycleEventsImplFabric.java → ...mpl/KessokuLifecycleEventsImplFabric.java b/...mpl/KessokuLifecycleEventsImplFabric.java → ...mpl/KessokuLifecycleEventsImplFabric.java
diff --git a/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json b/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json
diff --git a/lifecycle-events-neo/build.gradle → lifecycle-events/neo/build.gradle b/lifecycle-events-neo/build.gradle → lifecycle-events/neo/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-neo.gradle")
+apply from: rootProject.file("gradle/scripts/klib-neo.gradle")
 
 group = "band.kessoku.lib.events.lifecycle"
 base.archivesName = rootProject.name + "-lifecycle-events"

diff --git a/lifecycle-events-neo/gradle.properties → lifecycle-events/neo/gradle.properties b/lifecycle-events-neo/gradle.properties → lifecycle-events/neo/gradle.properties
diff --git a/...cle/KessokuLifecycleEventsEntrypoint.java → ...cle/KessokuLifecycleEventsEntrypoint.java b/...cle/KessokuLifecycleEventsEntrypoint.java → ...cle/KessokuLifecycleEventsEntrypoint.java
diff --git a/...e/impl/KessokuLifecycleEventsImplNeo.java → ...e/impl/KessokuLifecycleEventsImplNeo.java b/...e/impl/KessokuLifecycleEventsImplNeo.java → ...e/impl/KessokuLifecycleEventsImplNeo.java
diff --git a/...cycle/mixin/neo/MinecraftServerMixin.java → ...cycle/mixin/neo/MinecraftServerMixin.java b/...cycle/mixin/neo/MinecraftServerMixin.java → ...cycle/mixin/neo/MinecraftServerMixin.java
diff --git a/...e/mixin/neo/ServerEntityHandlerMixin.java → ...e/mixin/neo/ServerEntityHandlerMixin.java b/...e/mixin/neo/ServerEntityHandlerMixin.java → ...e/mixin/neo/ServerEntityHandlerMixin.java
diff --git a/...lifecycle/mixin/neo/ServerWorldMixin.java → ...lifecycle/mixin/neo/ServerWorldMixin.java b/...lifecycle/mixin/neo/ServerWorldMixin.java → ...lifecycle/mixin/neo/ServerWorldMixin.java
diff --git a/...n/neo/client/ClientChunkManagerMixin.java → ...n/neo/client/ClientChunkManagerMixin.java b/...n/neo/client/ClientChunkManagerMixin.java → ...n/neo/client/ClientChunkManagerMixin.java
diff --git a/.../neo/client/ClientEntityHandlerMixin.java → .../neo/client/ClientEntityHandlerMixin.java b/.../neo/client/ClientEntityHandlerMixin.java → .../neo/client/ClientEntityHandlerMixin.java
diff --git a/...client/ClientPlayNetworkHandlerMixin.java → ...client/ClientPlayNetworkHandlerMixin.java b/...client/ClientPlayNetworkHandlerMixin.java → ...client/ClientPlayNetworkHandlerMixin.java
diff --git a/...ixin/neo/client/MinecraftClientMixin.java → ...ixin/neo/client/MinecraftClientMixin.java b/...ixin/neo/client/MinecraftClientMixin.java → ...ixin/neo/client/MinecraftClientMixin.java
diff --git a/...cle/mixin/neo/client/WorldChunkMixin.java → ...cle/mixin/neo/client/WorldChunkMixin.java b/...cle/mixin/neo/client/WorldChunkMixin.java → ...cle/mixin/neo/client/WorldChunkMixin.java
diff --git a/...cle/mixin/neo/server/WorldChunkMixin.java → ...cle/mixin/neo/server/WorldChunkMixin.java b/...cle/mixin/neo/server/WorldChunkMixin.java → ...cle/mixin/neo/server/WorldChunkMixin.java
diff --git a/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
diff --git a/...es/kessoku-lifecycle-events.accesswidener → ...es/kessoku-lifecycle-events.accesswidener b/...es/kessoku-lifecycle-events.accesswidener → ...es/kessoku-lifecycle-events.accesswidener
diff --git a/.../kessoku-lifecycle-events.neo.mixins.json → .../kessoku-lifecycle-events.neo.mixins.json b/.../kessoku-lifecycle-events.neo.mixins.json → .../kessoku-lifecycle-events.neo.mixins.json
diff --git a/neo/build.gradle b/neo/build.gradle
diff --git a/platform-common/build.gradle → platform/common/build.gradle b/platform-common/build.gradle → platform/common/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-common.gradle")
+apply from: rootProject.file("gradle/scripts/klib-common.gradle")
 
 group = "band.kessoku.lib.platform"
 base.archivesName = rootProject.name + "-platform"

diff --git a/...kessoku/lib/platform/KessokuPlatform.java → ...kessoku/lib/platform/KessokuPlatform.java b/...kessoku/lib/platform/KessokuPlatform.java → ...kessoku/lib/platform/KessokuPlatform.java
diff --git a/...va/band/kessoku/lib/platform/api/Env.java → ...va/band/kessoku/lib/platform/api/Env.java b/...va/band/kessoku/lib/platform/api/Env.java → ...va/band/kessoku/lib/platform/api/Env.java
diff --git a/...and/kessoku/lib/platform/api/ModData.java → ...and/kessoku/lib/platform/api/ModData.java b/...and/kessoku/lib/platform/api/ModData.java → ...and/kessoku/lib/platform/api/ModData.java
diff --git a/...u/lib/platform/api/ModDependencyInfo.java → ...u/lib/platform/api/ModDependencyInfo.java b/...u/lib/platform/api/ModDependencyInfo.java → ...u/lib/platform/api/ModDependencyInfo.java
diff --git a/...d/kessoku/lib/platform/api/ModLoader.java → ...d/kessoku/lib/platform/api/ModLoader.java b/...d/kessoku/lib/platform/api/ModLoader.java → ...d/kessoku/lib/platform/api/ModLoader.java
diff --git a/...latform/impl/KessokuPlatformServices.java → ...latform/impl/KessokuPlatformServices.java b/...latform/impl/KessokuPlatformServices.java → ...latform/impl/KessokuPlatformServices.java
diff --git a/...events-common/src/main/resources/icon.png → platform/common/src/main/resources/icon.png b/...events-common/src/main/resources/icon.png → platform/common/src/main/resources/icon.png
diff --git a/platform-fabric/build.gradle → platform/fabric/build.gradle b/platform-fabric/build.gradle → platform/fabric/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-fabric.gradle")
+apply from: rootProject.file("gradle/scripts/klib-fabric.gradle")
 
 group = "band.kessoku.lib.platform"
 base.archivesName = rootProject.name + "-platform"

diff --git a/...b/platform/KessokuPlatformEntrypoint.java → ...b/platform/KessokuPlatformEntrypoint.java b/...b/platform/KessokuPlatformEntrypoint.java → ...b/platform/KessokuPlatformEntrypoint.java
diff --git a/...essoku/lib/platform/impl/ModDataImpl.java → ...essoku/lib/platform/impl/ModDataImpl.java b/...essoku/lib/platform/impl/ModDataImpl.java → ...essoku/lib/platform/impl/ModDataImpl.java
diff --git a/.../platform/impl/ModDependencyInfoImpl.java → .../platform/impl/ModDependencyInfoImpl.java b/.../platform/impl/ModDependencyInfoImpl.java → .../platform/impl/ModDependencyInfoImpl.java
diff --git a/...soku/lib/platform/impl/ModLoaderImpl.java → ...soku/lib/platform/impl/ModLoaderImpl.java b/...soku/lib/platform/impl/ModLoaderImpl.java → ...soku/lib/platform/impl/ModLoaderImpl.java
diff --git a/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json b/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json
diff --git a/platform-neo/build.gradle → platform/neo/build.gradle b/platform-neo/build.gradle → platform/neo/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-neo.gradle")
+apply from: rootProject.file("gradle/scripts/klib-neo.gradle")
 
 group = "band.kessoku.lib.platform"
 base.archivesName = rootProject.name + "-platform"

diff --git a/neo/gradle.properties → platform/neo/gradle.properties b/neo/gradle.properties → platform/neo/gradle.properties
diff --git a/...b/platform/KessokuPlatformEntrypoint.java → ...b/platform/KessokuPlatformEntrypoint.java b/...b/platform/KessokuPlatformEntrypoint.java → ...b/platform/KessokuPlatformEntrypoint.java
diff --git a/...essoku/lib/platform/impl/ModDataImpl.java → ...essoku/lib/platform/impl/ModDataImpl.java b/...essoku/lib/platform/impl/ModDataImpl.java → ...essoku/lib/platform/impl/ModDataImpl.java
diff --git a/.../platform/impl/ModDependencyInfoImpl.java → .../platform/impl/ModDependencyInfoImpl.java b/.../platform/impl/ModDependencyInfoImpl.java → .../platform/impl/ModDependencyInfoImpl.java
diff --git a/...soku/lib/platform/impl/ModLoaderImpl.java → ...soku/lib/platform/impl/ModLoaderImpl.java b/...soku/lib/platform/impl/ModLoaderImpl.java → ...soku/lib/platform/impl/ModLoaderImpl.java
diff --git a/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
diff --git a/registry-common/build.gradle → registry/common/build.gradle b/registry-common/build.gradle → registry/common/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-common.gradle")
+apply from: rootProject.file("gradle/scripts/klib-common.gradle")
 
 group = "band.kessoku.lib.registry"
 base.archivesName = rootProject.name + "-registry"

diff --git a/...kessoku/lib/registry/KessokuRegistry.java → ...kessoku/lib/registry/KessokuRegistry.java b/...kessoku/lib/registry/KessokuRegistry.java → ...kessoku/lib/registry/KessokuRegistry.java
diff --git a/...essoku/lib/registry/api/FuelRegistry.java → ...essoku/lib/registry/api/FuelRegistry.java b/...essoku/lib/registry/api/FuelRegistry.java → ...essoku/lib/registry/api/FuelRegistry.java
diff --git a/...nd/kessoku/lib/registry/api/Registry.java → ...nd/kessoku/lib/registry/api/Registry.java b/...nd/kessoku/lib/registry/api/Registry.java → ...nd/kessoku/lib/registry/api/Registry.java
diff --git a/...egistry/impl/KessokuRegistryServices.java → ...egistry/impl/KessokuRegistryServices.java b/...egistry/impl/KessokuRegistryServices.java → ...egistry/impl/KessokuRegistryServices.java
diff --git a/neo/src/main/resources/icon.png → registry/common/src/main/resources/icon.png b/neo/src/main/resources/icon.png → registry/common/src/main/resources/icon.png
diff --git a/.../resources/kessoku-registry.accesswidener → .../resources/kessoku-registry.accesswidener b/.../resources/kessoku-registry.accesswidener → .../resources/kessoku-registry.accesswidener
diff --git a/registry-fabric/build.gradle → registry/fabric/build.gradle b/registry-fabric/build.gradle → registry/fabric/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-fabric.gradle")
+apply from: rootProject.file("gradle/scripts/klib-fabric.gradle")
 
 group = "band.kessoku.lib.registry"
 base.archivesName = rootProject.name + "-registry"

diff --git a/...b/registry/KessokuRegistryEntrypoint.java → ...b/registry/KessokuRegistryEntrypoint.java b/...b/registry/KessokuRegistryEntrypoint.java → ...b/registry/KessokuRegistryEntrypoint.java
diff --git a/...ssoku/lib/registry/impl/RegistryImpl.java → ...ssoku/lib/registry/impl/RegistryImpl.java b/...ssoku/lib/registry/impl/RegistryImpl.java → ...ssoku/lib/registry/impl/RegistryImpl.java
diff --git a/...ixin/AbstractFurnaceBlockEntityMixin.java → ...ixin/AbstractFurnaceBlockEntityMixin.java b/...ixin/AbstractFurnaceBlockEntityMixin.java → ...ixin/AbstractFurnaceBlockEntityMixin.java
diff --git a/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json b/...fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json
diff --git a/...urces/kessoku-registry-fabric.mixins.json → ...urces/kessoku-registry-fabric.mixins.json b/...urces/kessoku-registry-fabric.mixins.json → ...urces/kessoku-registry-fabric.mixins.json
diff --git a/registry-neo/build.gradle → registry/neo/build.gradle b/registry-neo/build.gradle → registry/neo/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file("gradle/scripts/kessokulib-neo.gradle")
+apply from: rootProject.file("gradle/scripts/klib-neo.gradle")
 
 group = "band.kessoku.lib.registry"
 base.archivesName = rootProject.name + "-registry"

diff --git a/platform-neo/gradle.properties → registry/neo/gradle.properties b/platform-neo/gradle.properties → registry/neo/gradle.properties
diff --git a/...b/registry/KessokuRegistryEntrypoint.java → ...b/registry/KessokuRegistryEntrypoint.java b/...b/registry/KessokuRegistryEntrypoint.java → ...b/registry/KessokuRegistryEntrypoint.java
diff --git a/...ssoku/lib/registry/impl/RegistryImpl.java → ...ssoku/lib/registry/impl/RegistryImpl.java b/...ssoku/lib/registry/impl/RegistryImpl.java → ...ssoku/lib/registry/impl/RegistryImpl.java
diff --git a/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
diff --git a/settings.gradle b/settings.gradle
@@ -9,13 +9,31 @@ pluginManagement {
 
 rootProject.name = 'kessoku-lib'
 
-include("fabric", "neo") // Bundle modules
-include("base-common", "base-fabric", "base-neo") // Base
-include("event-base-common", "event-base-fabric", "event-base-neo") // Event Base
-include("platform-common", "platform-fabric", "platform-neo") // Platform
-include("registry-common", "registry-fabric", "registry-neo") // Registry
-include("lifecycle-events-common", "lifecycle-events-fabric", "lifecycle-events-neo") // Lifecycle Events
-include("command-common", "command-fabric", "command-neo") // Command API
-include("keybind-common", "keybind-fabric", "keybind-neo") // Keybind API
-include("config-common", "config-fabric", "config-neo") // Config API
+includeWrapper("fabric")
+includeWrapper("neo")
 
+includeModule("base") // Base
+includeModule("event-base") // Event Base
+includeModule("platform") // Platform
+includeModule("registry") // Registry
+includeModule("lifecycle-events") // Lifecycle Events
+includeModule("command") // Command API
+includeModule("keybind") // Keybind API
+includeModule("config") // Config API
+
+
+void includeWrapper(String platform) {
+    include("wrapper/$platform")
+    project(":wrapper/$platform").name = "$rootProject.name-$platform"
+}
+
+void includeModule(String moduleName) {
+    includePlatform(moduleName, "common")
+    includePlatform(moduleName, "fabric")
+    includePlatform(moduleName, "neo")
+}
+
+void includePlatform(String moduleName, String platform) {
+    include("$moduleName/$platform")
+    project(":$moduleName/$platform").name = "$moduleName-$platform"
+}
diff --git a/wrapper/fabric/build.gradle b/wrapper/fabric/build.gradle
@@ -0,0 +1,12 @@
+apply from: rootProject.file("gradle/scripts/klib-fabric.gradle")
+
+group = "band.kessoku.lib"
+base.archivesName = rootProject.name
+
+var modules = ["base", "event-base", "lifecycle-events", "platform", "registry"]
+
+dependencies {
+    //modules.each {
+    //    moduleInclude(project, "$it", "fabric")
+    //}
+}
diff --git a/fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json
diff --git a/platform-common/src/main/resources/icon.png → wrapper/fabric/src/main/resources/icon.png b/platform-common/src/main/resources/icon.png → wrapper/fabric/src/main/resources/icon.png
diff --git a/wrapper/neo/build.gradle b/wrapper/neo/build.gradle
@@ -0,0 +1,12 @@
+apply from: rootProject.file("gradle/scripts/klib-neo.gradle")
+
+group = "band.kessoku.lib"
+base.archivesName = rootProject.name
+
+var modules = ["base", "event-base", "lifecycle-events", "platform", "registry"]
+
+dependencies {
+    //modules.each {
+    //    moduleInclude(project, "$it", "neo")
+    //}
+}
diff --git a/registry-neo/gradle.properties → wrapper/neo/gradle.properties b/registry-neo/gradle.properties → wrapper/neo/gradle.properties
diff --git a/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
diff --git a/registry-common/src/main/resources/icon.png → wrapper/neo/src/main/resources/icon.png b/registry-common/src/main/resources/icon.png → wrapper/neo/src/main/resources/icon.png