feat: 和平模式修复ENDERMAN/WITHER、自定义菜单事不过三、BaoTa第三路备选

- AreaProtection: HOSTILE_TYPES添加ENDERMAN和WITHER；末影人使用remove()替代teleport()避免自动传送回来
- GUIManager+Main: 宝箱自定义物品存入菜单时事不过三原则（前两次警告，第三次没收）
- UpdateChecker: 添加BaoTa HTML第三路备选通道，GitHub/Gitee限流后自动降级

.idea/misc.xml

@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_25" default="true" project-jdk-name="25" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

pom.xml

@@ -11,7 +11,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <java.version>21</java.version>
+        <java.version>25</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -55,10 +55,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.14.0</version>
                 <configuration>
-                    <source>21</source>
+                    <source>25</source>
-                    <target>21</target>
+                    <target>25</target>
                 </configuration>
             </plugin>
         </plugins>

src/main/java/Sdf1_login/AreaProtection.java

@@ -1494,7 +1494,12 @@ public class AreaProtection implements Listener {
                 // 没名字或不在白名单，传送虚空
                 Location voidLoc = ent.getLocation().clone();
                 voidLoc.setY(ent.getWorld().getMinHeight() - 50);
-                ent.teleport(voidLoc);
+                // 末影人受伤害会自动传送回来，所以直接移除实体
+                if ("ENDERMAN".equals(ent.getType().name())) {
+                    ent.remove();
+                } else {
+                    ent.teleport(voidLoc);
+                }
                 banished++;
             /*    plugin.getLogger().info("[和平] "
                         + ent.getType().name()
@@ -1518,7 +1523,12 @@ public class AreaProtection implements Listener {
             // 没有保护期且不在白名单，传送虚空
             Location voidLoc = ent.getLocation().clone();
             voidLoc.setY(ent.getWorld().getMinHeight() - 50);
-            ent.teleport(voidLoc);
+            // 末影人受伤害会自动传送回来，直接移除
+            if ("ENDERMAN".equals(ent.getType().name())) {
+                ent.remove();
+            } else {
+                ent.teleport(voidLoc);
+            }
             banished++;
            /* plugin.getLogger().info("[和平] "
                     + ent.getType().name()
@@ -1544,7 +1554,8 @@ public class AreaProtection implements Listener {
             "ILLUSIONER", "VEX",
             "PHANTOM", "SHULKER", "WARDEN", "BREEZE",
             "PIGLIN", "PIGLIN_BRUTE", "ZOGLIN",
-            "ZOMBIFIED_PIGLIN", "ENDER_DRAGON"
+            "ZOMBIFIED_PIGLIN", "ENDER_DRAGON",
+            "ENDERMAN", "WITHER"
     ));
 
     private boolean isHostile(String typeName) {

src/main/java/Sdf1_login/GUIManager.java

@@ -16,6 +16,7 @@ import org.bukkit.util.io.BukkitObjectInputStream;
 import org.bukkit.util.io.BukkitObjectOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.util.concurrent.ConcurrentHashMap;
 
 
 
@@ -49,6 +50,11 @@ public class GUIManager implements Listener {
     private final Map<UUID, Integer> userMgmtPages = new HashMap<>();
     private static final int UMGMT_PAGE_SIZE = 45;
 
+    // ★ 宝箱物品拦截计数（事不过三）
+    private final ConcurrentHashMap<String, Integer>
+            treasureMenuBlockCount =
+            new ConcurrentHashMap<>();
+
 
 
     public GUIManager(Main plugin) {
@@ -1571,6 +1577,11 @@ public class GUIManager implements Listener {
                              Inventory topInv,
                              ItemStack item, int removeSlot) {
 
+        // ★ 拦截宝箱自定义物品（事不过三原则）
+        if (handleTreasureItemBlock(p, item)) {
+            return;
+        }
+
         int amount = item.getAmount();
         removeSnowballFromInventory(p); //没收雪球菜单
         // 1. 从来源移除
@@ -1697,6 +1708,75 @@ public class GUIManager implements Listener {
     }
 
 
+    /** ★ 检测宝箱自定义物品（lore 含 §0§k 或 CUSTOM 标记） */
+    boolean isTreasureCustomItem(ItemStack item) {
+        if (item == null) return false;
+        ItemMeta meta = item.getItemMeta();
+        if (meta == null) return false;
+        List<String> lore = meta.getLore();
+        if (lore == null) return false;
+        for (String line : lore) {
+            if (line.contains("\u00a70\u00a7k")
+                    || line.contains("CUSTOM")) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 宝箱自定义物品拦截（事不过三原则）
+     * @param player 玩家
+     * @param item 要存入的物品
+     * @return true表示已拦截（调用方应return），false表示未拦截（继续原逻辑）
+     */
+    public boolean handleTreasureItemBlock(Player player, ItemStack item) {
+        if (!isTreasureCustomItem(item)) {
+            return false; // 不是宝箱物品，不拦截
+        }
+
+        String key = player.getUniqueId() + ":" + item.getType().name();
+        int count = treasureMenuBlockCount.getOrDefault(key, 0) + 1;
+        treasureMenuBlockCount.put(key, count);
+
+        if (count < 3) {
+            // 第1次或第2次：警告
+            player.sendMessage("§c§l[宝箱物品] §e该物品是宝箱自定义物品，无法存入菜单！");
+            player.sendMessage("§c§l[宝箱物品] §e第" + count + "/3次警告，第三次将没收物品！");
+            return true;
+        } else {
+            // 第3次：没收物品
+            // 1. 从玩家背包移除该物品
+            boolean removed = false;
+            for (int i = 0; i < player.getInventory().getSize(); i++) {
+                ItemStack invItem = player.getInventory().getItem(i);
+                if (invItem != null && invItem.isSimilar(item)) {
+                    player.getInventory().setItem(i, null);
+                    removed = true;
+                    break;
+                }
+            }
+            // 2. 如果背包没找到，可能在光标上（普通点击/拖拽场景）
+            if (!removed) {
+                org.bukkit.inventory.InventoryView view = player.getOpenInventory();
+                ItemStack cursor = view.getCursor();
+                if (cursor != null && cursor.isSimilar(item)) {
+                    view.setCursor(null);
+                    removed = true;
+                }
+            }
+            // 3. 清零计数器
+            treasureMenuBlockCount.remove(key);
+            // 4. 发送没收提示
+            player.sendMessage("§c§l[宝箱物品] §e你多次尝试存入宝箱物品，物品已被没收！");
+            player.sendMessage("§c§l[宝箱物品] §c事不过三，这是第三次警告！");
+            // 5. 记录日志
+            plugin.getLogger().warning("[宝箱物品] 玩家 " + player.getName() + " 第三次尝试存入宝箱物品，物品已没收: " + item.getType().name());
+            return true;
+        }
+    }
+
+
 // ===== 辅助方法 =====
 
     // 只匹配带[菜单]的非雪球物品

src/main/java/Sdf1_login/Main.java

@@ -3976,6 +3976,11 @@ public class Main extends JavaPlugin
             if (toIconSlot) {
                 ItemStack dragged =
                         e.getOldCursor().clone();
+                // ★ 拦截宝箱自定义物品（事不过三原则）
+                if (gui.handleTreasureItemBlock(p, dragged)) {
+                    e.setCancelled(true);
+                    return;
+                }
                 String b64 = gui.serializeItem(dragged);
                 if (b64 != null) {
                     db.saveMenuIcon(p.getName(), b64,

src/main/java/Sdf1_login/UpdateChecker.java

@@ -55,6 +55,10 @@ public class UpdateChecker {
     private static final String GITEE_API =
             "https://gitee.com/api/v5/repos/" + GITEE_OWNER + "/" + GITEE_REPO + "/releases/latest";
 
+    // 第三路备选：宝塔静态HTML
+    private static final String FALLBACK_HTML =
+            "https://caoyuan.ypshidifu.cn/update_check.html";
+
     // 仓库页面链接
     private static final String GITHUB_LINK =
             "https://github.com/" + GITHUB_OWNER + "/" + GITHUB_REPO + "/releases";
@@ -202,37 +206,47 @@ public class UpdateChecker {
         } else if (ge != null && ge.isSuccess()) {
             chosen = ge;
         } else {
-            // 双通道均失败
+            // ★ 双通道均失败，尝试第三路备选（宝塔静态HTML）
-            failCount++;
+            plugin.getLogger().info("[Sdf1_login] GitHub/Gitee 均失败，尝试第三路备选 BaoTa...");
-            StringBuilder sb = new StringBuilder();
+            CheckResult fbResult = tryFallbackChannel();
-            if (gh != null && gh.error != null) {
+            if (fbResult != null && fbResult.isSuccess()) {
-                sb.append("§7GitHub: §c").append(gh.error);
+                chosen = fbResult;
+                plugin.getLogger().info("[Sdf1_login] 第三路备选 BaoTa 检查成功: " + fbResult.version);
+            } else {
+                failCount++;
+                StringBuilder sb = new StringBuilder();
+                if (gh != null && gh.error != null) {
+                    sb.append("§7GitHub: §c").append(gh.error);
+                }
+                if (ge != null && ge.error != null) {
+                    if (sb.length() > 0) sb.append("\n");
+                    sb.append("§7Gitee:  §c").append(ge.error);
+                }
+                if (fbResult != null && fbResult.error != null) {
+                    if (sb.length() > 0) sb.append("\n");
+                    sb.append("§7BaoTa:  §c").append(fbResult.error);
+                }
+                if (failCount >= TRIP_THRESHOLD) {
+                    circuitTripped = true;
+                    plugin.getLogger().warning(
+                            "[Sdf1_login] 更新检测已熔断，连续失败" + failCount + "次");
+                    scheduleRetry();
+                }
+                if (sender != null) {
+                    final String msg = sb.toString();
+                    final boolean tripped = circuitTripped;
+                    final int fc = failCount;
+                    Bukkit.getScheduler().runTask(plugin, () -> {
+                        sender.sendMessage("§c§l[更新] 检测失败");
+                        sender.sendMessage(msg);
+                        sender.sendMessage("§e失败次数: " + fc + "/" + TRIP_THRESHOLD);
+                        if (tripped) {
+                            sender.sendMessage("§c已熔断，2分钟后自动重试，或重启服务器重置");
+                        }
+                    });
+                }
+                return;
             }
-            if (ge != null && ge.error != null) {
-                if (sb.length() > 0) sb.append("\n");
-                sb.append("§7Gitee:  §c").append(ge.error);
-            }
-            if (failCount >= TRIP_THRESHOLD) {
-                circuitTripped = true;
-                plugin.getLogger().warning(
-                        "[Sdf1_login] 更新检测已熔断，连续失败" + failCount + "次");
-                // 熔断后安排2分钟后重试
-                scheduleRetry();
-            }
-            if (sender != null) {
-                final String msg = sb.toString();
-                final boolean tripped = circuitTripped;
-                final int fc = failCount;
-                Bukkit.getScheduler().runTask(plugin, () -> {
-                    sender.sendMessage("§c§l[更新] 检测失败");
-                    sender.sendMessage(msg);
-                    sender.sendMessage("§e失败次数: " + fc + "/" + TRIP_THRESHOLD);
-                    if (tripped) {
-                        sender.sendMessage("§c已熔断，2分钟后自动重试，或重启服务器重置");
-                    }
-                });
-            }
-            return;
         }
 
         // 至少一个通道成功
@@ -314,6 +328,81 @@ public class UpdateChecker {
 
     // ========== HTTP 请求 ==========
 
+    /**
+     * 第三路备选：从宝塔静态HTML解析版本信息
+     * HTML中用 <!--UPDATE_DATA 包裹结构化数据：
+     * pluginName|version|downloadLink
+     */
+    private CheckResult tryFallbackChannel() {
+        HttpURLConnection conn = null;
+        try {
+            URL url = new URL(FALLBACK_HTML);
+            conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("GET");
+            conn.setRequestProperty("User-Agent", "Sdf1-Plugin-UpdateChecker/1.0");
+            conn.setConnectTimeout(TIMEOUT_MS);
+            conn.setReadTimeout(TIMEOUT_MS);
+            conn.setInstanceFollowRedirects(true);
+
+            int code = conn.getResponseCode();
+            if (code != 200) {
+                return new CheckResult(null, "BaoTa", FALLBACK_HTML,
+                        "BaoTa: HTTP " + code);
+            }
+
+            BufferedReader reader = new BufferedReader(
+                    new InputStreamReader(conn.getInputStream(), "UTF-8"));
+            StringBuilder sb = new StringBuilder();
+            String line;
+            while ((line = reader.readLine()) != null) {
+                sb.append(line).append("\n");
+            }
+            reader.close();
+
+            // 解析 <!--UPDATE_DATA ... UPDATE_DATA--> 块
+            String html = sb.toString();
+
+            // ★ 去除 Cloudflare 注入的 CDN-CGI 链接（<a href=...>...</a>）
+            html = html.replaceAll("<a\\s[^>]*>[^<]*</a>", "");
+
+            int start = html.indexOf("<!--UPDATE_DATA");
+            int end = html.indexOf("UPDATE_DATA-->");
+            if (start < 0 || end < 0 || end <= start) {
+                return new CheckResult(null, "BaoTa", FALLBACK_HTML,
+                        "BaoTa: 无法解析更新数据块");
+            }
+            String block = html.substring(start, end);
+
+            // 逐行查找匹配当前插件名的记录
+            String[] lines = block.split("\n");
+            for (String l : lines) {
+                l = l.trim();
+                // 跳过空行、注释标记行、HTML注入标签
+                if (l.isEmpty() || l.startsWith("<!--") || l.startsWith("<")) continue;
+                if (l.startsWith("Sdf1_login|")) {
+                    // 格式: Sdf1_login|1.0|https://...
+                    String[] parts = l.split("\\|");
+                    if (parts.length >= 2) {
+                        String ver = parts[1].trim();
+                        String link = parts.length >= 3 ? parts[2].trim() : GITHUB_LINK;
+                        return new CheckResult(ver, "BaoTa", link, null);
+                    }
+                }
+            }
+
+            return new CheckResult(null, "BaoTa", FALLBACK_HTML,
+                    "BaoTa: 未找到 Sdf1_login 的版本信息");
+
+        } catch (java.net.SocketTimeoutException e) {
+            return new CheckResult(null, "BaoTa", FALLBACK_HTML, "BaoTa: 连接超时");
+        } catch (Exception e) {
+            return new CheckResult(null, "BaoTa", FALLBACK_HTML,
+                    "BaoTa: " + e.getMessage());
+        } finally {
+            if (conn != null) conn.disconnect();
+        }
+    }
+
     private static class CheckResult {
         final String version;
         final String source;
@@ -340,9 +429,10 @@ public class UpdateChecker {
             conn.setRequestMethod("GET");
             conn.setRequestProperty("User-Agent",
                     "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
-                            + "(KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36");
+                            + "(KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36");
             conn.setRequestProperty("Accept", "*/*");
-            conn.setRequestProperty("Accept-Language", "zh-CN,zh;q=0.9");
+            conn.setRequestProperty("Accept-Language", "zh-CN,zh;q=0.9,en;q=0.8");
+            conn.setRequestProperty("Connection", "keep-alive");
             conn.setConnectTimeout(TIMEOUT_MS);
             conn.setReadTimeout(TIMEOUT_MS);
             conn.setInstanceFollowRedirects(true);
@@ -353,7 +443,10 @@ public class UpdateChecker {
                 return new CheckResult(null, sourceName, link, sourceName + ": 未找到 (HTTP 404)");
             }
             if (code == 403) {
-                return new CheckResult(null, sourceName, link, sourceName + ": 被限流 (HTTP 403)");
+                String errBody = "";
+                try { BufferedReader er = new BufferedReader(new InputStreamReader(conn.getErrorStream())); StringBuilder eb = new StringBuilder(); String el; while ((el = er.readLine()) != null) eb.append(el); er.close(); errBody = eb.toString(); } catch (Exception ignored) {}
+                String detail = errBody.isEmpty() ? "" : " | " + errBody.substring(0, Math.min(errBody.length(), 200));
+                return new CheckResult(null, sourceName, link, sourceName + ": 被限流 (HTTP 403)" + detail);
             }
             if (code != 200) {
                 return new CheckResult(null, sourceName, link, sourceName + ": HTTP " + code);