Update to Minecraft 1.17

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-06-11 15:00:00 +10:00
parent 75faba7fde
commit b3a8254758
619 changed files with 10708 additions and 8451 deletions

View File

@@ -1,7 +1,7 @@
--- a/net/minecraft/world/item/crafting/ShapedRecipes.java
+++ b/net/minecraft/world/item/crafting/ShapedRecipes.java
@@ -22,6 +22,13 @@
import net.minecraft.world.item.ItemStack;
@@ -23,6 +23,13 @@
import net.minecraft.world.item.Items;
import net.minecraft.world.level.World;
+// CraftBukkit start
@@ -13,8 +13,8 @@
+
public class ShapedRecipes implements RecipeCrafting {
private final int width;
@@ -40,6 +47,66 @@
final int width;
@@ -41,6 +48,66 @@
this.result = itemstack;
}
@@ -66,7 +66,7 @@
+ break;
+ }
+ char c = 'a';
+ for (RecipeItemStack list : this.items) {
+ for (RecipeItemStack list : this.recipeItems) {
+ RecipeChoice choice = CraftRecipe.toBukkit(list);
+ if (choice != null) {
+ recipe.setIngredient(c, choice);
@@ -80,4 +80,4 @@
+
@Override
public MinecraftKey getKey() {
return this.key;
return this.id;