simplify brainsweeping

Common/src/main/java/at/petrak/hexcasting/common/misc/Brainsweeping.java

@@ -17,11 +17,13 @@ import org.jetbrains.annotations.Nullable;
 public class Brainsweeping {
     // Keeping these functions in Brainsweeping just so we have to change less code
     public static void brainsweep(Mob entity) {
-        IXplatAbstractions.INSTANCE.brainsweep(entity);
+        if (isValidTarget(entity)) {
+            IXplatAbstractions.INSTANCE.brainsweep(entity);
+        }
     }
 
     public static boolean isBrainswept(Mob entity) {
-        return IXplatAbstractions.INSTANCE.isBrainswept(entity);
+        return isValidTarget(entity) && IXplatAbstractions.INSTANCE.isBrainswept(entity);
     }
 
     // TODO: make this a tag

Common/src/main/java/at/petrak/hexcasting/mixin/MixinMob.java

@@ -1,15 +1,13 @@
 package at.petrak.hexcasting.mixin;
 
 import at.petrak.hexcasting.common.misc.Brainsweeping;
-import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.entity.Mob;
 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.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-// Prevents the villager from any of its brain goals or making ambient noise
+// Prevents brainswept mobs from having an AI tick
 @Mixin(Mob.class)
 public class MixinMob {
     @Inject(method = "serverAiStep", at = @At("HEAD"), cancellable = true)
@@ -20,11 +18,11 @@ public class MixinMob {
         }
     }
 
-    @Inject(method = "getAmbientSound", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "playAmbientSound", at = @At("HEAD"), cancellable = true)
-    protected void onGetAmbientSound(CallbackInfoReturnable<SoundEvent> ci) {
+    protected void onPlayAmbientSound(CallbackInfo ci) {
         var self = (Mob) (Object) this;
         if (Brainsweeping.isBrainswept(self)) {
-            ci.setReturnValue(null);
+            ci.cancel();
         }
     }
 }

Common/src/main/java/at/petrak/hexcasting/mixin/MixinVillager.java

@@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-// Prevents the villager from any of its brain goals or making ambient noise
+// Prevents the villager from any of its brain goals
 @Mixin(Villager.class)
 public class MixinVillager {
     @Inject(method = "registerBrainGoals", at = @At("HEAD"), cancellable = true)

Common/src/main/java/at/petrak/hexcasting/mixin/accessor/AccessorLivingEntity.java

@@ -1,12 +0,0 @@
-package at.petrak.hexcasting.mixin.accessor;
-
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.ai.Brain;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(LivingEntity.class)
-public interface AccessorLivingEntity {
-    @Accessor("brain")
-    void hex$SetBrain(Brain<?> brain);
-}

Common/src/main/resources/hexplat.mixins.json

@@ -5,7 +5,7 @@
   "refmap": "hexcasting.mixins.refmap.json",
   "package": "at.petrak.hexcasting.mixin",
   "mixins": [
-    "MixinMob", "MixinVillager", "accessor.AccessorLivingEntity", "accessor.AccessorUseOnContext",
+    "MixinMob", "MixinVillager", "accessor.AccessorUseOnContext",
     "accessor.CriteriaTriggersAccessor"
   ]
 }

Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/CCBrainswept.java

@@ -3,7 +3,9 @@ package at.petrak.hexcasting.fabric.cc;
 import dev.onyxstudios.cca.api.v3.component.Component;
 import dev.onyxstudios.cca.api.v3.component.sync.AutoSyncedComponent;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Mob;
 
 public class CCBrainswept implements Component, AutoSyncedComponent {
     public static final String TAG_BRAINSWEPT = "brainswept";
@@ -25,6 +27,13 @@ public class CCBrainswept implements Component, AutoSyncedComponent {
         HexCardinalComponents.BRAINSWEPT.sync(this.owner);
     }
 
+    @Override
+    public void applySyncPacket(FriendlyByteBuf buf) {
+        AutoSyncedComponent.super.applySyncPacket(buf);
+        if (owner instanceof Mob mob && brainswept)
+            mob.removeFreeWill();
+    }
+
     @Override
     public void readFromNbt(CompoundTag tag) {
         this.brainswept = tag.getBoolean(TAG_BRAINSWEPT);

Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java

@@ -84,6 +84,8 @@ public class FabricXplatImpl implements IXplatAbstractions {
         var cc = HexCardinalComponents.BRAINSWEPT.get(mob);
         cc.setBrainswept(true);
         // CC API does the syncing for us
+        
+        mob.removeFreeWill();
     }
 
     @Override

Forge/src/main/java/at/petrak/hexcasting/forge/xplat/ForgeXplatImpl.java

@@ -13,7 +13,6 @@ import at.petrak.hexcasting.api.spell.casting.CastingHarness;
 import at.petrak.hexcasting.api.spell.casting.ResolvedPattern;
 import at.petrak.hexcasting.api.utils.HexUtils;
 import at.petrak.hexcasting.common.lib.HexItems;
-import at.petrak.hexcasting.common.misc.Brainsweeping;
 import at.petrak.hexcasting.common.network.IMessage;
 import at.petrak.hexcasting.forge.cap.CapSyncers;
 import at.petrak.hexcasting.forge.cap.HexCapabilities;
@@ -81,15 +80,13 @@ public class ForgeXplatImpl implements IXplatAbstractions {
 
     @Override
     public void brainsweep(Mob mob) {
-        if (Brainsweeping.isValidTarget(mob)) {
+        mob.getPersistentData().putBoolean(TAG_BRAINSWEPT, true);
-            mob.getPersistentData().putBoolean(TAG_BRAINSWEPT, true);
 
-            mob.removeFreeWill();
+        mob.removeFreeWill();
 
-            if (mob.level instanceof ServerLevel) {
+        if (mob.level instanceof ServerLevel) {
-                ForgePacketHandler.getNetwork()
+            ForgePacketHandler.getNetwork()
-                    .send(PacketDistributor.TRACKING_ENTITY.with(() -> mob), MsgBrainsweepAck.of(mob));
+                .send(PacketDistributor.TRACKING_ENTITY.with(() -> mob), MsgBrainsweepAck.of(mob));
-            }
         }
     }