Display correct blueprint task blocks.

remmintan · Mar 16, 2024 · d2a95e1 · d2a95e1
1 parent 6554de3
commit d2a95e1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/org/minefortress/tasks/BlueprintTask.java b/src/main/java/org/minefortress/tasks/BlueprintTask.java
@@ -11,6 +11,7 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
 import net.remmintan.mods.minefortress.core.TaskType;
+import net.remmintan.mods.minefortress.core.dtos.tasks.TaskInformationDto;
 import net.remmintan.mods.minefortress.core.interfaces.entities.pawns.IFortressAwareEntity;
 import net.remmintan.mods.minefortress.core.interfaces.entities.pawns.IWorkerPawn;
 import net.remmintan.mods.minefortress.core.interfaces.tasks.ITaskBlockInfo;
@@ -145,4 +146,12 @@ private void removeReservedItem(IFortressAwareEntity colonist, Item item) {
         }
     }
 
+    @Override
+    public List<TaskInformationDto> toTaskInformationDto() {
+        Set<BlockPos> allBlocks = new HashSet<>(blueprintData.keySet());
+        if(blueprintEntityData != null) allBlocks.addAll(blueprintEntityData.keySet());
+        if(blueprintAutomaticData != null) allBlocks.addAll(blueprintAutomaticData.keySet());
+        final var positions = allBlocks.stream().map(it -> it.add(startingBlock)).toList();
+        return List.of(new TaskInformationDto(id, positions, taskType));
+    }
 }
diff --git a/...tworking/java/net/remmintan/mods/minefortress/networking/s2c/S2CAddClientTasksPacket.java b/...tworking/java/net/remmintan/mods/minefortress/networking/s2c/S2CAddClientTasksPacket.java
@@ -13,7 +13,7 @@
 
 public class S2CAddClientTasksPacket implements FortressS2CPacket {
 
-    public static final String CHANNEL = "minefortress:client_task_state";
+    public static final String CHANNEL = "minefortress_client_task_state";
 
     private final List<TaskInformationDto> tasks;