Pawns will keep working when hungry, but will do slower

Author: remmintan

src/core/java/net/remmintan/mods/minefortress/core/interfaces/resources/IServerResourceManager.java

@@ -5,8 +5,10 @@
 import net.remmintan.mods.minefortress.core.dtos.ItemInfo;
 import net.remmintan.mods.minefortress.core.interfaces.server.IServerManager;
 import net.remmintan.mods.minefortress.core.interfaces.server.ISyncableServerManager;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 public interface IServerResourceManager extends IResourceManager, IServerManager, ISyncableServerManager {
@@ -23,4 +25,9 @@ public interface IServerResourceManager extends IResourceManager, IServerManager
 
     List<ItemStack> getAllItems();
 
+    boolean hasEatableItem();
+
+    @NotNull
+    Optional<ItemStack> getEatableItem();
+
 }

src/main/java/org/minefortress/entity/Colonist.java

@@ -99,6 +99,14 @@ protected void initDataTracker() {
         this.dataTracker.startTracking(HAS_TASK, false);
     }
 
+    public float getAdjustedMovementSpeed() {
+        final var currentFoodLevel = getCurrentFoodLevel();
+        if (currentFoodLevel < 10)
+            return Colonist.SLOW_MOVEMENT_SPEED;
+        else
+            return Colonist.FAST_MOVEMENT_SPEED;
+    }
+
     public IBaritone getBaritone() {
         return baritone;
     }

src/main/java/org/minefortress/entity/ai/MovementHelper.kt

@@ -54,7 +54,7 @@ class MovementHelper(private val colonist: Colonist) {
     @JvmOverloads
     fun goTo(
         goal: BlockPos,
-        speed: Float = Colonist.FAST_MOVEMENT_SPEED,
+        speed: Float = colonist.adjustedMovementSpeed,
         reachDistance: Double = Colonist.WORK_REACH_DISTANCE.toDouble()
     ) {
         if (this.goal != null && this.goal == goal) {

src/main/java/org/minefortress/entity/ai/goal/AbstractFortressGoal.java

@@ -4,7 +4,11 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.world.World;
 import net.remmintan.mods.minefortress.core.interfaces.entities.pawns.controls.IEatControl;
+import net.remmintan.mods.minefortress.core.interfaces.resources.IServerResourceManager;
+import net.remmintan.mods.minefortress.core.interfaces.server.IServerManagersProvider;
+import net.remmintan.mods.minefortress.core.utils.ServerModUtils;
 import org.minefortress.entity.Colonist;
+import org.minefortress.events.HungryPawnStartsWorkingCallback;
 
 import java.util.EnumSet;
 
@@ -21,8 +25,18 @@ protected AbstractFortressGoal(Colonist colonist) {
         }
     }
 
-    protected boolean isHungry() {
-        return colonist.getEatControl().map(IEatControl::isHungry).orElse(false);
+    protected boolean wantAndCanEatSomeFood() {
+        final var hungry = colonist.getEatControl().map(IEatControl::isHungry).orElse(false);
+        final var hasSomeFoodToIt = ServerModUtils.getManagersProvider(colonist.getServer(), colonist.getFortressPos())
+                .map(IServerManagersProvider::getResourceManager)
+                .map(IServerResourceManager::hasEatableItem)
+                .orElse(false);
+
+        if (hungry && !hasSomeFoodToIt) {
+            HungryPawnStartsWorkingCallback.EVENT.invoker().hungryPawnStartsWorking(colonist, colonist.getCurrentFoodLevel());
+        }
+
+        return hungry && hasSomeFoodToIt;
     }
 
 

src/main/java/org/minefortress/entity/ai/goal/ColonistExecuteTaskGoal.java

@@ -25,8 +25,7 @@ public ColonistExecuteTaskGoal(Colonist colonist) {
     @Override
     public boolean canStart() {
         final var hasTask = getTaskControl().hasTask();
-        final var notStarving = !super.isHungry();
-        return  hasTask && notStarving;
+        return hasTask && !wantAndCanEatSomeFood();
     }
 
 
@@ -65,7 +64,7 @@ public void tick() {
 
         if (getMovementHelper().getGoal() == null) {
             var distance = getTaskControl().taskIsOfType(CutTreesTask.class) ? 6f : Colonist.WORK_REACH_DISTANCE;
-            getMovementHelper().goTo(goal.getPos(), Colonist.FAST_MOVEMENT_SPEED, distance);
+            getMovementHelper().goTo(goal.getPos(), colonist.getAdjustedMovementSpeed(), distance);
         }
 
         if (getMovementHelper().hasReachedGoal()) {
@@ -86,7 +85,7 @@ public void tick() {
 
     @Override
     public boolean shouldContinue() {
-        return getTaskControl().hasTask() && !super.isHungry();
+        return getTaskControl().hasTask() && !super.wantAndCanEatSomeFood();
     }
 
     @Override
@@ -123,7 +122,7 @@ private void moveToNextBlock() {
         if (goal == null) {
             return;
         }
-        getMovementHelper().goTo(goal.getPos(), Colonist.FAST_MOVEMENT_SPEED);
+        getMovementHelper().goTo(goal.getPos());
         colonist.setGoal(goal);
     }
     private ITaskControl getTaskControl() {

src/main/java/org/minefortress/entity/ai/goal/DailyProfessionTasksGoal.java

@@ -1,7 +1,7 @@
 package org.minefortress.entity.ai.goal;
 
-import org.minefortress.entity.Colonist;
 import net.remmintan.mods.minefortress.core.interfaces.entities.pawns.controls.ITaskControl;
+import org.minefortress.entity.Colonist;
 import org.minefortress.entity.ai.professions.*;
 
 import java.util.Map;
@@ -28,7 +28,7 @@ public DailyProfessionTasksGoal(Colonist colonist) {
 
     @Override
     public boolean canStart() {
-        if(this.isHungry()) return false;
+        if (this.wantAndCanEatSomeFood()) return false;
         final ITaskControl taskControl = getTaskControl();
         if(taskControl.hasTask()) return false;
         final String professionId = colonist.getProfessionId();
@@ -60,7 +60,7 @@ public void tick() {
 
     @Override
     public boolean shouldContinue() {
-        return  !isHungry()
+        return !wantAndCanEatSomeFood()
                 && this.currentTask != null
                 && this.currentTask.shouldContinue(colonist)
                 && !getTaskControl().hasTask();
@@ -74,7 +74,7 @@ public void stop() {
 
     @Override
     public boolean canStop() {
-        return this.isHungry();
+        return this.wantAndCanEatSomeFood();
     }
 
     private ITaskControl getTaskControl() {

src/main/java/org/minefortress/entity/ai/goal/EatGoal.java

@@ -1,10 +1,6 @@
 package org.minefortress.entity.ai.goal;
 
-import com.mojang.datafixers.util.Pair;
 import net.minecraft.entity.ai.goal.Goal;
-import net.minecraft.entity.effect.StatusEffectCategory;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.item.ItemStack;
 import net.remmintan.mods.minefortress.core.interfaces.entities.pawns.IFortressAwareEntity;
 import net.remmintan.mods.minefortress.core.interfaces.entities.pawns.controls.IEatControl;
 import net.remmintan.mods.minefortress.core.interfaces.resources.IServerResourceManager;
@@ -13,7 +9,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.minefortress.entity.HungryEntity;
 
-import java.util.Comparator;
 import java.util.Optional;
 
 public class EatGoal extends Goal {
@@ -25,13 +20,13 @@ public EatGoal(HungryEntity entity) {
 
     @Override
     public boolean canStart() {
-        return getEatControl().isHungry() && getEatableItem().isPresent();
+        return getEatControl().isHungry() && getResourceManager().flatMap(IServerResourceManager::getEatableItem).isPresent();
     }
 
     @Override
     public void start() {
         getResourceManager().ifPresent(it ->
-            getEatableItem().ifPresent(st -> {
+                it.getEatableItem().ifPresent(st -> {
                 it.increaseItemAmount(st.getItem(), -1);
                 getEatControl().eatFood(st.getItem());
             })
@@ -55,40 +50,6 @@ private IEatControl getEatControl() {
         return entity.getEatControl().orElseThrow();
     }
 
-    @NotNull
-    private Optional<ItemStack> getEatableItem() {
-        return getResourceManager()
-                .flatMap(it -> it
-                        .getAllItems()
-                        .stream()
-                        .filter(EatGoal::isEatable)
-                        .max(
-                                Comparator.comparingDouble(stack ->
-                                        {
-                                            final var foodComponent = stack.getItem().getFoodComponent();
-                                            //noinspection DataFlowIssue
-                                            return foodComponent.getHunger() * foodComponent.getSaturationModifier() * 2.0f;
-                                        }
-                                )
-                        )
-                );
-    }
-
-    private static boolean isEatable(ItemStack stack) {
-        if(stack.isEmpty() || !stack.getItem().isFood())
-            return false;
 
-        final var foodComponent = stack.getItem().getFoodComponent();
-        final var statusEffects = foodComponent.getStatusEffects();
-        if(statusEffects.isEmpty())
-            return true;
-
-        for (Pair<StatusEffectInstance, Float> statusEffect : statusEffects) {
-            if(statusEffect.getFirst().getEffectType().getCategory() == StatusEffectCategory.HARMFUL)
-                return false;
-        }
-
-        return true;
-    }
 
 }

src/main/java/org/minefortress/entity/ai/goal/PawnExecuteAreaBasedTaskGoal.kt

@@ -7,7 +7,7 @@ class PawnExecuteAreaBasedTaskGoal(colonist: Colonist) : AbstractFortressGoal(co
 
 
     override fun canStart(): Boolean {
-        return colonist.areaBasedTaskControl.hasMoreBlocks() && !isHungry
+        return colonist.areaBasedTaskControl.hasMoreBlocks() && !wantAndCanEatSomeFood()
     }
 
     override fun start() {

src/main/java/org/minefortress/entity/ai/professions/FarmerDailyTask.java

@@ -55,10 +55,10 @@ public void tick(Colonist colonist) {
                 if(!this.iterator.hasNext()) return;
                 this.goal = this.iterator.next();
             } while(goalAlreadyInCorrectState(colonist));
-            movementHelper.goTo(goal.pos().up(), Colonist.FAST_MOVEMENT_SPEED);
+            movementHelper.goTo(goal.pos().up());
         }
         if (this.goal != null && movementHelper.getGoal() == null) {
-            movementHelper.goTo(goal.pos().up(), Colonist.FAST_MOVEMENT_SPEED);
+            movementHelper.goTo(goal.pos().up());
         }
 
         if (movementHelper.hasReachedGoal() && colonist.getPlaceControl().isDone() && colonist.getDigControl().isDone()) {
@@ -102,7 +102,7 @@ private void doFarmCrops(Colonist colonist) {
                     final var blockItem = seedsOpt.get();
                     final var bsTaskBlockInfo = new BlockStateTaskBlockInfo(blockItem, aboveBlockPos, blockItem.getBlock().getDefaultState());
                     colonist.setGoal(bsTaskBlockInfo);
-                    movementHelper.goTo(aboveBlockPos, Colonist.FAST_MOVEMENT_SPEED);
+                    movementHelper.goTo(aboveBlockPos);
                 } else {
                     this.goal = null;
                 }

src/main/java/org/minefortress/entity/ai/professions/FisherDailyTask.java

@@ -55,7 +55,7 @@ public void tick(Colonist colonist) {
         final var movementHelper = colonist.getMovementHelper();
         final var earthPos = goal.getEarthPos();
         if (!earthPos.equals(movementHelper.getGoal()))
-            movementHelper.goTo(earthPos, Colonist.FAST_MOVEMENT_SPEED);
+            movementHelper.goTo(earthPos);
 
         if (movementHelper.hasReachedGoal()) {
             colonist.putItemInHand(Items.FISHING_ROD);