Update to Minecraft 1.12-pre6

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-05-30 21:25:59 +10:00
parent f69eb04edc
commit ea6ca4328a
35 changed files with 297 additions and 260 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/ShapelessRecipes.java
+++ b/net/minecraft/server/ShapelessRecipes.java
@@ -6,6 +6,10 @@
@@ -6,12 +6,24 @@
import com.google.gson.JsonParseException;
import java.util.ArrayList;
import java.util.Iterator;
@@ -9,9 +9,23 @@
+import org.bukkit.craftbukkit.inventory.CraftShapelessRecipe;
+// CraftBukkit end
public class ShapelessRecipes extends IRecipe {
public class ShapelessRecipes implements IRecipe {
@@ -18,6 +22,21 @@
private final ItemStack result;
private final NonNullList<RecipeItemStack> ingredients;
private final String c;
+ // CraftBukkit start
+ public MinecraftKey key;
+
+ @Override
+ public void setKey(MinecraftKey key) {
+ this.key = key;
+ }
+ // CraftBukkit end
public ShapelessRecipes(String s, ItemStack itemstack, NonNullList<RecipeItemStack> nonnulllist) {
this.c = s;
@@ -19,6 +31,21 @@
this.ingredients = nonnulllist;
}