diff --git a/ansible/src/paper-plugins/ProtocolLib.jar b/ansible/src/paper-plugins/ProtocolLib.jar index d9444b644..92d1dd738 100644 Binary files a/ansible/src/paper-plugins/ProtocolLib.jar and b/ansible/src/paper-plugins/ProtocolLib.jar differ diff --git a/ansible/src/paper-plugins/SuperVanish-6.2.18.jar b/ansible/src/paper-plugins/SuperVanish-6.2.18.jar deleted file mode 100644 index e47ea83e2..000000000 Binary files a/ansible/src/paper-plugins/SuperVanish-6.2.18.jar and /dev/null differ diff --git a/ansible/src/paper-plugins/SuperVanish-6.2.20.jar b/ansible/src/paper-plugins/SuperVanish-6.2.20.jar new file mode 100644 index 000000000..6ff7e3890 Binary files /dev/null and b/ansible/src/paper-plugins/SuperVanish-6.2.20.jar differ diff --git a/build.gradle.kts b/build.gradle.kts index 8e25c97bd..ac6db0921 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ import com.gradle.enterprise.gradleplugin.GradleEnterpriseExtension plugins { id("io.papermc.paperweight.userdev") version "1.7.2" apply false - id("com.gradleup.shadow") version "8.3.0" apply false + id("com.github.johnrengelman.shadow") version "8.1.1" apply false id("xyz.jpenilla.run-paper") version "2.2.2" apply false } diff --git a/plugins/banstick-paper/build.gradle.kts b/plugins/banstick-paper/build.gradle.kts index 300855a84..5eecb3b8d 100644 --- a/plugins/banstick-paper/build.gradle.kts +++ b/plugins/banstick-paper/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("io.papermc.paperweight.userdev") - id("com.gradleup.shadow") + id("com.github.johnrengelman.shadow") } version = "2.0.1" diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts index 8cf768307..906000283 100644 --- a/plugins/build.gradle.kts +++ b/plugins/build.gradle.kts @@ -44,7 +44,7 @@ subprojects { create("maven") { from(components["java"]) } - pluginManager.withPlugin("com.gradleup.shadow") { + pluginManager.withPlugin("com.github.johnrengelman.shadow") { create("shadow") { from(components["java"]) } @@ -67,7 +67,7 @@ subprojects { } } - pluginManager.withPlugin("com.gradleup.shadow") { + pluginManager.withPlugin("com.github.johnrengelman.shadow") { tasks { named("build") { dependsOn("shadowJar") diff --git a/plugins/civmodcore-paper/build.gradle.kts b/plugins/civmodcore-paper/build.gradle.kts index 981b9c1f8..6f757eb3b 100644 --- a/plugins/civmodcore-paper/build.gradle.kts +++ b/plugins/civmodcore-paper/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("io.papermc.paperweight.userdev") - id("com.gradleup.shadow") + id("com.github.johnrengelman.shadow") id("xyz.jpenilla.run-paper") } diff --git a/plugins/civspy-paper/build.gradle.kts b/plugins/civspy-paper/build.gradle.kts index ed012a7df..c20dc9bb5 100644 --- a/plugins/civspy-paper/build.gradle.kts +++ b/plugins/civspy-paper/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("io.papermc.paperweight.userdev") - id("com.gradleup.shadow") + id("com.github.johnrengelman.shadow") id("xyz.jpenilla.run-paper") } diff --git a/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java index 229f61933..2f6928490 100644 --- a/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java +++ b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java @@ -146,7 +146,7 @@ public class NpcPlayerHelperImpl implements NpcPlayerHelper { //Although we can use Mojang mappings when developing, We need to use the obfuscated field name //until we can run a full Mojmapped server. I personally used this site when updating to 1.20.6: // https://mappings.cephx.dev/1.20.6/net/minecraft/world/food/FoodData.html - foodTickTimerField = FoodData.class.getDeclaredField("d"); + foodTickTimerField = FoodData.class.getDeclaredField("d"); // todo fix foodTickTimerField.setAccessible(true); foodTickTimer = foodTickTimerField.getInt(entity.getFoodData()); } catch (NoSuchFieldException | IllegalAccessException e) { diff --git a/plugins/kirabukkitgateway-paper/build.gradle.kts b/plugins/kirabukkitgateway-paper/build.gradle.kts index 5f2f6357f..5b7469e10 100644 --- a/plugins/kirabukkitgateway-paper/build.gradle.kts +++ b/plugins/kirabukkitgateway-paper/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("io.papermc.paperweight.userdev") - id("com.gradleup.shadow") + id("com.github.johnrengelman.shadow") } version = "2.0.3"