From c95da2775f19aa9ed9eb09ae8a91a3751448ee0e Mon Sep 17 00:00:00 2001 From: Madeline Miller Date: Sat, 15 Jul 2023 20:59:50 +1000 Subject: [PATCH] Shade and relocate jlibnoise --- worldedit-bukkit/build.gradle.kts | 2 ++ worldedit-fabric/build.gradle.kts | 2 ++ worldedit-forge/build.gradle.kts | 2 ++ worldedit-sponge/build.gradle.kts | 2 ++ 4 files changed, 8 insertions(+) diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index 2802a5348a..2579eba3a6 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -98,10 +98,12 @@ tasks.named("shadowJar") { include(dependency("org.bstats:")) include(dependency("io.papermc:paperlib")) include(dependency("it.unimi.dsi:fastutil")) + include(dependency("com.sk89q.lib:jlibnoise")) relocate("org.bstats", "com.sk89q.worldedit.bstats") relocate("io.papermc.lib", "com.sk89q.worldedit.bukkit.paperlib") relocate("it.unimi.dsi.fastutil", "com.sk89q.worldedit.bukkit.fastutil") + relocate("net.royawesome.jlibnoise", "com.sk89q.worldedit.jlibnoise"); } } diff --git a/worldedit-fabric/build.gradle.kts b/worldedit-fabric/build.gradle.kts index 7a55be0f73..48904b3c7d 100644 --- a/worldedit-fabric/build.gradle.kts +++ b/worldedit-fabric/build.gradle.kts @@ -137,8 +137,10 @@ tasks.named("shadowJar") { archiveClassifier.set("dist-dev") dependencies { relocate("org.antlr.v4", "com.sk89q.worldedit.antlr4") + relocate("net.royawesome.jlibnoise", "com.sk89q.worldedit.jlibnoise"); include(dependency("org.antlr:antlr4-runtime")) + include(dependency("com.sk89q.lib:jlibnoise")) } } diff --git a/worldedit-forge/build.gradle.kts b/worldedit-forge/build.gradle.kts index 565e180966..0d1d72141c 100644 --- a/worldedit-forge/build.gradle.kts +++ b/worldedit-forge/build.gradle.kts @@ -168,9 +168,11 @@ addJarManifest(WorldEditKind.Mod, includeClasspath = false) tasks.named("shadowJar") { dependencies { relocate("org.antlr.v4", "com.sk89q.worldedit.antlr4") + relocate("net.royawesome.jlibnoise", "com.sk89q.worldedit.jlibnoise"); include(dependency("org.antlr:antlr4-runtime")) include(dependency("org.mozilla:rhino-runtime")) + include(dependency("com.sk89q.lib:jlibnoise")) } minimize { exclude(dependency("org.mozilla:rhino-runtime")) diff --git a/worldedit-sponge/build.gradle.kts b/worldedit-sponge/build.gradle.kts index 39042d1069..4799d6a8df 100644 --- a/worldedit-sponge/build.gradle.kts +++ b/worldedit-sponge/build.gradle.kts @@ -70,9 +70,11 @@ tasks.named("shadowJar") { dependencies { include(dependency("org.bstats:")) include(dependency("org.antlr:antlr4-runtime")) + include(dependency("com.sk89q.lib:jlibnoise")) relocate("org.antlr.v4", "com.sk89q.worldedit.antlr4") relocate("org.bstats", "com.sk89q.worldedit.sponge.bstats") + relocate("net.royawesome.jlibnoise", "com.sk89q.worldedit.jlibnoise"); } } tasks.named("assemble").configure {