diff --git a/src/main/java/org/spongepowered/asm/mixin/Unique.java b/src/main/java/org/spongepowered/asm/mixin/Unique.java
index e5ed1fa4..a57d803b 100644
--- a/src/main/java/org/spongepowered/asm/mixin/Unique.java
+++ b/src/main/java/org/spongepowered/asm/mixin/Unique.java
@@ -48,7 +48,8 @@ import java.lang.annotation.Target;
*
* - public methods
* - public methods marked with this annotation are discarded if a
- * matching target exists. A warning-level message is generated.
+ * matching target exists. Unless {@link #silent} is set to true, a
+ * warning-level message is generated.
* - private and protected methods
* - non-public methods are renamed if a matching target method is
* found, this allows utility methods to be safely assigned meaningful names
@@ -68,5 +69,16 @@ import java.lang.annotation.Target;
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
public @interface Unique {
+
+ /**
+ * If this annotation is applied to a public method in a mixin and a
+ * conflicting method is found in a target class, then a
+ * warning-level message is generated in the log. To suppress this
+ * message, set this value to true.
+ *
+ * @return true to suppress warning message when a public method is
+ * discarded
+ */
+ public boolean silent() default false;
}
diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java
index 7c4098c3..ef0da4d5 100644
--- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java
+++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java
@@ -41,6 +41,7 @@ import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel;
import org.spongepowered.asm.mixin.MixinEnvironment.Option;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.gen.Invoker;
import org.spongepowered.asm.mixin.gen.throwables.InvalidAccessorException;
@@ -415,7 +416,7 @@ class MixinPreProcessorStandard {
return false;
}
- String type = method.isUnique() ? "@Unique" : "synthetic";
+ String type = method.isSynthetic() ? "synthetic" : "@Unique";
if (Bytecode.getVisibility(mixinMethod).ordinal() < Visibility.PUBLIC.ordinal()) {
String uniqueName = context.getUniqueName(mixinMethod, false);
@@ -430,8 +431,11 @@ class MixinPreProcessorStandard {
+ " cannot overwrite " + target.name + target.desc + " in " + context.getTarget());
}
- MixinPreProcessorStandard.logger.warn("Discarding {} public method {} in {} because it already exists in {}", type, mixinMethod.name,
- this.mixin, context.getTarget());
+ AnnotationNode unique = Annotations.getVisible(mixinMethod, Unique.class);
+ if (unique == null || !Annotations.getValue(unique, "silent", Boolean.FALSE).booleanValue()) {
+ MixinPreProcessorStandard.logger.warn("Discarding {} public method {} in {} because it already exists in {}", type, mixinMethod.name,
+ this.mixin, context.getTarget());
+ }
return true;
}