Remove all references to the adaptive smeltery so people don't get co…

…nfused

RIP Adaptive smeltery

src/main/java/tconstruct/smeltery/SmelteryProxyClient.java

@@ -38,7 +38,6 @@ public void initialize ()
     void registerRenderer ()
     {
         RenderingRegistry.registerBlockHandler(new TankRender());
-        RenderingRegistry.registerBlockHandler(new TankAirRender());
         RenderingRegistry.registerBlockHandler(new CastingBlockRender());
         RenderingRegistry.registerBlockHandler(new DryingRackRender());
         RenderingRegistry.registerBlockHandler(new PaneRender());
@@ -50,10 +49,7 @@ void registerRenderer ()
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(TinkerSmeltery.lavaTank), tankItemRenderer);
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(TinkerSmeltery.lavaTankNether), tankItemRenderer);
 
-        if (!PHConstruct.newSmeltery)
-        {
-            RenderingRegistry.registerBlockHandler(new SmelteryRender());
-        }
+        RenderingRegistry.registerBlockHandler(new SmelteryRender());
 
         ClientRegistry.bindTileEntitySpecialRenderer(CastingTableLogic.class, new CastingTableSpecialRenderer());
         ClientRegistry.bindTileEntitySpecialRenderer(CastingBasinLogic.class, new CastingBasinSpecialRender());
@@ -124,10 +120,7 @@ public Object getClientGuiElement (int ID, EntityPlayer player, World world, int
     {
         if (ID == SmelteryProxyCommon.smelteryGuiID)
         {
-            if (PHConstruct.newSmeltery)
-                return new AdaptiveSmelteryGui(player.inventory, (AdaptiveSmelteryLogic) world.getTileEntity(x, y, z), world, x, y, z);
-            else
-                return new SmelteryGui(player.inventory, (SmelteryLogic) world.getTileEntity(x, y, z), world, x, y, z);
+            return new SmelteryGui(player.inventory, (SmelteryLogic) world.getTileEntity(x, y, z), world, x, y, z);
         }
         return null;
     }

src/main/java/tconstruct/smeltery/TinkerSmeltery.java

@@ -60,7 +60,6 @@ public class TinkerSmeltery
     public static Block lavaTank;
     public static Block searedBlock;
     public static Block castingChannel;
-    public static Block tankAir;
     public static Block smelteryNether;
     public static Block lavaTankNether;
     public static Block searedBlockNether;
@@ -176,8 +175,6 @@ public void preInit (FMLPreInitializationEvent event)
 
         TinkerSmeltery.castingChannel = (new CastingChannelBlock()).setBlockName("CastingChannel");
 
-        TinkerSmeltery.tankAir = new TankAirBlock(Material.leaves).setBlockUnbreakable().setBlockName("tconstruct.tank.air");
-
         // Liquids
         TinkerSmeltery.liquidMetal = new MaterialLiquid(MapColor.tntColor);
 
@@ -373,16 +370,10 @@ public void preInit (FMLPreInitializationEvent event)
         // Smeltery stuff
         GameRegistry.registerBlock(TinkerSmeltery.smeltery, SmelteryItemBlock.class, "Smeltery");
         GameRegistry.registerBlock(TinkerSmeltery.smelteryNether, SmelteryItemBlock.class, "SmelteryNether");
-        if (PHConstruct.newSmeltery)
-        {
-            GameRegistry.registerTileEntity(AdaptiveSmelteryLogic.class, "TConstruct.Smeltery");
-            GameRegistry.registerTileEntity(AdaptiveDrainLogic.class, "TConstruct.SmelteryDrain");
-        }
-        else
-        {
-            GameRegistry.registerTileEntity(SmelteryLogic.class, "TConstruct.Smeltery");
-            GameRegistry.registerTileEntity(SmelteryDrainLogic.class, "TConstruct.SmelteryDrain");
-        }
+
+        GameRegistry.registerTileEntity(SmelteryLogic.class, "TConstruct.Smeltery");
+        GameRegistry.registerTileEntity(SmelteryDrainLogic.class, "TConstruct.SmelteryDrain");
+
         GameRegistry.registerTileEntity(MultiServantLogic.class, "TConstruct.Servants");
         GameRegistry.registerBlock(TinkerSmeltery.lavaTank, LavaTankItemBlock.class, "LavaTank");
         GameRegistry.registerBlock(TinkerSmeltery.lavaTankNether, LavaTankItemBlock.class, "LavaTankNether");
@@ -397,9 +388,6 @@ public void preInit (FMLPreInitializationEvent event)
         GameRegistry.registerBlock(TinkerSmeltery.castingChannel, CastingChannelItem.class, "CastingChannel");
         GameRegistry.registerTileEntity(CastingChannelLogic.class, "CastingChannel");
 
-        GameRegistry.registerBlock(TinkerSmeltery.tankAir, "TankAir");
-        GameRegistry.registerTileEntity(TankAirLogic.class, "tconstruct.tank.air");
-
         GameRegistry.registerBlock(TinkerSmeltery.speedBlock, SpeedBlockItem.class, "SpeedBlock");
 
         // Glass

src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java

@@ -82,18 +82,4 @@ public void bucketFill (FillBucketEvent evt)
             }
         }
     }
-
-    // Player interact event - prevent breaking of tank air blocks in creative
-    @SubscribeEvent
-    public void playerInteract (PlayerInteractEvent event)
-    {
-        if (event.action == Action.LEFT_CLICK_BLOCK)
-        {
-            Block block = event.entity.worldObj.getBlock(event.x, event.y, event.z);
-            if (block instanceof TankAirBlock)
-            {
-                event.setCanceled(true);
-            }
-        }
-    }
 }

src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java

@@ -48,7 +48,7 @@ public SmelteryBlock(String prefix)
     @Override
     public int getRenderType ()
     {
-        return PHConstruct.newSmeltery ? 0 : SmelteryRender.smelteryModel;
+        return SmelteryRender.smelteryModel;
     }
 
     @Override
@@ -237,16 +237,9 @@ public TileEntity createNewTileEntity (World world, int metadata)
         switch (metadata)
         {
         case 0:
-            if (PHConstruct.newSmeltery)
-                return new AdaptiveSmelteryLogic();
-            else
-                return new SmelteryLogic();
-
+            return new SmelteryLogic();
         case 1:
-            if (PHConstruct.newSmeltery)
-                return new AdaptiveDrainLogic();
-            else
-                return new SmelteryDrainLogic();
+            return new SmelteryDrainLogic();
         case 3:
             return null; // Furnace
         }
@@ -257,7 +250,7 @@ public TileEntity createNewTileEntity (World world, int metadata)
     public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack stack)
     {
         super.onBlockPlacedBy(world, x, y, z, entityliving, stack);
-        if (world.getBlockMetadata(x, y, z) == 0 && !PHConstruct.newSmeltery)
+        if (world.getBlockMetadata(x, y, z) == 0)
             onBlockPlacedElsewhere(world, x, y, z, entityliving);
     }
 
@@ -324,17 +317,11 @@ public int getComparatorInputOverride (World world, int x, int y, int z, int com
         int meta = world.getBlockMetadata(x, y, z);
         if (meta == 0)
         {
-            if (PHConstruct.newSmeltery)
-                return 0;
-            else
-                return Container.calcRedstoneFromInventory(((SmelteryLogic) world.getTileEntity(x, y, z)));
+            return Container.calcRedstoneFromInventory(((SmelteryLogic) world.getTileEntity(x, y, z)));
         }
         if (meta == 1)
         {
-            if (PHConstruct.newSmeltery)
-                return 0;
-            else
-                return ((SmelteryDrainLogic) world.getTileEntity(x, y, z)).comparatorStrength();
+            return ((SmelteryDrainLogic) world.getTileEntity(x, y, z)).comparatorStrength();
         }
         return 0;
     }