Shifts villager initializaion after pulsar's preinit, fixes crash on …

…opening villager trade window, closes #719
SlimeKnights · Jul 13, 2014 · 84744e0 · 84744e0
1 parent b6d8e1f
commit 84744e0
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java
@@ -122,18 +122,6 @@ public void preInit (FMLPreInitializationEvent event)
 
         //GameRegistry.registerFuelHandler(content);
 
-        if (PHConstruct.addToVillages)
-        {
-            // adds to the villager spawner egg
-            VillagerRegistry.instance().registerVillagerId(78943);
-            // moved down, not needed if 'addToVillages' is false
-            VillagerRegistry.instance().registerVillageTradeHandler(78943, new TVillageTrades());
-            VillagerRegistry.instance().registerVillageCreationHandler(new VillageToolStationHandler());
-            VillagerRegistry.instance().registerVillageCreationHandler(new VillageSmelteryHandler());
-            MapGenStructureIO.func_143031_a(ComponentToolWorkshop.class, "TConstruct:ToolWorkshopStructure");
-            MapGenStructureIO.func_143031_a(ComponentSmeltery.class, "TConstruct:SmelteryStructure");
-        }
-
         playerTracker = new TPlayerHandler();
         // GameRegistry.registerPlayerTracker(playerTracker);
         FMLCommonHandler.instance().bus().register(playerTracker);
@@ -146,6 +134,18 @@ public void preInit (FMLPreInitializationEvent event)
         }
 
         pulsar.preInit(event);
+
+        if (PHConstruct.addToVillages)
+        {
+            // adds to the villager spawner egg
+            VillagerRegistry.instance().registerVillagerId(78943);
+            // moved down, not needed if 'addToVillages' is false
+            VillagerRegistry.instance().registerVillageTradeHandler(78943, new TVillageTrades());
+            VillagerRegistry.instance().registerVillageCreationHandler(new VillageToolStationHandler());
+            VillagerRegistry.instance().registerVillageCreationHandler(new VillageSmelteryHandler());
+            MapGenStructureIO.func_143031_a(ComponentToolWorkshop.class, "TConstruct:ToolWorkshopStructure");
+            MapGenStructureIO.func_143031_a(ComponentSmeltery.class, "TConstruct:SmelteryStructure");
+        }
     }
 
     @EventHandler