Deprecation cleanup (#637)

52 files changed, 58 insertions, 382 deletions

diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java
index 08462c6c65..55f1df240f 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java
@@ -28,7 +28,6 @@ public abstract class BlockBaseNBT extends BlockContainer {
     @SideOnly(Side.CLIENT)
     private IIcon textureFront;
 
-    @SuppressWarnings("deprecation")
     public BlockBaseNBT(final Material material, final String unlocalName, final String displayName) {
         super(material);
         this.setBlockName(unlocalName);
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
index 79b24e2405..57b70c1927 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
@@ -31,7 +31,6 @@ public class BlockTankXpConverter extends BlockContainer {
     @SideOnly(Side.CLIENT)
     private IIcon textureFront;
 
-    @SuppressWarnings("deprecation")
     public BlockTankXpConverter() {
         super(Material.iron);
         this.setBlockName("blockTankXpConverter");
diff --git a/src/main/java/gtPlusPlus/core/block/general/FirePit.java b/src/main/java/gtPlusPlus/core/block/general/FirePit.java
index e73c88bee0..4b4390bc78 100644
--- a/src/main/java/gtPlusPlus/core/block/general/FirePit.java
+++ b/src/main/java/gtPlusPlus/core/block/general/FirePit.java
@@ -35,7 +35,6 @@ public class FirePit extends BasicBlock {
     public static final int META_ANTIBUILDER = 2;
     private int meta;
 
-    @SuppressWarnings("deprecation")
     public FirePit() {
         super("blockFirePit", Material.wood);
         this.setBlockName("blockFirePit");
diff --git a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java
index dbcd3ed57c..0a09e902f7 100644
--- a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java
+++ b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java
@@ -17,7 +17,6 @@ import net.minecraftforge.fluids.IFluidContainerItem;
 import net.minecraftforge.fluids.ItemFluidContainer;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
@@ -35,13 +34,11 @@ public class FluidTankInfinite extends BlockContainer {
     @SideOnly(Side.CLIENT)
     private IIcon textureFront;
 
-    @SuppressWarnings("deprecation")
     public FluidTankInfinite() {
         super(Material.iron);
         this.setBlockName("blockInfiniteFluidTank");
         this.setCreativeTab(AddToCreativeTab.tabMachines);
         GameRegistry.registerBlock(this, "blockInfiniteFluidTank");
-        LanguageRegistry.addName(this, "Infinite Fluid Tank");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/general/HellFire.java b/src/main/java/gtPlusPlus/core/block/general/HellFire.java
index 1e864a13c8..916385647c 100644
--- a/src/main/java/gtPlusPlus/core/block/general/HellFire.java
+++ b/src/main/java/gtPlusPlus/core/block/general/HellFire.java
@@ -35,10 +35,8 @@ import gtPlusPlus.core.util.math.MathUtils;
 
 public class HellFire extends BlockFire {
 
-    @Deprecated
     private final int[] field_149849_a = new int[Short.MAX_VALUE];
 
-    @Deprecated
     private final int[] field_149848_b = new int[Short.MAX_VALUE];
 
     @SideOnly(Side.CLIENT)
@@ -252,16 +250,6 @@ public class HellFire extends BlockFire {
     }
 
     /**
-     * Checks the specified block coordinate to see if it can catch fire. Args: blockAccess, x, y, z
-     */
-    @Override
-    @Deprecated
-    public boolean canBlockCatchFire(final IBlockAccess p_149844_1_, final int p_149844_2_, final int p_149844_3_,
-            final int p_149844_4_) {
-        return this.canCatchFire(p_149844_1_, p_149844_2_, p_149844_3_, p_149844_4_, UP);
-    }
-
-    /**
      * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z
      */
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java
index 4d974b9a61..2d2a407057 100644
--- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java
+++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java
@@ -23,7 +23,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
@@ -37,14 +36,12 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
 public abstract class BlockGenericRedstone extends BlockContainer {
 
-    @SuppressWarnings("deprecation")
     public BlockGenericRedstone(String aUnlocalizedSuffix, String aDisplayName) {
         super(Material.redstoneLight);
         this.setBlockName("blockGenericRedstone." + aUnlocalizedSuffix);
         this.setHardness(3f);
         this.setCreativeTab(AddToCreativeTab.tabMachines);
         GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockGenericRedstone." + aUnlocalizedSuffix);
-        LanguageRegistry.addName(this, aDisplayName);
     }
 
     private final HashMap<Integer, HashMap<ForgeDirection, IIcon>> mTextures = new HashMap<Integer, HashMap<ForgeDirection, IIcon>>();
diff --git a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
index bf4fa41296..0fc3b5b666 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
@@ -34,7 +34,6 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip {
         return this.mTooltipID;
     }
 
-    @SuppressWarnings("deprecation")
     public CircuitProgrammer() {
         super(Material.iron);
     }
diff --git a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java
index e5ee4633f5..1a2dba6e65 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java
@@ -50,7 +50,6 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip {
         return this.mTooltipID;
     }
 
-    @SuppressWarnings("deprecation")
     public DecayablesChest() {
         super(Material.iron);
         this.setBlockName("blockDecayablesChest");
@@ -184,24 +183,4 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip {
             final int z) {
         return false;
     }
-
-    /*
-     * @Override public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { TileEntityFishTrap te =
-     * (TileEntityFishTrap) world.getTileEntity(pos); InventoryHelper.dropInventoryItems(world, pos, te);
-     * super.breakBlock(world, pos, blockstate); }
-     * @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer,
-     * ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap)
-     * worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); } }
-     */
-
-    /**
-     * Update Chest Meta - Stub
-     * 
-     * @param aWorld
-     * @param xPos
-     * @param yPos
-     * @param zPos
-     */
-    @Deprecated
-    public void func_149954_e(World aWorld, int xPos, int yPos, int zPos) {}
 }
diff --git a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java
index 74ed902b0d..90d74c5d37 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java
@@ -49,7 +49,6 @@ public class EggBox extends BlockContainer implements ITileTooltip {
         return this.mTooltipID;
     }
 
-    @SuppressWarnings("deprecation")
     public EggBox() {
         super(Material.wood);
         this.setBlockName("blockEggBox");
@@ -147,24 +146,4 @@ public class EggBox extends BlockContainer implements ITileTooltip {
             final int z) {
         return false;
     }
-
-    /*
-     * @Override public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { TileEntityFishTrap te =
-     * (TileEntityFishTrap) world.getTileEntity(pos); InventoryHelper.dropInventoryItems(world, pos, te);
-     * super.breakBlock(world, pos, blockstate); }
-     * @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer,
-     * ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap)
-     * worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); } }
-     */
-
-    /**
-     * Update Chest Meta - Stub
-     * 
-     * @param aWorld
-     * @param xPos
-     * @param yPos
-     * @param zPos
-     */
-    @Deprecated
-    public void func_149954_e(World aWorld, int xPos, int yPos, int zPos) {}
 }
diff --git a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java
index 569a7d5762..1fb1e97703 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java
@@ -46,7 +46,6 @@ public class FishTrap extends BlockContainer implements ITileTooltip {
         return this.mTooltipID;
     }
 
-    @SuppressWarnings("deprecation")
     public FishTrap() {
         super(Material.iron);
         this.setBlockName("blockFishTrap");
@@ -134,14 +133,4 @@ public class FishTrap extends BlockContainer implements ITileTooltip {
             final int z) {
         return false;
     }
-
-    /*
-     * @Override public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { TileEntityFishTrap te =
-     * (TileEntityFishTrap) world.getTileEntity(pos); InventoryHelper.dropInventoryItems(world, pos, te);
-     * super.breakBlock(world, pos, blockstate); }
-     * @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer,
-     * ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap)
-     * worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); } }
-     */
-
 }
diff --git a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java
index 8b83713d3b..a89de43744 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java
@@ -28,7 +28,6 @@ public class HeliumGenerator extends BlockContainer {
     @SideOnly(Side.CLIENT)
     private IIcon textureFront;
 
-    @SuppressWarnings("deprecation")
     public HeliumGenerator() {
         super(Material.wood);
         this.setBlockName("blockHeliumGenerator");
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
index a3cd9fb408..8c388f1408 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
@@ -43,7 +43,6 @@ public class Machine_ModularityTable extends BlockContainer implements ITileTool
         return this.mTooltipID;
     }
 
-    @SuppressWarnings("deprecation")
     public Machine_ModularityTable() {
         super(Material.iron);
         this.setBlockName("blockModularity");
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
index f833774683..68532bc478 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
@@ -47,7 +47,6 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip {
         return this.mTooltipID;
     }
 
-    @SuppressWarnings("deprecation")
     public Machine_PestKiller() {
         super(Material.wood);
         this.setBlockName("blockPestKiller");
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
index f2e848a1ee..4d34d96b21 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
@@ -52,7 +52,6 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip
         return this.mTooltipID;
     }
 
-    @SuppressWarnings("deprecation")
     public Machine_ProjectTable() {
         super(Material.iron);
         this.setBlockName("blockProjectBench");
diff --git a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java
index e3f09dc25c..982b29ed97 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java
@@ -41,7 +41,6 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip {
         return ItemBlockBasicTile.class;
     }
 
-    @SuppressWarnings("deprecation")
     public VolumetricFlaskSetter() {
         super(Material.iron);
     }
diff --git a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
index 102cff2232..76b27ce93e 100644
--- a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
+++ b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
@@ -158,7 +158,7 @@ public class CommandEnableDebugWhileRunning implements ICommand {
                         aFluidContainerData.put("FluidStack Local Name: " + aHeldItemFluid.getLocalizedName());
                         aFluidContainerData
                                 .put("Fluid Unlocal Name: " + aHeldItemFluid.getFluid().getUnlocalizedName());
-                        aFluidContainerData.put("Fluid Local Name: " + aHeldItemFluid.getFluid().getLocalizedName());
+                        aFluidContainerData.put("Fluid Local Name: " + aHeldItemFluid.getLocalizedName());
                         aFluidContainerData.put("Fluid Name: " + aHeldItemFluid.getFluid().getName());
                     }
 
diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
index 296fc0518d..fd8d317fe6 100644
--- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
@@ -23,7 +23,6 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCircuits;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustom_Cables;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustom_Pipes;
-import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_ComponentAssemblers;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Dehydrators;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_FluidTanks;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_GeothermalEngines;
@@ -117,7 +116,6 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.showHiddenNEIItems;
 import static gtPlusPlus.core.lib.CORE.EVERGLADESBIOME_ID;
 import static gtPlusPlus.core.lib.CORE.EVERGLADES_ID;
 import static gtPlusPlus.core.lib.CORE.turbineCutoffBase;
-import static gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames;
 
 import java.io.File;
 
@@ -250,8 +248,6 @@ public class ConfigHandler {
                 GregTech.ID,
                 false,
                 "These may be overpowered, Consult a local electrician.");
-        enableMachine_ComponentAssemblers = config
-                .getBoolean("enableComponentAssemblers", GregTech.ID, true, "These construct machine components.");
         enableMachine_Safes = config
                 .getBoolean("enableMachineSafes", GregTech.ID, true, "These protect your goodies/rare stuff.");
         enableMachine_Dehydrators = config
@@ -428,15 +424,6 @@ public class ConfigHandler {
         EVERGLADESBIOME_ID = config
                 .getInt("darkbiome_ID", "worldgen", 238, 1, 254, "The biome within the Dark Dimension.");
 
-        // Blacklisted Accelerator TileEntities
-        BlacklistedTileEntiyClassNames = new String[] {
-                "com.rwtema.extrautils.tileentity.enderquarry.TileEntityEnderQuarry" };
-        BlacklistedTileEntiyClassNames = config.getStringList(
-                "BlacklistedTileEntiyClassNames",
-                GregTech.ID,
-                BlacklistedTileEntiyClassNames,
-                "The Canonical Class-Names of TileEntities that should be ignored by the WorldAccelerator");
-
         // Pollution
         pollutionPerSecondMultiPackager = config
                 .get(
diff --git a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
index 120488acbb..46e56d3f1d 100644
--- a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
+++ b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
@@ -45,15 +45,15 @@ public class ItemGenericFluidBucket extends ItemBucket {
 
         if (FluidFactory.mMetaToBucketMap.containsKey(aID)) {
             try {
+                // noinspection deprecation
                 throw new GregtechException(
-                        "" + aID
-                                + " is already registered! Unable to register fluid: "
+                        aID + " is already registered! Unable to register fluid: "
                                 + FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName());
             } catch (GregtechException e) {
                 e.printStackTrace();
+                // noinspection deprecation
                 CORE.crash(
-                        "" + aID
-                                + " is already registered! Unable to register fluid: "
+                        aID + " is already registered! Unable to register fluid: "
                                 + FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName());
             }
         }
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlus