diff --git a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinConfig.java index d43df580..d14f49ad 100644 --- a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinConfig.java @@ -31,6 +31,11 @@ import java.util.Set; */ public interface IMixinConfig { + /** + * Default priority for mixin configs and mixins + */ + public static final int DEFAULT_PRIORITY = 1000; + /** * Get the name of the file from which this configuration object was * initialised 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 d0e5f4e9..f5e9cbde 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -111,7 +111,16 @@ class MixinConfig implements Comparable, IMixinConfig { * Configuration priority */ @SerializedName("priority") - private final int priority = 1000; + private int priority = IMixinConfig.DEFAULT_PRIORITY; + + /** + * Default mixin priority. By default, mixins get a priority of + * {@link IMixinConfig#DEFAULT_PRIORITY DEFAULT_PRIORITY} unless a different + * value is specified in the annotation. This setting allows the base + * priority for all mixins in this config to be set to an alternate value. + */ + @SerializedName("mixinPriority") + private int mixinPriority = IMixinConfig.DEFAULT_PRIORITY; /** * Package containing all mixins. This package will be monitored by the @@ -383,7 +392,15 @@ class MixinConfig implements Comparable, IMixinConfig { public int getPriority() { return this.priority; } - + + /** + * Get the default priority for mixins in this config. Values specified in + * the mixin annotation still override this value + */ + public int getDefaultMixinPriority() { + return this.mixinPriority; + } + /** * Get the list of mixin classes we will be applying */ 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 aefeeaf4..58a62684 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -271,7 +271,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } Integer priority = ASMHelper.getAnnotationValue(mixin, "priority"); - return priority == null ? 1000 : priority.intValue(); + return priority == null ? this.parent.getDefaultMixinPriority() : priority.intValue(); } private boolean validateTargetClasses(ClassNode classNode) {