Heavily updated delivery drone pathfinding logic

Author: OutCraft-Mods

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

@@ -59,6 +59,7 @@ public void portAdded(LevelAccessor levelAccessor, GlobalPos pos, String filter)
 				if (!pathsInThisDimension.containsKey(Couple.create(trackedPortPos, blockPos))) {
 					this.recalculatePath((Level) levelAccessor, blockPos, trackedPortPos);
 					pathsInThisDimension.put(Couple.create(trackedPortPos, blockPos), null);
+					pathsInThisDimension.put(Couple.create(blockPos, trackedPortPos), null);
 				}
 
 			});
@@ -75,7 +76,7 @@ public void recalculatePath(Level level, BlockPos blockPos, BlockPos trackedPort
 		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(() -> {
+		Thread thread = new Thread(() -> {
 			final SimpleWorldProvider worldProvider = new SimpleWorldProvider();
 
 			addCellsFromWorld(worldProvider, trackedPortPos, blockPos, 16, level); // TODO Make configurable
@@ -100,13 +101,18 @@ public void recalculatePath(Level level, BlockPos blockPos, BlockPos trackedPort
 					.collect(Collectors.toCollection(ArrayList::new));
 
 			ArrayList<BlockPos> reversePathList = new ArrayList<>(pathList);
-			Collections.reverse(pathList);
+			Collections.reverse(reversePathList);
 
+			this.savedPaths.computeIfAbsent(level.dimension().toString(), key -> new HashMap<>())
+					.put(Couple.create(blockPos, trackedPortPos), 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();
+		});
+		thread.setDaemon(true);
+		thread.setPriority(2);
+		thread.start();
 	}
 
 	private static void addCellsFromWorld(SimpleWorldProvider blockManager, BlockPos trackedPortPos, BlockPos blockPos, int margin, Level level) {

src/main/java/com/workert/robotics/content/robotics/drone_delivery/delivery_drone/DeliveryDroneEntity.java

@@ -27,7 +27,7 @@
 import java.util.List;
 
 public class DeliveryDroneEntity extends LivingEntity {
-	private ItemStack box;
+	private ItemStack box = ItemStack.EMPTY;
 
 	private boolean isReturning = false;
 	private BlockPos startBlockPos;
@@ -38,7 +38,6 @@ public class DeliveryDroneEntity extends LivingEntity {
 
 	public DeliveryDroneEntity(EntityType<? extends LivingEntity> entityType, Level level) {
 		super(entityType, level);
-		this.box = ItemStack.EMPTY;
 		this.setNoGravity(true);
 	}
 
@@ -72,6 +71,9 @@ public void tick() {
 			}
 		}
 
+		System.out.println(this.path);
+		System.out.println(this.pathProgress);
+
 		if (this.path == null || this.path.isEmpty()) {
 			this.path = Robotics.DRONE_NETWORK.savedPaths.computeIfAbsent(this.level().dimension().toString(), key -> new HashMap<>())
 					.get(this.isReturning
@@ -94,7 +96,6 @@ public void tick() {
 			}
 		}
 
-
 		if (this.path != null && !this.path.isEmpty()) {
 			if (!this.level()
 					.isEmptyBlock(this.path.get(this.pathProgress)) || (this.pathProgress != (this.path.size() - 1) && !this.level()
@@ -114,6 +115,7 @@ public void tick() {
 					this.pathProgress++;
 				} else {
 					if (!this.box.isEmpty() && this.destinationBlockPos != null
+							&& this.position().distanceTo(this.destinationBlockPos.getCenter()) < 5
 							&& this.level().getBlockEntity(this.destinationBlockPos) != null
 							&& this.level().getBlockEntity(this.destinationBlockPos) instanceof DronePortBlockEntity dronePortBlockEntity) {
 						if (this.isReturning) {
@@ -206,6 +208,24 @@ protected void dropAllDeathLoot(DamageSource pDamageSource) {
 		this.dropBox();
 	}
 
+	@Override
+	public void kill() {
+		super.kill();
+		for (int x = -3; x <= 3; x++) {
+			for (int z = -3; z <= 3; z++) {
+				ForgeChunkManager.forceChunk(
+						(ServerLevel) this.level(),
+						Robotics.MOD_ID,
+						this,
+						this.chunkPosition().x + x,
+						this.chunkPosition().z + z,
+						false,
+						false
+				);
+			}
+		}
+	}
+
 	@Override
 	public void addAdditionalSaveData(CompoundTag compound) {
 		super.addAdditionalSaveData(compound);

src/main/java/com/workert/robotics/content/robotics/drone_delivery/drone_port/DronePortBlockEntity.java

@@ -47,9 +47,9 @@ protected void onOpenChange(boolean open) {
 	public void lazyTick() {
 		if (this.level != null && !this.inventory.isEmpty()) {
 			ItemStack box = ItemHelper.extract(this.inventory,
-					itemStack -> !itemStack.isEmpty() && PackageItem.isPackage(itemStack) && !PackageItem.matchAddress(itemStack,
-							this.addressFilter),
-					1, true);
+					itemStack -> !itemStack.isEmpty() && PackageItem.isPackage(itemStack) && !PackageItem.getAddress(itemStack)
+							.isEmpty() && !PackageItem.matchAddress(itemStack,
+							this.addressFilter), 1, true);
 			if (!box.isEmpty() && this.target != null && this.level.getEntitiesOfClass(DeliveryDroneEntity.class,
 					new AABB(this.getBlockPos()).inflate(0, 1, 0)).isEmpty())
 				if (this.target.export(this.level, this.worldPosition, box, false))
@@ -122,7 +122,6 @@ private static BlockPos getNearestBlockPos(BlockPos target, List<BlockPos> desti
 					nearest = pos;
 				}
 			}
-
 			return nearest;
 		}