A lot of work on delivery drones

Author: OutCraft-Mods

src/main/java/com/workert/robotics/content/robotics/drone_delivery/DroneNetworkSavedData.java

@@ -25,8 +25,8 @@ public class DroneNetworkSavedData extends SavedData {
 	@Override
 	public CompoundTag save(CompoundTag nbt) {
 		GlobalDroneNetworkManager drones = Robotics.DRONE_NETWORK;
-		CompoundTag levelCompound = new CompoundTag();
 
+		CompoundTag dronePortLevelCompound = new CompoundTag();
 		drones.dronePorts.forEach((level, network) -> {
 			ListTag dronePorts = new ListTag();
 			network.forEach((blockPos, filter) -> {
@@ -35,30 +35,33 @@ public CompoundTag save(CompoundTag nbt) {
 				dronePort.putString("Filter", filter);
 				dronePorts.add(dronePort);
 			});
-			levelCompound.put(level, dronePorts);
+			dronePortLevelCompound.put(level, dronePorts);
 		});
-		nbt.put("DronePorts", levelCompound);
+		nbt.put("DronePorts", dronePortLevelCompound);
 
+		CompoundTag savedPathLevelCompound = new CompoundTag();
 		drones.savedPaths.forEach((level, paths) -> {
 			ListTag savedPaths = new ListTag();
 			paths.forEach((fromToBlockPos, waypointList) -> {
-				CompoundTag savedPath = new CompoundTag();
+				if (waypointList != null && !waypointList.isEmpty()) {
+					CompoundTag savedPath = new CompoundTag();
 
-				savedPath.put("From", NbtUtils.writeBlockPos(fromToBlockPos.getFirst()));
-				savedPath.put("To", NbtUtils.writeBlockPos(fromToBlockPos.getSecond()));
+					savedPath.put("From", NbtUtils.writeBlockPos(fromToBlockPos.getFirst()));
+					savedPath.put("To", NbtUtils.writeBlockPos(fromToBlockPos.getSecond()));
 
-				CompoundTag waypoints = new CompoundTag();
-				waypoints.putInt("Length", waypointList.size());
-				for (int i = 0; i < waypointList.size(); i++) {
-					waypoints.put(String.valueOf(i), NbtUtils.writeBlockPos(waypointList.get(i)));
-				}
-				savedPath.put("Waypoints", waypoints);
+					CompoundTag waypoints = new CompoundTag();
+					waypoints.putInt("Length", waypointList.size());
+					for (int i = 0; i < waypointList.size(); i++) {
+						waypoints.put(String.valueOf(i), NbtUtils.writeBlockPos(waypointList.get(i)));
+					}
+					savedPath.put("Waypoints", waypoints);
 
-				savedPaths.add(savedPath);
+					savedPaths.add(savedPath);
+				}
 			});
-			levelCompound.put(level, savedPaths);
+			savedPathLevelCompound.put(level, savedPaths);
 		});
-		nbt.put("SavedPaths", levelCompound);
+		nbt.put("SavedPaths", savedPathLevelCompound);
 
 		return nbt;
 	}

src/main/java/com/workert/robotics/content/robotics/drone_delivery/GlobalDroneNetworkManager.java

@@ -1,5 +1,6 @@
 package com.workert.robotics.content.robotics.drone_delivery;
 
+import com.workert.robotics.content.robotics.drone_delivery.drone_port.DronePortBlockEntity;
 import com.workert.robotics.content.robotics.drone_delivery.pathing.Cell;
 import com.workert.robotics.content.robotics.drone_delivery.pathing.Pathfinder;
 import com.workert.robotics.content.robotics.drone_delivery.pathing.SimpleWorldProvider;
@@ -34,45 +35,50 @@ public void levelLoaded(LevelAccessor level) {
 	}
 
 	public void portAdded(LevelAccessor levelAccessor, GlobalPos pos, String filter) {
-		if (this.dronePorts.computeIfAbsent(pos.dimension().toString(), key -> new HashMap<>()).containsKey(pos.pos()))
-			return;
-
 		BlockPos blockPos = pos.pos();
 
 		Map<BlockPos, String> portsInThisDimension = this.dronePorts.computeIfAbsent(pos.dimension().toString(), key -> new HashMap<>());
 
-		List<BlockPos> trackedPorts = new ArrayList<>();
+		if (((DronePortBlockEntity) Objects.requireNonNull(levelAccessor.getBlockEntity(blockPos))).acceptsPackages) {
+			List<BlockPos> trackedPorts = new ArrayList<>();
 
-		portsInThisDimension.forEach((portBlockPos, portFilter) -> {
-			if (!portBlockPos.equals(blockPos)) {
-				double distance = blockPos.distToCenterSqr(portBlockPos.getX(), portBlockPos.getY(), portBlockPos.getZ());
-				if (distance < 256) { // TODO Make configurable
-					trackedPorts.add(portBlockPos);
+			portsInThisDimension.forEach((portBlockPos, portFilter) -> {
+				if (!portBlockPos.equals(blockPos)) {
+					double distance = blockPos.distToCenterSqr(portBlockPos.getX(), portBlockPos.getY(), portBlockPos.getZ());
+					if (distance < 16384) { // TODO Make configurable
+						trackedPorts.add(portBlockPos);
+					}
 				}
-			}
-		});
+			});
 
-		Map<Couple<BlockPos>, List<BlockPos>> pathsInThisDimension = this.savedPaths.computeIfAbsent(
-				((Level) levelAccessor).dimension().toString(),
-				key -> new HashMap<>());
+			Map<Couple<BlockPos>, List<BlockPos>> pathsInThisDimension = this.savedPaths.computeIfAbsent(
+					((Level) levelAccessor).dimension().toString(),
+					key -> new HashMap<>());
 
-		trackedPorts.forEach(trackedPortPos -> {
-			if (!pathsInThisDimension.containsKey(Couple.create(blockPos, trackedPortPos)))
-				this.recalculatePath((Level) levelAccessor, blockPos, trackedPortPos);
+			trackedPorts.forEach(trackedPortPos -> {
+				if (!pathsInThisDimension.containsKey(Couple.create(trackedPortPos, blockPos))) {
+					this.recalculatePath((Level) levelAccessor, blockPos, trackedPortPos);
+					pathsInThisDimension.put(Couple.create(trackedPortPos, blockPos), null);
+				}
 
-		});
+			});
+		}
 
 		portsInThisDimension.put(blockPos, filter);
 		this.markDirty();
 	}
 
 	public void recalculatePath(Level level, BlockPos blockPos, BlockPos trackedPortPos) {
+		if (level.isClientSide())
+			return;
+
+		System.out.println("Calculating path from " + blockPos + " to " + trackedPortPos);
 		this.savedPaths.computeIfAbsent(level.dimension().toString(),
 				key -> new HashMap<>()).remove(Couple.create(blockPos, trackedPortPos));
 		new Thread(() -> {
 			final SimpleWorldProvider worldProvider = new SimpleWorldProvider();
 
-			addCellsFromWorld(worldProvider, trackedPortPos, blockPos, 10, level); // TODO Make configurable
+			addCellsFromWorld(worldProvider, trackedPortPos, blockPos, 16, level); // TODO Make configurable
 
 			Pathfinder pathfinder = new Pathfinder(
 					new Cell(blockPos.getX(), blockPos.getY() + 1, blockPos.getZ()),
@@ -92,15 +98,14 @@ public void recalculatePath(Level level, BlockPos blockPos, BlockPos trackedPort
 
 			ArrayList<BlockPos> pathList = path.stream().map(cell -> new BlockPos(cell.x, cell.y, cell.z))
 					.collect(Collectors.toCollection(ArrayList::new));
-			this.savedPaths.computeIfAbsent(level.dimension().toString(), key -> new HashMap<>())
-					.put(Couple.create(blockPos, trackedPortPos), pathList);
 
 			ArrayList<BlockPos> reversePathList = new ArrayList<>(pathList);
-			Collections.reverse(reversePathList);
+			Collections.reverse(pathList);
 
 			this.savedPaths.computeIfAbsent(level.dimension().toString(), key -> new HashMap<>())
 					.put(Couple.create(trackedPortPos, blockPos), reversePathList);
 			this.markDirty();
+			System.out.println("Finished path from " + blockPos + " to " + trackedPortPos);
 		}).start();
 	}
 
@@ -111,7 +116,12 @@ private static void addCellsFromWorld(SimpleWorldProvider blockManager, BlockPos
 					trackedPortPos.getX()) + margin; x++) {
 				for (int z = Math.min(blockPos.getZ(), trackedPortPos.getZ()) - margin; z <= Math.max(blockPos.getZ(),
 						trackedPortPos.getZ()) + margin; z++) {
-					if (!level.isEmptyBlock(new BlockPos(x, y, z)))
+					if (!level.isEmptyBlock(new BlockPos(x, y, z)) ||
+							(
+									!(level.getBlockEntity(new BlockPos(x, y - 1, z)) instanceof DronePortBlockEntity) &&
+											!level.isEmptyBlock(new BlockPos(x, y - 1, z))
+							)
+					)
 						blockManager.addWall(new Cell(x, y, z));
 				}
 			}
@@ -121,13 +131,11 @@ private static void addCellsFromWorld(SimpleWorldProvider blockManager, BlockPos
 	public void portRemoved(GlobalPos pos) {
 		this.dronePorts.computeIfAbsent(pos.dimension().toString(), key -> new HashMap<>()).remove(pos.pos());
 		List<Couple<BlockPos>> toRemove = new ArrayList<>();
-		/* Also remove corresponding savedPaths
 		this.savedPaths.computeIfAbsent(pos.dimension().toString(), key -> new HashMap<>()).forEach((couple, path) -> {
 			if (couple.either(blockPos -> blockPos.equals(pos.pos())))
 				toRemove.add(couple);
 		});
 		toRemove.forEach(couple -> this.savedPaths.get(pos.dimension().toString()).remove(couple));
-		*/
 		this.markDirty();
 	}