Merge branch 'master' of https://github.com/GTNewHorizons/GoodGenerator

3 files changed, 79 insertions, 4 deletions

diff --git a/src/main/java/goodgenerator/main/GoodGenerator.java b/src/main/java/goodgenerator/main/GoodGenerator.java
index 48c6dbfb2e..1daa7dfedb 100644
--- a/src/main/java/goodgenerator/main/GoodGenerator.java
+++ b/src/main/java/goodgenerator/main/GoodGenerator.java
@@ -24,8 +24,8 @@ import cpw.mods.fml.common.Mod;
         + "required-after:bartworks; "
         + "required-after:tectech; ")
 public final class GoodGenerator {
-    public static final String MOD_ID = "GoodGenerator";
-    public static final String MOD_NAME = "Good Generator";
+    public static final String MOD_ID = "GRADLETOKEN_MODID";
+    public static final String MOD_NAME = "GRADLETOKEN_MODNAME";
     public static final String VERSION = "GRADLETOKEN_VERSION";
 
     public static final CreativeTabs GG = new MyTabs("Good Generator");
diff --git a/src/main/java/goodgenerator/main/GoodGenerator.java.bak b/src/main/java/goodgenerator/main/GoodGenerator.java.bak
new file mode 100644
index 0000000000..b072ba04db
--- /dev/null
+++ b/src/main/java/goodgenerator/main/GoodGenerator.java.bak
@@ -0,0 +1,75 @@
+package goodgenerator.main;
+
+import goodgenerator.common.CommonProxy;
+import goodgenerator.crossmod.thaumcraft.Research;
+import goodgenerator.items.MyMaterial;
+import goodgenerator.loader.*;
+import goodgenerator.network.MessageOpenNeutronSensorGUI;
+import goodgenerator.network.MessageSetNeutronSensorData;
+import goodgenerator.tabs.MyTabs;
+import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.SidedProxy;
+import cpw.mods.fml.common.event.*;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
+import cpw.mods.fml.relauncher.Side;
+import net.minecraft.creativetab.CreativeTabs;
+import cpw.mods.fml.common.Mod;
+
+@SuppressWarnings("ALL")
+@Mod(modid = GoodGenerator.MOD_ID, version = GoodGenerator.VERSION,
+        dependencies = "required-after:IC2; "
+        + "required-after:gregtech; "
+        + "required-after:bartworks; "
+        + "required-after:tectech; ")
+public final class GoodGenerator {
+    public static final String MOD_ID = "GoodGenerator";
+    public static final String MOD_NAME = "GRADLETOKEN_MODNAME";
+    public static final String VERSION = "GRADLETOKEN_VERSION";
+
+    public static final CreativeTabs GG = new MyTabs("Good Generator");
+
+    @SidedProxy(clientSide = "goodgenerator.client.ClientProxy",serverSide = "goodgenerator.common.CommonProxy")
+    public static CommonProxy proxy;
+    public static SimpleNetworkWrapper CHANNEL = NetworkRegistry.INSTANCE.newSimpleChannel(MOD_ID);
+
+    static {
+        CHANNEL.registerMessage(MessageSetNeutronSensorData.ServerHandler.class, MessageSetNeutronSensorData.class, 0, Side.SERVER);
+        CHANNEL.registerMessage(MessageOpenNeutronSensorGUI.ClientHandler.class, MessageOpenNeutronSensorGUI.class, 1, Side.CLIENT);
+    }
+
+    @Mod.Instance(GoodGenerator.MOD_ID)
+    public static GoodGenerator instance;
+
+    @Mod.EventHandler
+    public static void preInit(FMLPreInitializationEvent event) {
+        GG_Config_Loader.run();
+        WerkstoffAdderRegistry.addWerkstoffAdder(new MyMaterial());
+        //WerkstoffAdderRegistry.addWerkstoffAdder(new IsotopeMaterialLoader());
+        Loaders.preInitLoad();
+        proxy.preInit(event);
+    }
+    @Mod.EventHandler
+    public static void init(FMLInitializationEvent event) {
+        Loaders.initLoad();
+        proxy.init(event);
+    }
+    @Mod.EventHandler
+    public static void postInit(FMLPostInitializationEvent event) {
+        Loaders.postInitLoad();
+        crossMod();
+        proxy.postInit(event);
+    }
+    @Mod.EventHandler
+    public void onLoadComplete(FMLLoadCompleteEvent event) {
+        //NaquadahReworkRecipeLoader.SmallRecipeChange();
+        NaquadahReworkRecipeLoader.Remover();
+    }
+
+    public static void crossMod() {
+        if (Loader.isModLoaded("Thaumcraft")) {
+            Research.addResearch();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 1b37becea3..ea26d88ac7 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,8 +3,8 @@
   "modid": "GoodGenerator",
   "name": "Good Generator",
   "description": "Add some powerful generators",
-  "version": "${version}",
-  "mcversion": "${mcversion}",
+  "version": "${modVersion}",
+  "mcversion": "${minecraftVersion}",
   "url": "",
   "updateUrl": "",
   "authorList": ["GlodBlock"],