From 3305581373d84c3540ba2b41a285119b2e3f372c Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Fri, 20 Mar 2015 23:16:48 -0500 Subject: [PATCH] Fixed Precision Sawmill not applying secondary outputs --- .../common/recipe/inputs/ItemStackInput.java | 2 ++ .../recipe/machines/ChanceMachineRecipe.java | 1 - .../common/recipe/outputs/ChanceOutput.java | 15 +++++++-------- .../common/tile/TileEntityChanceMachine.java | 3 +-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/mekanism/common/recipe/inputs/ItemStackInput.java b/src/main/java/mekanism/common/recipe/inputs/ItemStackInput.java index 19728318e..d0d5d898d 100644 --- a/src/main/java/mekanism/common/recipe/inputs/ItemStackInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/ItemStackInput.java @@ -47,8 +47,10 @@ public class ItemStackInput extends MachineInput { inventory[index] = StackUtils.subtract(inventory[index], ingredient); } + return true; } + return false; } diff --git a/src/main/java/mekanism/common/recipe/machines/ChanceMachineRecipe.java b/src/main/java/mekanism/common/recipe/machines/ChanceMachineRecipe.java index e292a21aa..bb374fdf2 100644 --- a/src/main/java/mekanism/common/recipe/machines/ChanceMachineRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/ChanceMachineRecipe.java @@ -23,6 +23,5 @@ public abstract class ChanceMachineRecipe { inventory[primaryIndex] = primaryOutput.copy(); } - return true; } else if(inventory[primaryIndex].isItemEqual(primaryOutput) && inventory[primaryIndex].stackSize + primaryOutput.stackSize <= inventory[primaryIndex].getMaxStackSize()) { @@ -71,13 +70,12 @@ public class ChanceOutput extends MachineOutput { inventory[primaryIndex].stackSize += primaryOutput.stackSize; } - - return true; } - - return false; + else { + return false; + } } - + if(hasSecondary() && (!doEmit || checkSecondary())) { if(inventory[secondaryIndex] == null) @@ -98,8 +96,9 @@ public class ChanceOutput extends MachineOutput return true; } - - return false; + else { + return false; + } } return true; diff --git a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java index 35015d456..79cfea0ae 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java @@ -66,8 +66,7 @@ public abstract class TileEntityChanceMachine