diff options
author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-06-17 14:37:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-17 14:37:10 +0200 |
commit | 909149cd28dad31993837595d60e3df096b19437 (patch) | |
tree | b593cc9ef0d48883d36c441316a337e80b138787 /src/main/java/gregtech/api/metatileentity/implementations | |
parent | b588e82ef749c1f047182a7b230c157a3965c42e (diff) | |
parent | 541144f4433044a6c0b9612e7cd7f94cf9440095 (diff) | |
download | GT5-Unofficial-909149cd28dad31993837595d60e3df096b19437.tar.gz GT5-Unofficial-909149cd28dad31993837595d60e3df096b19437.tar.bz2 GT5-Unofficial-909149cd28dad31993837595d60e3df096b19437.zip |
Merge pull request #1074 from Techlone/advminer2_improvements
AdvMiner2 renamed; new tiers of OreDrillingPlant
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java | 7 |
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(); |