Fix casting tables and basins not having recipes

SlimeKnights · Jul 4, 2014 · 601c1b8 · 601c1b8
1 parent 4236d53
commit 601c1b8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java
@@ -460,7 +460,7 @@ public void preInit (FMLPreInitializationEvent event)
                 TinkerSmeltery.moltenNickel, TinkerSmeltery.moltenLead, TinkerSmeltery.moltenSilver, TinkerSmeltery.moltenShiny, TinkerSmeltery.moltenInvar, TinkerSmeltery.moltenElectrum,
                 TinkerSmeltery.moltenEnder, TinkerSmeltery.glueFluidBlock };
 
-        FluidType.registerFluidType("Water", Blocks.snow, 0, 20, FluidRegistry.getFluid("water"), false); //TODO: Too much reliance on World.
+        FluidType.registerFluidType("Water", Blocks.snow, 0, 20, FluidRegistry.getFluid("water"), false);
         FluidType.registerFluidType("Iron", Blocks.iron_block, 0, 600, TinkerSmeltery.moltenIronFluid, true);
         FluidType.registerFluidType("Gold", Blocks.gold_block, 0, 400, TinkerSmeltery.moltenGoldFluid, false);
         FluidType.registerFluidType("Tin", TinkerWorld.metalBlock, 5, 400, TinkerSmeltery.moltenTinFluid, false);
@@ -559,15 +559,17 @@ public void preInit (FMLPreInitializationEvent event)
     public void init (FMLInitializationEvent event)
     {
         proxy.initialize();
+        craftingTableRecipes();
+        addRecipesForSmeltery();
+        addOreDictionarySmelteryRecipes();
+        addRecipesForTableCasting();
+        addRecipesForBasinCasting();
     }
 
     @Handler
     public void postInit (FMLPostInitializationEvent evt)
     {
-        craftingTableRecipes();
-        addRecipesForSmeltery();
-        addOreDictionarySmelteryRecipes();
-        addRecipesForTableCasting();
+        modIntegration();
     }
 
     private void craftingTableRecipes ()
@@ -657,7 +659,7 @@ public void addOreDictionarySmelteryRecipes ()
             Smeltery.addDictionaryMelting("nugget" + fluidTypeName, ft, -100, TConstruct.nuggetLiquidValue);
 
             // Ingots, Dust
-            registerIngotCasting(ft, fluidTypeName);
+            registerIngotCasting(ft, "ingot" + fluidTypeName);
             Smeltery.addDictionaryMelting("ingot" + fluidTypeName, ft, -50, TConstruct.ingotLiquidValue);
             Smeltery.addDictionaryMelting("dust" + fluidTypeName, ft, -75, TConstruct.ingotLiquidValue);
 
@@ -1027,12 +1029,13 @@ protected static void addRecipesForSmeltery ()
 
     private void registerIngotCasting (FluidType ft, String name)
     {
+        System.out.println("Registering ingot cast for "+name);
         ItemStack pattern = new ItemStack(TinkerSmeltery.metalPattern, 1, 0);
         LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting();
         for (ItemStack ore : OreDictionary.getOres(name))
         {
             tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50);
-            tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.oreLiquidValue), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50);
+            tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50);
             tableCasting.addCastingRecipe(new ItemStack(ore.getItem(), 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.ingotLiquidValue), pattern, 80);
         }
     }

diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java
@@ -359,6 +359,12 @@ public void preInit (FMLPreInitializationEvent event)
         }
 
         registerMaterials();
+
+        //TODO: Redesign stencil table to be a sensible block
+        TinkerTools.patternOutputs = new Item[] { TinkerTools.toolRod, TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.swordBlade, TinkerTools.wideGuard,
+                TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.binding, TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.knifeBlade, TinkerTools.chiselHead, TinkerTools.toughRod,
+                TinkerTools.toughBinding, TinkerTools.largePlate, TinkerTools.broadAxeHead, TinkerTools.scytheBlade, TinkerTools.excavatorHead, TinkerTools.largeSwordBlade, TinkerTools.hammerHead,
+                TinkerTools.fullGuard, null, null, TinkerTools.arrowhead, null };
     }
 
 
@@ -408,10 +414,6 @@ public void postInit (FMLPostInitializationEvent evt)
     private void addPartMapping ()
     {
         /* Tools */
-        TinkerTools.patternOutputs = new Item[] { TinkerTools.toolRod, TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.swordBlade, TinkerTools.wideGuard,
-                TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.binding, TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.knifeBlade, TinkerTools.chiselHead, TinkerTools.toughRod,
-                TinkerTools.toughBinding, TinkerTools.largePlate, TinkerTools.broadAxeHead, TinkerTools.scytheBlade, TinkerTools.excavatorHead, TinkerTools.largeSwordBlade, TinkerTools.hammerHead,
-                TinkerTools.fullGuard, null, null, TinkerTools.arrowhead, null };
 
         int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 };
 

diff --git a/src/main/java/tconstruct/tools/ToolProxyClient.java b/src/main/java/tconstruct/tools/ToolProxyClient.java
@@ -442,7 +442,6 @@ void addToolRenderMappings ()
         }
 
         String[] bowstringTypes = { "string", "magicfabric", "flamestring" };
-        System.out.println("Shortbow: " + TinkerTools.shortbow);
         for (int bowIter = 0; bowIter < bowstringTypes.length; bowIter++)
         {
             TConstructClientRegistry.addAlternateMaterialRenderMapping(TinkerTools.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true);