Cleanup basic machines & some deprecations (#360)

Former-commit-id: cea4eaa2e409783af151c5f9c2cea6749ca68aef

5 files changed, 29 insertions, 35 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/debug/CreativeScanner.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/debug/CreativeScanner.java
index 95938fc39d..2dcc69377e 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/debug/CreativeScanner.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/debug/CreativeScanner.java
@@ -24,20 +24,13 @@ public class CreativeScanner extends GT_MetaTileEntity_Scanner {
         super(aID, aName, aNameRegional, aTier);
     }
 
-    public CreativeScanner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, String aGUIName,
-            String aNEIName) {
-        super(aName, aTier, aDescription, aTextures, aGUIName, aNEIName);
+    public CreativeScanner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new CreativeScanner(
-                this.mName,
-                this.mTier,
-                this.mDescriptionArray,
-                this.mTextures,
-                this.mGUIName,
-                this.mNEIName);
+        return new CreativeScanner(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java
index 6b02faa800..6830042f80 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java
@@ -51,7 +51,6 @@ import gregtech.common.items.behaviors.Behaviour_DataOrb;
 
 public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine {
 
-    private static final String MGUINAME = "BW.GUI.BioLab.png";
     private static final int DNA_EXTRACTION_MODULE = 0;
     private static final int PCR_THERMOCYCLE_MODULE = 1;
     private static final int PLASMID_SYNTHESIS_MODULE = 2;
@@ -69,8 +68,6 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine {
                 (String) null,
                 6,
                 2,
-                GT_MetaTileEntity_BioLab.MGUINAME,
-                null,
                 TextureFactory.of(
                         TextureFactory.of(
                                 new Textures.BlockIcons.CustomIcon(
@@ -127,21 +124,19 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine {
                                 .glow().build()));
     }
 
-    public GT_MetaTileEntity_BioLab(String aName, int aTier, int aAmperage, String aDescription,
-            ITexture[][][] aTextures, String aNEIName) {
-        super(aName, aTier, aAmperage, aDescription, aTextures, 6, 2, GT_MetaTileEntity_BioLab.MGUINAME, aNEIName);
+    public GT_MetaTileEntity_BioLab(String aName, int aTier, int aAmperage, String[] aDescription,
+            ITexture[][][] aTextures) {
+        super(aName, aTier, aAmperage, aDescription, aTextures, 6, 2);
     }
 
     @Override
-    @SuppressWarnings("deprecation")
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) {
         return new GT_MetaTileEntity_BioLab(
                 this.mName,
                 this.mTier,
                 this.mAmperage,
-                this.mDescription,
-                this.mTextures,
-                this.mNEIName);
+                this.mDescriptionArray,
+                this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java
index 630efddc8f..2f4811270f 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java
@@ -18,6 +18,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
 import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference;
 import com.github.bartimaeusnek.bartworks.util.ChatColorHelper;
@@ -117,9 +119,9 @@ public class GT_MetaTileEntity_Diode extends GT_MetaTileEntity_BasicHull {
         else return 0L;
     }
 
-    @SuppressWarnings("deprecation")
     public String[] getDescription() {
-        return new String[] { this.mDescription,
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
                 StatCollector.translateToLocal("tooltip.tile.tiereddsc.0.name") + " "
                         + ChatColorHelper.YELLOW
                         + GT_Utility.formatNumbers(GT_Values.V[this.mTier]),
@@ -129,6 +131,6 @@ public class GT_MetaTileEntity_Diode extends GT_MetaTileEntity_BasicHull {
                 StatCollector.translateToLocal("tooltip.tile.tiereddsc.2.name") + " "
                         + ChatColorHelper.YELLOW
                         + GT_Utility.formatNumbers(this.maxAmperesOut()),
-                BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() };
+                BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get());
     }
 }
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java
index 8452086fdb..570d4592c4 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java
@@ -16,6 +16,8 @@ package com.github.bartimaeusnek.crossmod.tectech.tileentites.tiered;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoTunnel;
 
@@ -24,7 +26,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.util.GT_Utility;
 
-@SuppressWarnings("deprecation")
 public class TT_MetaTileEntity_LowPowerLaserDynamo extends GT_MetaTileEntity_Hatch_DynamoTunnel
         implements LowPowerLaser {
 
@@ -32,9 +33,9 @@ public class TT_MetaTileEntity_LowPowerLaserDynamo extends GT_MetaTileEntity_Hat
         super(aID, aName, aNameRegional, aTier, aAmp);
     }
 
-    public TT_MetaTileEntity_LowPowerLaserDynamo(String aName, int aTier, int aAmp, String aDescription,
+    public TT_MetaTileEntity_LowPowerLaserDynamo(String aName, int aTier, int aAmp, String[] aDescription,
             ITexture[][][] aTextures) {
-        super(aName, aTier, aAmp, new String[] { aDescription }, aTextures);
+        super(aName, aTier, aAmp, aDescription, aTextures);
     }
 
     @Override
@@ -43,7 +44,7 @@ public class TT_MetaTileEntity_LowPowerLaserDynamo extends GT_MetaTileEntity_Hat
                 this.mName,
                 this.mTier,
                 this.Amperes,
-                this.mDescription,
+                this.mDescriptionArray,
                 this.mTextures);
     }
 
@@ -69,13 +70,14 @@ public class TT_MetaTileEntity_LowPowerLaserDynamo extends GT_MetaTileEntity_Hat
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription,
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
                 StatCollector.translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.1") + ": "
                         + EnumChatFormatting.YELLOW
                         + GT_Utility.formatNumbers(this.getTotalPower())
                         + EnumChatFormatting.RESET
                         + " EU/t",
-                BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() };
+                BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get());
     }
 
     @Override
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java
index c9854e4cbd..6a0425bfbc 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java
@@ -16,6 +16,8 @@ package com.github.bartimaeusnek.crossmod.tectech.tileentites.tiered;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel;
 
@@ -24,7 +26,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.util.GT_Utility;
 
-@SuppressWarnings("deprecation")
 public class TT_MetaTileEntity_LowPowerLaserHatch extends GT_MetaTileEntity_Hatch_EnergyTunnel
         implements LowPowerLaser {
 
@@ -32,20 +33,21 @@ public class TT_MetaTileEntity_LowPowerLaserHatch extends GT_MetaTileEntity_Hatc
         super(aID, aName, aNameRegional, aTier, aAmp);
     }
 
-    public TT_MetaTileEntity_LowPowerLaserHatch(String aName, int aTier, int aAmp, String aDescription,
+    public TT_MetaTileEntity_LowPowerLaserHatch(String aName, int aTier, int aAmp, String[] aDescription,
             ITexture[][][] aTextures) {
-        super(aName, aTier, aAmp, new String[] { aDescription }, aTextures);
+        super(aName, aTier, aAmp, aDescription, aTextures);
     }
 
     @Override
     public String[] getDescription() {
-        return new String[] { this.mDescription,
+        return ArrayUtils.addAll(
+                this.mDescriptionArray,
                 StatCollector.translateToLocal("gt.blockmachines.hatch.energytunnel.desc.1") + ": "
                         + EnumChatFormatting.YELLOW
                         + GT_Utility.formatNumbers(this.getTotalPower())
                         + EnumChatFormatting.RESET
                         + " EU/t",
-                BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() };
+                BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get());
     }
 
     @Override
@@ -54,7 +56,7 @@ public class TT_MetaTileEntity_LowPowerLaserHatch extends GT_MetaTileEntity_Hatc
                 this.mName,
                 this.mTier,
                 this.Amperes,
-                this.mDescription,
+                this.mDescriptionArray,
                 this.mTextures);
     }