New: Support for MixinExtras @Definitions.

src/main/java/net/fabricmc/tinyremapper/extension/mixin/common/data/Annotation.java

@@ -71,4 +71,6 @@ public final class Annotation {
 	public static final String MIXIN_EXTRAS_WRAP_OPERATION = "Lcom/llamalad7/mixinextras/injector/wrapoperation/WrapOperation;";
 	public static final String MIXIN_EXTRAS_WRAP_WITH_CONDITION = "Lcom/llamalad7/mixinextras/injector/WrapWithCondition;";
 	public static final String MIXIN_EXTRAS_WRAP_WITH_CONDITION_V2 = "Lcom/llamalad7/mixinextras/injector/v2/WrapWithCondition;";
+	public static final String MIXIN_EXTRAS_DEFINITIONS = "Lcom/llamalad7/mixinextras/expression/Definitions;";
+	public static final String MIXIN_EXTRAS_DEFINITION = "Lcom/llamalad7/mixinextras/expression/Definition;";
 }

src/main/java/net/fabricmc/tinyremapper/extension/mixin/common/data/AnnotationElement.java

@@ -34,4 +34,6 @@ public final class AnnotationElement {
 	public static final String TO = "to";
 	public static final String SLICE = "slice";
 	public static final String METHOD = "method";
+	public static final String DEFINITION_METHOD = "method";
+	public static final String DEFINITION_FIELD = "field";
 }

src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/SoftTargetMixinMethodVisitor.java

@@ -30,6 +30,8 @@
 import net.fabricmc.tinyremapper.extension.mixin.common.data.MxMember;
 import net.fabricmc.tinyremapper.extension.mixin.soft.annotation.AccessorAnnotationVisitor;
 import net.fabricmc.tinyremapper.extension.mixin.soft.annotation.InvokerAnnotationVisitor;
+import net.fabricmc.tinyremapper.extension.mixin.soft.annotation.injection.DefinitionAnnotationVisitor;
+import net.fabricmc.tinyremapper.extension.mixin.soft.annotation.injection.DefinitionsAnnotationVisitor;
 import net.fabricmc.tinyremapper.extension.mixin.soft.annotation.injection.InjectAnnotationVisitor;
 import net.fabricmc.tinyremapper.extension.mixin.soft.annotation.injection.ModifyArgAnnotationVisitor;
 import net.fabricmc.tinyremapper.extension.mixin.soft.annotation.injection.ModifyArgsAnnotationVisitor;
@@ -93,6 +95,10 @@ public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
 			return new WrapWithConditionAnnotationVisitor(data, av, targets);
 		case Annotation.MIXIN_EXTRAS_WRAP_WITH_CONDITION_V2:
 			return new WrapWithConditionV2AnnotationVisitor(data, av, targets);
+		case Annotation.MIXIN_EXTRAS_DEFINITIONS:
+			return new DefinitionsAnnotationVisitor(data, av);
+		case Annotation.MIXIN_EXTRAS_DEFINITION:
+			return new DefinitionAnnotationVisitor(data, av);
 		}
 
 		return av;

src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/annotation/injection/DefinitionAnnotationVisitor.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2016, 2018, Player, asie
+ * Copyright (c) 2025, FabricMC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.fabricmc.tinyremapper.extension.mixin.soft.annotation.injection;
+
+import java.util.Objects;
+
+import org.objectweb.asm.AnnotationVisitor;
+
+import net.fabricmc.tinyremapper.extension.mixin.common.data.AnnotationElement;
+import net.fabricmc.tinyremapper.extension.mixin.common.data.CommonData;
+import net.fabricmc.tinyremapper.extension.mixin.common.data.Constant;
+import net.fabricmc.tinyremapper.extension.mixin.soft.data.MemberInfo;
+
+public class DefinitionAnnotationVisitor extends AnnotationVisitor {
+	private final CommonData data;
+
+	public DefinitionAnnotationVisitor(CommonData data, AnnotationVisitor delegate) {
+		super(Constant.ASM_VERSION, Objects.requireNonNull(delegate));
+
+		this.data = Objects.requireNonNull(data);
+	}
+
+	@Override
+	public AnnotationVisitor visitArray(String name) {
+		AnnotationVisitor av = super.visitArray(name);
+		switch (name) {
+		case AnnotationElement.DEFINITION_METHOD:
+		case AnnotationElement.DEFINITION_FIELD:
+			return new MemberRemappingVisitor(data, av);
+		}
+
+		return av;
+	}
+
+	private static class MemberRemappingVisitor extends AnnotationVisitor {
+		private final CommonData data;
+
+		MemberRemappingVisitor(CommonData data, AnnotationVisitor delegate) {
+			super(Constant.ASM_VERSION, Objects.requireNonNull(delegate));
+
+			this.data = Objects.requireNonNull(data);
+		}
+
+		@Override
+		public void visit(String name, Object value) {
+			MemberInfo info = MemberInfo.parse(Objects.requireNonNull((String) value));
+
+			if (info != null) {
+				value = new AtMemberMappable(data, info).result().toString();
+			}
+
+			super.visit(name, value);
+		}
+	}
+}

src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/annotation/injection/DefinitionsAnnotationVisitor.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016, 2018, Player, asie
+ * Copyright (c) 2025, FabricMC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.fabricmc.tinyremapper.extension.mixin.soft.annotation.injection;
+
+import java.util.Objects;
+
+import org.objectweb.asm.AnnotationVisitor;
+
+import net.fabricmc.tinyremapper.extension.mixin.common.data.AnnotationElement;
+import net.fabricmc.tinyremapper.extension.mixin.common.data.CommonData;
+import net.fabricmc.tinyremapper.extension.mixin.common.data.Constant;
+
+public class DefinitionsAnnotationVisitor extends AnnotationVisitor {
+	private final CommonData data;
+
+	public DefinitionsAnnotationVisitor(CommonData data, AnnotationVisitor delegate) {
+		super(Constant.ASM_VERSION, Objects.requireNonNull(delegate));
+
+		this.data = Objects.requireNonNull(data);
+	}
+
+	@Override
+	public AnnotationVisitor visitArray(String name) {
+		AnnotationVisitor av = super.visitArray(name);
+
+		if (name.equals(AnnotationElement.VALUE)) {
+			return new DefinitionRemappingVisitor(data, av);
+		}
+
+		return av;
+	}
+
+	private static class DefinitionRemappingVisitor extends AnnotationVisitor {
+		private final CommonData data;
+
+		DefinitionRemappingVisitor(CommonData data, AnnotationVisitor delegate) {
+			super(Constant.ASM_VERSION, Objects.requireNonNull(delegate));
+
+			this.data = Objects.requireNonNull(data);
+		}
+
+		@Override
+		public AnnotationVisitor visitAnnotation(String name, String descriptor) {
+			return new DefinitionAnnotationVisitor(data, super.visitAnnotation(name, descriptor));
+		}
+	}
+}