Split TProxyClient into module proxies

src/main/java/tconstruct/common/TProxyCommon.java

@@ -11,9 +11,6 @@ public class TProxyCommon implements IGuiHandler
     public void initialize()
     {
 
-    }
-    public void spawnParticle (String slimeParticle, double xPos, double yPos, double zPos, double velX, double velY, double velZ)
-    {
     }
 
     @Override

src/main/java/tconstruct/mechworks/MechworksProxyClient.java

@@ -1,11 +1,15 @@
 package tconstruct.mechworks;
 
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiInventory;
+import net.minecraft.client.renderer.entity.RenderSnowball;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
 import net.minecraft.world.World;
 import tconstruct.armor.ArmorProxyCommon;
 import tconstruct.client.TProxyClient;
+import tconstruct.client.entity.item.ExplosiveRender;
 import tconstruct.client.gui.AdaptiveSmelteryGui;
 import tconstruct.client.gui.ArmorExtendedGui;
 import tconstruct.client.gui.CraftingStationGui;
@@ -21,6 +25,8 @@
 import tconstruct.client.gui.ToolStationGui;
 import tconstruct.client.tabs.TabRegistry;
 import tconstruct.common.TProxyCommon;
+import tconstruct.mechworks.entity.item.EntityLandmineFirework;
+import tconstruct.mechworks.entity.item.ExplosivePrimed;
 import tconstruct.mechworks.inventory.ContainerLandmine;
 import tconstruct.mechworks.logic.TileEntityLandmine;
 import tconstruct.smeltery.SmelteryProxyCommon;
@@ -41,8 +47,15 @@ public class MechworksProxyClient extends MechworksProxyCommon
 {    
     public void initialize()
     {
+        registerRenderer();
         registerGuiHandler();        
     }
+
+    void registerRenderer()
+    {
+        RenderingRegistry.registerEntityRenderingHandler(EntityLandmineFirework.class, new RenderSnowball(Items.fireworks));
+        RenderingRegistry.registerEntityRenderingHandler(ExplosivePrimed.class, new ExplosiveRender());
+    }
 
     protected void registerGuiHandler()
     {

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

@@ -1,28 +1,133 @@
 package tconstruct.smeltery;
 
+import cpw.mods.fml.client.registry.ClientRegistry;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import mantle.client.MProxyClient;
+import mantle.lib.client.MantleClientRegistry;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fluids.RenderBlockFluid;
+import tconstruct.armor.TinkerArmor;
+import tconstruct.armor.modelblock.DryingRackRender;
+import tconstruct.armor.modelblock.DryingRackSpecialRender;
+import tconstruct.blocks.logic.DryingRackLogic;
 import tconstruct.client.gui.AdaptiveSmelteryGui;
 import tconstruct.client.gui.SmelteryGui;
+import tconstruct.client.pages.BlockCastPage;
 import tconstruct.common.TProxyCommon;
 import tconstruct.smeltery.logic.AdaptiveSmelteryLogic;
+import tconstruct.smeltery.logic.CastingBasinLogic;
+import tconstruct.smeltery.logic.CastingTableLogic;
 import tconstruct.smeltery.logic.SmelteryLogic;
+import tconstruct.smeltery.model.BlockRenderCastingChannel;
+import tconstruct.smeltery.model.CastingBasinSpecialRender;
+import tconstruct.smeltery.model.CastingTableSpecialRenderer;
+import tconstruct.smeltery.model.PaneConnectedRender;
+import tconstruct.smeltery.model.PaneRender;
+import tconstruct.smeltery.model.SearedRender;
+import tconstruct.smeltery.model.SmelteryRender;
+import tconstruct.smeltery.model.TankAirRender;
+import tconstruct.smeltery.model.TankRender;
+import tconstruct.tools.TinkerTools;
 import tconstruct.util.config.PHConstruct;
 
 public class SmelteryProxyClient extends SmelteryProxyCommon
 {    
     @Override
     public void initialize()
     {
+        registerRenderer();
         registerGuiHandler();
+        registerManualIcons();
+        registerManualRecipes();
         MinecraftForge.EVENT_BUS.register(this);
     }
 
+    void registerRenderer()
+    {
+        RenderingRegistry.registerBlockHandler(new TankRender());
+        RenderingRegistry.registerBlockHandler(new TankAirRender());
+        RenderingRegistry.registerBlockHandler(new SearedRender());
+        RenderingRegistry.registerBlockHandler(new DryingRackRender());
+        RenderingRegistry.registerBlockHandler(new PaneRender());
+        RenderingRegistry.registerBlockHandler(new PaneConnectedRender());
+        RenderingRegistry.registerBlockHandler(new RenderBlockFluid());
+        RenderingRegistry.registerBlockHandler(new BlockRenderCastingChannel());
+
+        if (!PHConstruct.newSmeltery)
+            RenderingRegistry.registerBlockHandler(new SmelteryRender());
+
+        ClientRegistry.bindTileEntitySpecialRenderer(CastingTableLogic.class, new CastingTableSpecialRenderer());
+        ClientRegistry.bindTileEntitySpecialRenderer(CastingBasinLogic.class, new CastingBasinSpecialRender());
+        ClientRegistry.bindTileEntitySpecialRenderer(DryingRackLogic.class, new DryingRackSpecialRender());
+    }
+
+    void registerManualIcons()
+    {
+        MantleClientRegistry.registerManualIcon("smelterybook", new ItemStack(TinkerTools.manualBook, 1, 2));
+        MantleClientRegistry.registerManualIcon("smeltery", new ItemStack(TinkerSmeltery.smeltery));
+        MantleClientRegistry.registerManualIcon("blankcast", new ItemStack(TinkerTools.blankPattern, 1, 1));
+        MantleClientRegistry.registerManualIcon("castingtable", new ItemStack(TinkerSmeltery.searedBlock));
+        // MantleClientRegistry.registerManualIcon("liquidiron", new
+        // ItemStack(TRepo.liquidMetalStill));
+        MantleClientRegistry.registerManualIcon("lavatank", new ItemStack(TinkerSmeltery.lavaTank));
+        MantleClientRegistry.registerManualIcon("searedbrick", new ItemStack(TinkerSmeltery.smeltery, 1, 2));
+        MantleClientRegistry.registerManualIcon("drain", new ItemStack(TinkerSmeltery.smeltery, 1, 1));
+        MantleClientRegistry.registerManualIcon("faucet", new ItemStack(TinkerSmeltery.searedBlock, 1, 1));
+
+        MantleClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TinkerSmeltery.buckets, 1, 16));
+        MantleClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TinkerSmeltery.buckets, 1, 15));
+        MantleClientRegistry.registerManualIcon("gluebucket", new ItemStack(TinkerSmeltery.buckets, 1, 25));
+        MantleClientRegistry.registerManualIcon("slimebucket", new ItemStack(TinkerSmeltery.buckets, 1, 24));
+        MantleClientRegistry.registerManualIcon("enderbucket", new ItemStack(TinkerSmeltery.buckets, 1, 23));
+
+        MProxyClient.registerManualPage("blockcast", BlockCastPage.class);
+    }
+
+    void registerManualRecipes()
+    {
+        ItemStack sand = new ItemStack(Blocks.sand, 1, 0);
+        ItemStack gravel = new ItemStack(Blocks.gravel, 1, 0);
+        ItemStack clay = new ItemStack(Items.clay_ball, 1, 0);
+        ItemStack glass = new ItemStack(Blocks.glass, 1, 0);
+
+        ItemStack grout = new ItemStack(TinkerTools.craftedSoil, 2, 1);
+        ItemStack searedbrick = new ItemStack(TinkerTools.materials, 1, 2);
+        ItemStack searedbrickBlock = new ItemStack(TinkerSmeltery.smeltery, 1, 2);
+        ItemStack plankSlab = new ItemStack(Blocks.wooden_slab, 1, 0);
+
+        MantleClientRegistry.registerManualSmallRecipe("grout", grout, sand, gravel, null, clay);
+        MantleClientRegistry.registerManualFurnaceRecipe("searedbrick", searedbrick, grout);
+        MantleClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TinkerSmeltery.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick);
+        MantleClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TinkerSmeltery.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick,
+                searedbrick, searedbrick);
+        MantleClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TinkerArmor.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null, null);
+
+        MantleClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TinkerSmeltery.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null,
+                searedbrick);
+
+        MantleClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TinkerSmeltery.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick, searedbrick,
+                searedbrick, searedbrick);
+        MantleClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TinkerSmeltery.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass, searedbrick);
+        MantleClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TinkerSmeltery.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick, glass,
+                searedbrick);
+
+        MantleClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TinkerSmeltery.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick,
+                null, searedbrick);
+        MantleClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TinkerSmeltery.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null);
+        MantleClientRegistry.registerManualLargeRecipe("castingchannel", new ItemStack(TinkerSmeltery.castingChannel), null, null, null, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick);
+        MantleClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TinkerSmeltery.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick,
+                searedbrick, searedbrick);
+    }
+
     @Override
     protected void registerGuiHandler()
     {

src/main/java/tconstruct/tools/TinkerTools.java

@@ -179,7 +179,7 @@ public class TinkerTools
     public static Item bowstring;
     public static Item arrowhead;
     public static Item fletching;
-    public static Block craftedSoil;
+    public static Block craftedSoil; //TODO: Untwine this
     public static Block multiBrick;
     public static Block multiBrickFancy;
     // Tool modifiers
@@ -204,7 +204,6 @@ public TinkerTools()
     @Handler
     public void preInit (FMLPreInitializationEvent event)
     {
-        System.out.println("This is the ultimate showdown");
         //Blocks
         TinkerTools.toolStationWood = new ToolStationBlock(Material.wood).setBlockName("ToolStation");
         TinkerTools.toolForge = new ToolForgeBlock(Material.iron).setBlockName("ToolForge");