Switched from FML Optional to AE Optional, lets me specify more interesting requirements for integration, and lets the config alter the resulting integration setup.

2014-04-06 01:55:24 -05:00
parent 97c06db6ef
commit 5248eeeace
32 changed files with 526 additions and 271 deletions
@@ -19,14 +19,12 @@ import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
 public class AppEngCore extends DummyModContainer implements IFMLLoadingPlugin
 {

+	public final AppEngCore instance;
+
 	protected final ModMetadata md = new ModMetadata();

-	@EventHandler
-	public void load(FMLInitializationEvent event)
-	{
-	}
-
 	public AppEngCore() {
+		instance = this;
 		FMLRelaunchLog.info( "[AppEng] Core Init" );
 		md.autogenerated = true;
 		md.credits = "AlgorithmX2";
@@ -35,6 +33,11 @@ public class AppEngCore extends DummyModContainer implements IFMLLoadingPlugin
 		md.name = getName();
 	}

+	@EventHandler
+	public void load(FMLInitializationEvent event)
+	{
+	}
+
 	@Override
 	public boolean registerBus(EventBus bus, LoadController controller)
 	{
@@ -44,7 +47,7 @@ public class AppEngCore extends DummyModContainer implements IFMLLoadingPlugin
 	@Override
 	public String[] getASMTransformerClass()
 	{
-		return null;//return new String[] { "appeng.transformer.AppEngASMTransformer" };
+		return new String[] { "appeng.transformer.asm.ASMIntegration" };
 	}

 	@Override
@@ -97,6 +100,6 @@ public class AppEngCore extends DummyModContainer implements IFMLLoadingPlugin
 	@Override
 	public String getAccessTransformerClass()
 	{
-		return  "appeng.transformer.AppEngASMTransformer" ;
+		return "appeng.transformer.asm.ASMTweaker";
 	}
 }