Deprecation cleanup (#637)

2 files changed, 2 insertions, 15 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java
index 51596dd8cd..9a09ad6538 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java
@@ -12,9 +12,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo
      */
     public final byte mTier;
 
-    @Deprecated
-    public final String mDescription;
-
     /**
      * A simple Description.
      */
@@ -30,7 +27,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo
         super(aID, aName, aNameRegional, aInvSlotCount);
         mTier = (byte) Math.max(0, Math.min(aTier, 9));
         mDescriptionArray = aDescription == null ? new String[0] : new String[] { aDescription };
-        mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : "";
         // must always be the last call!
         if (GT.isClientSide()) mTextures = getTextureSet(aTextures);
         else mTextures = null;
@@ -41,7 +37,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo
         super(aID, aName, aNameRegional, aInvSlotCount);
         mTier = (byte) Math.max(0, Math.min(aTier, 9));
         mDescriptionArray = aDescription == null ? new String[0] : aDescription;
-        mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : "";
 
         // must always be the last call!
         if (GT.isClientSide()) mTextures = getTextureSet(aTextures);
@@ -53,7 +48,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo
         super(aName, aInvSlotCount);
         mTier = (byte) aTier;
         mDescriptionArray = aDescription == null ? new String[0] : new String[] { aDescription };
-        mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : "";
         mTextures = aTextures;
     }
 
@@ -62,7 +56,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo
         super(aName, aInvSlotCount);
         mTier = (byte) aTier;
         mDescriptionArray = aDescription == null ? new String[0] : aDescription;
-        mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : "";
         mTextures = aTextures;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java
index cc5f1eff85..79975d3ac8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java
@@ -6,6 +6,7 @@ import net.minecraft.world.World;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.CustomMetaTileBase;
@@ -57,14 +58,7 @@ public abstract class MetaTileEntityCustomPower extends CustomMetaTileBase {
         short tY = this.getBaseMetaTileEntity().getYCoord();
         int tZ = this.getBaseMetaTileEntity().getZCoord();
         World tWorld = this.getBaseMetaTileEntity().getWorld();
-        GT_Utility.sendSoundToPlayers(
-                tWorld,
-                (String) GregTech_API.sSoundList.get(Integer.valueOf(209)),
-                1.0F,
-                -1.0F,
-                tX,
-                tY,
-                tZ);
+        GT_Utility.sendSoundToPlayers(tWorld, SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1.0F, tX, tY, tZ);
         tWorld.setBlock(tX, tY, tZ, Blocks.air);
         if (GregTech_API.sMachineExplosions) {
             tWorld.createExplosion(