diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-08-19 10:43:07 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-08-19 12:30:23 +0200 |
| commit | f63ada36762f9fb9d07c0acf24ef8bd2a3325670 (patch) | |
| tree | 6a5b6b4216792c634f338e53b2dc0e32a1df7329 /src/main/java/gregtech/common/tileentities/machines | |
| parent | 41154b14d264cb2fe6a0702c5a3948c885646096 (diff) | |
| download | GT5-Unofficial-f63ada36762f9fb9d07c0acf24ef8bd2a3325670.tar.gz GT5-Unofficial-f63ada36762f9fb9d07c0acf24ef8bd2a3325670.tar.bz2 GT5-Unofficial-f63ada36762f9fb9d07c0acf24ef8bd2a3325670.zip | |
Macerating glass into glass dust #1849
https://github.com/GTNewHorizons/NewHorizons/issues/1849
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines')
2 files changed, 4 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 7d666e8c58..4ee145fc76 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,8 @@ public class GT_MetaTileEntity_Macerator_Bronze extends GT_MetaTileEntity_BasicM return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; } if (tRecipe.getOutput(0) != null) mOutputItems[0] = tRecipe.getOutput(0); - this.mEUt = 2; - this.mMaxProgresstime = 800; + this.mEUt = tRecipe.mEUt; + this.mMaxProgresstime = (tRecipe.mDuration * 2); getInputAt(0).stackSize -= tRecipe.mInputs[0].stackSize; return FOUND_AND_SUCCESSFULLY_USED_RECIPE; } 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 2ceda38952..677dcc9f58 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,8 @@ public class GT_MetaTileEntity_Macerator_Steel extends GT_MetaTileEntity_BasicMa return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
}
if (tRecipe.getOutput(0) != null) mOutputItems[0] = tRecipe.getOutput(0);
- this.mEUt = 4;
- this.mMaxProgresstime = 400;
+ this.mEUt = (2 * tRecipe.mEUt);
+ this.mMaxProgresstime = tRecipe.mDuration;
getInputAt(0).stackSize -= tRecipe.mInputs[0].stackSize;
return FOUND_AND_SUCCESSFULLY_USED_RECIPE;
}
|