Fix recipe caching not considering different rotations

Closes CyclopsMC/IntegratedTerminals#129
CyclopsMC · Oct 19, 2024 · 9d9f8a3 · 9d9f8a3
1 parent f57ce14
commit 9d9f8a3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/loader-common/src/main/java/org/cyclops/cyclopscore/helper/CraftingHelpersCommon.java b/loader-common/src/main/java/org/cyclops/cyclopscore/helper/CraftingHelpersCommon.java
@@ -141,8 +141,18 @@ public boolean equals(Object obj) {
                 return false;
             }
             RecipeInput otherInput = ((CacheableCraftingInventory) obj).getInventoryCrafting();
-            if (getInventoryCrafting().size() != otherInput.size()) {
-                return false;
+            if (getInventoryCrafting() instanceof CraftingInput craftingInputThis) {
+                if (otherInput instanceof CraftingInput craftingInputOther) {
+                    if (craftingInputThis.width() != craftingInputOther.width() || craftingInputThis.height() != craftingInputOther.height()) {
+                        return false;
+                    }
+                } else {
+                    return false;
+                }
+            } else {
+                if (getInventoryCrafting().size() != otherInput.size()) {
+                    return false;
+                }
             }
             for (int i = 0; i < getInventoryCrafting().size(); i++) {
                 if (!ItemStack.isSameItemSameComponents(getInventoryCrafting().getItem(i), otherInput.getItem(i))) {
@@ -155,9 +165,11 @@ public boolean equals(Object obj) {
         @Override
         public int hashCode() {
             int hash = 11 + getInventoryCrafting().size();
+            if (getInventoryCrafting() instanceof CraftingInput craftingInput) {
+                hash = 23 + 3 * craftingInput.width() + 5 * craftingInput.height();
+            }
             for (int i = 0; i < getInventoryCrafting().size(); i++) {
-                hash = hash << 1;
-                hash |= modHelpers.getItemStackHelpers().getItemStackHashCode(getInventoryCrafting().getItem(i));
+                hash |= modHelpers.getItemStackHelpers().getItemStackHashCode(getInventoryCrafting().getItem(i)) * i;
             }
             return hash;
         }

diff --git a/loader-neoforge/src/main/java/org/cyclops/cyclopscore/helper/CraftingHelpers.java b/loader-neoforge/src/main/java/org/cyclops/cyclopscore/helper/CraftingHelpers.java
@@ -159,8 +159,18 @@ public boolean equals(Object obj) {
                 return false;
             }
             RecipeInput otherInput = ((CacheableCraftingInventory) obj).getInventoryCrafting();
-            if (getInventoryCrafting().size() != otherInput.size()) {
-                return false;
+            if (getInventoryCrafting() instanceof CraftingInput craftingInputThis) {
+                if (otherInput instanceof CraftingInput craftingInputOther) {
+                    if (craftingInputThis.width() != craftingInputOther.width() || craftingInputThis.height() != craftingInputOther.height()) {
+                        return false;
+                    }
+                } else {
+                    return false;
+                }
+            } else {
+                if (getInventoryCrafting().size() != otherInput.size()) {
+                    return false;
+                }
             }
             for (int i = 0; i < getInventoryCrafting().size(); i++) {
                 if (!ItemStack.isSameItemSameComponents(getInventoryCrafting().getItem(i), otherInput.getItem(i))) {
@@ -173,9 +183,11 @@ public boolean equals(Object obj) {
         @Override
         public int hashCode() {
             int hash = 11 + getInventoryCrafting().size();
+            if (getInventoryCrafting() instanceof CraftingInput craftingInput) {
+                hash = 23 + 3 * craftingInput.width() + 5 * craftingInput.height();
+            }
             for (int i = 0; i < getInventoryCrafting().size(); i++) {
-                hash = hash << 1;
-                hash |= ItemStackHelpers.getItemStackHashCode(getInventoryCrafting().getItem(i));
+                hash |= ItemStackHelpers.getItemStackHashCode(getInventoryCrafting().getItem(i)) * i;
             }
             return hash;
         }