Skin Improvements

src/main/java/io/github/skippyall/minions/mixins/EntityViewMixin.java

@@ -0,0 +1,24 @@
+package io.github.skippyall.minions.mixins;
+
+import io.github.skippyall.minions.mixinhelpers.EntityViewMixinHelper;
+import net.minecraft.entity.Entity;
+import net.minecraft.world.EntityView;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+import java.util.function.Predicate;
+
+@Mixin(EntityView.class)
+public class EntityViewMixin {
+    @ModifyArg(method = "getClosestPlayer(DDDDZ)Lnet/minecraft/entity/player/PlayerEntity;", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/EntityView;getClosestPlayer(DDDDLjava/util/function/Predicate;)Lnet/minecraft/entity/player/PlayerEntity;"))
+    private @Nullable Predicate<Entity> addMinionPredicate(@Nullable Predicate<Entity> targetPredicate) {
+        Predicate<Entity> predicate = EntityViewMixinHelper.ADDITIONAL_PREDICATE.get();
+        if(targetPredicate != null) {
+            return predicate.and(targetPredicate);
+        } else {
+            return predicate;
+        }
+    }
+}

src/main/java/io/github/skippyall/minions/mixins/MobEntityMixin.java

@@ -1,29 +1,36 @@
 package io.github.skippyall.minions.mixins;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.mixinhelpers.EntityViewMixinHelper;
 import io.github.skippyall.minions.module.MobSpawningModule;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
 import net.minecraft.predicate.entity.EntityPredicates;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(MobEntity.class)
 public abstract class MobEntityMixin {
-    @Redirect(method = "checkDespawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getClosestPlayer(Lnet/minecraft/entity/Entity;D)Lnet/minecraft/entity/player/PlayerEntity;"))
-    public PlayerEntity checkMobDespawningMinion(World instance, Entity entity, double maxDistance) {
-        return instance.getClosestPlayer(entity.getX(), entity.getY(), entity.getZ(), maxDistance, EntityPredicates.EXCEPT_SPECTATOR.and(entity1 -> {
-            if(entity1 instanceof ServerPlayerEntity player) {
-                if(player instanceof MinionFakePlayer minion) {
-                    return MobSpawningModule.canMinionDespawnMobs(minion);
-                }
+    @WrapOperation(method = "checkDespawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getClosestPlayer(Lnet/minecraft/entity/Entity;D)Lnet/minecraft/entity/player/PlayerEntity;"))
+    public PlayerEntity checkMobDespawningMinion(World instance, Entity entity, double maxDistance, Operation<PlayerEntity> original) {
+        EntityViewMixinHelper.ADDITIONAL_PREDICATE.set(entity2 -> {
+            if(entity2 instanceof MinionFakePlayer minion) {
+                return MobSpawningModule.canMinionDespawnMobs(minion);
+            } else {
                 return true;
             }
-            return false;
-        }));
+        });
+        PlayerEntity player = original.call(instance, entity, maxDistance);
+        EntityViewMixinHelper.ADDITIONAL_PREDICATE.remove();
+        return player;
     }
 }

src/main/java/io/github/skippyall/minions/mixins/ServerPlayerMixin.java

@@ -18,7 +18,7 @@ public abstract class ServerPlayerMixin implements ServerPlayerInterface {
     @Unique
     public EntityPlayerActionPack actionPack;
     @Override
-    public EntityPlayerActionPack getActionPack()
+    public EntityPlayerActionPack minions$getActionPack()
     {
         return actionPack;
     }