Fix TE metals displaying the wrong block inside the smeltery

SlimeKnights · Feb 9, 2015 · f06ecd3 · f06ecd3
1 parent 08c95c6
commit f06ecd3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java b/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java
@@ -1,6 +1,7 @@
 package tconstruct.plugins.te4;
 
 import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
 import mantle.pulsar.pulse.Handler;
@@ -15,9 +16,11 @@
 import net.minecraftforge.oredict.OreDictionary;
 import tconstruct.TConstruct;
 import tconstruct.library.TConstructRegistry;
+import tconstruct.library.crafting.FluidType;
 import tconstruct.library.crafting.LiquidCasting;
 import tconstruct.library.crafting.Smeltery;
 import tconstruct.smeltery.TinkerSmeltery;
+import tconstruct.world.TinkerWorld;
 
 import java.util.ArrayList;
 
@@ -26,6 +29,20 @@
 public class TinkersThermalFoundation {
     static final String TF_MOD_ID = "ThermalFoundation";
 
+    @Handler
+    public void preInit(FMLPreInitializationEvent event) {
+        registerFluidType("Nickel", 400, TinkerSmeltery.moltenNickelFluid);
+        registerFluidType("Lead", 400, TinkerSmeltery.moltenLeadFluid);
+        registerFluidType("Silver", 400, TinkerSmeltery.moltenSilverFluid);
+        registerFluidType("Platinum", 400, TinkerSmeltery.moltenShinyFluid);
+        registerFluidType("Invar", 400, TinkerSmeltery.moltenInvarFluid);
+        registerFluidType("Electrum", 400, TinkerSmeltery.moltenElectrumFluid);
+        registerFluidType("Lumium", 370, TinkerSmeltery.moltenLumiumFluid);
+        registerFluidType("Signalum", 450, TinkerSmeltery.moltenSignalumFluid);
+        registerFluidType("Mithril", 800, TinkerSmeltery.moltenMithrilFluid);
+        registerFluidType("Enderium", 1000, TinkerSmeltery.moltenEnderiumFluid);
+    }
+
     @Handler
     public void init(FMLInitializationEvent event) {
         // melt stuff in the smeltery
@@ -100,4 +117,13 @@ public void init(FMLInitializationEvent event) {
         part3 = new FluidStack(TinkerSmeltery.moltenShinyFluid, amount);
         Smeltery.addAlloyMixing(result, part1, part2, part3, new FluidStack(TinkerSmeltery.moltenEnderFluid, amount));
     }
+
+
+    private void registerFluidType(String name, int temp, Fluid fluid) {
+        ItemStack stack = GameRegistry.findItemStack(TF_MOD_ID, "block" + name, 1);
+        if(stack == null || stack.getItem() == null)
+            stack = new ItemStack(TinkerWorld.metalBlock);
+
+        FluidType.registerFluidType(name, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), temp, fluid, false);
+    }
 }
diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java
@@ -346,16 +346,6 @@ public void preInit (FMLPreInitializationEvent event)
         FluidType.registerFluidType("Manyullyn", TinkerWorld.metalBlock, 2, 750, TinkerSmeltery.moltenManyullynFluid, true);
         FluidType.registerFluidType("Bronze", TinkerWorld.metalBlock, 4, 500, TinkerSmeltery.moltenBronzeFluid, true);
         FluidType.registerFluidType("Steel", TinkerWorld.metalBlock, 9, 700, TinkerSmeltery.moltenSteelFluid, true);
-        FluidType.registerFluidType("Nickel", TinkerWorld.metalBlock, 0, 400, TinkerSmeltery.moltenNickelFluid, false);
-        FluidType.registerFluidType("Lead", TinkerWorld.metalBlock, 0, 400, TinkerSmeltery.moltenLeadFluid, false);
-        FluidType.registerFluidType("Silver", TinkerWorld.metalBlock, 0, 400, TinkerSmeltery.moltenSilverFluid, false);
-        FluidType.registerFluidType("Platinum", TinkerWorld.metalBlock, 0, 400, TinkerSmeltery.moltenShinyFluid, false);
-        FluidType.registerFluidType("Invar", TinkerWorld.metalBlock, 0, 400, TinkerSmeltery.moltenInvarFluid, false);
-        FluidType.registerFluidType("Electrum", TinkerWorld.metalBlock, 0, 400, TinkerSmeltery.moltenElectrumFluid, false);
-        FluidType.registerFluidType("Lumium", TinkerWorld.metalBlock, 0, 370, TinkerSmeltery.moltenLumiumFluid, false);
-        FluidType.registerFluidType("Signalum", TinkerWorld.metalBlock, 0, 450, TinkerSmeltery.moltenSignalumFluid, false);
-        FluidType.registerFluidType("Mithril", TinkerWorld.metalBlock, 0, 800, TinkerSmeltery.moltenMithrilFluid, false);
-        FluidType.registerFluidType("Enderium", TinkerWorld.metalBlock, 0, 1000, TinkerSmeltery.moltenEnderiumFluid, false);
         FluidType.registerFluidType("Obsidian", Blocks.obsidian, 0, 750, TinkerSmeltery.moltenObsidianFluid, true);
         FluidType.registerFluidType("Ender", TinkerWorld.metalBlock, 10, 500, TinkerSmeltery.moltenEnderFluid, false);
         FluidType.registerFluidType("Glass", Blocks.sand, 0, 625, TinkerSmeltery.moltenGlassFluid, false);