Merge branch 'OreDrills' into experimental

2 files changed, 10 insertions, 4 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
index 13936d3f5e..fd3eec16a6 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 89c75a0b4c..6856f54887 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
@@ -409,6 +409,12 @@ 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();