aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/RecipeFinderForParallel.java28
1 files changed, 16 insertions, 12 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/RecipeFinderForParallel.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/RecipeFinderForParallel.java
index 052c29eff2..2988df6b7f 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/util/RecipeFinderForParallel.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/RecipeFinderForParallel.java
@@ -89,18 +89,6 @@ public class RecipeFinderForParallel {
}
/*OreDict Stuff*/
- for (int tItem : tCompressedItemRecipe.keySet()) {
- ItemStack tRealRecipe = GT_Utility.intToStack(tItem);
- int tTargetAmount = tCompressedItemRecipe.get(tItem);
- for (ItemStack input : aItemStacks) {
- if (GT_OreDictUnificator.isInputStackEqual(input, tRealRecipe)) {
- int d = Math.min(tTargetAmount, input.stackSize);
- tTargetAmount -= d;
- input.stackSize -= d;
- }
- if (tTargetAmount == 0) break;
- }
- }
/*Wildcard Stuff*/
for (int tItem : tCompressedItemRecipe.keySet()) {
if (tItem >> 16 == Short.MAX_VALUE) {
@@ -119,6 +107,22 @@ public class RecipeFinderForParallel {
}
}
}
+ else {
+ ItemStack tRealRecipe = GT_Utility.intToStack(tItem);
+ int tTargetAmount = tCompressedItemRecipe.get(tItem);
+ for (ItemStack input : aItemStacks) {
+ if (GT_OreDictUnificator.isInputStackEqual(input, tRealRecipe)) {
+ int d = Math.min(tTargetAmount, input.stackSize);
+ tTargetAmount -= d;
+ tCompressedItemRecipe.put(tItem, tTargetAmount);
+ input.stackSize -= d;
+ }
+ if (tTargetAmount == 0) {
+ tCompressedItemRecipe.remove(tItem);
+ break;
+ }
+ }
+ }
}
return tCurrentPara;