diff --git a/gradle.properties b/gradle.properties index 2fe4d6f..166c78f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -69,7 +69,7 @@ mixinPlugin = mixin.plugin.MixinPlugin # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! mixinsPackage = mixin.mixins # Specify a preinit mixin here. Preinit mixins should be used very rarely, if at all, so this mixin config will not be managed by the buildscript, only included. -mixinPreinitConfig = +mixinPreinitConfig = mixins.preinit.json # 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 diff --git a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java index 99c9eec..f115ddb 100644 --- a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java +++ b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java @@ -2,7 +2,6 @@ package com.falsepattern.endlessids.asm; import com.falsepattern.endlessids.asm.transformer.DragonAPIModList; import com.falsepattern.endlessids.asm.transformer.FmlRegistry; -import com.falsepattern.endlessids.asm.transformer.SpaceCoreModInfoGenerator; import java.util.HashMap; import java.util.Map; @@ -10,7 +9,6 @@ import java.util.Map; public enum ClassEdit { FmlRegistry(new FmlRegistry(), new String[]{"cpw.mods.fml.common.registry.GameData", "cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry"}), - SpaceCoreModInfoGenerator(new SpaceCoreModInfoGenerator(), new String[]{"com.spacechase0.minecraft.spacecore.mcp.ModInfoGenerator"}), DragonAPIModList(new DragonAPIModList(), new String[]{"Reika.DragonAPI.ModList"}); private static final Map editMap; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dev/spacecore/ModInfoGeneratorMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dev/spacecore/ModInfoGeneratorMixin.java new file mode 100644 index 0000000..c8bc03e --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dev/spacecore/ModInfoGeneratorMixin.java @@ -0,0 +1,19 @@ +package com.falsepattern.endlessids.mixin.mixins.common.dev.spacecore; + +import com.spacechase0.minecraft.spacecore.mcp.ModInfoGenerator; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(value = ModInfoGenerator.class, + remap = false) +public abstract class ModInfoGeneratorMixin { + @Inject(method = "generate", + at = @At("HEAD"), + cancellable = true, + require = 1) + private static void noGenerate(CallbackInfo ci) { + ci.cancel(); + } +} diff --git a/src/main/resources/mixins.preinit.json b/src/main/resources/mixins.preinit.json new file mode 100644 index 0000000..87f17ac --- /dev/null +++ b/src/main/resources/mixins.preinit.json @@ -0,0 +1,12 @@ +{ + "required": true, + "minVersion": "0.7.11", + "package": "com.falsepattern.endlessids.mixin.mixins", + "refmap": "mixins.endlessids.refmap.json", + "target": "@env(PREINIT)", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "common.dev.spacecore.ModInfoGeneratorMixin" + ] +} +