From ad4eb2ec7db059d43e12a0e39db69ecc899dec39 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Thu, 8 Jun 2023 15:27:41 +0200 Subject: [PATCH] Fix bad fixup --- patches/server/0001-Setup-Gradle-project.patch | 4 ++-- patches/server/0003-Build-system-changes.patch | 4 ++-- patches/server/0004-Test-changes.patch | 2 +- patches/server/0005-Paper-config-files.patch | 2 +- ...alConsoleAppender-for-console-improvements.patch | 2 +- ...-plugin-prefixes-using-Log4J-configuration.patch | 2 +- ...t-that-allowed-colored-signs-to-be-created.patch | 13 ------------- 7 files changed, 8 insertions(+), 21 deletions(-) diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index f399f66b1d..293a413616 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -28,7 +28,7 @@ index 3df8c60ab5cd1454660980883f80668d535b742b..37c3a00659ce21623be07317f4f6a45b +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..b663ef66dfe3f19a58f265de866d002d19517324 +index 0000000000000000000000000000000000000000..ca692b4758172cb139938f28457cf5639a4411cf --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,137 @@ @@ -59,7 +59,7 @@ index 0000000000000000000000000000000000000000..b663ef66dfe3f19a58f265de866d002d + testImplementation("org.hamcrest:hamcrest-library:1.3") +} + -+val craftbukkitPackageVersion = "1_19_R3" // Paper ++val craftbukkitPackageVersion = "1_20_R1" // Paper +tasks.jar { + archiveClassifier.set("dev") + diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch index b1b50fe88d..b8086f8648 100644 --- a/patches/server/0003-Build-system-changes.patch +++ b/patches/server/0003-Build-system-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes diff --git a/build.gradle.kts b/build.gradle.kts -index b663ef66dfe3f19a58f265de866d002d19517324..2b67d93dd4d18235b28388dab3ee9bd57d2b816c 100644 +index ca692b4758172cb139938f28457cf5639a4411cf..592d2cd1114ee9fbf7b16068ef729f7db4de83d1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,10 +9,9 @@ plugins { @@ -29,7 +29,7 @@ index b663ef66dfe3f19a58f265de866d002d19517324..2b67d93dd4d18235b28388dab3ee9bd5 + implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty } - val craftbukkitPackageVersion = "1_19_R3" // Paper + val craftbukkitPackageVersion = "1_20_R1" // Paper @@ -34,6 +35,7 @@ tasks.jar { val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" diff --git a/patches/server/0004-Test-changes.patch b/patches/server/0004-Test-changes.patch index f084ccd6c1..c5fd94f438 100644 --- a/patches/server/0004-Test-changes.patch +++ b/patches/server/0004-Test-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Test changes diff --git a/build.gradle.kts b/build.gradle.kts -index 2b67d93dd4d18235b28388dab3ee9bd57d2b816c..69753539208112385e5057be560dc57071259b33 100644 +index 592d2cd1114ee9fbf7b16068ef729f7db4de83d1..f3f20b34a3ebcbb75004003892e903ee4fd0edd3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,6 +12,7 @@ dependencies { diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch index 832c8f6a94..286eef9c75 100644 --- a/patches/server/0005-Paper-config-files.patch +++ b/patches/server/0005-Paper-config-files.patch @@ -14,7 +14,7 @@ public org.spigotmc.SpigotWorldConfig getString(Ljava/lang/String;Ljava/lang/Str public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES diff --git a/build.gradle.kts b/build.gradle.kts -index 69753539208112385e5057be560dc57071259b33..bdd78d14723211bfec493126d603b99611cdf748 100644 +index f3f20b34a3ebcbb75004003892e903ee4fd0edd3..d8da21801eda8ea5d04c8eb2941bbef968cb7951 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,6 +13,7 @@ dependencies { diff --git a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch index b12bb27aa9..5a9145313b 100644 --- a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -19,7 +19,7 @@ Other changes: configuration diff --git a/build.gradle.kts b/build.gradle.kts -index bdd78d14723211bfec493126d603b99611cdf748..9fb608d9cfb0dcd8d937244ecbe97487757af479 100644 +index d8da21801eda8ea5d04c8eb2941bbef968cb7951..38c08ee8e935d3fdf5ad4e443352e3563609e3c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,17 @@ plugins { diff --git a/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch index 9236622489..da2d8e20f1 100644 --- a/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/build.gradle.kts b/build.gradle.kts -index 9fb608d9cfb0dcd8d937244ecbe97487757af479..967b675eb600282b881d966f95c9d3cde3edc4e8 100644 +index 38c08ee8e935d3fdf5ad4e443352e3563609e3c0..97f1a5bafdd1f520fee5f31fda87b4c251aea33f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { diff --git a/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index dc608a7233..1c7e757649 100644 --- a/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -4,19 +4,6 @@ Date: Thu, 26 Apr 2018 04:41:11 -0400 Subject: [PATCH] Fix exploit that allowed colored signs to be created -diff --git a/build.gradle.kts b/build.gradle.kts -index 967b675eb600282b881d966f95c9d3cde3edc4e8..97f1a5bafdd1f520fee5f31fda87b4c251aea33f 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -38,7 +38,7 @@ dependencies { - implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty - } - --val craftbukkitPackageVersion = "1_19_R3" // Paper -+val craftbukkitPackageVersion = "1_20_R1" // Paper - tasks.jar { - archiveClassifier.set("dev") - diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java index a778d53bba0f9678a47ce6c3d94449ae7cd1c527..41861cb1e303213b2963e90fac6b4cbbfbbe36f7 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java