Fixing golems

src/main/java/com/dynamitos/mixin/CopperGolemBrainMixin.java

@@ -1,12 +1,17 @@
 package com.dynamitos.mixin;
 
+import java.util.function.Predicate;
+
 import org.jetbrains.annotations.Nullable;
 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;
 
+import com.dynamitos.Copperfarmers;
+
 import net.minecraft.block.Blocks;
+import net.minecraft.block.entity.ChestBlockEntity;
 import net.minecraft.entity.ai.brain.task.MoveItemsTask;
 import net.minecraft.entity.passive.CopperGolemBrain;
 import net.minecraft.entity.passive.CopperGolemEntity;
@@ -46,4 +51,15 @@ public abstract class CopperGolemBrainMixin {
             }
         });
     }
+
+    @Inject(method = "createStoragePredicate", at = @At("HEAD"), cancellable = true)
+    private static void createStoragePredicate(CallbackInfoReturnable<Predicate<MoveItemsTask.Storage>> callbackInfo) {
+        callbackInfo.setReturnValue(storage -> {
+            if (storage.state().isOf(Blocks.FARMLAND)) {
+                Copperfarmers.LOGGER.debug("Storage predicate returning false for farmland at " + storage.pos());
+                return false;
+            }
+            return storage.blockEntity() instanceof ChestBlockEntity chestBlockEntity ? !chestBlockEntity.getViewingUsers().isEmpty() : false;
+        });
+    }
 }

src/main/java/com/dynamitos/mixin/MoveItemsTaskMixin.java

@@ -34,6 +34,8 @@ import net.minecraft.world.World;
 
 @Mixin(MoveItemsTask.class)
 public abstract class MoveItemsTaskMixin extends MultiTickTask<PathAwareEntity> {
+    private MoveItemsTaskAccessor thisAccessor = (MoveItemsTaskAccessor) this;
+
     public MoveItemsTaskMixin(Map<MemoryModuleType<?>, MemoryModuleState> requiredMemoryState) {
         super(requiredMemoryState);
         // TODO Auto-generated constructor stub
@@ -56,7 +58,8 @@ public abstract class MoveItemsTaskMixin extends MultiTickTask<PathAwareEntity>
                     // if block is farmland
                     if (blockState.isOf(Blocks.FARMLAND) && world.isAir(pos.up())) {
                         Copperfarmers.LOGGER.debug("Found farmland at " + pos);
-                        callbackInfo.setReturnValue(Optional.of(new MoveItemsTask.Storage(pos, null, null, blockState)));
+                        callbackInfo
+                                .setReturnValue(Optional.of(new MoveItemsTask.Storage(pos, null, null, blockState)));
                         return;
                     }
                 }
@@ -67,16 +70,18 @@ public abstract class MoveItemsTaskMixin extends MultiTickTask<PathAwareEntity>
     @Inject(method = "testContainer", at = @At("HEAD"), cancellable = true)
     private void testContainer(PathAwareEntity entity, BlockState state, CallbackInfoReturnable<Boolean> callbackInfo) {
         Copperfarmers.LOGGER.debug("Wrapped testContainer called");
-        if(state.isOf(Blocks.FARMLAND)) {
+        if (!MoveItemsTaskAccessor.copperfarmers$canPickUpItem(entity) && state.isOf(Blocks.FARMLAND)) {
+            Copperfarmers.LOGGER.debug("testContainer returning true for farmland");
             callbackInfo.setReturnValue(true);
         }
     }
 
     @Inject(method = "tickInteracting", at = @At("HEAD"), cancellable = true)
-    private void tickInteracting(MoveItemsTask.Storage storage, World world, PathAwareEntity entity, CallbackInfo callbackInfo) {
+    private void tickInteracting(MoveItemsTask.Storage storage, World world, PathAwareEntity entity,
+            CallbackInfo callbackInfo) {
         Copperfarmers.LOGGER.debug("Wrapped tickInteracting called");
-        MoveItemsTaskAccessor thisAccessor = (MoveItemsTaskAccessor)this;
-		if (!thisAccessor.copperfarmers$isWithinRange(2.0, storage, world, entity, thisAccessor.copperfarmers$atCenterY(entity))) {
+        if (!thisAccessor.copperfarmers$isWithinRange(2.0, storage, world, entity,
+                thisAccessor.copperfarmers$atCenterY(entity))) {
             thisAccessor.copperfarmers$transitionToTravelling(entity);
         } else {
             thisAccessor.copperfarmers$setInteractionTicks(thisAccessor.copperfarmers$getInteractionTicks() + 1);
@@ -90,8 +95,7 @@ public abstract class MoveItemsTaskMixin extends MultiTickTask<PathAwareEntity>
                         this::takeStack2,
                         (entityxx, inventory) -> thisAccessor.copperfarmers$invalidateTargetStorage(entity),
                         this::placeStack2,
-					(entityxx, inventory) -> thisAccessor.copperfarmers$invalidateTargetStorage(entity)
-				);
+                        (entityxx, inventory) -> thisAccessor.copperfarmers$invalidateTargetStorage(entity));
                 thisAccessor.copperfarmers$transitionToTravelling(entity);
             }
         }
@@ -99,7 +103,8 @@ public abstract class MoveItemsTaskMixin extends MultiTickTask<PathAwareEntity>
     }
 
     @Inject(method = "transitionToInteracting", at = @At("HEAD"), cancellable = true)
-    private void transitionToInteracting(MoveItemsTask.Storage storage, PathAwareEntity entity, CallbackInfo callbackInfo) {
+    private void transitionToInteracting(MoveItemsTask.Storage storage, PathAwareEntity entity,
+            CallbackInfo callbackInfo) {
         Copperfarmers.LOGGER.debug("Wrapped transitionToInteracting called");
         this.selectInteractionState2(
                 entity,
@@ -107,9 +112,8 @@ public abstract class MoveItemsTaskMixin extends MultiTickTask<PathAwareEntity>
                 this.createSetInteractionStateCallback2(MoveItemsTask.InteractionState.PICKUP_ITEM),
                 this.createSetInteractionStateCallback2(MoveItemsTask.InteractionState.PICKUP_NO_ITEM),
                 this.createSetInteractionStateCallback2(MoveItemsTask.InteractionState.PLACE_ITEM),
-			this.createSetInteractionStateCallback2(MoveItemsTask.InteractionState.PLACE_NO_ITEM)
-		);
-		((MoveItemsTaskAccessor)this).copperfarmers$setNavigationState(MoveItemsTask.NavigationState.INTERACTING);
+                this.createSetInteractionStateCallback2(MoveItemsTask.InteractionState.PLACE_NO_ITEM));
+        thisAccessor.copperfarmers$setNavigationState(MoveItemsTask.NavigationState.INTERACTING);
         callbackInfo.cancel();
     }
 
@@ -117,17 +121,20 @@ public abstract class MoveItemsTaskMixin extends MultiTickTask<PathAwareEntity>
     private void isUnchanged(World world, MoveItemsTask.Storage storage, CallbackInfoReturnable<Boolean> callbackInfo) {
         Copperfarmers.LOGGER.debug("Wrapped isUnchanged called");
         if (storage.state().isOf(Blocks.FARMLAND) && world.isAir(storage.pos().up())) {
+            Copperfarmers.LOGGER.debug("isUnchanged returning true for farmland at " + storage.pos());
             callbackInfo.setReturnValue(true);
+            return;
         }
-        if(storage.inventory() == null) {
-            Copperfarmers.LOGGER.debug("No inventory at " + storage.pos());
+        Copperfarmers.LOGGER.debug("Storage state: " + storage.state() + " isAir: " + world.isAir(storage.pos().up()));
+        if (storage.blockEntity() == null) {
+            Copperfarmers.LOGGER.debug("No blockentity " + storage.pos());
             callbackInfo.setReturnValue(false);
+            return;
         }
     }
 
     private void placeStack2(PathAwareEntity entity, MoveItemsTask.Storage storage) {
         Copperfarmers.LOGGER.debug("Wrapped placeStack called");
-        MoveItemsTaskAccessor thisAccessor = (MoveItemsTaskAccessor)this;
         BlockPos pos = storage.pos();
         ServerWorld world = (ServerWorld) entity.getEntityWorld();
         if (world.getBlockState(pos).isOf(Blocks.FARMLAND) && world.isAir(pos.up())
@@ -157,8 +164,8 @@ public abstract class MoveItemsTaskMixin extends MultiTickTask<PathAwareEntity>
     }
 
     private void takeStack2(PathAwareEntity entity, MoveItemsTask.Storage storage) {
-        MoveItemsTaskAccessor thisAccessor = (MoveItemsTaskAccessor)this;
-		entity.equipStack(EquipmentSlot.MAINHAND, MoveItemsTaskAccessor.copperfarmers$extractStack(storage.inventory()));
+        entity.equipStack(EquipmentSlot.MAINHAND,
+                MoveItemsTaskAccessor.copperfarmers$extractStack(storage.inventory()));
         entity.setDropGuaranteed(EquipmentSlot.MAINHAND);
         storage.inventory().markDirty();
         thisAccessor.copperfarmers$resetVisitedPositions(entity);
@@ -170,8 +177,7 @@ public abstract class MoveItemsTaskMixin extends MultiTickTask<PathAwareEntity>
             BiConsumer<PathAwareEntity, MoveItemsTask.Storage> pickupItemCallback,
             BiConsumer<PathAwareEntity, MoveItemsTask.Storage> pickupNoItemCallback,
             BiConsumer<PathAwareEntity, MoveItemsTask.Storage> placeItemCallback,
-		BiConsumer<PathAwareEntity, MoveItemsTask.Storage> placeNoItemCallback)
-    {
+            BiConsumer<PathAwareEntity, MoveItemsTask.Storage> placeNoItemCallback) {
         Copperfarmers.LOGGER.debug("Wrapped selectInteractionState called");
         if (storage == null && entity.getEquippedStack(EquipmentSlot.MAINHAND).isOf(Items.WHEAT_SEEDS)) {
             placeItemCallback.accept(entity, storage);
@@ -190,7 +196,8 @@ public abstract class MoveItemsTaskMixin extends MultiTickTask<PathAwareEntity>
         }
     }
 
-	private BiConsumer<PathAwareEntity, MoveItemsTask.Storage> createSetInteractionStateCallback2(MoveItemsTask.InteractionState state) {
-		return (entity, inventory) -> ((MoveItemsTaskAccessor)this).copperfarmers$setInteractionState(state);
+    private BiConsumer<PathAwareEntity, MoveItemsTask.Storage> createSetInteractionStateCallback2(
+            MoveItemsTask.InteractionState state) {
+        return (entity, inventory) -> thisAccessor.copperfarmers$setInteractionState(state);
     }
 }