From 69496722bb78c4dc8a74267ddcebe52b75482d54 Mon Sep 17 00:00:00 2001
From: Bernhard Bonigl <bernhard.bonigl@gmail.com>
Date: Sat, 21 Feb 2015 20:25:36 +0100
Subject: [PATCH] Move Oredictionary registrations to preInit

---
 src/main/java/tconstruct/smeltery/TinkerSmeltery.java | 3 ++-
 src/main/java/tconstruct/world/TinkerWorld.java       | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java
index a6c73a287bb..1171dac9325 100644
--- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java
+++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java
@@ -417,6 +417,8 @@ public void preInit (FMLPreInitializationEvent event)
         {
             TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Cast", new ItemStack(TinkerSmeltery.metalPattern, 1, i));
         }
+
+        oreRegistry();
     }
 
     @Handler
@@ -428,7 +430,6 @@ public void init (FMLInitializationEvent event)
         addRecipesForTableCasting();
         addRecipesForBasinCasting();
         addRecipesForFurnace();
-        oreRegistry();
     }
 
     @Handler
diff --git a/src/main/java/tconstruct/world/TinkerWorld.java b/src/main/java/tconstruct/world/TinkerWorld.java
index 6a7ae41ce68..e680dc6866c 100644
--- a/src/main/java/tconstruct/world/TinkerWorld.java
+++ b/src/main/java/tconstruct/world/TinkerWorld.java
@@ -161,6 +161,7 @@ public void preInit (FMLPreInitializationEvent event)
         TinkerWorld.woodenRail = new WoodRail().setStepSound(Block.soundTypeWood).setCreativeTab(TConstructRegistry.blockTab).setBlockName("rail.wood");
 
         GameRegistry.registerBlock(TinkerWorld.meatBlock, HamboneItemBlock.class, "MeatBlock");
+        OreDictionary.registerOre("hambone", new ItemStack(TinkerWorld.meatBlock));
         GameRegistry.registerBlock(TinkerWorld.woolSlab1, WoolSlab1Item.class, "WoolSlab1");
         GameRegistry.registerBlock(TinkerWorld.woolSlab2, WoolSlab2Item.class, "WoolSlab2");
 
@@ -235,6 +236,8 @@ public void preInit (FMLPreInitializationEvent event)
         TinkerWorld.metalBlock.stepSound = Block.soundTypeMetal;
         GameRegistry.registerBlock(TinkerWorld.metalBlock, MetalItemBlock.class, "MetalBlock");
         FluidType.registerFluidType("Slime", TinkerWorld.slimeGel, 0, 250, TinkerWorld.blueSlimeFluid, false);
+
+        oreRegistry();
     }
 
     @Handler
@@ -242,7 +245,6 @@ public void init (FMLInitializationEvent event)
     {
         craftingTableRecipes();
         addRecipesForFurnace();
-        oreRegistry();
         addLoot();
         createEntities();
         proxy.initialize();
@@ -406,7 +408,6 @@ private void craftingTableRecipes ()
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerWorld.slimeChannel, 1, 0), "slimeball", "slimeball", "slimeball", "slimeball", new ItemStack(Items.redstone)));
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerWorld.slimePad, 1, 0), TinkerWorld.slimeChannel, "slimeball"));
 
-        OreDictionary.registerOre("hambone", new ItemStack(TinkerWorld.meatBlock));
         GameRegistry.addRecipe(new ItemStack(TinkerWorld.meatBlock), "mmm", "mbm", "mmm", 'b', new ItemStack(Items.bone), 'm', new ItemStack(Items.porkchop));
     }