From 6045e7cfa7bc38ae87b744de0c6804f2c2c96972 Mon Sep 17 00:00:00 2001 From: Bierque Jason Date: Mon, 16 Oct 2023 13:56:36 +0200 Subject: [PATCH] Update Upstream (Folia) Upstream has released updates that appear to apply and compile correctly Folia Changes : https://github.com/PaperMC/Folia/commit/9190eb011c60a185cc88f6985fb5b941eafa91a3 Update paper --- gradle.properties | 2 +- patches/server/0001-Rebranding.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 392ef4d..cf352c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = fr.euphilia.tenseimc version = 1.20.2-R0.1-SNAPSHOT mcVersion = 1.20.2 -foliaRef = 84aecdc64afc48e73fffe01f6055c453567f2027 +foliaRef = 9190eb011c60a185cc88f6985fb5b941eafa91a3 org.gradle.caching=true org.gradle.parallel=false diff --git a/patches/server/0001-Rebranding.patch b/patches/server/0001-Rebranding.patch index c2ec9c6..6123910 100644 --- a/patches/server/0001-Rebranding.patch +++ b/patches/server/0001-Rebranding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Rebranding diff --git a/build.gradle.kts b/build.gradle.kts -index 521ff85fcf10fc85fe706d6fa3778e0569551829..0c7061bf912629de8b7e9510dd8bb1f153949b35 100644 +index b62a25bd32b7976dd00f53521d0e050d60c34ca7..167c0c0f2a2d1cb8658bca7886c448198f4503f1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating @@ -17,7 +17,7 @@ index 521ff85fcf10fc85fe706d6fa3778e0569551829..0c7061bf912629de8b7e9510dd8bb1f1 implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") { exclude("io.papermc.paper", "paper-api") } -@@ -70,13 +70,13 @@ tasks.jar { +@@ -68,13 +68,13 @@ tasks.jar { manifest { val git = Git(rootProject.layout.projectDirectory.path) val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() @@ -134,7 +134,7 @@ index 2f2a8a0c05024115f3b7bd69ae400fadff2f36c5..b62137def6ac3826eb5d9e367d97579b public SystemReport fillSystemReport(SystemReport details) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 249ff636a40f6493444a6ea8b8a5e017cb2c30eb..cba140514d91a6d9713a2bd38a112f565e3c6bb0 100644 +index a50a9ffda4875061fb8840873115119f334f0519..eb302567a5e6e83ad64547445e0d9e058aacccdc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -267,7 +267,7 @@ import javax.annotation.Nullable; // Paper