Misc advancement / recipe reload fixes including SPIGOT-3240

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

paper-server/nms-patches/ShapelessRecipes.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/ShapelessRecipes.java
 +++ b/net/minecraft/server/ShapelessRecipes.java
-@@ -5,11 +5,16 @@
+@@ -5,6 +5,10 @@
  import com.google.gson.JsonObject;
  import java.util.ArrayList;
  import java.util.Iterator;
@@ -11,13 +11,7 @@
  
  public class ShapelessRecipes extends IRecipe {
  
-     private final ItemStack result;
-     private final NonNullList<RecipeItemStack> ingredients;
-+    public MinecraftKey key; // CraftBukkit
- 
-     public ShapelessRecipes(String s, ItemStack itemstack, NonNullList<RecipeItemStack> nonnulllist) {
-         super(s);
-@@ -17,6 +22,21 @@
+@@ -17,6 +21,21 @@
          this.ingredients = nonnulllist;
      }