Update to Minecraft 1.21.2

By: md_5 <git@md-5.net>
2024-10-23 02:15:00 +11:00
parent 2c4beb962b
commit d3a23f42c3
522 changed files with 8501 additions and 6477 deletions
--- a/paper-server/nms-patches/net/minecraft/world/item/crafting/ShapelessRecipes.patch
+++ b/paper-server/nms-patches/net/minecraft/world/item/crafting/ShapelessRecipes.patch
@@ -1,7 +1,7 @@
 --- a/net/minecraft/world/item/crafting/ShapelessRecipes.java
 +++ b/net/minecraft/world/item/crafting/ShapelessRecipes.java
-@@ -13,6 +13,13 @@
- import net.minecraft.world.item.ItemStack;
+@@ -17,6 +17,13 @@
+ import net.minecraft.world.item.crafting.display.SlotDisplay;
 import net.minecraft.world.level.World;
 
 +// CraftBukkit start
@@ -14,8 +14,8 @@
 public class ShapelessRecipes implements RecipeCrafting {
 
     final String group;
-@@ -27,6 +34,22 @@
-         this.ingredients = nonnulllist;
+@@ -33,6 +40,22 @@
+         this.ingredients = list;
     }
 
 +    // CraftBukkit start
@@ -35,5 +35,5 @@
 +    // CraftBukkit end
 +
     @Override
-     public RecipeSerializer<?> getSerializer() {
+     public RecipeSerializer<ShapelessRecipes> getSerializer() {
         return RecipeSerializer.SHAPELESS_RECIPE;