Fix pathfinding command coordinate handling.

michaelzangl · May 9, 2020 · 7034733 · 7034733
1 parent f6d9864
commit 7034733
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/Minebot/src/main/java/net/famzangl/minecraft/minebot/ai/command/CommandRegistry.java b/Minebot/src/main/java/net/famzangl/minecraft/minebot/ai/command/CommandRegistry.java
@@ -98,6 +98,7 @@ public boolean interceptCommand(String message) {
                     // Show chat message to client. TODO: Use nice minecraft message
                     AIChatController.addChatLine("ERROR while evaluating: "
                             + e.getMessage());
+                    LOGGER.warn("Error during command evaluation", e);
                 }
             }
             // Otherwise ignored, let Minecraft handle this

diff --git a/Minebot/src/main/java/net/famzangl/minecraft/minebot/ai/path/FillAreaPathfinder.java b/Minebot/src/main/java/net/famzangl/minecraft/minebot/ai/path/FillAreaPathfinder.java
@@ -16,7 +16,6 @@
  *******************************************************************************/
 package net.famzangl.minecraft.minebot.ai.path;
 
-import net.famzangl.minecraft.minebot.ai.AIHelper;
 import net.famzangl.minecraft.minebot.ai.command.AICommandParameter.BlockFilter;
 import net.famzangl.minecraft.minebot.ai.path.world.BlockSet;
 import net.famzangl.minecraft.minebot.ai.path.world.BlockSets;
@@ -35,7 +34,7 @@
 
 public class FillAreaPathfinder extends MovePathFinder {
 	private static final Marker MARKER_FILL = MarkerManager.getMarker("fill");
-	private static final Logger LOGGER = LogManager.getLogger(AIHelper.class);
+	private static final Logger LOGGER = LogManager.getLogger(FillAreaPathfinder.class);
 	private static final BlockSet PLACEABLE_BLOCKS = BlockSets.SIMPLE_CUBE;
 	private static final BlockSet GROUND_BLOCKS = BlockSet.builder().add(BlockSets.SIMPLE_CUBE).add(
 			BlockSets.FALLING).build();

diff --git a/Minebot/src/main/java/net/famzangl/minecraft/minebot/ai/path/GoToPathfinder.java b/Minebot/src/main/java/net/famzangl/minecraft/minebot/ai/path/GoToPathfinder.java
@@ -20,8 +20,12 @@
 import net.famzangl.minecraft.minebot.ai.utils.BlockArea;
 import net.famzangl.minecraft.minebot.ai.utils.BlockCuboid;
 import net.minecraft.util.math.BlockPos;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class GoToPathfinder extends WalkingPathfinder {
+	private static final Logger LOGGER = LogManager.getLogger(FillAreaPathfinder.class);
+
 	private final BlockPos position;
 	int HORIZONTAL_SEARCH_MIN = (int) (HORIZONTAL_SEARCH_DISTANCE * .8);
 	int VERTICAL_SEARCH_MIN = (int) (VERTICAL_SEARCH_DISTANCE * .8);
@@ -38,7 +42,7 @@ protected boolean runSearch(BlockPos playerPosition) {
 		}
 		BlockPos posDiff = position.subtract(playerPosition);
 		BlockArea<WorldData> area = new BlockCuboid<>(
-				playerPosition, playerPosition
+				position, position
 		);
 		// X
 		if (posDiff.getX() > HORIZONTAL_SEARCH_MIN) {
@@ -85,11 +89,13 @@ protected boolean runSearch(BlockPos playerPosition) {
 		}
 		targetArea = area;
 
+		LOGGER.debug("Pathfinder target area is: {}", area);
+
 		return super.runSearch(playerPosition);
 	}
 
 	@Override
 	protected float rateDestination(int distance, int x, int y, int z) {
-		return targetArea.contains(world, position) ? distance : -1;
+		return targetArea.contains(world, x, y, z) ? distance : -1;
 	}
 }
diff --git a/Minebot/src/main/java/net/famzangl/minecraft/minebot/ai/utils/AreaIntersection.java b/Minebot/src/main/java/net/famzangl/minecraft/minebot/ai/utils/AreaIntersection.java
@@ -43,4 +43,9 @@ public boolean contains(WorldT world, int x, int y, int z) {
 	public <WorldT2 extends WorldT> void accept(AreaVisitor<? super WorldT2> visitor, WorldT2 world) {
 		a.accept(new FilteredAreaVisitor<WorldT2>(visitor, b), world);
 	}
+
+	@Override
+	public String toString() {
+		return a + " ∩ " + b;
+	}
 }
diff --git a/Minebot/src/main/java/net/famzangl/minecraft/minebot/ai/utils/AreaUnion.java b/Minebot/src/main/java/net/famzangl/minecraft/minebot/ai/utils/AreaUnion.java
@@ -26,4 +26,9 @@ public <WorldT2 extends WorldT> void accept(AreaVisitor<? super WorldT2> visitor
     public boolean contains(WorldT world, int x, int y, int z) {
         return a.contains(world, x, y, z) || b.contains(world, x, y, z);
     }
+
+    @Override
+    public String toString() {
+        return a + " ∪ " + b;
+    }
 }
diff --git a/Minebot/src/main/java/net/famzangl/minecraft/minebot/ai/utils/BlockCuboid.java b/Minebot/src/main/java/net/famzangl/minecraft/minebot/ai/utils/BlockCuboid.java
@@ -97,6 +97,8 @@ public BlockCuboid<WorldT> move(Vec3i vec) {
 
 	@Override
 	public String toString() {
-		return "BlockCuboid [min=" + min + ", max=" + max + "]";
+		return "BlockCuboid [x=" + min.getX() + ".." + max.getX() + "," +
+				"y=" + min.getY() + ".." + max.getY() + "," +
+				"z=" + min.getZ() + ".." + max.getZ() + "]";
 	}
 }