Misc advancement / recipe reload fixes including SPIGOT-3240

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

paper-server/nms-patches/IRecipe.patch

@@ -1,13 +1,37 @@
 --- a/net/minecraft/server/IRecipe.java
 +++ b/net/minecraft/server/IRecipe.java
-@@ -28,7 +28,9 @@
-         return ((MinecraftKey) CraftingManager.recipes.b(this)).a((MinecraftKey) CraftingManager.recipes.b(irecipe));
+@@ -3,6 +3,7 @@
+ public abstract class IRecipe implements Comparable<IRecipe> {
+ 
+     protected String a;
++    public MinecraftKey key; // CraftBukkit
+ 
+     public IRecipe() {
+         this("");
+@@ -25,10 +26,24 @@
+     }
+ 
+     public int a(IRecipe irecipe) {
+-        return ((MinecraftKey) CraftingManager.recipes.b(this)).a((MinecraftKey) CraftingManager.recipes.b(irecipe));
++        return this.key.a(irecipe.key); // CraftBukkit
      }
  
 -    public int compareTo(Object object) {
-+    public int compareTo(IRecipe object) { // CraftBukkit = decompile error
++    public int compareTo(IRecipe object) { // CraftBukkit - decompile error
          return this.a((IRecipe) object);
      }
 +
-+    public abstract org.bukkit.inventory.Recipe toBukkitRecipe(); // CraftBukkit
++    // CraftBukkit start
++    @Override
++    public boolean equals(Object obj) {
++        return obj instanceof IRecipe && key.equals(((IRecipe) obj).key);
++    }
++
++    @Override
++    public int hashCode() {
++        return key.hashCode();
++    }
++
++    public abstract org.bukkit.inventory.Recipe toBukkitRecipe();
++    // CraftBukkit end
  }