aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohannes Gäßler <updrn@student.kit.edu>2017-08-19 11:31:04 +0200
committerJohannes Gäßler <updrn@student.kit.edu>2017-08-19 11:32:29 +0200
commite8c75a54ee69b1853b413d3aafbb2ffa02128d19 (patch)
treec805096b87feeacbcc13810140bb479d3a7f7cfd /src
parent87cdb8ac00a97ad64ca70af1f0ecfd5c6977c771 (diff)
downloadGT5-Unofficial-e8c75a54ee69b1853b413d3aafbb2ffa02128d19.tar.gz
GT5-Unofficial-e8c75a54ee69b1853b413d3aafbb2ffa02128d19.tar.bz2
GT5-Unofficial-e8c75a54ee69b1853b413d3aafbb2ffa02128d19.zip
Fixed Steam Macerators using constant EUt, recipe time
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java4
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 07e2c4722c..2ed8d7a63f 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
@@ -59,8 +59,8 @@ public class GT_MetaTileEntity_Macerator_Bronze
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 65e05c898d..987d3156bf 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
@@ -59,8 +59,8 @@ public class GT_MetaTileEntity_Macerator_Steel
return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
}
if (tRecipe.getOutput(0) != null) mOutputItems[0] = tRecipe.getOutput(0);
- this.mEUt = 6;
- this.mMaxProgresstime = 400;
+ this.mEUt = (3 * tRecipe.mEUt);
+ this.mMaxProgresstime = tRecipe.mDuration;
getInputAt(0).stackSize -= tRecipe.mInputs[0].stackSize;
return FOUND_AND_SUCCESSFULLY_USED_RECIPE;
}