First attempt to fix the roads task

remmintan · Mar 16, 2024 · 17a0271 · 17a0271
1 parent d2a95e1
commit 17a0271
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/src/core/java/net/remmintan/mods/minefortress/core/interfaces/tasks/ITasksCreator.java b/src/core/java/net/remmintan/mods/minefortress/core/interfaces/tasks/ITasksCreator.java
@@ -14,10 +14,8 @@
 public interface ITasksCreator extends IServerManager {
 
     ITask createCutTreesTask(UUID uuid, List<BlockPos> treeRoots, List<BlockPos> positions);
-    default ITask createRoadsTask(UUID digUuid, TaskType type, UUID placeUuid, List<BlockPos> blocks, Item itemInHand) {
-        return createRoadsTask(digUuid, type, placeUuid, blocks, itemInHand, () -> {});
-    }
-    ITask createRoadsTask(UUID digUuid, TaskType type, UUID placeUuid, List<BlockPos> blocks, Item itemInHand, Runnable onComplete);
+
+    ITask createRoadsTask(UUID digUuid, TaskType type, UUID placeUuid, List<BlockPos> blocks, Item itemInHand);
 
     ITask createSelectionTask(UUID id, TaskType taskType, BlockPos start, BlockPos end, ServerSelectionType selectionType, HitResult hitResult, List<BlockPos> positions, ServerPlayerEntity player);
 

diff --git a/src/main/java/org/minefortress/tasks/RoadsTask.java b/src/main/java/org/minefortress/tasks/RoadsTask.java
@@ -32,12 +32,11 @@ public class RoadsTask implements ITask {
     private final int totalParts;
     private int finishedParts = 0;
 
-    private final Runnable onComplete;
+    private final List<Runnable> taskFinishListeners = new ArrayList<>();
 
-    public RoadsTask(UUID id, TaskType taskType, List<BlockPos> blocks, Item item, Runnable onComplete) {
+    public RoadsTask(UUID id, TaskType taskType, List<BlockPos> blocks, Item item) {
         this.id = id;
         this.taskType = taskType;
-        this.onComplete = onComplete;
         this.blocks = blocks;
         this.item = item;
         this.totalParts = prepareParts();
@@ -120,14 +119,19 @@ public void returnPart(Pair<BlockPos, BlockPos> partStartAndEnd) {
     public void finishPart(ITaskPart part, IWorkerPawn colonist) {
         final ServerWorld world = colonist.getServerWorld();
         finishedParts++;
-        if(taskParts.isEmpty() && finishedParts == totalParts){
+        if(taskParts.isEmpty() && totalParts <= finishedParts){
             world.getPlayers().stream().findAny().ifPresent(player -> {
                 FortressServerNetworkHelper.send(player, FortressChannelNames.FINISH_TASK, new ClientboundTaskExecutedPacket(this.getId()));
             });
-            onComplete.run();
+            taskFinishListeners.forEach(Runnable::run);
         }
     }
 
+    @Override
+    public void addFinishListener(Runnable listener) {
+        taskFinishListeners.add(listener);
+    }
+
     @Override
     public List<TaskInformationDto> toTaskInformationDto() {
         if(taskType == TaskType.BUILD){

diff --git a/src/main/java/org/minefortress/tasks/TasksCreator.java b/src/main/java/org/minefortress/tasks/TasksCreator.java
@@ -22,8 +22,8 @@ public ITask createCutTreesTask(UUID uuid, List<BlockPos> treeRoots, List<BlockP
     }
 
     @Override
-    public ITask createRoadsTask(UUID digUuid, TaskType type, UUID placeUuid, List<BlockPos> blocks, Item itemInHand, Runnable onComplete) {
-        return new RoadsTask(placeUuid, type, blocks, itemInHand, onComplete);
+    public ITask createRoadsTask(UUID digUuid, TaskType type, UUID placeUuid, List<BlockPos> blocks, Item itemInHand) {
+        return new RoadsTask(placeUuid, type, blocks, itemInHand);
     }
 
     @Override

diff --git a/...rking/java/net/remmintan/mods/minefortress/networking/c2s/ServerboundRoadsTaskPacket.java b/...rking/java/net/remmintan/mods/minefortress/networking/c2s/ServerboundRoadsTaskPacket.java
@@ -66,7 +66,8 @@ public void handle(MinecraftServer server, ServerPlayerEntity player) {
         if(manager.isSurvival())
             resourceManager.reserveItems(placeUuid, Collections.singletonList(resourceManager.createItemInfo(item, blocks.size())));
 
-        final var digTask = tasksCreator.createRoadsTask(digUuid, TaskType.REMOVE, placeUuid, blocks, item, onDigComplete);
+        final var digTask = tasksCreator.createRoadsTask(digUuid, TaskType.REMOVE, placeUuid, blocks, item);
+        digTask.addFinishListener(onDigComplete);
         taskManager.addTask(digTask, provider, manager, selectedPawns, player);
     }
 }