Revert "Fix localization failure with driller (#178)" (#183)

* Revert "Fix localization failure with driller (#178)"

This reverts commit 6b1ca058f85f7de08608a4605c27e1ccdc4c8eef [formerly 476453a57b8b6a6be52709854e36d6b83092ac5d].

* Make descriptions in line with GT

* Space

* update GT

* Fix build

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Former-commit-id: be31b795e6394abf449922d57398e1fa25786407

4 files changed, 8 insertions, 27 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java
index 0409cabb4a..db331896ca 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java
@@ -276,7 +276,8 @@ public class GT_TileEntity_CircuitAssemblyLine extends GT_MetaTileEntity_Enhance
         }
     }
 
-    private boolean addInputHatchToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
+    @Override
+    public boolean addInputHatchToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         if (aTileEntity == null) {
             return false;
         } else {
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java
index 010cc53cce..80c19222a1 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java
@@ -106,7 +106,7 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase {
     @Override
     protected GT_Multiblock_Tooltip_Builder createTooltip() {
         GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
-        String casings = getCasingName() != null ? getCasingName() : "Casing";
+        String casings = getCasingBlockItem().get(0).getDisplayName();
         tt.addMachineType("Geothermal Heat Pump")
                 .addInfo("Consumes " + GT_Values.V[this.mTier + 2] + "EU/t")
                 .addInfo("Has 4 Modes, use the Screwdriver to change them:");
@@ -124,8 +124,8 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase {
         tt.addSeparator()
                 .beginStructureBlock(3, 7, 3, false)
                 .addController("Front bottom")
-                .addStructureInfo(casings + " form the 3x1x3 Base")
-                .addOtherStructurePart(casings, " 1x3x1 pillar above the center of the base (2 minimum total)")
+                .addOtherStructurePart(casings, "form the 3x1x3 Base")
+                .addOtherStructurePart(casings, "1x3x1 pillar above the center of the base (2 minimum total)")
                 .addOtherStructurePart(getFrameMaterial().mName + " Frame Boxes", "Each pillar's side and 1x3x1 on top")
                 .addEnergyHatch(VN[getMinTier()] + "+, Any base casing")
                 .addMaintenanceHatch("Any base casing")
@@ -142,11 +142,6 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase {
     }
 
     @Override
-    protected String getCasingName() {
-        return "Heat Proof Machine Casing";
-    }
-
-    @Override
     protected Materials getFrameMaterial() {
         return Materials.Tungsten;
     }
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java
index adc7979bdd..ee1a5ee319 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java
@@ -171,7 +171,7 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri
 
     @Override
     protected GT_Multiblock_Tooltip_Builder createTooltip() {
-        String casings = getCasingName() != null ? getCasingName() : "Casing";
+        String casings = getCasingBlockItem().get(0).getDisplayName();
 
         final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
         tt.addMachineType("Miner")
@@ -185,8 +185,8 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri
                 .addSeparator()
                 .beginStructureBlock(3, 7, 3, false)
                 .addController("Front bottom")
-                .addStructureInfo(casings + " form the 3x1x3 Base")
-                .addOtherStructurePart(casings, " 1x3x1 pillar above the center of the base (2 minimum total)")
+                .addOtherStructurePart(casings, "form the 3x1x3 Base")
+                .addOtherStructurePart(casings, "1x3x1 pillar above the center of the base (2 minimum total)")
                 .addOtherStructurePart(getFrameMaterial().mName + " Frame Boxes", "Each pillar's side and 1x3x1 on top")
                 .addEnergyHatch(VN[getMinTier()] + "+, Any base casing")
                 .addMaintenanceHatch("Any base casing")
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiners.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiners.java
index fb87f050b8..a5058a34d7 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiners.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiners.java
@@ -45,11 +45,6 @@ public class GT_TileEntity_VoidMiners  {
         }
 
         @Override
-        protected String getCasingName() {
-            return "UV Machine Casing";
-        }
-
-        @Override
         protected Materials getFrameMaterial() {
             return Materials.Europium;
         }
@@ -81,11 +76,6 @@ public class GT_TileEntity_VoidMiners  {
         }
 
         @Override
-        protected String getCasingName() {
-            return "Mining Black Plutonium Casing";
-        }
-
-        @Override
         protected Materials getFrameMaterial() {
             return Materials.BlackPlutonium;
         }
@@ -117,11 +107,6 @@ public class GT_TileEntity_VoidMiners  {
         }
 
         @Override
-        protected String getCasingName() {
-            return "Mining Neutronium Casing";
-        }
-
-        @Override
         protected Materials getFrameMaterial() {
             return Materials.Neutronium;
         }