From 75c3c008c3eb6dd7c10aa91d39a7767da832ce08 Mon Sep 17 00:00:00 2001 From: granny Date: Sun, 30 Mar 2025 15:23:16 -0700 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@41a094cf move block data/state impl PaperMC/Paper@6b26b219 remove hardcoded durability from material --- gradle.properties | 2 +- .../files/src/main/java/org/bukkit/Material.java.patch | 2 +- .../sources/net/minecraft/world/item/ItemStack.java.patch | 2 +- .../sources/net/minecraft/world/level/Level.java.patch | 6 +++--- .../craftbukkit/block/{ => state}/CraftBeehive.java.patch | 4 ++-- .../craftbukkit/block/{ => state}/CraftConduit.java.patch | 6 +++--- .../bukkit/craftbukkit/entity/CraftHumanEntity.java.patch | 2 +- .../bukkit/craftbukkit/util/CraftMagicNumbers.java.patch | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) rename purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/{ => state}/CraftBeehive.java.patch (94%) rename purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/{ => state}/CraftConduit.java.patch (72%) diff --git a/gradle.properties b/gradle.properties index 0efe1d86b..39a1cbfe4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.21.5-R0.1-SNAPSHOT mcVersion = 1.21.5 -paperCommit = a70f7745a81d43089944069d701d69ad811aa4f1 +paperCommit = 6b26b21940bda7e0947d80b9a18f208ee7d570d9 org.gradle.configuration-cache = true org.gradle.caching = true diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch index 1e13c5b4a..4e068e234 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -3632,4 +_,40 @@ +@@ -3616,4 +_,40 @@ return this.asItemType().getDefaultDataTypes(); } // Paper end - data component API diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch index c40077a55..313c15cf7 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch @@ -3,7 +3,7 @@ @@ -458,6 +_,7 @@ // revert back all captured blocks for (org.bukkit.block.BlockState blockstate : blocks) { - ((org.bukkit.craftbukkit.block.CraftBlockState) blockstate).revertPlace(); + ((org.bukkit.craftbukkit.block.state.CraftBlockState) blockstate).revertPlace(); + ((org.bukkit.craftbukkit.block.CraftBlock) blockstate.getBlock()).getNMS().getBlock().forgetPlacer(); // Purpur - Store placer on Block when placed } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch index 3d5c15c0b..73f664b3b 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/level/Level.java +++ b/net/minecraft/world/level/Level.java -@@ -159,11 +_,55 @@ +@@ -158,11 +_,55 @@ } // Paper end - add paper world config @@ -56,7 +56,7 @@ public CraftWorld getWorld() { return this.world; } -@@ -207,6 +_,8 @@ +@@ -206,6 +_,8 @@ ) { this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) levelData).getLevelName()); // Spigot this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config @@ -65,7 +65,7 @@ this.generator = gen; this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); -@@ -1413,4 +_,14 @@ +@@ -1412,4 +_,14 @@ return this.id; } } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/state/CraftBeehive.java.patch similarity index 94% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/state/CraftBeehive.java.patch index e8bb09a96..a589b7608 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/state/CraftBeehive.java.patch @@ -1,5 +1,5 @@ ---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java -+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java +--- a/src/main/java/org/bukkit/craftbukkit/block/state/CraftBeehive.java ++++ b/src/main/java/org/bukkit/craftbukkit/block/state/CraftBeehive.java @@ -16,8 +_,15 @@ public class CraftBeehive extends CraftBlockEntityState implements Beehive { diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/state/CraftConduit.java.patch similarity index 72% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/state/CraftConduit.java.patch index 355e42fa4..be1b1e7e6 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/state/CraftConduit.java.patch @@ -1,6 +1,6 @@ ---- a/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java -+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java -@@ -73,7 +_,7 @@ +--- a/src/main/java/org/bukkit/craftbukkit/block/state/CraftConduit.java ++++ b/src/main/java/org/bukkit/craftbukkit/block/state/CraftConduit.java +@@ -74,7 +_,7 @@ public int getRange() { this.ensureNoWorldGeneration(); ConduitBlockEntity conduit = (ConduitBlockEntity) this.getBlockEntityFromWorld(); diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch index b7ffe4864..5c6badd7c 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -@@ -276,6 +_,7 @@ +@@ -277,6 +_,7 @@ @Override public void recalculatePermissions() { this.perm.recalculatePermissions(); diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch index 2caad1ea9..2a910b78f 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -481,7 +_,7 @@ +@@ -479,7 +_,7 @@ @Override public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {