Fixed mixin crash

Author: Faboslav

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.12
+
+- Fixed raid member mixin crash
+
 ## 4.0.11
 
 - Fixed persistent maulers (they should properly despawn now)

common/src/main/java/com/faboslav/friendsandfoes/common/mixin/RaidMemberMixin.java

@@ -1,18 +1,16 @@
 package com.faboslav.friendsandfoes.common.mixin;
 
 import com.faboslav.friendsandfoes.common.FriendsAndFoes;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.raid.Raid;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.Slice;
 
 @Mixin(Raid.RaiderType.class)
 public final class RaidMemberMixin
 {
-	@WrapOperation(
+	@ModifyArg(
 		method = "<clinit>",
 		slice = @Slice(
 			from = @At(
@@ -22,15 +20,12 @@ public final class RaidMemberMixin
 		),
 		at = @At(
 			value = "INVOKE",
-			target = "Lnet/minecraft/world/entity/raid/Raid$RaiderType;<init>(Ljava/lang/String;ILnet/minecraft/world/entity/EntityType;[I)V"
+			target = "Lnet/minecraft/world/entity/raid/Raid$RaiderType;<init>(Ljava/lang/String;ILnet/minecraft/world/entity/EntityType;[I)V",
+			ordinal = 0
 		)
 	)
-	private static void friendsandfoes$wrapEvokerCtor(
-		String name,
-		int id,
-		EntityType<?> type,
-		int[] countInWave,
-		Operation<Void> original
+	private static int[] friendsandfoes_updateCountInWave(
+		int[] countInWave
 	) {
 		if (
 			(
@@ -42,9 +37,9 @@ public final class RaidMemberMixin
 				&& FriendsAndFoes.getConfig().enableIceologerInRaids
 			)
 		) {
-			original.call(name, id, type, new int[]{0, 0, 0, 0, 0, 1, 1, 1});
-		} else {
-			original.call(name, id, type, countInWave);
+			return new int[]{0, 0, 0, 0, 0, 1, 1, 1};
 		}
+
+		return new int[]{0, 0, 0, 0, 0, 1, 1, 2};
 	}
 }

gradle.properties

@@ -10,7 +10,7 @@ java.version=
 mod.name=Friends&Foes
 mod.id=friendsandfoes
 mod.group=com.faboslav.friendsandfoes
-mod.version=4.0.11
+mod.version=4.0.12
 mod.author=Faboslav
 mod.description=Adds outvoted and forgotten mobs from the mob vote, expanding on their original concepts and introducing new vanilla-like features.
 mod.license=CC-BY-NC-ND-4.0