From ff0b2391d8709fa0897effe3cd20bc27e468317d Mon Sep 17 00:00:00 2001 From: MrNavaStar Date: Mon, 4 Mar 2024 03:52:13 -0700 Subject: [PATCH] I hate gradle so much --- ...craft_Server___loader_fabric__loader-fabric.xml | 2 +- ...necraft_Server___loader_forge__loader-forge.xml | 2 +- client/build.gradle | 4 +--- common/build.gradle | 14 ++++++++++++-- loader-common/build.gradle | 2 +- loader-fabric/build.gradle | 1 - loader-forge/build.gradle | 1 - loader-plugin/build.gradle | 1 - 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.idea/runConfigurations/Minecraft_Server___loader_fabric__loader-fabric.xml b/.idea/runConfigurations/Minecraft_Server___loader_fabric__loader-fabric.xml index cab89c3..c6b01dc 100644 --- a/.idea/runConfigurations/Minecraft_Server___loader_fabric__loader-fabric.xml +++ b/.idea/runConfigurations/Minecraft_Server___loader_fabric__loader-fabric.xml @@ -12,5 +12,5 @@ - + \ No newline at end of file diff --git a/.idea/runConfigurations/Minecraft_Server___loader_forge__loader-forge.xml b/.idea/runConfigurations/Minecraft_Server___loader_forge__loader-forge.xml index 275184d..dee6028 100644 --- a/.idea/runConfigurations/Minecraft_Server___loader_forge__loader-forge.xml +++ b/.idea/runConfigurations/Minecraft_Server___loader_forge__loader-forge.xml @@ -12,5 +12,5 @@ - + \ No newline at end of file diff --git a/client/build.gradle b/client/build.gradle index fcc5456..fa3d91b 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -1,5 +1,5 @@ dependencies { - shadow api(project(path: ':common', configuration: 'default')) + shadow api(project(path: ':common', configuration: 'shadow')) shadow implementation("io.netty:netty-buffer:${project.netty_version}") shadow implementation("io.netty:netty-transport:${project.netty_version}") shadow implementation("io.netty:netty-handler:${project.netty_version}") @@ -7,8 +7,6 @@ dependencies { shadowJar { relocate 'io.netty', 'me.mrnavastar.protoweaver.libs.netty' - relocate "com.esotericsoftware", "me.mrnavastar.protoweaver.libs.esotericsoftware" - relocate "com.cedarsoftware", "me.mrnavastar.protoweaver.libs.cedarsoftware" exclude "META-INF/maven/**" exclude "META-INF/native-image/**" diff --git a/common/build.gradle b/common/build.gradle index 72e98f3..61e19c8 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,6 +1,16 @@ dependencies { - implementation "com.esotericsoftware:kryo5:${project.kyro_version}" + shadow implementation("com.esotericsoftware:kryo5:${project.kyro_version}") compileOnly "io.netty:netty-buffer:${project.netty_version}" compileOnly "io.netty:netty-transport:${project.netty_version}" compileOnly "io.netty:netty-codec:${project.netty_version}" -} \ No newline at end of file +} + +shadowJar { + relocate "com.esotericsoftware", "me.mrnavastar.protoweaver.libs.esotericsoftware" + + exclude "META-INF/maven/**" + exclude "META-INF/native-image/**" + minimize() +} + +jar.finalizedBy(shadowJar) \ No newline at end of file diff --git a/loader-common/build.gradle b/loader-common/build.gradle index d0b46c1..536b27e 100644 --- a/loader-common/build.gradle +++ b/loader-common/build.gradle @@ -11,7 +11,7 @@ loom { } dependencies { - implementation project(path: ':common', configuration: 'default') + implementation project(path: ':common', configuration: 'shadow') minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings loom.officialMojangMappings() diff --git a/loader-fabric/build.gradle b/loader-fabric/build.gradle index e6795a1..53b7cc2 100644 --- a/loader-fabric/build.gradle +++ b/loader-fabric/build.gradle @@ -42,7 +42,6 @@ shadowJar { exclude 'io.netty.handler.ssl.*' } relocate "org.bouncycastle", "me.mrnavastar.protoweaver.libs.bouncycastle" - relocate "com.esotericsoftware", "me.mrnavastar.protoweaver.libs.esotericsoftware" exclude "META-INF/maven/**" exclude "META-INF/native-image/**" diff --git a/loader-forge/build.gradle b/loader-forge/build.gradle index 10e5ae1..8854c27 100644 --- a/loader-forge/build.gradle +++ b/loader-forge/build.gradle @@ -41,7 +41,6 @@ shadowJar { exclude 'io.netty.handler.ssl.*' } relocate "org.bouncycastle", "me.mrnavastar.protoweaver.libs.bouncycastle" - relocate "com.esotericsoftware", "me.mrnavastar.protoweaver.libs.esotericsoftware" exclude "META-INF/maven/**" exclude "META-INF/native-image/**" diff --git a/loader-plugin/build.gradle b/loader-plugin/build.gradle index 5823315..6aa883b 100644 --- a/loader-plugin/build.gradle +++ b/loader-plugin/build.gradle @@ -17,7 +17,6 @@ shadowJar { exclude 'io.netty.handler.ssl.*' } relocate "org.bouncycastle", "me.mrnavastar.protoweaver.libs.bouncycastle" - relocate "com.esotericsoftware", "me.mrnavastar.protoweaver.libs.esotericsoftware" exclude "META-INF/maven/**" exclude "META-INF/native-image/**"