diff --git a/.gitignore b/.gitignore index 5c1c9cc5b..a1a036d4c 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,5 @@ classes/ .settings *.launch -**/src/generated/ \ No newline at end of file +**/src/generated/ +Merged/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 296267cbf..1973a2f9a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,18 @@ +import io.github.rancraftplayz.jarmerger.JarMergerPlugin + +buildscript { + dependencies{ + classpath files('plugins/DHJarMerger-1.0.jar') + } +} + plugins { id "architectury-plugin" version "3.4-SNAPSHOT" id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false } +apply plugin: JarMergerPlugin + architectury { minecraft = rootProject.minecraft_version } diff --git a/fabric/build.gradle b/fabric/build.gradle index 7782a0e20..f9826a9a1 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -138,6 +138,8 @@ shadowJar { relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress' relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig' + relocate 'com.seibel.lod.common', 'fabric.com.seibel.lod.common' + classifier "dev-shadow" } diff --git a/fabric/src/main/resources/lod.mixins.json b/fabric/src/main/resources/fabric.lod.mixins.json similarity index 100% rename from fabric/src/main/resources/lod.mixins.json rename to fabric/src/main/resources/fabric.lod.mixins.json diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 986471131..dcbbf0e96 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -33,7 +33,7 @@ }, "mixins": [ - "lod.mixins.json" + "fabric.lod.mixins.json" ], "accessWidener" : "lod.accesswidener", diff --git a/forge/build.gradle b/forge/build.gradle index acf754b6e..ce4987a52 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -78,6 +78,8 @@ shadowJar { relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress' // relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig' + relocate 'com.seibel.lod.common', 'forge.com.seibel.lod.common' + classifier "dev-shadow" } diff --git a/plugins/DHJarMerger-1.0.jar b/plugins/DHJarMerger-1.0.jar new file mode 100644 index 000000000..7d06ddeb9 Binary files /dev/null and b/plugins/DHJarMerger-1.0.jar differ