workaround Spigot recipe handling bug

DenizenScript · Nov 5, 2021 · 9b310f0 · 9b310f0
1 parent 8564ec9
commit 9b310f0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/...src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityDarkDuration.java b/...src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityDarkDuration.java
@@ -57,7 +57,7 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
         // <--[tag]
         // @attribute <EntityTag.dark_duration>
         // @returns DurationTag
-        // @mechanism EntityTag.direction
+        // @mechanism EntityTag.dark_duration
         // @group attributes
         // @description
         // Returns the duration remaining before a glow squid starts glowing.

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/ItemScriptHelper.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/ItemScriptHelper.java
@@ -390,14 +390,20 @@ public static boolean isAllowedChoice(ItemScriptContainer script, RecipeChoice c
 
     private static ItemStack AIR = new ItemStack(Material.AIR);
 
-    public static boolean shouldDenyCraft(ItemStack[] items, Recipe recipe) {
+    public enum DenyCraftReason {
+        ALLOWED,
+        IMPOSSIBLE,
+        NOT_ALLOWED
+    }
+
+    public static DenyCraftReason shouldDenyCraft(ItemStack[] items, Recipe recipe) {
         int width = items.length == 9 ? 3 : 2;
         int shapeStartX = 0, shapeStartY = 0;
         if (recipe instanceof ShapedRecipe) {
             String[] shape = ((ShapedRecipe) recipe).getShape();
             if (shape.length != width || shape[0].length() != width) {
                 if (shape.length > width || shape[0].length() > width) {
-                    return false; // Already impossible regardless
+                    return DenyCraftReason.ALLOWED; // Already impossible regardless
                 }
                 loopStart:
                 for (shapeStartX = 0; shapeStartX <= width - shape[0].length(); shapeStartX++) {
@@ -442,7 +448,7 @@ else if (recipe instanceof ShapedRecipe) {
                 int x = i % width - shapeStartX;
                 int y = i / width - shapeStartY;
                 if (x < 0 || y < 0) {
-                    return true;
+                    return DenyCraftReason.IMPOSSIBLE;
                 }
                 String[] shape = ((ShapedRecipe) recipe).getShape();
                 if (y < shape.length && x < shape[y].length()) {
@@ -460,7 +466,24 @@ else if (recipe instanceof CookingRecipe) {
                 allowed = true; // Shouldn't be possible?
             }
             if (!allowed) {
-                return true;
+                return DenyCraftReason.NOT_ALLOWED;
+            }
+        }
+        return DenyCraftReason.ALLOWED;
+    }
+
+    public static boolean hasAlternateValidRecipe(Recipe recipe, ItemStack[] items) {
+        // Workaround for Spigot bug with the wrong recipe ID getting grabbed
+        if (recipe instanceof ShapedRecipe) {
+            ItemStack result = recipe.getResult();
+            if (isItemscript(result)) {
+                for (Recipe altRecipe : Bukkit.getRecipesFor(result)) {
+                    if (altRecipe instanceof ShapedRecipe) {
+                        if (shouldDenyCraft(items, altRecipe) == DenyCraftReason.ALLOWED) {
+                            return true;
+                        }
+                    }
+                }
             }
         }
         return false;
@@ -473,7 +496,7 @@ public void onCraftPrepared(PrepareItemCraftEvent event) {
             return;
         }
         ItemStack[] items = event.getInventory().getMatrix();
-        if (shouldDenyCraft(items, recipe)) {
+        if (shouldDenyCraft(items, recipe) != DenyCraftReason.ALLOWED && !hasAlternateValidRecipe(recipe, items)) {
             event.getInventory().setResult(null);
         }
     }
@@ -482,7 +505,7 @@ public void onCraftPrepared(PrepareItemCraftEvent event) {
     public void onItemCrafted(CraftItemEvent event) {
         Recipe recipe = event.getRecipe();
         ItemStack[] items = event.getInventory().getMatrix();
-        if (shouldDenyCraft(items, recipe)) {
+        if (shouldDenyCraft(items, recipe) != DenyCraftReason.ALLOWED && !hasAlternateValidRecipe(recipe, items)) {
             event.setCancelled(true);
         }
     }
@@ -495,7 +518,7 @@ public void onItemCooked(BlockCookEvent event) {
         }
         ItemStack[] stacks = new ItemStack[] { event.getSource() };
         for (Recipe recipe : Bukkit.getRecipesFor(event.getResult())) {
-            if (recipe instanceof CookingRecipe && !shouldDenyCraft(stacks, recipe)) {
+            if (recipe instanceof CookingRecipe && shouldDenyCraft(stacks, recipe) == DenyCraftReason.ALLOWED) {
                 return;
             }
         }