Update to Minecraft 1.21.2

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-10-23 02:15:00 +11:00
parent 2c4beb962b
commit d3a23f42c3
522 changed files with 8501 additions and 6477 deletions

View File

@@ -1,7 +1,7 @@
--- a/net/minecraft/world/item/crafting/ShapedRecipes.java
+++ b/net/minecraft/world/item/crafting/ShapedRecipes.java
@@ -10,6 +10,14 @@
import net.minecraft.world.item.ItemStack;
@@ -17,6 +17,14 @@
import net.minecraft.world.item.crafting.display.SlotDisplay;
import net.minecraft.world.level.World;
+// CraftBukkit start
@@ -15,7 +15,7 @@
public class ShapedRecipes implements RecipeCrafting {
final ShapedRecipePattern pattern;
@@ -30,6 +38,68 @@
@@ -39,6 +47,68 @@
this(s, craftingbookcategory, shapedrecipepattern, itemstack, true);
}
@@ -69,7 +69,7 @@
+ break;
+ }
+ char c = 'a';
+ for (RecipeItemStack list : this.pattern.ingredients()) {
+ for (Optional<RecipeItemStack> list : this.pattern.ingredients()) {
+ RecipeChoice choice = CraftRecipe.toBukkit(list);
+ if (choice != null) {
+ recipe.setIngredient(c, choice);
@@ -82,5 +82,5 @@
+ // CraftBukkit end
+
@Override
public RecipeSerializer<?> getSerializer() {
public RecipeSerializer<? extends ShapedRecipes> getSerializer() {
return RecipeSerializer.SHAPED_RECIPE;