Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable

2 files changed, 10 insertions, 5 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
index 884ceac8ba..c01d2f8b15 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -86,10 +86,10 @@ public abstract class MetaTileEntity implements IMetaTileEntity {
         GT_LanguageManager.addStringLocalization("gt.blockmachines." + mName + ".name", aRegionalName);
         mInventory = new ItemStack[aInvSlotCount];
 
-        if (GT.isClientSide()) {
-            ItemStack tStack = new ItemStack(GregTech_API.sBlockMachines, 1, aID);
-            tStack.getItem().addInformation(tStack, null, new ArrayList<String>(), true);
-        }
+//        if (GT.isClientSide()) {
+//            ItemStack tStack = new ItemStack(GregTech_API.sBlockMachines, 1, aID);
+//            tStack.getItem().addInformation(tStack, null, new ArrayList<String>(), true);
+//        }
     }
 
     /**
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();