From 03551e21a0b395bcf1bcfb4feef5976fb32d7417 Mon Sep 17 00:00:00 2001 From: tgame14 Date: Wed, 9 Apr 2014 19:29:35 +0300 Subject: [PATCH] Adjusted Resonant Induction to respond to late phase @Config loading --- .../core/ResonantInduction.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/scala/resonantinduction/core/ResonantInduction.java b/src/main/scala/resonantinduction/core/ResonantInduction.java index 150818d7..d1643995 100644 --- a/src/main/scala/resonantinduction/core/ResonantInduction.java +++ b/src/main/scala/resonantinduction/core/ResonantInduction.java @@ -1,5 +1,6 @@ package resonantinduction.core; +import calclavia.lib.config.ConfigAnnotationEvent; import calclavia.lib.config.ConfigHandler; import calclavia.lib.content.ContentRegistry; import calclavia.lib.network.PacketAnnotation; @@ -22,6 +23,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.fluids.BlockFluidFinite; import org.modstats.ModstatInfo; import org.modstats.Modstats; @@ -84,6 +86,7 @@ public class ResonantInduction // Register Forge Events MinecraftForge.EVENT_BUS.register(ResourceGenerator.INSTANCE); MinecraftForge.EVENT_BUS.register(new TextureHookHandler()); + MinecraftForge.EVENT_BUS.register(INSTANCE); blockMachinePart = contentRegistry.createBlock(BlockMachineMaterial.class, ItemBlockMetadata.class); @@ -127,14 +130,7 @@ public class ResonantInduction @EventHandler public void postInit(FMLPostInitializationEvent evt) { - try - { - ConfigHandler.configure(Settings.CONFIGURATION, "resonantinduction"); - } - catch (Exception e) - { - e.printStackTrace(); - } + ConfigHandler.configure(Settings.CONFIGURATION, "resonantinduction"); // Generate Resources ResourceGenerator.generateOreResources(); @@ -142,6 +138,15 @@ public class ResonantInduction Settings.CONFIGURATION.save(); } + @ForgeSubscribe + public void configAnnotationAdded(ConfigAnnotationEvent event) + { + if (event.sourceClass.getName().startsWith("resonantinduction")) + { + ConfigHandler.handleClass(event.sourceClass, Settings.CONFIGURATION); + } + } + /** * Recipe Types */