Removed the concept of border and influence flags from the game entir…

…ely. The whole concept was confusing and made gameplay less dynamic and straightforward.

src/core/java/net/remmintan/mods/minefortress/core/interfaces/client/IClientFortressManager.java

@@ -36,8 +36,7 @@ void sync(
             FortressGamemode gamemode,
             boolean connectedToTheServer,
             int maxColonistsCount,
-            int reservedColonistCount,
-            boolean borderEnabled
+            int reservedColonistCount
     );
 
     void tick(IHoveredBlockProvider fortressClient);
@@ -79,8 +78,6 @@ void sync(
 
     List<BuildingHealthRenderInfo> getBuildingHealths();
 
-    boolean isBorderEnabled();
-
     void openRepairBuildingScreen(UUID buildingId, Map<BlockPos, BlockState> blocksToRepair);
 
     IClientResourceManager getResourceManager();

src/core/java/net/remmintan/mods/minefortress/core/interfaces/client/IClientManagersProvider.java

@@ -3,7 +3,6 @@
 import net.remmintan.mods.minefortress.core.interfaces.blueprints.IClientBlueprintManager;
 import net.remmintan.mods.minefortress.core.interfaces.combat.IClientPawnsSelectionManager;
 import net.remmintan.mods.minefortress.core.interfaces.combat.ITargetedSelectionManager;
-import net.remmintan.mods.minefortress.core.interfaces.infuence.IClientInfluenceManager;
 import net.remmintan.mods.minefortress.core.interfaces.selections.ISelectionManager;
 import net.remmintan.mods.minefortress.core.interfaces.tasks.IAreasClientManager;
 
@@ -12,7 +11,6 @@ public interface IClientManagersProvider {
     IAreasClientManager get_AreasClientManager();
     IClientBlueprintManager get_BlueprintManager();
     IClientFortressManager get_ClientFortressManager();
-    IClientInfluenceManager get_InfluenceManager();
     IClientPawnsSelectionManager get_PawnsSelectionManager();
     default ISelectedColonistProvider getSelectedColonistProvider() {
         final var pawnsSelectionManager = get_PawnsSelectionManager();

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

@@ -12,11 +12,8 @@ public interface IFortressModServerManager {
     IServerManagersProvider getManagersProvider(UUID id);
     IServerFortressManager getFortressManager(ServerPlayerEntity player);
     IServerFortressManager getFortressManager(UUID id);
-    boolean isBorderEnabled();
     void save();
     void load();
-
-    void load(boolean border);
     void tick(PlayerManager manager);
     Optional<IServerManagersProvider> findReachableFortress(BlockPos pos, double reachRange);
 }

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

@@ -18,10 +18,9 @@
 import java.util.UUID;
 
 public interface IServerFortressManager {
-    void setBorderVisibilityState(boolean borderEnabled);
     void scheduleSync();
 
-    void syncOnJoin(boolean borderEnabled);
+    void syncOnJoin();
     IPawnNameGenerator getNameGenerator();
     void replaceColonistWithTypedPawn(LivingEntity colonist, String warriorId, EntityType<? extends LivingEntity> entityType);
 

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

@@ -4,7 +4,6 @@
 import net.remmintan.mods.minefortress.core.interfaces.automation.server.IServerAutomationAreaManager;
 import net.remmintan.mods.minefortress.core.interfaces.blueprints.buildings.IServerBuildingsManager;
 import net.remmintan.mods.minefortress.core.interfaces.combat.IServerFightManager;
-import net.remmintan.mods.minefortress.core.interfaces.infuence.IServerInfluenceManager;
 import net.remmintan.mods.minefortress.core.interfaces.professions.IServerProfessionsManager;
 import net.remmintan.mods.minefortress.core.interfaces.resources.IServerResourceManager;
 import net.remmintan.mods.minefortress.core.interfaces.tasks.IServerTaskManager;
@@ -19,9 +18,6 @@ public interface IServerManagersProvider {
     default IServerAutomationAreaManager getAutomationAreaManager() {
         return getManager(IServerAutomationAreaManager.class);
     }
-    default IServerInfluenceManager getInfluenceManager() {
-        return getManager(IServerInfluenceManager.class);
-    }
     default IServerProfessionsManager getProfessionsManager() {
         return getManager(IServerProfessionsManager.class);
     }

src/main/java/org/minefortress/blueprints/manager/BaseClientStructureManager.java

@@ -9,7 +9,6 @@
 import net.remmintan.mods.minefortress.core.interfaces.blueprints.*;
 import net.remmintan.mods.minefortress.core.interfaces.client.IClientManagersProvider;
 import org.jetbrains.annotations.Nullable;
-import org.minefortress.utils.ModUtils;
 
 import java.util.Map;
 import java.util.Optional;
@@ -54,10 +53,6 @@ private void checkNotEnoughResources() {
         }
     }
 
-    protected boolean isEnoughResources() {
-        return enoughResources;
-    }
-
     private void checkCantBuild() {
         if(!enoughResources) {
             cantBuild = true;
@@ -72,22 +67,19 @@ private void checkCantBuild() {
                 .collect(Collectors.toSet());
         final int floorLevel = getSelectedStructure().getFloorLevel();
 
-        final var fortressBorder = ModUtils.getInfluenceManager().getFortressBorder();
 
         final boolean blueprintPartInTheSurface = blueprintDataPositions.stream()
                 .filter(blockPos -> blockPos.getY() >= floorLevel)
                 .map(pos -> pos.add(structureBuildPos.down(floorLevel)))
-                .anyMatch(pos -> !BuildingHelper.canPlaceBlock(client.world, pos) ||
-                        fortressBorder.map(border -> !border.contains(pos)).orElse(false));
+                .anyMatch(pos -> !BuildingHelper.canPlaceBlock(client.world, pos));
 
         final boolean blueprintPartInTheAir = blueprintDataPositions.stream()
                 .filter(blockPos -> {
                     final int y = blockPos.getY();
                     return y<=floorLevel;
                 })
                 .map(pos -> pos.add(structureBuildPos.down(floorLevel)))
-                .anyMatch(pos -> BuildingHelper.canPlaceBlock(client.world, pos.down()) ||
-                        fortressBorder.map(border -> !border.contains(pos)).orElse(false));
+                .anyMatch(pos -> BuildingHelper.canPlaceBlock(client.world, pos.down()));
 
         cantBuild = blueprintPartInTheSurface || blueprintPartInTheAir;
     }

src/main/java/org/minefortress/commands/CommandsManager.java

@@ -10,7 +10,6 @@ public class CommandsManager {
     private static final List<MineFortressCommand> commands = Arrays.asList(
             new DebugItemsCommand(),
             new DebugPawnsCommand(),
-            new BorderToggleCommand(),
             new SpawnPawnsCommand(),
             new WarriorsCommand()
     );

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

@@ -15,15 +15,14 @@
 import net.minecraft.world.LocalDifficulty;
 import net.minecraft.world.ServerWorldAccess;
 import net.minecraft.world.World;
+import net.remmintan.mods.minefortress.core.interfaces.entities.pawns.IProfessional;
+import net.remmintan.mods.minefortress.core.interfaces.entities.pawns.IWarrior;
 import org.jetbrains.annotations.Nullable;
 import org.minefortress.entity.ai.goal.EatGoal;
 import org.minefortress.entity.ai.goal.SelectTargetToAttackGoal;
-import org.minefortress.entity.ai.goal.warrior.CapturePositionGoal;
 import org.minefortress.entity.ai.goal.warrior.FollowLivingEntityGoal;
 import org.minefortress.entity.ai.goal.warrior.MeleeAttackGoal;
 import org.minefortress.entity.ai.goal.warrior.MoveToBlockGoal;
-import net.remmintan.mods.minefortress.core.interfaces.entities.pawns.IProfessional;
-import net.remmintan.mods.minefortress.core.interfaces.entities.pawns.IWarrior;
 import org.minefortress.professions.ServerProfessionManager;
 
 public final class WarriorPawn extends TargetedPawn implements IProfessional, IWarrior {
@@ -55,7 +54,6 @@ protected void initGoals() {
         this.goalSelector.add(2, new MoveToBlockGoal(this));
         this.goalSelector.add(2, new FollowLivingEntityGoal(this));
         this.goalSelector.add(3, new EatGoal(this));
-        this.goalSelector.add(3, new CapturePositionGoal(this));
         this.goalSelector.add(9, new LookAtEntityGoal(this, LivingEntity.class, 4f));
         this.goalSelector.add(10, new LookAroundGoal(this));