aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity/implementations
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-06-17 14:38:20 +0200
committerBlood-Asp <bloodasphendrik@gmail.com>2017-06-17 14:38:20 +0200
commitedc857c8a95d39d78bf2e4c325bd2f8d21334469 (patch)
treea05e9da0dfb6f14e89019fa1c38391b8f8dec949 /src/main/java/gregtech/api/metatileentity/implementations
parent617f057dad27b8d9fc1dde0c669569b09453a0ed (diff)
parent909149cd28dad31993837595d60e3df096b19437 (diff)
downloadGT5-Unofficial-edc857c8a95d39d78bf2e4c325bd2f8d21334469.tar.gz
GT5-Unofficial-edc857c8a95d39d78bf2e4c325bd2f8d21334469.tar.bz2
GT5-Unofficial-edc857c8a95d39d78bf2e4c325bd2f8d21334469.zip
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index 963aa2926d..86d74f3dac 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -36,7 +36,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
public ItemStack[] mOutputItems = null;
public FluidStack[] mOutputFluids = null;
public String mNEI;
- public int damageFactorLow = 5;
+ public int damageFactorLow = 5;
public float damageFactorHigh = 0.6f;
public ArrayList<GT_MetaTileEntity_Hatch_Input> mInputHatches = new ArrayList<GT_MetaTileEntity_Hatch_Input>();
@@ -394,6 +394,11 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
return 6;
}
+ public int getCurrentEfficiency(ItemStack itemStack) {
+ int maxEff = getMaxEfficiency(itemStack);
+ return maxEff - (getIdealStatus() - getRepairStatus()) * maxEff / 10;
+ }
+
public boolean doRandomMaintenanceDamage() {
if (!isCorrectMachinePart(mInventory[1]) || getRepairStatus() == 0) {
stopMachine();