Renamed plugin entry classes to *Pulse, wrapped FMP and NEI to preven…

…t NoClassDefFoundError
progwml6 · Sep 4, 2014 · ee1e3fa · ee1e3fa
1 parent 3fe0672
commit ee1e3fa
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 74 deletions.
diff --git a/src/main/java/mods/natura/plugins/PluginController.java b/src/main/java/mods/natura/plugins/PluginController.java
@@ -1,12 +1,12 @@
 package mods.natura.plugins;
 
 import static mods.natura.Natura.pulsar;
-import mods.natura.plugins.fmp.ForgeMultiPart;
+import mods.natura.plugins.fmp.FMPPulse;
 import mods.natura.plugins.imc.*;
-import mods.natura.plugins.minefactoryreloaded.MineFactoryReloaded;
-import mods.natura.plugins.nei.NotEnoughItems;
-import mods.natura.plugins.te4.ThermalExpansion4;
-import mods.natura.plugins.thaumcraft.Thaumcraft;
+import mods.natura.plugins.minefactoryreloaded.MFRPulse;
+import mods.natura.plugins.nei.NEIPulse;
+import mods.natura.plugins.te4.TE4Pulse;
+import mods.natura.plugins.thaumcraft.ThaumcraftPulse;
 
 /**
  * Master controller for Natura compat plugins.
@@ -22,14 +22,14 @@ private PluginController()
 
     public static void registerBuiltins ()
     {
-    	pulsar.registerPulse(new ThermalExpansion4());
-    	pulsar.registerPulse(new BuildCraft());
-    	pulsar.registerPulse(new Forestry());
-    	pulsar.registerPulse(new TreeCapitator());
-    	pulsar.registerPulse(new Thaumcraft());
-    	pulsar.registerPulse(new ForgeMultiPart());
-    	pulsar.registerPulse(new NotEnoughItems());
-    	pulsar.registerPulse(new MineFactoryReloaded());
+    	pulsar.registerPulse(new TE4Pulse());
+    	pulsar.registerPulse(new BuildCraftPulse());
+    	pulsar.registerPulse(new ForestryPulse());
+    	pulsar.registerPulse(new TreeCapitatorPulse());
+    	pulsar.registerPulse(new ThaumcraftPulse());
+    	pulsar.registerPulse(new FMPPulse());
+    	pulsar.registerPulse(new NEIPulse());
+    	pulsar.registerPulse(new MFRPulse());
     }
 
 }
diff --git a/src/main/java/mods/natura/plugins/fmp/FMPPulse.java b/src/main/java/mods/natura/plugins/fmp/FMPPulse.java
@@ -0,0 +1,26 @@
+package mods.natura.plugins.fmp;
+
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import mantle.pulsar.pulse.Handler;
+import mantle.pulsar.pulse.Pulse;
+import mods.natura.Natura;
+
+@Pulse(id = "Natura FMP Compatibility", modsRequired = ForgeMultiPart.modId)
+public class FMPPulse
+{
+
+    @Handler
+    public void init (FMLInitializationEvent evt)
+    {
+        try
+        {
+            Natura.logger.debug("[FMP] Registering Natura decorative blocks with FMP.");
+            ForgeMultiPart.registerBlocks();
+        }
+        catch (Exception e)
+        {
+            Natura.logger.catching(e);
+        }
+    }
+
+}
diff --git a/src/main/java/mods/natura/plugins/fmp/ForgeMultiPart.java b/src/main/java/mods/natura/plugins/fmp/ForgeMultiPart.java
@@ -1,41 +1,27 @@
 package mods.natura.plugins.fmp;
 
+import mods.natura.common.NContent;
 import net.minecraft.block.Block;
 import codechicken.microblock.BlockMicroMaterial;
 import codechicken.microblock.MicroMaterialRegistry;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import mantle.pulsar.pulse.Handler;
-import mantle.pulsar.pulse.Pulse;
-import mods.natura.Natura;
-import mods.natura.common.NContent;
 
-@Pulse(id = "Natura FMP Compatibility", modsRequired = ForgeMultiPart.modId)
 public class ForgeMultiPart
 {
 
     public static final String modId = "ForgeMultipart";
 
-    @Handler
-    public void init (FMLInitializationEvent evt)
+    public static void registerBlocks ()
     {
-        try
-        {
-            Natura.logger.debug("[FMP] Registering Natura decorative blocks with FMP.");
-            registerBlock(NContent.bloodwood);
-            registerBlock(NContent.willow);
-            registerBlock(NContent.planks, 0, 12);
-            registerBlock(NContent.tree, 0, 3);
-            registerBlock(NContent.rareTree, 0, 3);
-            registerBlock(NContent.rareLeaves, 0, 3);
-            registerBlock(NContent.darkLeaves, 0, 3);
-            registerBlock(NContent.redwood, 0, 2);
-            registerBlock(NContent.floraLeaves, 0, 2);
-            registerBlock(NContent.floraLeavesNoColor, 0, 2);
-        }
-        catch (Exception e)
-        {
-            Natura.logger.catching(e);
-        }
+        registerBlock(NContent.bloodwood);
+        registerBlock(NContent.willow);
+        registerBlock(NContent.planks, 0, 12);
+        registerBlock(NContent.tree, 0, 3);
+        registerBlock(NContent.rareTree, 0, 3);
+        registerBlock(NContent.rareLeaves, 0, 3);
+        registerBlock(NContent.darkLeaves, 0, 3);
+        registerBlock(NContent.redwood, 0, 2);
+        registerBlock(NContent.floraLeaves, 0, 2);
+        registerBlock(NContent.floraLeavesNoColor, 0, 2);
     }
 
     //For blocks with metadata values only

diff --git a/...a/mods/natura/plugins/imc/BuildCraft.java → ...s/natura/plugins/imc/BuildCraftPulse.java b/...a/mods/natura/plugins/imc/BuildCraft.java → ...s/natura/plugins/imc/BuildCraftPulse.java
@@ -8,8 +8,8 @@
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLInterModComms;
 
-@Pulse(id = "Natura BuildCraft Compatibility", modsRequired = BuildCraft.modId)
-public class BuildCraft
+@Pulse(id = "Natura BuildCraft Compatibility", modsRequired = BuildCraftPulse.modId)
+public class BuildCraftPulse
 {
 
     public static final String modId = "BuildCraft|Transport";

diff --git a/...ava/mods/natura/plugins/imc/Forestry.java → ...ods/natura/plugins/imc/ForestryPulse.java b/...ava/mods/natura/plugins/imc/Forestry.java → ...ods/natura/plugins/imc/ForestryPulse.java
@@ -4,8 +4,8 @@
 import mantle.pulsar.pulse.Handler;
 import mantle.pulsar.pulse.Pulse;
 
-@Pulse(id = "Natura Forestry Compatibility", modsRequired = Forestry.modId)
-public class Forestry
+@Pulse(id = "Natura Forestry Compatibility", modsRequired = ForestryPulse.modId)
+public class ForestryPulse
 {
 
     public static final String modId = "Forestry";

diff --git a/...ods/natura/plugins/imc/TreeCapitator.java → ...atura/plugins/imc/TreeCapitatorPulse.java b/...ods/natura/plugins/imc/TreeCapitator.java → ...atura/plugins/imc/TreeCapitatorPulse.java
@@ -11,8 +11,8 @@
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.registry.GameData;
 
-@Pulse(id = "Natura TreeCapitator Compatibility", modsRequired = TreeCapitator.modId)
-public class TreeCapitator
+@Pulse(id = "Natura TreeCapitator Compatibility", modsRequired = TreeCapitatorPulse.modId)
+public class TreeCapitatorPulse
 {
 
     public static final String modId = "Treecapitator";

diff --git a/...efactoryreloaded/MineFactoryReloaded.java → ...plugins/minefactoryreloaded/MFRPulse.java b/...efactoryreloaded/MineFactoryReloaded.java → ...plugins/minefactoryreloaded/MFRPulse.java
@@ -5,8 +5,8 @@
 import mantle.pulsar.pulse.Pulse;
 import mods.natura.Natura;
 
-@Pulse(id = "Natura MFR Compatibility", modsRequired = MineFactoryReloaded.modId)
-public class MineFactoryReloaded
+@Pulse(id = "Natura MFR Compatibility", modsRequired = MFRPulse.modId)
+public class MFRPulse
 {
 
     public static final String modId = "MineFactoryReloaded";

diff --git a/src/main/java/mods/natura/plugins/nei/NEIPulse.java b/src/main/java/mods/natura/plugins/nei/NEIPulse.java
@@ -0,0 +1,30 @@
+package mods.natura.plugins.nei;
+
+import mantle.pulsar.pulse.Handler;
+import mantle.pulsar.pulse.Pulse;
+import mods.natura.Natura;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+
+@Pulse(id = "Natura NEI Compatibility", modsRequired = NEIPulse.modId)
+public class NEIPulse
+{
+    public static final String modId = "NotEnoughItems";
+
+    @Handler
+    public void init (FMLInitializationEvent evt)
+    {
+        if (FMLCommonHandler.instance().getSide().isServer())
+            return;
+
+        try
+        {
+            Natura.logger.debug("[NEI] Registering Natura NEI plugin.");
+            NotEnoughItems.registerNEICompat();
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/java/mods/natura/plugins/nei/NotEnoughItems.java b/src/main/java/mods/natura/plugins/nei/NotEnoughItems.java
@@ -3,34 +3,11 @@
 import codechicken.nei.api.API;
 import codechicken.nei.recipe.DefaultOverlayHandler;
 import cpw.mods.fml.common.*;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.relauncher.Side;
-import mantle.pulsar.pulse.Handler;
-import mantle.pulsar.pulse.Pulse;
-import mods.natura.Natura;
 import mods.natura.gui.WorkbenchGui;
 
-@Pulse(id = "Natura NEI Compatibility", modsRequired = NotEnoughItems.modId)
 public class NotEnoughItems
 {
-    public static final String modId = "NotEnoughItems";
-
-    @Handler
-    public void init (FMLInitializationEvent evt)
-    {
-        if (FMLCommonHandler.instance().getSide().isServer())
-            return;
-
-        try
-        {
-            Natura.logger.debug("[NEI] Registering Natura NEI plugin.");
-            registerNEICompat();
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
 
     public static void registerNEICompat ()
     {

diff --git a/...natura/plugins/te4/ThermalExpansion4.java → ...ava/mods/natura/plugins/te4/TE4Pulse.java b/...natura/plugins/te4/ThermalExpansion4.java → ...ava/mods/natura/plugins/te4/TE4Pulse.java
@@ -16,8 +16,8 @@
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.registry.GameRegistry;
 
-@Pulse(id = "Natura TE4 Compatibility", modsRequired = ThermalExpansion4.modId)
-public class ThermalExpansion4
+@Pulse(id = "Natura TE4 Compatibility", modsRequired = TE4Pulse.modId)
+public class TE4Pulse
 {
     private List<String> list;
 

diff --git a/...natura/plugins/thaumcraft/Thaumcraft.java → ...a/plugins/thaumcraft/ThaumcraftPulse.java b/...natura/plugins/thaumcraft/Thaumcraft.java → ...a/plugins/thaumcraft/ThaumcraftPulse.java
@@ -12,8 +12,8 @@
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 
-@Pulse(id = "Natura Thaumcraft Compatibility", modsRequired = Thaumcraft.modId)
-public class Thaumcraft
+@Pulse(id = "Natura Thaumcraft Compatibility", modsRequired = ThaumcraftPulse.modId)
+public class ThaumcraftPulse
 {
 
     public static final String modId = "Thaumcraft";