Merge branch '1.21.5' into 1.21.8

Author: AViewFromTheTop

src/main/java/net/frozenblock/trailiertales/mixin/common/datafix/DataFixersMixin.java

@@ -17,11 +17,9 @@
 
 package net.frozenblock.trailiertales.mixin.common.datafix;
 
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.mojang.datafixers.DataFixerBuilder;
 import com.mojang.datafixers.schemas.Schema;
-import java.util.function.BiFunction;
 import net.frozenblock.trailiertales.TTConstants;
 import net.minecraft.util.datafix.DataFixers;
 import net.minecraft.util.datafix.fixes.AddNewChoices;
@@ -33,7 +31,7 @@
 @Mixin(DataFixers.class)
 public class DataFixersMixin {
 
-	@WrapOperation(
+	@ModifyExpressionValue(
 		method = "addFixers",
 		at = @At(
 			value = "INVOKE",
@@ -48,8 +46,7 @@ public class DataFixersMixin {
 			)
 		)
 	)
-	private static Schema trailierTales$addFixers3689(DataFixerBuilder builder, int version, BiFunction<Integer, Schema, Schema> factory, Operation<Schema> original) {
-		Schema schema = original.call(builder, version, factory);
+	private static Schema trailierTales$addFixers3689(Schema schema, DataFixerBuilder builder) {
 		builder.addFixer(new AddNewChoices(schema, TTConstants.string("coffin"), References.BLOCK_ENTITY));
 		builder.addFixer(new AddNewChoices(schema, TTConstants.string("surveyor"), References.BLOCK_ENTITY));
 		builder.addFixer(new AddNewChoices(schema, TTConstants.string("apparition"), References.ENTITY));

src/main/java/net/frozenblock/trailiertales/mixin/common/datafix/V3689Mixin.java

@@ -17,8 +17,7 @@
 
 package net.frozenblock.trailiertales.mixin.common.datafix;
 
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.datafixers.DSL;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.types.templates.TypeTemplate;
@@ -29,20 +28,17 @@
 import net.minecraft.util.datafix.schemas.V3689;
 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.CallbackInfoReturnable;
 
 @Mixin(V3689.class)
 public class V3689Mixin {
 
-	@WrapOperation(
-		method = "registerBlockEntities",
-		at = @At(
-			value = "INVOKE",
-			target = "Lnet/minecraft/util/datafix/schemas/NamespacedSchema;registerBlockEntities(Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map;",
-			ordinal = 0
-		)
-	)
-	public Map<String, Supplier<TypeTemplate>> trailierTales$registerBlockEntities(V3689 instance, Schema schema, Operation<Map<String, Supplier<TypeTemplate>>> original) {
-		Map<String, Supplier<TypeTemplate>> map = original.call(instance, schema);
+	@Inject(method = "registerBlockEntities", at = @At("RETURN"))
+	public void wilderWild$registerBlockEntities(
+		Schema schema, CallbackInfoReturnable<Map<String, Supplier<TypeTemplate>>> info,
+		@Local Map<String, Supplier<TypeTemplate>> map
+	) {
 		schema.register(
 			map,
 			TTConstants.string("coffin"),
@@ -58,19 +54,13 @@ public class V3689Mixin {
 			TTConstants.string("surveyor"),
 			DSL::remainder
 		);
-		return map;
 	}
 
-	@WrapOperation(
-		method = "registerEntities",
-		at = @At(
-			value = "INVOKE",
-			target = "Lnet/minecraft/util/datafix/schemas/NamespacedSchema;registerEntities(Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map;",
-			ordinal = 0
-		)
-	)
-	public Map<String, Supplier<TypeTemplate>> trailierTales$registerEntities(V3689 instance, Schema schema, Operation<Map<String, Supplier<TypeTemplate>>> original) {
-		Map<String, Supplier<TypeTemplate>> map = original.call(instance, schema);
+	@Inject(method = "registerEntities", at = @At("RETURN"))
+	public void wilderWild$registerEntities(
+		Schema schema, CallbackInfoReturnable<Map<String, Supplier<TypeTemplate>>> info,
+		@Local Map<String, Supplier<TypeTemplate>> map
+	) {
 		schema.register(
 			map,
 			TTConstants.string("apparition"),
@@ -81,6 +71,5 @@ public class V3689Mixin {
 			TTConstants.string("thrown_item"),
 			(string) -> DSL.optionalFields("Item", References.ITEM_STACK.in(schema))
 		);
-		return map;
 	}
 }