From 84744e04045314959448b700ba2a9fe251b46f4d Mon Sep 17 00:00:00 2001 From: Glassmaker Date: Sun, 13 Jul 2014 13:58:04 +0300 Subject: [PATCH] Shifts villager initializaion after pulsar's preinit, fixes crash on opening villager trade window, closes #719 --- src/main/java/tconstruct/TConstruct.java | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 9232ff91de9..1aad1eae86d 100644 --- 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