aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2021-11-18 10:16:23 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2021-11-18 10:16:23 +0000
commit5c7319323b5cc3601bd3fa43ec373ca40bb54a5d (patch)
treee9cc6eeb232631490bbc47185ad7877293bfa938 /src
parent6b2cf812e54541c72b869e58b9613aca6c8359ad (diff)
downloadGT5-Unofficial-5c7319323b5cc3601bd3fa43ec373ca40bb54a5d.tar.gz
GT5-Unofficial-5c7319323b5cc3601bd3fa43ec373ca40bb54a5d.tar.bz2
GT5-Unofficial-5c7319323b5cc3601bd3fa43ec373ca40bb54a5d.zip
Factor in stack sizes for Hashing.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index 770a8747d9..2c5b2df5bf 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -570,21 +570,25 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
final int prime = 31;
int result = 1;
GT_ItemStack[] thisInputs = new GT_ItemStack[this.mInputs.length];
+ int totalInputStackSize = 0;
for (int i=0;i<this.mInputs.length;i++) {
thisInputs[i] = new GT_ItemStack(this.mInputs[i]);
+ totalInputStackSize += thisInputs[i].mStackSize;
}
int inputHash = Arrays.deepHashCode(thisInputs);
int inputFluidHash = Arrays.deepHashCode(this.mFluidInputs);
GT_ItemStack thisOutput = new GT_ItemStack(mOutput);
- GT_ItemStack thisResearch = new GT_ItemStack(mResearchItem);
- result = prime * result + inputFluidHash;
- result = prime * result + inputHash;
- result = prime * result + Objects.hash(
+ GT_ItemStack thisResearch = new GT_ItemStack(mResearchItem);
+ int miscRecipeDataHash = Arrays.deepHashCode(new Object[] {
+ totalInputStackSize,
mDuration, mEUt,
thisOutput,
thisResearch,
mResearchTime
- );
+ });
+ result = prime * result + inputFluidHash;
+ result = prime * result + inputHash;
+ result = prime * result + miscRecipeDataHash;
return result;
}