diff --git a/addon.gradle b/addon.gradle index 05d902b44..8535d4509 100644 --- a/addon.gradle +++ b/addon.gradle @@ -9,13 +9,3 @@ sourceSets { compileClasspath += configurations.compileStubs } } - -jar { - manifest { - attributes([ - "Manifest-Version" : 1.0, - "TweakClass" : "com.gtnewhorizons.angelica.loading.ATweaker", - "TweakOrder" : 1100, - ]) - } -} diff --git a/gradle.properties b/gradle.properties index db5f1dd34..902e41619 100644 --- a/gradle.properties +++ b/gradle.properties @@ -75,7 +75,7 @@ mixinsPackage = # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! # This parameter is for legacy compatibility only # Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin -coreModClass = +coreModClass = loading.AngelicaTweaker # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false! containsMixinsAndOrCoreModOnly = false diff --git a/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java b/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java new file mode 100644 index 000000000..81d821cd9 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java @@ -0,0 +1,12 @@ +package com.gtnewhorizons.angelica; + +import cpw.mods.fml.common.Mod; + +@Mod( + modid = "angelica", + name = "Angelica", + version = Tags.VERSION, + acceptedMinecraftVersions = "[1.7.10,)", + acceptableRemoteVersions = "*") +public class AngelicaMod { +} diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/ATweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/ATweaker.java deleted file mode 100644 index 149b6da24..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/loading/ATweaker.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.gtnewhorizons.angelica.loading; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.launchwrapper.ITweaker; -import net.minecraft.launchwrapper.Launch; -import net.minecraft.launchwrapper.LaunchClassLoader; - -public class ATweaker implements ITweaker { - - public List args; - public File gameDir; - public File assetsDir; - public String version; - - @Override - public void acceptOptions(List args, File gameDir, File assetsDir, String version) { - this.args = args; - this.gameDir = gameDir; - this.assetsDir = assetsDir; - this.version = version; - } - - @Override - public void injectIntoClassLoader(LaunchClassLoader launchClassLoader) { - launchClassLoader.addTransformerExclusion("com.gtnewhorizons.angelica.loading."); - launchClassLoader.addTransformerExclusion("com.gtnewhorizons.angelica.transform."); - launchClassLoader.registerTransformer("com.gtnewhorizons.angelica.transform.AClassTransformer"); - } - - @Override - public String[] getLaunchArguments() { - ArrayList argumentList = (ArrayList) Launch.blackboard.get("ArgumentList"); - if (argumentList.isEmpty()) { - List argsList = new ArrayList(); - if (gameDir != null) { - argumentList.add("--gameDir"); - argumentList.add(gameDir.getPath()); - } - if (assetsDir != null) { - argumentList.add("--assetsDir"); - argumentList.add(assetsDir.getPath()); - } - argumentList.add("--version"); - argumentList.add(version); - argumentList.addAll(args); - } - return new String[0]; - } - - @Override - public String getLaunchTarget() { - return "net.minecraft.client.main.Main"; - } -} diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java new file mode 100644 index 000000000..f09dd64d7 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java @@ -0,0 +1,37 @@ +package com.gtnewhorizons.angelica.loading; + +import java.util.Map; + +import cpw.mods.fml.relauncher.IFMLLoadingPlugin; + +@IFMLLoadingPlugin.MCVersion("1.7.10") +@IFMLLoadingPlugin.TransformerExclusions({ "com.gtnewhorizons.angelica.loading.", + "com.gtnewhorizons.angelica.transform." }) +@IFMLLoadingPlugin.SortingIndex(1100) +public class AngelicaTweaker implements IFMLLoadingPlugin { + + @Override + public String[] getASMTransformerClass() { + return new String[] { "com.gtnewhorizons.angelica.transform.AClassTransformer" }; + } + + @Override + public String getModContainerClass() { + return null; + } + + @Override + public String getSetupClass() { + return null; + } + + @Override + public void injectData(Map data) { + // no-op + } + + @Override + public String getAccessTransformerClass() { + return null; + } +}