Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

2014-06-06 21:10:26 -05:00
parent 3b394face2 9ae4ce54d1
commit 03330d02ba
7 changed files with 83 additions and 44 deletions
@@ -4,20 +4,19 @@ import invtweaks.api.InvTweaksAPI;
 import net.minecraft.item.ItemStack;
 import appeng.integration.BaseModule;
 import appeng.integration.abstraction.IInvTweaks;
-import cpw.mods.fml.common.Mod.Instance;
+import cpw.mods.fml.common.Loader;

 public class InvTweaks extends BaseModule implements IInvTweaks
 {

 	public static InvTweaks instance;

-	@Instance("inventorytweaks")
 	static InvTweaksAPI api;

 	@Override
 	public void Init()
 	{
-
+		api = (InvTweaksAPI) Loader.instance().getIndexedModList().get( "inventorytweaks" ).getMod();
 	}

 	@Override