Update to Minecraft 1.13-pre7

By: md_5 <git@md-5.net>

paper-server/nms-patches/ShapelessRecipes.patch

@@ -1,8 +1,8 @@
 --- a/net/minecraft/server/ShapelessRecipes.java
 +++ b/net/minecraft/server/ShapelessRecipes.java
-@@ -6,12 +6,24 @@
+@@ -5,6 +5,10 @@
  import com.google.gson.JsonParseException;
- import java.util.ArrayList;
+ import it.unimi.dsi.fastutil.ints.IntList;
  import java.util.Iterator;
 +// CraftBukkit start
 +import org.bukkit.craftbukkit.inventory.CraftItemStack;
@@ -11,21 +11,7 @@
  
  public class ShapelessRecipes implements IRecipe {
  
-     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 @@
+@@ -20,6 +24,20 @@
          this.ingredients = nonnulllist;
      }
  
@@ -35,15 +21,28 @@
 +        CraftItemStack result = CraftItemStack.asCraftMirror(this.result);
 +        CraftShapelessRecipe recipe = new CraftShapelessRecipe(result, this);
 +        for (RecipeItemStack list : this.ingredients) {
-+            if (list != null) {
-+                net.minecraft.server.ItemStack stack = list.choices[0];
-+                recipe.addIngredient(org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(stack.getItem()), (list.choices.length) > 1 ? 32767 : stack.getData());
-+            }
++            list.buildChoices();
++            net.minecraft.server.ItemStack stack = list.choices[0];
++            recipe.addIngredient(org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(stack.getItem()), (list.choices.length) > 1 ? 32767 : 0);
 +        }
 +        return recipe;
 +    }
 +    // CraftBukkit end
 +
-     public ItemStack b() {
-         return this.result;
+     public MinecraftKey getKey() {
+         return this.a;
+     }
+@@ -127,11 +145,11 @@
+             packetdataserializer.a(shapelessrecipes.result);
+         }
+ 
+-        public IRecipe a(MinecraftKey minecraftkey, PacketDataSerializer packetdataserializer) {
++        public ShapelessRecipes a(MinecraftKey minecraftkey, PacketDataSerializer packetdataserializer) { // CraftBukkit - decompile error
+             return this.b(minecraftkey, packetdataserializer);
+         }
+ 
+-        public IRecipe a(MinecraftKey minecraftkey, JsonObject jsonobject) {
++        public ShapelessRecipes a(MinecraftKey minecraftkey, JsonObject jsonobject) { // CraftBukkit - decompile error
+             return this.b(minecraftkey, jsonobject);
+         }
      }