diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index 4cf6821f..8459c4a1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -28,6 +28,7 @@ import java.io.InputStreamReader; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -71,6 +72,11 @@ class MixinConfig implements Comparable { */ private final transient Map> mixinMapping = new HashMap>(); + /** + * All mixins loaded by this config + */ + private final transient List mixins = new ArrayList(); + /** * Configuration priority */ @@ -237,6 +243,27 @@ class MixinConfig implements Comparable { List pluginMixins = this.plugin.getMixins(); this.initialiseMixins(pluginMixins, true); } + + for (Iterator iter = this.mixins.iterator(); iter.hasNext();) { + MixinInfo mixin = iter.next(); + try { + mixin.validate(); + } catch (Exception ex) { + this.logger.error(ex.getMessage(), ex); + this.removeMixin(mixin); + iter.remove(); + } + } + } + + private void removeMixin(MixinInfo remove) { + for (List mixinsFor : this.mixinMapping.values()) { + for (Iterator iter = mixinsFor.iterator(); iter.hasNext();) { + if (remove == iter.next()) { + iter.remove(); + } + } + } } private void initialiseMixins(List mixinClasses, boolean suppressPlugin) { @@ -256,6 +283,7 @@ class MixinConfig implements Comparable { for (String targetClass : mixin.getTargetClasses()) { this.mixinsFor(targetClass.replace('/', '.')).add(mixin); } + this.mixins.add(mixin); } } catch (Exception ex) { this.logger.error(ex.getMessage(), ex); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 9d0619ff..2778638c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -115,12 +115,6 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { */ private final List targetClassNames; - /** - * True if the superclass of the mixin is not the direct superclass - * of one or more targets - */ - private final boolean detachedSuper; - /** * Intrinsic order (for sorting mixins with identical priority) */ @@ -145,6 +139,18 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Interfaces soft-implemented using {@link Implements} */ private final transient List softImplements = new ArrayList(); + + /** + * Initial ClassNode created for mixin validation, not used for actual + * application + */ + private ClassNode validationClassNode; + + /** + * True if the superclass of the mixin is not the direct superclass + * of one or more targets + */ + private boolean detachedSuper; /** * Internal ctor, called by {@link MixinConfig} @@ -171,10 +177,15 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { this.priority = this.readPriority(classNode); this.targetClasses = this.readTargetClasses(classNode, suppressPlugin); this.targetClassNames = Collections.unmodifiableList(Lists.transform(this.targetClasses, Functions.toStringFunction())); - this.detachedSuper = this.validateTargetClasses(classNode); - this.validateMixin(classNode); - this.readImplementations(classNode); - this.prepare(classNode); + this.validationClassNode = classNode; + } + + void validate() { + this.detachedSuper = this.validateTargetClasses(this.validationClassNode); + this.validateMixin(this.validationClassNode); + this.readImplementations(this.validationClassNode); + this.prepare(this.validationClassNode); + this.validationClassNode = null; } /**