v1.1.8: 刷新地图时核对已占领区块，丢弃地图未确认的超期假占领，修复高地空洞

v1.1.8: 寻路超时自动 /u return 回城自救
寻路超时后发送 /u return 回城，等待 10 秒传送回王城后重新寻路；重试次数耗尽则回城后跳过，避免整个系统因寻路卡死而停止。
2026-08-18 18:59:59 +08:00 · 2026-08-18 16:11:32 +08:00 · 2026-08-18 14:20:59 +08:00 · 2026-08-18 13:47:20 +08:00 · 2026-08-18 13:07:04 +08:00
@@ -0,0 +1,22 @@
+# Gradle
+.gradle/
+build/
+
+# Secrets
+.env
+
+# IDE
+.idea/
+*.iml
+.vscode/
+.settings/
+.classpath
+.project
+bin/
+
+# OS
+Thumbs.db
+.DS_Store
+
+# Build temp
+.buildtmp/
@@ -16,7 +16,7 @@
 ## 安装

 1. 安装 Fabric Loader 0.16.14+ 和 Fabric API
-2. 将 `autostore-1.1.5.jar` 放入 `.minecraft/mods/` 目录
+2. 将 `autostore-1.1.8.jar` 放入 `.minecraft/mods/` 目录
 3. 启动游戏，按 `Ctrl+R` 打开 GUI

 ## 构建
@@ -26,4 +26,4 @@
 ./build_mod.sh
 ```

-输出文件：`autostore-1.1.5.jar`
+输出文件：`autostore-1.1.7.jar`
@@ -0,0 +1,57 @@
+plugins {
+    id 'fabric-loom' version '1.17.19'
+    id 'maven-publish'
+}
+
+version = project.mod_version
+group = project.maven_group
+
+base {
+    archivesName = project.archives_base_name
+}
+
+// 用于把 Baritone 原样打包进模组 jar 的资源（不放默认依赖里，避免 Gradle 误解析）
+configurations {
+    nestedJar
+}
+
+dependencies {
+    // Minecraft
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+    // Fabric API
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+    // Baritone API (local jar, compile only)
+    modImplementation files("libs/baritone-api-fabric-1.13.1.jar")
+
+    // 标记需要嵌套打包的 jar
+    nestedJar files("libs/baritone-api-fabric-1.13.1.jar")
+}
+
+processResources {
+    inputs.property "version", project.version
+    filteringCharset "UTF-8"
+
+    filesMatching("fabric.mod.json") {
+        expand "version": project.version
+    }
+
+    // 将 Baritone 嵌套打包进 META-INF/jars，匹配 fabric.mod.json 的 jars 声明，
+    // 使玩家无需单独安装 baritone 依赖即可运行
+    from(configurations.nestedJar) {
+        into "META-INF/jars"
+    }
+}
+
+tasks.withType(JavaCompile).configureEach {
+    it.options.release = 21
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
@@ -0,0 +1,15 @@
+org.gradle.jvmargs=-Xmx2G
+org.gradle.parallel=true
+
+# Fabric Properties
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.8
+loader_version=0.19.3
+
+# Mod Properties
+mod_version=1.1.8
+maven_group=autostore
+archives_base_name=autostore
+
+# Fabric API
+fabric_version=0.119.4+1.21.4
@@ -0,0 +1,9 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-9.7.0-bin.zip
+networkTimeout=10000
+retries=0
+retryBackOffMs=500
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
@@ -0,0 +1,248 @@
+#!/bin/sh
+
+#
+# Copyright © 2015 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   gradlew start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh gradlew
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
@@ -0,0 +1,82 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  gradlew startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+"%COMSPEC%" /c exit 1
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+"%COMSPEC%" /c exit 1
+
+:execute
+@rem Setup the command line
+
+
+
+@rem Execute gradlew
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
+
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%
@@ -0,0 +1,12 @@
+pluginManagement {
+    repositories {
+        maven {
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+rootProject.name = 'autostore'
@@ -7,13 +7,10 @@ package autostore.client.bridge;
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
 import baritone.api.Settings;
-import baritone.api.pathing.goals.Goal;
-import baritone.api.pathing.goals.GoalXZ;
 import autostore.client.config.ExpansionConfig;
 import autostore.client.territory.ChunkPos;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.client.MinecraftClient;

 /**
 * Baritone API 封装（桥接层）。
@@ -37,16 +34,10 @@ public final class BaritoneBridge {
        settings.allowPlace.value = config.allowPlace;
        settings.allowParkour.value = config.allowJump;
        settings.avoidance.value = config.avoidMobs;
-        // 减少走入地下矿洞：限制无水源时的下落高度，避免掉进深坑/矿洞。
-        // 放宽到 10 格，仍允许穿越峡谷、下坡等正常地形，同时避免掉入深坑
-        settings.maxFallHeightNoWater.value = 10;
-        // 轻微提高挖掘方块的额外代价，让寻路尽量绕行地面而非挖洞穿山，
-        // 但不会阻止必要挖掘（高山、峡谷等仍可通行）
-        settings.blockBreakAdditionalPenalty.value = 0.5;
    }

    /**
-     * 让 Baritone 寻路前往指定区块的中心。
+     * 让 Baritone 寻路前往指定区块（以“到达区块内”为完成条件）。
     *
     * @param chunk 目标区块
     */
@@ -55,9 +46,11 @@ public final class BaritoneBridge {
        if (baritone == null) {
            return;
        }
-        // 使用 GoalXZ 前往区块中心：Baritone 的 GoalXZ 自带约 10 格容差，
-        // 只需到达区块中心附近即可，避免中心点不可达导致寻路卡死
-        baritone.getCustomGoalProcess().setGoalAndPath(new GoalXZ(chunk.centerBlockX(), chunk.centerBlockZ()));
+        // 使用自定义 ChunkGoal：完成条件为“玩家脚下方块落在目标区块内”，
+        // 与控制器 playerChunk.equals(target) 的判定一致。避免 Baritone 自带
+        // GoalXZ（容差 0，精确到区块中心单格）在中心不可达时停在相邻区块，
+        // 造成目标区块错位与反复寻路。
+        baritone.getCustomGoalProcess().setGoalAndPath(new ChunkGoal(chunk));
    }

    /** 强制取消当前寻路任务。 */
@@ -69,18 +62,6 @@ public final class BaritoneBridge {
        baritone.getPathingBehavior().forceCancel();
    }

-    /**
-     * 发送服务器聊天命令（如 /u return 回城），command 参数不含前导斜杠。
-     * 用于寻路超时后的回城自救，避免玩家被困在地下矿洞等位置。
-     */
-    public void sendCommand(String command) {
-        MinecraftClient client = MinecraftClient.getInstance();
-        if (client == null || client.player == null || client.getNetworkHandler() == null) {
-            return;
-        }
-        client.getNetworkHandler().sendChatCommand(command);
-    }
-
    /** @return 当前是否正在寻路 */
    public boolean isPathing() {
        IBaritone baritone = this.primary();
@@ -0,0 +1,52 @@
+/*
+ * 本文件为 AutoStore 模组自定义的 Baritone 寻路目标。
+ */
+package autostore.client.bridge;
+
+import autostore.client.territory.ChunkPos;
+import baritone.api.pathing.goals.Goal;
+
+/**
+ * 以“到达目标区块内”为完成条件的寻路目标。
+ *
+ * <p>修复“目标区块错位”问题：Baritone 自带的 {@code GoalXZ} 容差为 0，
+ * 会要求玩家精确站在区块中心的单个方块上（如 {@code x*16+8, z*16+8}）。
+ * 一旦该方块不可达（被树、石头、水、建筑等占据），玩家会被停在区块边缘甚至
+ * 相邻区块，导致玩家所在区块与目标区块错位、反复寻路。</p>
+ *
+ * <p>本目标把完成条件放宽为“玩家脚下方块落在目标区块内”，与控制器中
+ * {@code playerChunk.equals(target)} 的判定完全一致，从而彻底消除
+ * 中心点不可达带来的错位。</p>
+ */
+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);
+    }
+}
@@ -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;
@@ -71,14 +70,18 @@ implements SubtitleChatMonitor.Listener {
    private int retryCount;
    /** 当前阶段（寻路/等待）的开始时间戳 */
    private long stageStartedMillis;
+    /** 发送 "/u return" 回城指令的时间戳；0 表示当前未处于回城恢复等待中 */
+    private long returnCommandAtMillis;
+    /** 回城后是否需要跳过当前目标（重试次数已耗尽则为 true） */
+    private boolean skipTargetAfterReturn;
+    /** 回城等待时长：发送 "/u return" 后等待传送回王城的毫秒数 */
+    private static final long RETURN_WAIT_MS = 10_000L;
    /** 最近一次开垦进度（0-100） */
    private int lastProgress;
    /** 当前目标区块的哈希集合，用于去重（防止重复计数） */
    private final Set<ChunkPos> claimedSet = new HashSet<>();
    /** 是否正在自动进食 */
    private boolean eating;
-    /** 回城自救后重新规划时保留重试计数，避免无限循环 */
-    private boolean keepRetryCount;

    public ExpansionController(TerritoryDataService dataService) {
        this.dataService = dataService;
@@ -171,6 +174,8 @@ implements SubtitleChatMonitor.Listener {
        this.claimedSet.clear();
        this.target = null;
        this.eating = false;
+        this.returnCommandAtMillis = 0L;
+        this.skipTargetAfterReturn = false;
        this.baritoneBridge.applyConfig(this.config);
        this.setState(State.PLANNING, "\u6b63\u5728\u751f\u6210\u6269\u5f20\u8ba1\u5212");
        this.log("\u5f00\u59cb\u81ea\u52a8\u6269\u5730\uff0c\u90a6\u56fd\uff1a" + this.model.selfStateName());
@@ -185,6 +190,8 @@ implements SubtitleChatMonitor.Listener {
        }
        this.baritoneBridge.cancel();
        this.eating = false;
+        this.returnCommandAtMillis = 0L;
+        this.skipTargetAfterReturn = false;
        this.setState(State.STOPPED, "\u5df2\u624b\u52a8\u505c\u6b62");
        this.log("\u5df2\u624b\u52a8\u505c\u6b62");
    }
@@ -233,10 +240,6 @@ implements SubtitleChatMonitor.Listener {
                this.tickNext();
                break;
            }
-            case 9: {
-                this.tickReturning();
-                break;
-            }
        }
    }

@@ -275,10 +278,7 @@ implements SubtitleChatMonitor.Listener {

    /** 让 Baritone 寻路前往当前目标区块，并进入 PATHING 状态 */
    private void startPathing() {
-        if (!this.keepRetryCount) {
-            this.retryCount = 0;
-        }
-        this.keepRetryCount = false;
+        this.retryCount = 0;
        this.stageStartedMillis = System.currentTimeMillis();
        this.lastProgress = 0;
        this.baritoneBridge.pathTo(this.target);
@@ -294,8 +294,28 @@ implements SubtitleChatMonitor.Listener {
            this.setState(State.NEXT, "\u76ee\u6807\u4e3a\u7a7a");
            return;
        }
-        // 目标已失效（被占领或不再与己方领土接壤）：立即跳过，避免继续寻路到无效区块
-        if (this.skipIfTargetInvalid()) {
+        // 正处于"回城恢复等待"中（已发送 /u return）：等待传送回王城，暂不处理超时/到达
+        if (this.returnCommandAtMillis > 0L) {
+            // 等待窗口未结束：静默等待，让 /u return 完成传送
+            if (System.currentTimeMillis() - this.returnCommandAtMillis < RETURN_WAIT_MS) {
+                this.status = "\u5bfb\u8def\u8d85\u65f6\uff0c\u6b63\u5728\u56de\u57ce\uff08/u return\uff09";
+                return;
+            }
+            // 等待窗口结束：取消回城等待；据重试次数决定重寻路或跳过
+            this.returnCommandAtMillis = 0L;
+            if (this.skipTargetAfterReturn) {
+                this.skipTargetAfterReturn = false;
+                this.log("\u5bfb\u8def\u8d85\u65f6\uff0c\u56de\u57ce\u540e\u8df3\u8fc7 " + this.target.x() + "," + this.target.z());
+                this.setState(State.FAIL, "\u5bfb\u8def\u8d85\u65f6");
+                this.dataService.refreshAsync();
+            } else {
+                this.log("\u5df2\u56de\u57ce\uff0c\u91cd\u65b0\u5bfb\u8def\u524d\u5f80 " + this.target.x() + "," + this.target.z());
+                this.retrySameTarget("\u5df2\u56de\u57ce\uff0c\u91cd\u65b0\u524d\u5f80 " + this.target.x() + "," + this.target.z());
+            }
+            return;
+        }
+        // 目标已被他人占领（地图刷新后发现）：立即跳过，避免继续寻路到无效区块
+        if (this.skipIfTargetClaimed("\u76ee\u6807\u5df2\u88ab\u5360\u9886")) {
            return;
        }
        if (this.playerChunk.equals(this.target)) {
@@ -309,17 +329,14 @@ implements SubtitleChatMonitor.Listener {
            ++this.retryCount;
            // 主动刷新地图，尽快同步"区块已被占领"的最新状态，避免玩家被困
            this.dataService.refreshAsync();
-            if (this.retryCount >= this.config.retries) {
-                this.log("\u5bfb\u8def\u8d85\u65f6\uff0c\u8df3\u8fc7 " + this.target.x() + "," + this.target.z());
-                this.setState(State.FAIL, "\u5bfb\u8def\u8d85\u65f6");
-            } else if (this.isUnderground()) {
-                // 玩家被困地下（矿洞等）：执行 /u return 回城自救，避免被困
-                this.log("\u5bfb\u8def\u8d85\u65f6\u4e14\u73a9\u5bb6\u5728\u5730\u4e0b\uff0c\u6267\u884c /u return \u56de\u57ce\u81ea\u6551 " + this.retryCount + "/" + this.config.retries);
-                this.returnToCapital("\u56de\u57ce\u540e\u91cd\u65b0\u5bfb\u8def " + this.target.x() + "," + this.target.z());
+            // 寻路超时：发送 /u return 回城，等待传送回王城后重新寻路；重试次数耗尽则回城后跳过
+            this.skipTargetAfterReturn = this.retryCount >= this.config.retries;
+            if (this.skipTargetAfterReturn) {
+                this.log("\u5bfb\u8def\u8d85\u65f6\uff0c\u56de\u57ce\u540e\u8df3\u8fc7 " + this.target.x() + "," + this.target.z());
            } else {
-                this.log("\u5bfb\u8def\u8d85\u65f6\uff0c\u91cd\u8bd5 " + this.retryCount + "/" + this.config.retries);
-                this.retrySameTarget("\u91cd\u8bd5\u524d\u5f80 " + this.target.x() + "," + this.target.z());
+                this.log("\u5bfb\u8def\u8d85\u65f6\uff0c\u56de\u57ce\u91cd\u8bd5 " + this.retryCount + "/" + this.config.retries);
            }
+            this.issueReturnCommand();
        }
    }

@@ -329,8 +346,8 @@ implements SubtitleChatMonitor.Listener {
            this.setState(State.NEXT, "\u76ee\u6807\u4e3a\u7a7a");
            return;
        }
-        // 目标已失效（被占领或不再与己方领土接壤）：立即跳过，避免被困在无效区块
-        if (this.skipIfTargetInvalid()) {
+        // 目标已被他人占领（地图刷新后发现）：立即跳过，避免被困在已占领区块
+        if (this.skipIfTargetClaimed("\u76ee\u6807\u5df2\u88ab\u5360\u9886")) {
            return;
        }
        // 玩家离开了目标区块（被击退/寻路偏差），重新寻路回去
@@ -353,11 +370,25 @@ implements SubtitleChatMonitor.Listener {
        }
    }

+    /**
+     * 发送 "/u return" 回城指令，取消当前寻路，并记录发送时刻以进入回城恢复等待。
+     * 服务器会在约 10 秒后将玩家传送回邦国王城，届时由 tickPathing 重新寻路。
+     */
+    private void issueReturnCommand() {
+        this.baritoneBridge.cancel();
+        MinecraftClient client = MinecraftClient.getInstance();
+        if (client != null && client.player != null && client.player.networkHandler != null) {
+            // sendChatCommand 需传不带斜杠的命令（"/u return" -> "u return"）
+            client.player.networkHandler.sendChatCommand("u return");
+        }
+        this.returnCommandAtMillis = System.currentTimeMillis();
+        this.status = "\u5bfb\u8def\u8d85\u65f6\uff0c\u5df2\u53d1\u9001 /u return \u56de\u57ce";
+    }
+
    /** 重试当前目标：取消旧寻路，重新让 Baritone 前往同一目标区块 */
    private void retrySameTarget(String statusText) {
-        // 目标已失效（被占领或不再与己方领土接壤）：不再重试，直接跳过，
-        // 避免玩家被反复拉回与领土不接壤的孤立区块
-        if (this.skipIfTargetInvalid()) {
+        // 目标已被他人占领（地图刷新后发现）：不再重试，直接跳过，避免玩家被困在已占领区块
+        if (this.skipIfTargetClaimed("\u91cd\u8bd5\u65f6\u53d1\u73b0\u76ee\u6807\u5df2\u88ab\u5360\u9886")) {
            return;
        }
        this.baritoneBridge.cancel();
@@ -367,130 +398,19 @@ implements SubtitleChatMonitor.Listener {
    }

    /**
-     * 若当前目标已失效（被其他邦国占领，或不再与己方领土接壤），
-     * 则取消寻路、记录日志、跳过该目标并进入 NEXT 状态，返回 true。
-     * 用于修复"寻路走到与领土不接壤区块后死等"的 bug：
-     * 地图数据刷新后，若目标周围被他人占领导致不再接壤，立即放弃该目标并重新规划。
+     * 若当前目标区块已被任何邦国占领（含己方与本次会话），
+     * 则记录日志、跳过该目标并进入 NEXT 状态，返回 true。
+     * 用于在地图数据异步刷新后及时识别"已被占领"的区块，避免死循环。
     */
-    private boolean skipIfTargetInvalid() {
-        if (this.target == null) {
-            return false;
-        }
-        if (!this.isTargetStillValid()) {
-            this.baritoneBridge.cancel();
-            this.log("\u76ee\u6807\u5df2\u5931\u6548\uff08\u88ab\u5360\u9886\u6216\u4e0d\u518d\u4e0e\u9886\u571f\u63a5\u58e4\uff09\uff0c\u8df3\u8fc7 " + this.target.x() + "," + this.target.z());
-            this.setState(State.NEXT, "\u76ee\u6807\u5931\u6548\uff0c\u91cd\u65b0\u89c4\u5212");
+    private boolean skipIfTargetClaimed(String reason) {
+        if (this.target != null && this.isClaimedByOthers(this.target)) {
+            this.log(reason + " " + this.target.x() + "," + this.target.z() + "\uff0c\u8df3\u8fc7");
+            this.setState(State.NEXT, "\u8df3\u8fc7\u5df2\u5360\u9886\u533a\u5757");
            return true;
        }
        return false;
    }

-    /**
-     * 判断当前目标是否仍然有效：
-     * 未被任何邦国占领，且与己方领土（含本次会话新占领）至少一个区块接壤。
-     * 使用实时地图数据校验，避免寻路到与领土不接壤的孤立区块。
-     */
-    private boolean isTargetStillValid() {
-        if (this.target == null) {
-            return false;
-        }
-        TerritoryModel m = this.dataService.model();
-        if (m.allClaimedChunks().contains(this.target)) {
-            return false;
-        }
-        HashSet<ChunkPos> own = new HashSet<ChunkPos>(m.sessionClaims());
-        TerritoryState self = m.selfState();
-        // Fallback：如果当前刷新后的模型找不到己方邦国，使用启动/规划时缓存的模型
-        // 启动检查成功说明邦国一定存在，fallback 解决竞态/刷新导致的 self 暂时性 null，避免所有目标被跳过
-        if (self == null && this.model != null) {
-            self = this.model.selfState();
-        }
-        if (self != null) {
-            own.addAll(self.chunks());
-        }
-        // 己方领土数据暂时不可用时保守视为有效，避免所有目标被误跳过导致玩家原地不动；
-        // 规划器生成目标时己方领土必然非空，此处 own 为空仅可能是刷新竞态，放行让寻路继续
-        if (own.isEmpty()) {
-            this.log("警告：己方领土数据暂时为空，保守放行目标 " + this.target.x() + "," + this.target.z());
-            return true;
-        }
-        return this.ownNeighbors(this.target, own) > 0;
-    }
-
-    /** 统计区块周围（上下左右）属于给定集合的邻居数量 */
-    private int ownNeighbors(ChunkPos chunk, Set<ChunkPos> own) {
-        int count = 0;
-        for (ChunkPos neighbor : this.cardinalNeighbors(chunk)) {
-            if (own.contains(neighbor)) {
-                ++count;
-            }
-        }
-        return count;
-    }
-
-    /** 判断区块是否属于己方领土（含本次会话新占领） */
-    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"));
@@ -756,8 +676,7 @@ implements SubtitleChatMonitor.Listener {
        FAIL,
        NEXT,
        COMPLETE,
-        STOPPED,
-        RETURNING;
+        STOPPED;

    }
 }
@@ -24,6 +24,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -65,6 +66,16 @@ public final class TerritoryDataService {
    private volatile long lastSuccessfulFetchMillis;
    /** 最近一次尝试拉取的时间戳（毫秒） */
    private volatile long lastAttemptMillis;
+    /** 会话内新占领区块的本地记录时间（毫秒），用于刷新时判断该占领是否已被地图数据确认 */
+    private final Map<ChunkPos, Long> sessionClaimTimes = new ConcurrentHashMap<>();
+    /**
+     * 会话占领"确认宽限"时长（毫秒）。
+     *
+     * <p>占领成功后，服务器动态地图（Dynmap/markers.json）可能尚未同步该区块，
+     * 因此在宽限期内即使地图未确认也先保留"会话占领"标记，避免刚占领的区块被误判为假占领。
+     * 超过宽限期仍未在地图中确认的，视为未真正占领并丢弃，使空洞区块能重新进入规划。
+     */
+    private static final long CLAIM_CONFIRM_GRACE_MS = 120_000L;

    public TerritoryDataService() {
        this.executor = TerritoryDataService.newExecutor();
@@ -111,8 +122,8 @@ public final class TerritoryDataService {

    /**
     * 异步刷新领土数据（在调度线程中执行）。
-     * 拉取成功后解析 JSON，并把上一份模型中的"会话新占领区块"合并进新模型，
-     * 避免刷新覆盖掉本次会话的占领记录。
+     * 拉取成功后解析 JSON，并把上一份模型中的"会话新占领区块"与刚拉取的最新地图数据仔细核对，
+     * 只保留"已被地图确认"或"刚占领未超宽限期"的占领记录，避免刷新时把假占领永久留在模型里。
     */
    public void refreshAsync() {
        this.executor.execute(() -> {
@@ -127,8 +138,25 @@ public final class TerritoryDataService {
                TerritoryModel parsed = TerritoryDataService.parse(response.body());
                TerritoryModel previous = this.model;
                if (previous != null) {
+                    long now = System.currentTimeMillis();
+                    // 本次拉取到的己方领土区块（地图数据即最终依据，无需缓存旧数据）
+                    Set<ChunkPos> freshOwn = new HashSet<>();
+                    TerritoryState freshSelf = parsed.state(this.selectedStateName);
+                    if (freshSelf != null) {
+                        freshOwn.addAll(freshSelf.chunks());
+                    }
                    for (ChunkPos sessionClaim : previous.sessionClaims()) {
-                        parsed.addSessionClaim(sessionClaim);
+                        Long claimTime = this.sessionClaimTimes.get(sessionClaim);
+                        boolean confirmed = freshOwn.contains(sessionClaim);
+                        boolean withinGrace = claimTime != null && now - claimTime < CLAIM_CONFIRM_GRACE_MS;
+                        if (confirmed || withinGrace) {
+                            // 地图已确认，或尚在宽限期（Dynmap 可能还没同步）：保留会话占领标记
+                            parsed.addSessionClaim(sessionClaim);
+                        } else if (claimTime != null) {
+                            // 地图始终未确认且超时：判定为假占领并移除，使空洞区块重新进入规划
+                            this.sessionClaimTimes.remove(sessionClaim);
+                        }
+                        // claimTime 为 null（从未在本服务记录）也视为未确认：不保留
                    }
                }
                parsed.setSelfStateName(this.selectedStateName);
@@ -163,6 +191,7 @@ public final class TerritoryDataService {
    }

    public void addSessionClaim(ChunkPos chunk) {
+        this.sessionClaimTimes.put(chunk, System.currentTimeMillis());
        TerritoryModel current = this.model;
        if (current != null) {
            current.addSessionClaim(chunk);
@@ -1 +1 @@
-{"schemaVersion":1,"id":"autostore","version":"1.1.5","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"}]}
+{"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"}]}
作者	SHA1	备注	提交日期
lyizai	d2a52199ae	v1.1.8: 刷新地图时核对已占领区块，丢弃地图未确认的超期假占领，修复高地空洞	2026-08-18 18:59:59 +08:00
lyizai	1f817199f7	v1.1.8: 寻路超时自动 /u return 回城自救寻路超时后发送 /u return 回城，等待 10 秒传送回王城后重新寻路；重试次数耗尽则回城后跳过，避免整个系统因寻路卡死而停止。	2026-08-18 16:11:32 +08:00
lyizai	9ee4b41630	v1.1.8: 回退寻路逻辑至 1.1.3 并修复目标区块错位回退：移除 1.1.4+ 引入的回城自救/接壤校验等寻路改动（导致玩家原地不动），恢复 1.1.3 的寻路行为。修复错位：Baritone 自带 GoalXZ 容差为 0，精确到区块中心单格，中心不可达时玩家停在相邻区块造成目标错位与反复寻路。新增 ChunkGoal，完成条件改为「玩家脚下方块落在目标区块内」，与 playerChunk.equals(target) 判定一致。	2026-08-18 14:20:59 +08:00
lyizai	15b4a40b6d	v1.1.7: 修复玩家不移动问题（移除寻路前相邻领土校验） 1.1.5 新增的「目标与己方领土接壤校验」在第三方领土地图刷新后，own 集合与规划器判定不一致，导致有效目标被误判跳过，玩家原地不动。已移除运行时的重复邻居验证（规划器已保证目标与己方领土相邻），仅保留「未被其它邦国占领」判断，恢复 1.1.2 及更早版本的行为。构建：修正 build.gradle 使 baritone 嵌套打包进 META-INF/jars（1.1.6 缺失）。	2026-08-18 13:47:20 +08:00
lyizai	b8e56dafcb	v1.1.6: 新增 Fabric Loom 构建环境 - 添加 build.gradle / settings.gradle / gradle.properties / wrapper - 嵌入 baritone-api-fabric-1.13.1.jar 依赖 - 添加 .gitignore - 更新版本号至 1.1.6	2026-08-18 13:07:04 +08:00