diff options
| author | Foghrye4 <foghrye4@gmail.com> | 2017-03-21 17:34:07 +0300 |
|---|---|---|
| committer | Foghrye4 <foghrye4@gmail.com> | 2017-03-21 17:34:07 +0300 |
| commit | 7305ba719930ea3fbf8aa987aeec48b33cdbd82e (patch) | |
| tree | 2307517925d965cd9228c8649013b07639987846 /ihl/recipes/UniversalRecipeManager.java | |
| parent | 5cb4c6e24033cf337812390d99a6817d24d21eab (diff) | |
Oregen
Diffstat (limited to 'ihl/recipes/UniversalRecipeManager.java')
| -rw-r--r-- | ihl/recipes/UniversalRecipeManager.java | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/ihl/recipes/UniversalRecipeManager.java b/ihl/recipes/UniversalRecipeManager.java index 169d6f6..6c09bb1 100644 --- a/ihl/recipes/UniversalRecipeManager.java +++ b/ihl/recipes/UniversalRecipeManager.java @@ -78,8 +78,7 @@ public class UniversalRecipeManager { this.keywordMap.put(keyword, input);
}
- public UniversalRecipeOutput getOutputFor(List<FluidStack> fluidInputs, List<ItemStack> itemInputs,
- boolean adjustInput, boolean inputAffectOutput) {
+ public UniversalRecipeOutput getOutputFor(List<FluidStack> fluidInputs, List<ItemStack> itemInputs) {
if (fluidInputs == null && itemInputs == null) {
return null;
} else {
@@ -94,15 +93,8 @@ public class UniversalRecipeManager { continue;
}
- if (recipeInput.adjustAmounts(fluidInputs, itemInputs, true, false)) {
- UniversalRecipeOutput output = entry.getValue();
- if (inputAffectOutput) {
- int multiplier = recipeInput.getMultiplierAndAdjustAmounts(fluidInputs, itemInputs);
- return output.copyWithMultiplier(multiplier);
- } else if (adjustInput) {
- recipeInput.adjustAmounts(fluidInputs, itemInputs, true, true);
- }
- return output;
+ if (recipeInput.matches(fluidInputs, itemInputs, true)) {
+ return entry.getValue();
}
}
@@ -128,7 +120,7 @@ public class UniversalRecipeManager { continue;
}
- if (recipeInput.adjustAmounts(fluidInputs1, itemInputs1, true, false)) {
+ if (recipeInput.matches(fluidInputs1, itemInputs1, true)) {
return recipeInput;
}
}
@@ -139,8 +131,8 @@ public class UniversalRecipeManager { }
@SuppressWarnings({ "unchecked", "rawtypes" })
- public UniversalRecipeOutput getOutputFor(List[] input, boolean adjustInput, boolean inputAffectOutput) {
- return this.getOutputFor(input[0], input[1], adjustInput, inputAffectOutput);
+ public UniversalRecipeOutput getOutputFor(List[] input) {
+ return this.getOutputFor(input[0], input[1]);
}
@SuppressWarnings({ "unchecked", "rawtypes" })
|