Remove the old smeltery stuff that was meant for comatibility, becaus…

…e it's too complicated to separately keep it in.
SlimeKnights · Sep 11, 2014 · 448d29e · 448d29e
1 parent cdd28f6
commit 448d29e
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 2,184 deletions.
diff --git a/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java b/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java
@@ -44,10 +44,7 @@ void registerRenderer ()
         RenderingRegistry.registerBlockHandler(new BlockRenderCastingChannel());
 
         if (!PHConstruct.newSmeltery) {
-            if(PHConstruct.oldSmeltery)
-                RenderingRegistry.registerBlockHandler(new SmelteryRenderOld());
-            else
-                RenderingRegistry.registerBlockHandler(new SmelteryRender());
+            RenderingRegistry.registerBlockHandler(new SmelteryRender());
         }
 
         ClientRegistry.bindTileEntitySpecialRenderer(CastingTableLogic.class, new CastingTableSpecialRenderer());
@@ -121,8 +118,6 @@ public Object getClientGuiElement (int ID, EntityPlayer player, World world, int
         {
             if (PHConstruct.newSmeltery)
                 return new AdaptiveSmelteryGui(player.inventory, (AdaptiveSmelteryLogic) world.getTileEntity(x, y, z), world, x, y, z);
-            else if(PHConstruct.oldSmeltery)
-                return new SmelteryGuiOld(player.inventory, (SmelteryLogicOld) 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);
         }

diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java
@@ -707,10 +707,7 @@ public void preInit (FMLPreInitializationEvent event)
         }
         else
         {
-            if(PHConstruct.oldSmeltery)
-                GameRegistry.registerTileEntity(SmelteryLogicOld.class, "TConstruct.Smeltery");
-            else
-                GameRegistry.registerTileEntity(SmelteryLogic.class, "TConstruct.Smeltery");
+            GameRegistry.registerTileEntity(SmelteryLogic.class, "TConstruct.Smeltery");
             GameRegistry.registerTileEntity(SmelteryDrainLogic.class, "TConstruct.SmelteryDrain");
         }
         GameRegistry.registerTileEntity(MultiServantLogic.class, "TConstruct.Servants");

diff --git a/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java b/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java
@@ -16,11 +16,9 @@
 import net.minecraft.world.*;
 import tconstruct.TConstruct;
 import tconstruct.library.TConstructRegistry;
-import tconstruct.library.crafting.Smeltery;
 import tconstruct.smeltery.SmelteryProxyCommon;
 import tconstruct.smeltery.logic.*;
 import tconstruct.smeltery.model.SmelteryRender;
-import tconstruct.smeltery.model.SmelteryRenderOld;
 import tconstruct.util.config.PHConstruct;
 
 public class SmelteryBlock extends InventoryBlock
@@ -50,8 +48,6 @@ public SmelteryBlock(String prefix)
     @Override
     public int getRenderType ()
     {
-        if(PHConstruct.oldSmeltery)
-            return SmelteryRenderOld.smelteryModel;
         return PHConstruct.newSmeltery ? 0 : SmelteryRender.smelteryModel;
     }
 
@@ -243,8 +239,6 @@ public TileEntity createNewTileEntity (World world, int metadata)
         case 0:
             if (PHConstruct.newSmeltery)
                 return new AdaptiveSmelteryLogic();
-            else if(PHConstruct.oldSmeltery)
-                return new SmelteryLogicOld();
             else
                 return new SmelteryLogic();