Fix more compile issues

17 files changed, 29 insertions, 29 deletions

diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch
index d958463393..e5631ad5cb 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/server/0005-Paper-config-files.patch
@@ -3642,7 +3642,7 @@ index 0000000000000000000000000000000000000000..6cdc40cb4a5f94654c874f9dbdb106fa
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/transformation/world/LegacyPaperWorldConfig.java b/src/main/java/io/papermc/paper/configuration/transformation/world/LegacyPaperWorldConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..f7520ba86c1a650d3bd9b902d2a59ec8eb6cde5d
+index 0000000000000000000000000000000000000000..3332531d902899a156179ef2e9ec85b2f42c1fd1
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/transformation/world/LegacyPaperWorldConfig.java
 @@ -0,0 +1,322 @@
@@ -3753,7 +3753,7 @@ index 0000000000000000000000000000000000000000..f7520ba86c1a650d3bd9b902d2a59ec8
 +            )
 +            .addVersion(26, ConfigurationTransformation.builder().addAction(path("alt-item-despawn-rate", "items", ConfigurationTransformation.WILDCARD_OBJECT), (path, value) -> {
 +                String itemName = path.get(path.size() - 1).toString();
-+                final Optional<Holder.Reference<Item>> item = BuiltInRegistries.ITEM.getHolder(ResourceKey.create(Registries.ITEM, new ResourceLocation(itemName.toLowerCase(Locale.ROOT))));
++                final Optional<Holder.Reference<Item>> item = BuiltInRegistries.ITEM.getHolder(ResourceKey.create(Registries.ITEM, ResourceLocation.parse(itemName.toLowerCase(Locale.ROOT))));
 +                if (item.isEmpty()) {
 +                    itemName = Material.valueOf(itemName).getKey().getKey();
 +                }
@@ -3785,7 +3785,7 @@ index 0000000000000000000000000000000000000000..f7520ba86c1a650d3bd9b902d2a59ec8
 +                    Map<String, Integer> rebuild = new HashMap<>();
 +                    value.childrenMap().forEach((key, node) -> {
 +                        String itemName = key.toString();
-+                        final Optional<Holder.Reference<Item>> itemHolder = BuiltInRegistries.ITEM.getHolder(ResourceKey.create(Registries.ITEM, new ResourceLocation(itemName.toLowerCase(Locale.ROOT))));
++                        final Optional<Holder.Reference<Item>> itemHolder = BuiltInRegistries.ITEM.getHolder(ResourceKey.create(Registries.ITEM, ResourceLocation.parse(itemName.toLowerCase(Locale.ROOT))));
 +                        final @Nullable String item;
 +                        if (itemHolder.isEmpty()) {
 +                            final @Nullable Material bukkitMat = Material.matchMaterial(itemName);
diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch
index 65b50c580d..1a30a65a7a 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -651,7 +651,7 @@ index 0000000000000000000000000000000000000000..23bd6d2d8fed5a3491e856f8b875456d
 +}
 diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..69347ac0547cba3842040f89615e721b5d1ac3ca
+index 0000000000000000000000000000000000000000..b9a64a40dbb025e34a3de81df1208de45df3cfcc
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
 @@ -0,0 +1,376 @@
@@ -705,7 +705,7 @@ index 0000000000000000000000000000000000000000..69347ac0547cba3842040f89615e721b
 +
 +@DefaultQualifier(NonNull.class)
 +public final class ChatProcessor {
-+    static final ResourceKey<ChatType> PAPER_RAW = ResourceKey.create(Registries.CHAT_TYPE, new ResourceLocation(ResourceLocation.PAPER_NAMESPACE, "raw"));
++    static final ResourceKey<ChatType> PAPER_RAW = ResourceKey.create(Registries.CHAT_TYPE, ResourceLocation.fromNamespaceAndPath(ResourceLocation.PAPER_NAMESPACE, "raw"));
 +    static final String DEFAULT_LEGACY_FORMAT = "<%1$s> %2$s"; // copied from PlayerChatEvent/AsyncPlayerChatEvent
 +    final MinecraftServer server;
 +    final ServerPlayer player;
@@ -1157,7 +1157,7 @@ index 0000000000000000000000000000000000000000..2fd6c3e65354071af71c7d8ebb97b559
 +}
 diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7397918cf747bc2352bf5bb112a71e7f6844e0e0
+index 0000000000000000000000000000000000000000..a6aef1ac31f3d2784b5d7b1af616965b5cd2c383
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 @@ -0,0 +1,478 @@
@@ -1310,7 +1310,7 @@ index 0000000000000000000000000000000000000000..7397918cf747bc2352bf5bb112a71e7f
 +    // Key
 +
 +    public static ResourceLocation asVanilla(final Key key) {
-+        return new ResourceLocation(key.namespace(), key.value());
++        return ResourceLocation.fromNamespaceAndPath(key.namespace(), key.value());
 +    }
 +
 +    public static ResourceLocation asVanillaNullable(final Key key) {
diff --git a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch
index 0ea8ae4013..cefaa74db4 100644
--- a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -216,7 +216,7 @@ index 0000000000000000000000000000000000000000..8f07539a82f449ad217e316a7513a170
 +
 +}
 diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-index 7397918cf747bc2352bf5bb112a71e7f6844e0e0..0f9b744a977ec7ab8f138989b2336117b3de1412 100644
+index a6aef1ac31f3d2784b5d7b1af616965b5cd2c383..2390618c553dec2f32467dd8f76a6e4651f726c9 100644
 --- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 +++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 @@ -31,6 +31,7 @@ import net.kyori.adventure.text.flattener.ComponentFlattener;
diff --git a/patches/server/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 1108c99038..4a2793dc00 100644
--- a/patches/server/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/patches/server/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -12,7 +12,7 @@ for this on CB at one point but I can't find it. We may need to do this
 ourselves at some point in the future.
 
 diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-index 69347ac0547cba3842040f89615e721b5d1ac3ca..e83f9517b31c5171b8dc75ab63a5bfe654221c84 100644
+index b9a64a40dbb025e34a3de81df1208de45df3cfcc..14e412ebf75b0e06ab53a1c8f9dd1be6ad1e2680 100644
 --- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
 +++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
 @@ -20,6 +20,7 @@ import net.kyori.adventure.audience.ForwardingAudience;
diff --git a/patches/server/0249-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0249-Implement-furnace-cook-speed-multiplier-API.patch
index beec51ee6f..24067a522f 100644
--- a/patches/server/0249-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/server/0249-Implement-furnace-cook-speed-multiplier-API.patch
@@ -9,7 +9,7 @@ to the nearest Integer when updating its current cook time.
 Co-authored-by: Eric Su <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index e2a587ca5b732c62c4956e6f39ad795cd1411cc4..b5a26a44b3cf7d864eae909acf619d857c4fa397 100644
+index e2a587ca5b732c62c4956e6f39ad795cd1411cc4..5ea2b05961590732a43bb5a1abf00bf8a00c72c2 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -79,6 +79,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
@@ -83,7 +83,7 @@ index e2a587ca5b732c62c4956e6f39ad795cd1411cc4..b5a26a44b3cf7d864eae909acf619d85
  
 -    private static int getTotalCookTime(Level world, AbstractFurnaceBlockEntity furnace) {
 -        if (world == null) return 200; // CraftBukkit - SPIGOT-4302
-+    private static int getTotalCookTime(@Nullable Level world, RecipeType<? extends AbstractCookingRecipe> recipeType, AbstractFurnaceBlockEntity furnace, double cookSpeedMultiplier) { // Paper - cook speed multiplier API
++    public static int getTotalCookTime(@Nullable Level world, RecipeType<? extends AbstractCookingRecipe> recipeType, AbstractFurnaceBlockEntity furnace, double cookSpeedMultiplier) { // Paper - cook speed multiplier API
          SingleRecipeInput singlerecipeinput = new SingleRecipeInput(furnace.getItem(0));
  
 -        return (Integer) furnace.quickCheck.getRecipeFor(singlerecipeinput, world).map((recipeholder) -> {
diff --git a/patches/server/0503-Add-recipe-to-cook-events.patch b/patches/server/0503-Add-recipe-to-cook-events.patch
index 4dfa74e848..6fe8720d21 100644
--- a/patches/server/0503-Add-recipe-to-cook-events.patch
+++ b/patches/server/0503-Add-recipe-to-cook-events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add recipe to cook events
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index b5a26a44b3cf7d864eae909acf619d857c4fa397..92a1173dc8be632a4ff4b6137dbe1a9244f64742 100644
+index 5ea2b05961590732a43bb5a1abf00bf8a00c72c2..84a3130a31f7a0fd5a8ae1b293dd3f2ca07c86d3 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -444,7 +444,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
diff --git a/patches/server/0517-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0517-add-consumeFuel-to-FurnaceBurnEvent.patch
index 87d5dc038b..1938dc07ed 100644
--- a/patches/server/0517-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0517-add-consumeFuel-to-FurnaceBurnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add consumeFuel to FurnaceBurnEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 92a1173dc8be632a4ff4b6137dbe1a9244f64742..35061cb17850789e40b0e4bca453df92f1178546 100644
+index 84a3130a31f7a0fd5a8ae1b293dd3f2ca07c86d3..aa59a45bcbe652996eddb80a3187618b7f6d1234 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -365,7 +365,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
diff --git a/patches/server/0563-Missing-Entity-API.patch b/patches/server/0563-Missing-Entity-API.patch
index a22e49b567..1c7bf215a5 100644
--- a/patches/server/0563-Missing-Entity-API.patch
+++ b/patches/server/0563-Missing-Entity-API.patch
@@ -1367,7 +1367,7 @@ index 794e4fe0a3fbd967f665b2707865c15491370c76..c284eb96a1e330078076cbe61f0f6e2f
      public void increaseAnger(Entity entity, int increase) {
          Preconditions.checkArgument(entity != null, "Entity cannot be null");
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-index 1113533d281ed159bb735040fb1f913482debf3a..7a8ce6956db56061af93ba9761f5d1057a90bc49 100644
+index 1113533d281ed159bb735040fb1f913482debf3a..955948f6ec096304671a98f7241930fa91565711 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 @@ -67,4 +67,36 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok
@@ -1393,7 +1393,7 @@ index 1113533d281ed159bb735040fb1f913482debf3a..7a8ce6956db56061af93ba9761f5d105
 +
 +    @Override
 +    public boolean canTravelThroughPortals() {
-+        return getHandle().canChangeDimensions();
++        return getHandle().canChangeDimensions(null, null); // Only used by the enderpearl... right now
 +    }
 +
 +    @Override
diff --git a/patches/server/0649-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0649-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index d7ccde8439..026f793541 100644
--- a/patches/server/0649-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0649-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose isFuel and canSmelt methods to FurnaceInventory
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java
-index 29a8cd7667860c4598a556e6ef3af39c731683db..4ce9fd8e4e124600f48f34c6943512f39444cb9b 100644
+index 29a8cd7667860c4598a556e6ef3af39c731683db..bd370f5c856d75b7210ef26036aedaa859c570be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java
 @@ -40,6 +40,20 @@ public class CraftInventoryFurnace extends CraftInventory implements FurnaceInve
@@ -22,7 +22,7 @@ index 29a8cd7667860c4598a556e6ef3af39c731683db..4ce9fd8e4e124600f48f34c6943512f3
 +    public boolean canSmelt(ItemStack stack) {
 +        // data packs are always loaded in the main world
 +        net.minecraft.server.level.ServerLevel world = ((org.bukkit.craftbukkit.CraftWorld) org.bukkit.Bukkit.getWorlds().get(0)).getHandle();
-+        return stack != null && !stack.getType().isEmpty() && world.getRecipeManager().getRecipeFor(((AbstractFurnaceBlockEntity) this.inventory).recipeType, new net.minecraft.world.SimpleContainer(CraftItemStack.asNMSCopy(stack)), world).isPresent();
++        return stack != null && !stack.getType().isEmpty() && world.getRecipeManager().getRecipeFor(((AbstractFurnaceBlockEntity) this.inventory).recipeType, new net.minecraft.world.item.crafting.SingleRecipeInput(CraftItemStack.asNMSCopy(stack)), world).isPresent();
 +    }
 +    // Paper end
 +
diff --git a/patches/server/0663-More-PotionEffectType-API.patch b/patches/server/0663-More-PotionEffectType-API.patch
index a83ffc4130..1bbb96d291 100644
--- a/patches/server/0663-More-PotionEffectType-API.patch
+++ b/patches/server/0663-More-PotionEffectType-API.patch
@@ -8,7 +8,7 @@ public net.minecraft.world.effect.MobEffect attributeModifiers
 public net.minecraft.world.effect.MobEffect$AttributeTemplate
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
-index 21d4224c8993f521d6004d708ecbf71fa6d09306..956b3eb1478b32399e507aead1551b51d6876695 100644
+index 21d4224c8993f521d6004d708ecbf71fa6d09306..6cf790c9fa23ea313423fdaeb7c181bf530828c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
 +++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
 @@ -129,6 +129,48 @@ public class CraftPotionEffectType extends PotionEffectType implements Handleabl
@@ -24,7 +24,7 @@ index 21d4224c8993f521d6004d708ecbf71fa6d09306..956b3eb1478b32399e507aead1551b51
 +            attributeMap.put(
 +                org.bukkit.craftbukkit.attribute.CraftAttribute.minecraftHolderToBukkit(attribute),
 +                // use zero as amplifier to get the base amount, as it is amount = base * (amplifier + 1)
-+                org.bukkit.craftbukkit.attribute.CraftAttributeInstance.convert(attributeModifier.create(this.handle.getDescriptionId(), 0))
++                org.bukkit.craftbukkit.attribute.CraftAttributeInstance.convert(attributeModifier.create(0))
 +            );
 +        });
 +        return java.util.Map.copyOf(attributeMap);
@@ -35,7 +35,7 @@ index 21d4224c8993f521d6004d708ecbf71fa6d09306..956b3eb1478b32399e507aead1551b51
 +        com.google.common.base.Preconditions.checkArgument(effectAmplifier >= 0, "effectAmplifier must be greater than or equal to 0");
 +        Holder<net.minecraft.world.entity.ai.attributes.Attribute> nmsAttribute = org.bukkit.craftbukkit.attribute.CraftAttribute.bukkitToMinecraftHolder(attribute);
 +        com.google.common.base.Preconditions.checkArgument(this.handle.attributeModifiers.containsKey(nmsAttribute), attribute + " is not present on " + this.getKey());
-+        return this.handle.attributeModifiers.get(nmsAttribute).create(this.handle.getDescriptionId(), effectAmplifier).amount();
++        return this.handle.attributeModifiers.get(nmsAttribute).create(effectAmplifier).amount();
 +    }
 +
 +    @Override
diff --git a/patches/server/0738-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0738-Add-Velocity-IP-Forwarding-Support.patch
index d264329e2d..99b0cc4d6a 100644
--- a/patches/server/0738-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0738-Add-Velocity-IP-Forwarding-Support.patch
@@ -15,7 +15,7 @@ login plugin message packet.
 
 diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..3c31ff3330c2e925e205c0c9ff4f0b832682b576
+index 0000000000000000000000000000000000000000..1b797955357612a4319452de7461ba044cbb88d6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 @@ -0,0 +1,86 @@
@@ -54,7 +54,7 @@ index 0000000000000000000000000000000000000000..3c31ff3330c2e925e205c0c9ff4f0b83
 +    public static final int MODERN_FORWARDING_WITH_KEY_V2 = 3;
 +    public static final int MODERN_LAZY_SESSION = 4;
 +    public static final byte MAX_SUPPORTED_FORWARDING_VERSION = MODERN_LAZY_SESSION;
-+    public static final ResourceLocation PLAYER_INFO_CHANNEL = new ResourceLocation("velocity", "player_info");
++    public static final ResourceLocation PLAYER_INFO_CHANNEL = ResourceLocation.fromNamespaceAndPath("velocity", "player_info");
 +
 +    public static boolean checkIntegrity(final FriendlyByteBuf buf) {
 +        final byte[] signature = new byte[32];
diff --git a/patches/server/0753-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0753-Fix-a-bunch-of-vanilla-bugs.patch
index 881132c6fa..23b2357fc4 100644
--- a/patches/server/0753-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0753-Fix-a-bunch-of-vanilla-bugs.patch
@@ -294,7 +294,7 @@ index fa5366961861370c2366e6f0ff026a6d65128316..a5c7c2d24498c66159316a4f92677625
                      return;
                  }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 35061cb17850789e40b0e4bca453df92f1178546..6d9bb60fd6d12933df960c984bc57084bd2f53db 100644
+index aa59a45bcbe652996eddb80a3187618b7f6d1234..f1a7054a0ee1842e78338d8984f151b24c352849 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -648,13 +648,10 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
diff --git a/patches/server/0814-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0814-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index d79f50d130..d90e599897 100644
--- a/patches/server/0814-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0814-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix crash relating to bad recipes in furnace-like tile
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 6d9bb60fd6d12933df960c984bc57084bd2f53db..86667e93a86d84aabd05aa40a0a37a454ce7d290 100644
+index f1a7054a0ee1842e78338d8984f151b24c352849..65ab9b22f724877b68f4f25aad2831e2cb080b19 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -616,6 +616,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
diff --git a/patches/server/0928-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0928-Validate-ResourceLocation-in-NBT-reading.patch
index 3500a62b66..1e72001076 100644
--- a/patches/server/0928-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0928-Validate-ResourceLocation-in-NBT-reading.patch
@@ -123,7 +123,7 @@ index ccc7367ab2740bea0f2b907223a0920b11665092..845eff7401b811c179dc9dee70eca0d7
              if (this.getLootTable() != null) {
                  this.lootableData().loadNbt(nbt);
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 86667e93a86d84aabd05aa40a0a37a454ce7d290..2ebaf72d795b1d2f1f1ecebb2dae21a035f60d90 100644
+index 65ab9b22f724877b68f4f25aad2831e2cb080b19..730aca233f6e7564d4cb85b5b628d23c4f01d2f4 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -295,7 +295,12 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
diff --git a/patches/unapplied/server/0990-Suspicious-Effect-Entry-API.patch b/patches/server/0987-Suspicious-Effect-Entry-API.patch
index 2ff782764f..42710c795a 100644
--- a/patches/unapplied/server/0990-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/0987-Suspicious-Effect-Entry-API.patch
@@ -91,7 +91,7 @@ index 9cc81bcccbf1141f66fedada1359b7c0dfa8e22a..5c5b64bd058684520fa175bfd10622ff
      public String toString() {
          return "CraftMushroomCow";
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSuspiciousStew.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSuspiciousStew.java
-index 8fc3cd507d333d2bdea759d7c102a56e88ad5f5a..14e944b4e83b80e0fc6d81e346cc305ab00561c5 100644
+index f6b3798cf06f94d7e3e76d1b6e83236ded5b21e0..39cab624de062514358a2a2942aea0e58cbd6e3e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSuspiciousStew.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSuspiciousStew.java
 @@ -22,7 +22,7 @@ public class CraftMetaSuspiciousStew extends CraftMetaItem implements Suspicious
diff --git a/patches/unapplied/server/0991-check-if-itemstack-is-stackable-first.patch b/patches/server/0988-check-if-itemstack-is-stackable-first.patch
index 6143642997..8e11960bdd 100644
--- a/patches/unapplied/server/0991-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/0988-check-if-itemstack-is-stackable-first.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] check if itemstack is stackable first
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java
-index 1e77482a98869e464c1f0a873cff8febf7924c8c..ca7fbe4f8c1e1d2fb90095aa35be4dda3029c23e 100644
+index a62e7354bf67a66bdf9cd7c8f5d2e8f6bcacc74f..6e66141dca61f777b354854b5d0bac2570b8bf3b 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Inventory.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java
 @@ -111,7 +111,7 @@ public class Inventory implements Container, Nameable {
diff --git a/patches/unapplied/server/0992-disable-forced-empty-world-ticks.patch b/patches/server/0989-disable-forced-empty-world-ticks.patch
index c6a2989ea0..7415c872ae 100644
--- a/patches/unapplied/server/0992-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0989-disable-forced-empty-world-ticks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] disable forced empty world ticks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3a1ecdaebfd64f4703eafc92b5895e1dbddd8ee6..b33bf957b1541756e3b983b87b1c83629757739a 100644
+index 4d7e234d379a451c4bb53bc2fcdf22cb191f8d1a..3f17212fc814156e2d3e8c7d4cf40680ab5cdbb5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -527,7 +527,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -528,7 +528,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          this.handlingTick = false;
          gameprofilerfiller.pop();