From 82757fcb1958e506bbee37aceb5c5cb44afc56bc Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Sat, 23 Sep 2023 11:57:42 +0300 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@fbedef8 Updated Upstream (Paper) PurpurMC/Purpur@cc43efd Updated Upstream (Paper) PurpurMC/Purpur@f6fd5f6 update paperweight to 1.5.7-SNAPSHOT --- patches/server/0002-Divine-Configuration.patch | 10 +++++----- patches/server/0023-Bump-Dependencies.patch | 13 +------------ patches/server/0026-Fix-MC-65198.patch | 8 ++++---- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/patches/server/0002-Divine-Configuration.patch b/patches/server/0002-Divine-Configuration.patch index 088d9a8..b7666de 100644 --- a/patches/server/0002-Divine-Configuration.patch +++ b/patches/server/0002-Divine-Configuration.patch @@ -377,7 +377,7 @@ index 713a091b8083e46b395311889c2a1482279c27ec..bddbc39bb6f82e90b25ef6b101ef7124 this.generator = gen; 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 380cc144d4889917298bdc2ebd691f6478a47470..3ab4e225e926b960f6cd84dad6c697283e45a25f 100644 +index 96bb9a7f80f2849ce04eeb043a9a294786772ebe..581ca3f5218e78e432605208751f6ddbfe2a53ca 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -15,6 +15,7 @@ import com.mojang.brigadier.tree.LiteralCommandNode; @@ -388,7 +388,7 @@ index 380cc144d4889917298bdc2ebd691f6478a47470..3ab4e225e926b960f6cd84dad6c69728 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; -@@ -1050,6 +1051,7 @@ public final class CraftServer implements Server { +@@ -1052,6 +1053,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot this.console.paperConfigurations.reloadConfigs(this.console); org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur @@ -396,7 +396,7 @@ index 380cc144d4889917298bdc2ebd691f6478a47470..3ab4e225e926b960f6cd84dad6c69728 for (ServerLevel world : this.console.getAllLevels()) { // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean)) -@@ -1066,6 +1068,7 @@ public final class CraftServer implements Server { +@@ -1068,6 +1070,7 @@ public final class CraftServer implements Server { } world.spigotConfig.init(); // Spigot world.purpurConfig.init(); // Purpur @@ -404,7 +404,7 @@ index 380cc144d4889917298bdc2ebd691f6478a47470..3ab4e225e926b960f6cd84dad6c69728 } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -1082,6 +1085,7 @@ public final class CraftServer implements Server { +@@ -1084,6 +1087,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.registerCommands(); // Spigot io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur @@ -412,7 +412,7 @@ index 380cc144d4889917298bdc2ebd691f6478a47470..3ab4e225e926b960f6cd84dad6c69728 this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2994,6 +2998,13 @@ public final class CraftServer implements Server { +@@ -2996,6 +3000,13 @@ public final class CraftServer implements Server { } // Purpur end diff --git a/patches/server/0023-Bump-Dependencies.patch b/patches/server/0023-Bump-Dependencies.patch index b181d62..9dbf80b 100644 --- a/patches/server/0023-Bump-Dependencies.patch +++ b/patches/server/0023-Bump-Dependencies.patch @@ -5,20 +5,9 @@ Subject: [PATCH] Bump Dependencies diff --git a/build.gradle.kts b/build.gradle.kts -index 8b450ebbb67416bbb395ed25114e8121b028fd6a..8e3360b7b4606955803d12585dccb5197165575b 100644 +index 4cdc840231642ad03fb0db1bfa1282315a02b2de..791b19148c2edae5d900d817ee164aa94a971908 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -37,8 +37,8 @@ dependencies { - implementation("io.netty:netty-codec-haproxy:4.1.87.Final") // Paper - Add support for proxy protocol - // Paper end - implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion -- implementation("org.ow2.asm:asm:9.4") -- implementation("org.ow2.asm:asm-commons:9.4") // Paper - ASM event executor generation -+ implementation("org.ow2.asm:asm:9.5") // DivineMC - bump dependencies -+ implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation // DivineMC - bump dependencies - testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito - implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files - implementation("commons-lang:commons-lang:2.6") @@ -47,7 +47,7 @@ dependencies { runtimeOnly("com.mysql:mysql-connector-j:8.0.33") runtimeOnly("com.lmax:disruptor:3.4.4") // Paper diff --git a/patches/server/0026-Fix-MC-65198.patch b/patches/server/0026-Fix-MC-65198.patch index 3259abd..19734ae 100644 --- a/patches/server/0026-Fix-MC-65198.patch +++ b/patches/server/0026-Fix-MC-65198.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Fix MC-65198 Original post on Mojira: https://bugs.mojang.com/browse/MC-65198 diff --git a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java -index 102739c0089ff3f6b3432f954304d43a3dfebc35..d925153b39ac4ddd273f84fb3d6cb071a00c9123 100644 +index a578882b64c581ef4f47fa483a9f2988cfa4c8cf..0660c07e1f360cb5e0a865a6b7574ea14a327f10 100644 --- a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java +++ b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java -@@ -140,6 +140,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu { +@@ -141,6 +141,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu { ItemStack itemstack1 = slot1.getItem(); itemstack = itemstack1.copy(); @@ -17,7 +17,7 @@ index 102739c0089ff3f6b3432f954304d43a3dfebc35..d925153b39ac4ddd273f84fb3d6cb071 int j = this.getInventorySlotStart(); int k = this.getUseRowEnd(); -@@ -178,7 +179,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu { +@@ -179,7 +180,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu { } this.activeQuickItem = itemstack; // Purpur @@ -40,7 +40,7 @@ index 46d1f768e4dcc2942ee7af81ee2713df10251731..311c3054c4a44043ddc32b1560b9a4d6 Container var3 = this.container; diff --git a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java -index 1b1f814770d1a906ed880df578845be2e9a14f46..4a513a537c3dfe446796611794c5b4c67df3bbb0 100644 +index 9699f97efcfecdc446ca25a6bab42cc484314cbb..6c95f72df1f3b6703c053f894857844abf5767da 100644 --- a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java +++ b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java @@ -257,6 +257,7 @@ public class StonecutterMenu extends AbstractContainerMenu {