diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2018-07-14 23:27:16 +0200 |
|---|---|---|
| committer | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2018-07-14 23:27:16 +0200 |
| commit | 3070df2a624a7d600eed846400cbe183c644bba1 (patch) | |
| tree | 2d8e464ea0b7a1da661b6ac9c9398ec7c6f1a4ba /src/main/java/gregtech | |
| parent | 46d49f19c4978092f84d11d98efc83be70765d7a (diff) | |
| download | GT5-Unofficial-3070df2a624a7d600eed846400cbe183c644bba1.tar.gz GT5-Unofficial-3070df2a624a7d600eed846400cbe183c644bba1.tar.bz2 GT5-Unofficial-3070df2a624a7d600eed846400cbe183c644bba1.zip | |
reverted Blood-Asp#1468 due to buggy behavior with ore grinding
Diffstat (limited to 'src/main/java/gregtech')
2 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java index 7595067853..c01b138682 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java @@ -58,8 +58,10 @@ public class GT_MetaTileEntity_Macerator_Bronze extends GT_MetaTileEntity_BasicM mOutputBlocked++; return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; } - if (!tRecipe.isRecipeInputEqual(true, new FluidStack[]{getFillableStack()}, getAllInputs())) - return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; + +// if (!tRecipe.isRecipeInputEqual(true, new FluidStack[]{getFillableStack()}, getAllInputs())) +// return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; + if (tRecipe.getOutput(0) != null) mOutputItems[0] = tRecipe.getOutput(0); this.mEUt = tRecipe.mEUt; this.mMaxProgresstime = (tRecipe.mDuration * 2); diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java index f6c5f20094..b127f839ed 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java @@ -58,8 +58,10 @@ public class GT_MetaTileEntity_Macerator_Steel extends GT_MetaTileEntity_BasicMa mOutputBlocked++;
return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
}
- if (!tRecipe.isRecipeInputEqual(true, new FluidStack[]{getFillableStack()}, getAllInputs()))
- return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
+
+// if (!tRecipe.isRecipeInputEqual(true, new FluidStack[]{getFillableStack()}, getAllInputs()))
+// return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
+
if (tRecipe.getOutput(0) != null) mOutputItems[0] = tRecipe.getOutput(0);
this.mEUt = (2 * tRecipe.mEUt);
this.mMaxProgresstime = tRecipe.mDuration;
|