From 7212250f1274c5160454fb2a2b9e0627f5cab339 Mon Sep 17 00:00:00 2001 From: booky10 Date: Sat, 28 Oct 2023 16:07:51 +0200 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@acc6d01 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9861) PaperMC/Paper@b974a6b Update paperweight to 1.5.9 (#9872) PaperMC/Paper@996d529 Resend entity using the bundle packet (#9853) --- build.gradle.kts | 2 +- gradle.properties | 2 +- patches/api/0001-Pufferfish-api-patches.patch | 12 +++--- .../0001-Pufferfish-Server-Patches.patch | 42 +++++++++---------- .../0003-Add-CloudPlane-configuration.patch | 12 +++--- ...15-Resend-more-data-on-locale-change.patch | 6 +-- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9d9f7af..c8414b1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("java-library") id("com.github.johnrengelman.shadow") version "8.1.1" apply false - id("io.papermc.paperweight.patcher") version "1.5.8" + id("io.papermc.paperweight.patcher") version "1.5.9" } repositories { diff --git a/gradle.properties b/gradle.properties index 17b84d3..b24077c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ version = 1.20.2-R0.1-SNAPSHOT mcVersion = 1.20.2 packageVersion = 1_20_R2 -paperRef = c1ac98328c3b4dc2834497aae70020af7b3c7d04 +paperRef = 996d529fb3d3f85f002bd9aa8a51dae07975d686 org.gradle.jvmargs = -Xmx2G diff --git a/patches/api/0001-Pufferfish-api-patches.patch b/patches/api/0001-Pufferfish-api-patches.patch index de1add1..b9b0ecb 100644 --- a/patches/api/0001-Pufferfish-api-patches.patch +++ b/patches/api/0001-Pufferfish-api-patches.patch @@ -462,10 +462,10 @@ index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..6efa6732e5559c3192d08b8631911be7 if (cloader instanceof PluginClassLoader) { diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee1b8df621 100644 +index f9b57b872780aa6b9b959494874b57c7a8ff0c53..90953bfc81168068a281be4d2d3942d5e7dd69ff 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -@@ -48,6 +48,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm +@@ -50,6 +50,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm private io.papermc.paper.plugin.provider.classloader.PluginClassLoaderGroup classLoaderGroup; // Paper public io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext; // Paper @@ -474,7 +474,7 @@ index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee static { ClassLoader.registerAsParallelCapable(); } -@@ -183,6 +185,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm +@@ -197,6 +199,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm throw new ClassNotFoundException(name); } @@ -482,7 +482,7 @@ index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee @Override protected Class findClass(String name) throws ClassNotFoundException { if (name.startsWith("org.bukkit.") || name.startsWith("net.minecraft.")) { -@@ -190,7 +193,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm +@@ -204,7 +207,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm } Class result = classes.get(name); @@ -491,7 +491,7 @@ index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee String path = name.replace('.', '/').concat(".class"); JarEntry entry = jar.getJarEntry(path); -@@ -237,6 +240,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm +@@ -251,6 +254,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm this.setClass(name, result); // Paper } @@ -499,7 +499,7 @@ index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee return result; } -@@ -251,6 +255,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm +@@ -265,6 +269,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm // Paper end super.close(); } finally { diff --git a/patches/server/0001-Pufferfish-Server-Patches.patch b/patches/server/0001-Pufferfish-Server-Patches.patch index 71a8a91..a7b4daa 100644 --- a/patches/server/0001-Pufferfish-Server-Patches.patch +++ b/patches/server/0001-Pufferfish-Server-Patches.patch @@ -2016,7 +2016,7 @@ index d02546b18cb689724887b4e85e8d32a18828a4ad..91eaff58bb422ba188e6cfaa9c20b45b public static long getCoordinateKey(final ChunkPos pair) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 97745f0bab8d82d397c6c2a5775aed92bca0a034..0c6785debb6da2d3bbc52780e835d79b3a98cccc 100644 +index 8f31413c939cc2b0454ad3d9a1b618dbae449d00..8d1a845d0cca6c37f331bb8a007623d67808b304 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -309,6 +309,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { + entity.activatedPriorityReset = false; // Pufferfish - DAB if (!entity.isRemoved()) { @@ -2308,7 +2308,7 @@ index 17610196db7a1c6feb2cf74a02479a8691aa323f..4cee5916ffff4add33cfd90c1957b70c this.tickIceAndSnow(flag, blockposition, chunk); } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ba972d1661426d7e30f6f61bad3b9608e66ea721..912f5e102e69301135ea4196acdf7f0a3300c9de 100644 +index c7d26a119415ced56ccad04f8a1b180d9f714586..042602fef0fd30b269be226241b1735f14f5222d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1250,6 +1250,7 @@ public class ServerPlayer extends Player { @@ -2344,7 +2344,7 @@ index ba972d1661426d7e30f6f61bad3b9608e66ea721..912f5e102e69301135ea4196acdf7f0a @Override diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 34fcdeb0f4039f1fc6c4c8c593cc615560af1ba2..ef6d8f787cba0db53270adedd923f9a47d435852 100644 +index 8bca5ba75977c0a61197eb47c94f0456d66b29a4..dcc26435a7d3eb83f92ec165cf16486a06397576 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1118,6 +1118,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -2468,7 +2468,7 @@ index d6cbe98e67fdbf8db46338a88ab1356dd63b50a3..49c1d677db8fcf53b39bd9673259b88d int DEFAULT_DISTANCE_LIMIT = 8; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f20ae9153b7098980ce6c0e75fcbbb4da652661b..1b1ef2b4b8441fa3c94b06ebb7713a2428d4a769 100644 +index 2eaa35f5679053b6864fcc4eeb49f360a828bb34..ed068acdf22bff2a2ddd1249142fdc05d7d82edb 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -305,7 +305,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -2630,7 +2630,7 @@ index 73871f456a85bda1e51f54986d0e61fb629822e8..ce61b4e067c94742043bef71a252a15d return (EntityType) Registry.register(BuiltInRegistries.ENTITY_TYPE, id, (EntityType) type.build(id)); // CraftBukkit - decompile error } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b95f88d5e5b4785ee063695fd81935636a0588d1..4535a37661743ede3bdca71fe6e66336028b3342 100644 +index 776e9adc07e9ddd142c9fc7df56b5795ff8b2249..cb4ac1939448a0eb297fee5215020396358800f5 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -414,7 +414,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -2888,7 +2888,7 @@ index 5ad5f22e5aa26445e5eb229958e7bf356bdd460e..0673be3d653c5d68923e1a26e64edf53 this.level().getProfiler().pop(); this.level().getProfiler().push("allayActivityUpdate"); diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java -index aa850cfaa0534d57e83f37360724da2428a48a18..e4bb67c4fb7228a63e0eac91825054fc189446fc 100644 +index d5b97d4316390028f54aa9bb9fa52b0b003e32a0..3de2fba9a7c69efa4acec32afd47a2904f04ec1d 100644 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java @@ -280,9 +280,12 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder(CraftNamespacedKey.toMinecraft(this.getKey()), new net.minecraft.world.item.crafting.ShapelessRecipe(this.getGroup(), CraftRecipe.getCategory(this.getCategory()), CraftItemStack.asNMSCopy(this.getResult()), data))); @@ -4018,7 +4018,7 @@ index e8e93538dfd71de86515d9405f728db1631e949a..3dff02fd97f001508e2f81192817bf1b // Paper start - try to shutdown on main server.safeShutdown(false, false); diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 2f9e5a1adf9d67ffe18d95f2822ca3d2288fb27a..14e8e7ad8d742cdc0c50d29d6dade3e338c0463e 100644 +index 59103744ac6beeb12719fdefcda54eeff498229e..c0333ba8e57cd284bb8ab15181da6b39d55872f9 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -38,6 +38,10 @@ import co.aikar.timings.MinecraftTimings; diff --git a/patches/server/0003-Add-CloudPlane-configuration.patch b/patches/server/0003-Add-CloudPlane-configuration.patch index 9e94ba5..155c693 100644 --- a/patches/server/0003-Add-CloudPlane-configuration.patch +++ b/patches/server/0003-Add-CloudPlane-configuration.patch @@ -206,7 +206,7 @@ index 0000000000000000000000000000000000000000..0bba071dd01550b504a435b94fa8ed8b + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 66aeb0ea388a8c8a08cf33728921061a0c74552f..d51170a2ec8300bde1d02ebb499fc96e6cee83cd 100644 +index 462c4eb3c06779f86f66778e9578d3d8f06c3294..bf3e66c85012af77be8044720460ea07c0b35e45 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -218,6 +218,14 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -225,7 +225,7 @@ index 66aeb0ea388a8c8a08cf33728921061a0c74552f..d51170a2ec8300bde1d02ebb499fc96e io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider // Paper end diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index f46e481fa46a57ab353fb828a3a2d6371a7ec2dd..401275d72a95e7e393b3d884a9113cd99705393b 100644 +index 62519cafcf1488d3ca023b49b35d019b4cf1c597..7ba77eb9600514d1a6f5ab7515aa2b43ccba392d 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -218,9 +218,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -242,18 +242,18 @@ index f46e481fa46a57ab353fb828a3a2d6371a7ec2dd..401275d72a95e7e393b3d884a9113cd9 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 5f416c2205bec32561a4a8487a97045d6367307e..f50525b51196e7c6ffa99c69a7eb6dd674a0066b 100644 +index f8de1ea26bbca0add037d566aa1f2c42b0197a03..e82a050936a4dcee4c3ed4522205c32f61825a0f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1039,6 +1039,7 @@ public final class CraftServer implements Server { - org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot + org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot this.console.paperConfigurations.reloadConfigs(this.console); + dev.booky.cloudplane.CloudPlaneConfig.init((File) console.options.valueOf("cloudplane-settings")); // CloudPlane 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)) -@@ -2919,6 +2920,13 @@ public final class CraftServer implements Server { +@@ -2920,6 +2921,13 @@ public final class CraftServer implements Server { return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); } @@ -268,7 +268,7 @@ index 5f416c2205bec32561a4a8487a97045d6367307e..f50525b51196e7c6ffa99c69a7eb6dd6 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 3ac14bdb414cdaff5f41167480d48a4ed6d9a16f..d6118c7e4275f41949371023c5ea6c306ed6488c 100644 +index cfcf23851909a7902cad16dcebf5bd414d79b4af..4eb45de81fdfe765d8e6a8c2c9846d4685b29baa 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -173,6 +173,14 @@ public class Main { diff --git a/patches/server/0015-Resend-more-data-on-locale-change.patch b/patches/server/0015-Resend-more-data-on-locale-change.patch index e2cda76..e52567d 100644 --- a/patches/server/0015-Resend-more-data-on-locale-change.patch +++ b/patches/server/0015-Resend-more-data-on-locale-change.patch @@ -27,7 +27,7 @@ index e38e2e5a7ddba9c140f362021b6be0b0974f7cd1..44140141b3e727131cfdc9fae2d84732 this.player = owner; } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 962e6d780d917b2e78d86f28034b7f348235737c..4671abde1a64b84ff2564f4d6a228dac1de73412 100644 +index db4b8887bef82fde3225769d415e9ee50079a29c..b581aa8ab59de2f85571d22aa1b09f7e1f9e9e4b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -322,6 +322,10 @@ public class ServerPlayer extends Player { @@ -42,7 +42,7 @@ index 962e6d780d917b2e78d86f28034b7f348235737c..4671abde1a64b84ff2564f4d6a228dac super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); this.chatVisibility = ChatVisiblity.FULL; @@ -2046,10 +2050,39 @@ public class ServerPlayer extends Player { - PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT); + PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), this.getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT); this.server.server.getPluginManager().callEvent(event); } + java.util.Locale adventure$locale = net.kyori.adventure.translation.Translator.parseLocale(clientOptions.language()); // CloudPlane - parsing was moved up @@ -104,7 +104,7 @@ index ec4325b90b5707e97927b95064ef4dd840b2a538..c754ed230a5320128839541bf707d0cb public static final EntityDataAccessor DATA_BACKGROUND_COLOR_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.INT); private static final EntityDataAccessor DATA_TEXT_OPACITY_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.BYTE); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6aed3d3cda132a33089a9ae0dd44daa41bf7c861..dc999814dc93108b42c33950e8385d7a71bb4331 100644 +index ff6e897f69e367a1790e22d820472093e0051888..3254f8584ab32ea9bebd07277a4f3c6d7cebe303 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -354,7 +354,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {