Changed the algorithm to determine how pawns wander around the fortress to make it more natural

Author: remmintan

src/building/java/net/remmintan/mods/minefortress/blocks/building/FortressBuildingBlockEntity.kt

@@ -19,6 +19,7 @@ import net.minecraft.screen.ScreenHandler
 import net.minecraft.server.world.ServerWorld
 import net.minecraft.text.Text
 import net.minecraft.util.math.BlockPos
+import net.minecraft.world.Heightmap
 import net.minecraft.world.World
 import net.remmintan.mods.minefortress.blocks.FortressBlocks
 import net.remmintan.mods.minefortress.core.dtos.ItemInfo
@@ -34,6 +35,9 @@ import net.remmintan.mods.minefortress.gui.building.BuildingScreenHandler
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.util.*
+import kotlin.math.abs
+import kotlin.math.max
+import kotlin.math.min
 import kotlin.streams.asSequence
 
 private const val MAX_BLOCKS_PER_UPDATE = 10
@@ -120,6 +124,31 @@ class FortressBuildingBlockEntity(pos: BlockPos?, state: BlockState?) :
         error("Trying to get managers on the client side")
     }
 
+    override fun getRandomPosToComeToBuilding(): BlockPos? {
+        val world = world ?: return null
+        val start = start ?: return null
+        val end = end ?: return null
+
+        val startY = min(start.y + metadata.floorLevel, end.y)
+        val endY = max(start.y + metadata.floorLevel, end.y)
+
+        var attempts = 0
+        do {
+            val randPos = BlockPos.iterateRandomly(world.random, 1, pos, 10)
+                .map {
+                    val y = world.getTopY(Heightmap.Type.WORLD_SURFACE, it.x, it.z)
+                    BlockPos(it.x, y, it.z)
+                }
+                .first()
+
+
+            val probablyOnTheRoof = endY - startY > 3 && abs(randPos.y - startY) > abs(endY - randPos.y)
+            if (!probablyOnTheRoof) return randPos
+        } while (++attempts < 5)
+
+        return null
+    }
+
     override fun getHireHandler() = hireHandler
 
     override fun getFurnacePos(): List<BlockPos>? =

src/core/java/net/remmintan/mods/minefortress/core/interfaces/buildings/IFortressBuilding.java

@@ -2,7 +2,6 @@
 
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.block.entity.FurnaceBlockEntity;
 import net.minecraft.entity.mob.HostileEntity;
 import net.minecraft.util.math.BlockBox;
 import net.minecraft.util.math.BlockPos;
@@ -12,6 +11,7 @@
 import net.remmintan.mods.minefortress.core.dtos.buildings.BlueprintMetadata;
 import net.remmintan.mods.minefortress.core.interfaces.automation.area.IAutomationArea;
 import net.remmintan.mods.minefortress.core.interfaces.blueprints.ProfessionType;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Map;
@@ -28,6 +28,9 @@ default BlockPos getPos() {
         }
     }
 
+    @Nullable
+    BlockPos getRandomPosToComeToBuilding();
+
     default List<String> getUpgrades() {
         return getMetadata().getRequirement().getUpgrades();
     }

src/core/java/net/remmintan/mods/minefortress/core/interfaces/buildings/IServerBuildingsManager.java

@@ -8,6 +8,7 @@
 import net.remmintan.mods.minefortress.core.interfaces.server.IServerManager;
 import net.remmintan.mods.minefortress.core.interfaces.server.ITickableManager;
 import net.remmintan.mods.minefortress.core.interfaces.server.IWritableManager;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Map;
@@ -28,6 +29,8 @@ public interface IServerBuildingsManager extends IServerManager, IWritableManage
     Optional<IFortressBuilding> findNearest(BlockPos pos);
     Optional<IFortressBuilding> findNearest(BlockPos pos, ProfessionType requirement);
 
+    @Nullable BlockPos getRandomPositionToGoTo();
+
     Optional<HostileEntity> getRandomBuildingAttacker();
     Optional<BlockPos> getFreeBed();
     boolean isPartOfAnyBuilding(BlockPos pos);

src/core/java/net/remmintan/mods/minefortress/core/interfaces/server/IServerFortressManager.java

@@ -56,6 +56,9 @@ public interface IServerFortressManager extends IFortressManager, IWritableManag
     void addPawn(LivingEntity pawn);
     Optional<BlockPos> getRandomPositionAroundCampfire();
 
+    @Nullable
+    BlockPos getRandomFortressPosition();
+
     Optional<LivingEntity> spawnPawnNearCampfire();
     void setSpawnPawns(boolean spawnPawns);
     void spawnDebugEntitiesAroundCampfire(EntityType<? extends IFortressAwareEntity> entityType, int num, ServerPlayerEntity player);

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

@@ -164,6 +164,7 @@ protected void initGoals() {
         this.goalSelector.add(6, new PawnExecuteAreaBasedTaskGoal(this));
         this.goalSelector.add(8, new WanderAroundTheFortressGoal(this));
         this.goalSelector.add(8, new SleepOnTheBedGoal(this));
+        this.goalSelector.add(9, new ReturnToFireGoal(this));
         this.goalSelector.add(10, new LookAroundGoal(this));
 
         this.targetSelector.add(1, new FortressRevengeGoal(this).setGroupRevenge());

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

@@ -21,10 +21,6 @@ protected AbstractFortressGoal(Colonist colonist) {
         }
     }
 
-    protected String getColonistName() {
-        return colonist.getName().getString();
-    }
-
     protected boolean isHungry() {
         return colonist.getEatControl().map(IEatControl::isHungry).orElse(false);
     }

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

@@ -19,6 +19,7 @@ public ReturnToFireGoal(Colonist colonist) {
 
     @Override
     public boolean canStart() {
+        if (colonist.getWorld().isDay()) return false;
         if(colonist.getTarget() != null && colonist.getTarget().isAlive()) return false;
         if(colonist.getTaskControl().hasTask()) return false;
         if(!isFarFromCenter()) return false;
@@ -39,7 +40,7 @@ public void start() {
 
     @Override
     public boolean shouldContinue() {
-        return
+        return colonist.getWorld().isNight() &&
                 !colonist.getTaskControl().hasTask() &&
                 !colonist.getMovementHelper().isStuck() &&
                 (isFarFromCenter() || colonist.getMovementHelper().stillTryingToReachGoal());

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

@@ -0,0 +1,59 @@
+package org.minefortress.entity.ai.goal
+
+import net.minecraft.util.math.BlockPos
+import net.remmintan.mods.minefortress.core.utils.ServerModUtils
+import org.minefortress.entity.Colonist
+import org.minefortress.entity.colonist.IFortressHungerManager
+import java.time.Duration
+import java.time.LocalDateTime
+
+class WanderAroundTheFortressGoal(colonist: Colonist) : AbstractFortressGoal(colonist) {
+    private var goal: BlockPos? = null
+    private var stopTime: LocalDateTime = LocalDateTime.now()
+    private var delay: Int = 0
+
+    override fun canStart(): Boolean {
+        if (colonist.eatControl.map { it.isEating }.orElse(false)) return false
+        if (!isDay || colonist.taskControl.hasTask()) return false
+        val durationSinceStop = Duration.between(stopTime, LocalDateTime.now()).toMillis()
+        if (durationSinceStop < delay) return false
+
+        goal = ServerModUtils
+            .getFortressManager(colonist)
+            .map { it.randomFortressPosition }
+            .orElse(null)
+
+        return goal != null
+    }
+
+    override fun start() {
+        colonist.currentTaskDesc = "Wandering around"
+        colonist.putItemInHand(null)
+        colonist.movementHelper.goTo(goal!!, Colonist.SLOW_MOVEMENT_SPEED)
+    }
+
+    override fun tick() {
+        super.tick()
+        colonist.addHunger(IFortressHungerManager.IDLE_EXHAUSTION)
+        if (colonist.movementHelper.isStuck) {
+            if (goal != null) {
+                colonist.resetControls()
+                colonist.teleport(goal!!.x.toDouble(), goal!!.y.toDouble(), goal!!.z.toDouble())
+            }
+        }
+    }
+
+    override fun shouldContinue(): Boolean {
+        return isDay && !colonist.taskControl.hasTask() && colonist.movementHelper.stillTryingToReachGoal()
+    }
+
+    override fun stop() {
+        goal = null
+        colonist.movementHelper.reset()
+        stopTime = LocalDateTime.now()
+        delay = colonist.world.random.nextInt(6000) + 5000
+    }
+
+    private val isDay: Boolean
+        get() = colonist.world.isDay
+}

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

@@ -20,6 +20,7 @@
 import net.remmintan.mods.minefortress.core.interfaces.automation.IAutomationAreaProvider;
 import net.remmintan.mods.minefortress.core.interfaces.automation.area.IAutomationArea;
 import net.remmintan.mods.minefortress.core.interfaces.blueprints.ProfessionType;
+import net.remmintan.mods.minefortress.core.interfaces.buildings.IServerBuildingsManager;
 import net.remmintan.mods.minefortress.core.interfaces.entities.IPawnNameGenerator;
 import net.remmintan.mods.minefortress.core.interfaces.entities.pawns.IFortressAwareEntity;
 import net.remmintan.mods.minefortress.core.interfaces.entities.pawns.IProfessional;
@@ -421,8 +422,8 @@ public boolean isPositionWithinFortress(BlockPos pos) {
     }
 
     public Optional<BlockPos> getRandomPositionAroundCampfire() {
-        final var fortressCenter = getFortressCenter();
-        if(fortressCenter == null) return Optional.empty();
+        final var position = getFortressCenter();
+        if (position == null) return Optional.empty();
 
         final var random = getWorld().random;
 
@@ -431,13 +432,23 @@ public Optional<BlockPos> getRandomPositionAroundCampfire() {
         final var x = (int) Math.round(radius * Math.cos(angle) * getCampfireWarmRadius());
         final var z = (int) Math.round(radius * Math.sin(angle) * getCampfireWarmRadius());
 
-        final var blockX = fortressCenter.getX() + x;
-        final var blockZ = fortressCenter.getZ() + z;
+        final var blockX = position.getX() + x;
+        final var blockZ = position.getZ() + z;
         final var blockY = getWorld().getTopY(Heightmap.Type.WORLD_SURFACE, blockX, blockZ);
 
         return Optional.of(new BlockPos(blockX, blockY, blockZ));
     }
 
+    @Override
+    public @Nullable BlockPos getRandomFortressPosition() {
+        if (fortressCenter == null || server == null || world == null) return null;
+        return ServerModUtils.getManagersProvider(server, fortressCenter)
+                .map(IServerManagersProvider::getBuildingsManager)
+                .map(IServerBuildingsManager::getRandomPositionToGoTo)
+                .or(this::getRandomPositionAroundCampfire)
+                .orElse(null);
+    }
+
     public double getCampfireWarmRadius() {
         return Math.max(Math.sqrt(getTotalColonistsCount()), 4);
     }