From 61cfcf5c8ef93c5c1d3857f92072e7ce610caa42 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Mon, 7 Mar 2022 09:08:41 +0000 Subject: [PATCH] Update Paper --- build.gradle.kts | 8 ++++---- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- patches/server/0003-Leaves-Server-Config.patch | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 930a6064..a2dc8565 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java - id("com.github.johnrengelman.shadow") version "7.1.0" apply false - id("io.papermc.paperweight.patcher") version "1.3.3" + id("com.github.johnrengelman.shadow") version "7.1.2" apply false + id("io.papermc.paperweight.patcher") version "1.3.5" } repositories { @@ -12,7 +12,7 @@ repositories { } dependencies { - remapper("net.fabricmc:tiny-remapper:0.7.0:fat") + remapper("net.fabricmc:tiny-remapper:0.8.1:fat") decompiler("net.minecraftforge:forgeflower:1.5.498.22") paperclip("io.papermc:paperclip:3.0.2") } @@ -65,4 +65,4 @@ paperweight { serverOutputDir.set(layout.projectDirectory.dir("leaves-server")) } } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index a2acedb9..5705e071 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ version = 1.18.2-R0.1-SNAPSHOT mcVersion = 1.18.2 packageVersion = 1_18_R2 org.gradle.jvmargs=-Xmx2G -paperRef=1e12cf8db62dde92a4bc79300ef32e0fdc6e50a8 +paperRef=c34fb0942a73b932dc182c063e398ed47182fa61 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897..41dfb879 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/patches/server/0003-Leaves-Server-Config.patch b/patches/server/0003-Leaves-Server-Config.patch index 0bdf77c7..e7a6eecf 100644 --- a/patches/server/0003-Leaves-Server-Config.patch +++ b/patches/server/0003-Leaves-Server-Config.patch @@ -67,7 +67,7 @@ index 160c0f37aa3aaf7598f852acf9bd444f79444c97..53409a2c7cf2143e085c724a6e96e8ea this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 25b9d4ccedb9df8b5134a15aa81ccf391db6b8da..85aec3b017e11ab94cc0846be019fb5d632127f9 100644 +index a554fbe3db6030084029839fdfe9a3d955b10d26..3fb3fc5b30d3cb171047cfb9caebf064a83f02bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -955,6 +955,7 @@ public final class CraftServer implements Server { @@ -86,7 +86,7 @@ index 25b9d4ccedb9df8b5134a15aa81ccf391db6b8da..85aec3b017e11ab94cc0846be019fb5d } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -2673,6 +2675,14 @@ public final class CraftServer implements Server { +@@ -2693,6 +2695,14 @@ public final class CraftServer implements Server { { return com.destroystokyo.paper.PaperConfig.config; }