修复“目标区块错位”问题：Baritone 自带的 {@code GoalXZ} 容差为 0， + * 会要求玩家精确站在区块中心的单个方块上（如 {@code x*16+8, z*16+8}）。 + * 一旦该方块不可达（被树、石头、水、建筑等占据），玩家会被停在区块边缘甚至 + * 相邻区块，导致玩家所在区块与目标区块错位、反复寻路。
+ * + *本目标把完成条件放宽为“玩家脚下方块落在目标区块内”，与控制器中 + * {@code playerChunk.equals(target)} 的判定完全一致，从而彻底消除 + * 中心点不可达带来的错位。
+ */ +public final class ChunkGoal implements Goal { + + /** 目标区块 X 坐标 */ + private final int targetX; + /** 目标区块 Z 坐标 */ + private final int targetZ; + /** 目标区块中心的方块 X 坐标（用于启发式距离估算） */ + private final int centerX; + /** 目标区块中心的方块 Z 坐标（用于启发式距离估算） */ + private final int centerZ; + + public ChunkGoal(ChunkPos chunk) { + this.targetX = chunk.x(); + this.targetZ = chunk.z(); + this.centerX = chunk.centerBlockX(); + this.centerZ = chunk.centerBlockZ(); + } + + /** 判断玩家脚下方块是否落在目标区块内 */ + @Override + public boolean isInGoal(int x, int y, int z) { + return Math.floorDiv(x, 16) == this.targetX && Math.floorDiv(z, 16) == this.targetZ; + } + + /** 启发式：到目标区块中心的水平欧几里得距离（可采纳，保证寻路效率） */ + @Override + public double heuristic(int x, int y, int z) { + double dx = x - this.centerX; + double dz = z - this.centerZ; + return Math.sqrt(dx * dx + dz * dz); + } +} diff --git a/src/main/java/autostore/client/controller/ExpansionController.java b/src/main/java/autostore/client/controller/ExpansionController.java index 74ed2f5..1eae339 100644 --- a/src/main/java/autostore/client/controller/ExpansionController.java +++ b/src/main/java/autostore/client/controller/ExpansionController.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Set; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.block.BlockState; import net.minecraft.util.Hand; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -77,8 +76,6 @@ implements SubtitleChatMonitor.Listener { private final Set注意：己方领土数据暂时不可用时保守视为有效（可能性极小，仅刷新竞态时发生）， - * 避免所有目标被误跳过导致玩家原地不动。 - */ - private boolean isTargetStillValid() { - if (this.target == null) { - return false; - } - TerritoryModel m = this.dataService.model(); - return !m.allClaimedChunks().contains(this.target); - } - - /** 判断区块是否属于己方领土（含本次会话新占领） */ - private boolean isInOwnTerritory(ChunkPos chunk) { - TerritoryModel m = this.dataService.model(); - if (m.sessionClaims().contains(chunk)) { - return true; - } - TerritoryState self = m.selfState(); - return self != null && self.chunks().contains(chunk); - } - - /** - * 判断玩家是否被困在地下（头顶上方连续数格被实心方块遮挡）。 - * 用于寻路超时时识别"走进矿洞"的情况，从而触发回城自救。 - */ - private boolean isUnderground() { - MinecraftClient client = MinecraftClient.getInstance(); - if (client == null || client.player == null || client.world == null) { - return false; - } - BlockPos pos = client.player.getBlockPos(); - for (int y = pos.getY() + 1; y <= pos.getY() + 3; ++y) { - BlockPos above = new BlockPos(pos.getX(), y, pos.getZ()); - BlockState state = client.world.getBlockState(above); - if (state.isOpaqueFullCube()) { - return true; - } - } - return false; - } - - /** - * 回城自救：取消当前寻路，发送 /u return 命令回到国家王城区块， - * 并进入 RETURNING 状态等待回城完成后重新规划扩地任务。 - * 用于避免玩家被困在地下矿洞或无效区块。 - */ - private void returnToCapital(String statusText) { - this.baritoneBridge.cancel(); - this.stageStartedMillis = System.currentTimeMillis(); - this.keepRetryCount = true; - this.baritoneBridge.sendCommand("u return"); - this.setState(State.RETURNING, "\u56de\u57ce\u81ea\u6551\u4e2d"); - this.log("\u6267\u884c /u return \u56de\u57ce\uff0c\u7b49\u5f85\u8fd4\u56de\u738b\u57ce\u540e\u7ee7\u7eed"); - } - - /** - * 回城阶段每帧逻辑：等待玩家回到己方领土（含王城）后重新规划。 - * /u return 传送需要约 10 秒，因此前 10 秒不检查位置，避免传送未完成就误判； - * 若等待超时（60 秒）仍未回到领土，则跳过当前目标继续，避免死等。 - */ - private void tickReturning() { - long elapsedSeconds = (System.currentTimeMillis() - this.stageStartedMillis) / 1000L; - if (elapsedSeconds >= 60) { - this.log("\u56de\u57ce\u7b49\u5f85\u8d85\u65f6\uff0c\u8df3\u8fc7\u5f53\u524d\u76ee\u6807\u7ee7\u7eed"); - this.setState(State.FAIL, "\u56de\u57ce\u8d85\u65f6\uff0c\u8df3\u8fc7\u76ee\u6807"); - return; - } - // /u return 传送约需 10 秒，等待传送完成后才检查是否回到己方领土 - if (elapsedSeconds >= 10 && this.isInOwnTerritory(this.playerChunk)) { - this.log("\u5df2\u56de\u5230\u5df1\u65b9\u9886\u571f\uff0c\u91cd\u65b0\u89c4\u5212\u6269\u5730\u4efb\u52a1"); - this.setState(State.NEXT, "\u5df2\u56de\u57ce\uff0c\u91cd\u65b0\u89c4\u5212"); - } - } - /** 成功后的过渡：进入 NEXT 状态，准备处理下一个目标 */ private void tickSuccess() { this.setState(State.NEXT, "\u5df2\u5b8c\u6210 " + this.completedClaims + (this.config.targetCount > 0 ? "/" + this.config.targetCount : "/\u6301\u7eed")); @@ -729,8 +630,7 @@ implements SubtitleChatMonitor.Listener { FAIL, NEXT, COMPLETE, - STOPPED, - RETURNING; + STOPPED; } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 1b64e80..516d27a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1 +1 @@ -{"schemaVersion":1,"id":"autostore","version":"1.1.7","name":"AutoStore","description":"","authors":[],"contact":{},"license":"All-Rights-Reserved","environment":"client","entrypoints":{"fabric-datagen":["autostore.client.AutoStoreModDataGenerator"],"client":["autostore.client.AutoStoreModClient"],"main":["autostore.AutoStoreMod"]},"mixins":["autostore.mixins.json",{"config":"autostore.client.mixins.json","environment":"client"}],"depends":{"fabricloader":">=0.16.14","fabric-api":"*","minecraft":"1.21.4"},"jars":[{"file":"META-INF/jars/baritone-api-fabric-1.13.1.jar"}]} \ No newline at end of file +{"schemaVersion":1,"id":"autostore","version":"1.1.8","name":"AutoStore","description":"","authors":[],"contact":{},"license":"All-Rights-Reserved","environment":"client","entrypoints":{"fabric-datagen":["autostore.client.AutoStoreModDataGenerator"],"client":["autostore.client.AutoStoreModClient"],"main":["autostore.AutoStoreMod"]},"mixins":["autostore.mixins.json",{"config":"autostore.client.mixins.json","environment":"client"}],"depends":{"fabricloader":">=0.16.14","fabric-api":"*","minecraft":"1.21.4"},"jars":[{"file":"META-INF/jars/baritone-api-fabric-1.13.1.jar"}]} \ No newline at end of file