Update to Minecraft 1.13-pre7

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-07-15 10:00:00 +10:00
parent d1e91a8adb
commit 7e0a66fdd5
608 changed files with 17788 additions and 9378 deletions

View File

@@ -1,18 +1,18 @@
--- a/net/minecraft/server/RecipeArmorDye.java
+++ b/net/minecraft/server/RecipeArmorDye.java
@@ -3,9 +3,13 @@
@@ -3,11 +3,13 @@
import com.google.common.collect.Lists;
import java.util.ArrayList;
-public class RecipeArmorDye implements IRecipe {
-public class RecipeArmorDye extends IRecipeComplex {
+public class RecipeArmorDye extends ShapelessRecipes implements IRecipe { // CraftBukkit - added extends
- public RecipeArmorDye() {}
+ // CraftBukkit start - Delegate to new parent class with bogus info
+ public RecipeArmorDye() {
+ super("", new ItemStack(Items.LEATHER_HELMET, 0, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.DYE)));
+ }
public RecipeArmorDye(MinecraftKey minecraftkey) {
- super(minecraftkey);
+ super(minecraftkey, "", new ItemStack(Items.LEATHER_HELMET, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.BONE_MEAL)));
}
+ // CraftBukkit end
public boolean a(InventoryCrafting inventorycrafting, World world) {
ItemStack itemstack = ItemStack.a;
public boolean a(IInventory iinventory, World world) {
if (!(iinventory instanceof InventoryCrafting)) {