diff --git a/gradle.properties b/gradle.properties index 166c78f..2fe4d6f 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 = mixins.preinit.json +mixinPreinitConfig = # 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 6d75bfe..6caa514 100644 --- a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java +++ b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java @@ -9,11 +9,12 @@ import java.util.HashMap; import java.util.Map; public enum ClassEdit { + ChunkProviderSuperPatcher(new ChunkProviderSuperPatcher()), + DragonAPIModList(new DragonAPIModList(), "Reika.DragonAPI.ModList"), FmlRegistry(new FmlRegistry(), "cpw.mods.fml.common.registry.GameData", "cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry"), - ChunkProviderSuperPatcher(new ChunkProviderSuperPatcher()), - DragonAPIModList(new DragonAPIModList(), "Reika.DragonAPI.ModList"); + SpaceCoreModInfoGenerator(new SpaceCoreModInfoGenerator(), "com.spacechase0.minecraft.spacecore.mcp.ModInfoGenerator"); private static final Map editMap; diff --git a/src/main/java/com/falsepattern/endlessids/asm/transformer/SpaceCoreModInfoGenerator.java b/src/main/java/com/falsepattern/endlessids/asm/transformer/SpaceCoreModInfoGenerator.java index c292e6d..fca7644 100644 --- a/src/main/java/com/falsepattern/endlessids/asm/transformer/SpaceCoreModInfoGenerator.java +++ b/src/main/java/com/falsepattern/endlessids/asm/transformer/SpaceCoreModInfoGenerator.java @@ -9,6 +9,9 @@ import org.objectweb.asm.tree.InsnNode; public class SpaceCoreModInfoGenerator implements IClassNodeTransformer { @Override public void transform(final ClassNode cn, final boolean obfuscated) { + if (obfuscated) { + return; + } for (val method: cn.methods) { if (method.name.equals("generate")) { val iterator = method.instructions.iterator(); 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 deleted file mode 100644 index c8bc03e..0000000 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dev/spacecore/ModInfoGeneratorMixin.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 87f17ac..0000000 --- a/src/main/resources/mixins.preinit.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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" - ] -} -