Merge branch 'master' into experimental

Conflicts: resources/assets/tinker/lang/en_US.lang
SlimeKnights · Dec 2, 2014 · ee980cc · ee980cc
2 parents 007c1a4 + ea87572
commit ee980cc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang
@@ -225,6 +225,7 @@ item.tconstruct.MetalPattern.fletching.name=Fletching Cast
 item.tconstruct.MetalPattern.arrowhead.name=Arrowhead Cast
 item.tconstruct.MetalPattern.ingot.name=Ingot Cast
 item.tconstruct.MetalPattern.gem.name=Gem Cast
+item.tconstruct.MetalPattern.nugget.name=Nugget Cast
 item.tconstruct.MetalPattern.shuriken.name=Shuriken Cast
 item.tconstruct.MetalPattern.crossbowlimb.name=Crossbow Limb Cast
 item.tconstruct.MetalPattern.crossbowbody.name=Crossbow Body Cast

diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java
@@ -867,6 +867,7 @@ public void addOreDictionarySmelteryRecipes ()
 
             // Nuggets
             Smeltery.addDictionaryMelting("nugget" + fluidTypeName, ft, -100, TConstruct.nuggetLiquidValue);
+            registerNuggetCasting(ft, "nugget" + fluidTypeName);
 
             // Ingots, Dust
             registerIngotCasting(ft, "ingot" + fluidTypeName);
@@ -903,6 +904,7 @@ public void addOreDictionarySmelteryRecipes ()
             FluidType ft = FluidType.getFluidType("Obsidian");
             String fluidTypeName = "Obsidian";
             Smeltery.addDictionaryMelting("nugget" + fluidTypeName, ft, -100, TConstruct.nuggetLiquidValue);
+            registerNuggetCasting(ft, "nugget" + fluidTypeName);
 
             // Ingots, Dust
             registerIngotCasting(ft, "ingot" + fluidTypeName);
@@ -1291,6 +1293,18 @@ private void registerIngotCasting (FluidType ft, String name)
         }
     }
 
+    private void registerNuggetCasting (FluidType ft, String name)
+    {
+        ItemStack pattern = new ItemStack(TinkerSmeltery.metalPattern, 1, 27);
+        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.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.nuggetLiquidValue), pattern, 40);
+        }
+    }
+
     private void registerBlockCasting (FluidType ft, String name)
     {
         for (ItemStack ore : OreDictionary.getOres(name))

diff --git a/src/main/java/tconstruct/smeltery/items/MetalPattern.java b/src/main/java/tconstruct/smeltery/items/MetalPattern.java
@@ -24,7 +24,7 @@ protected static String[] getPatternNames (String partType)
         return names;
     }
 
-    private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "", "", "arrowhead", "gem" };
+    private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "", "", "arrowhead", "gem", "nugget" };
 
     @Override
     public void getSubItems (Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_)