优化代码

Author: MineSunshineone

pom.xml

@@ -22,23 +22,13 @@
     </repositories>
 
     <dependencies>
-        <!-- Folia API -->
+        <!-- Paper 1.21 API -->
         <dependency>
-            <groupId>dev.folia</groupId>
-            <artifactId>folia-api</artifactId>
-            <version>1.20.1-R0.1-SNAPSHOT</version>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.21-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-api</artifactId>
-            <version>4.14.0</version>
-        </dependency>
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.14.0</version>
-        </dependency>
     </dependencies>
 
     <build>

src/main/java/ict/minesunshineone/landmark/listener/PlayerListener.java

@@ -279,26 +279,43 @@ public void cleanup() {
         lastCheckTimes.clear();
     }
 
-    @EventHandler(priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerInteract(PlayerInteractEvent event) {
         Action action = event.getAction();
         Player player = event.getPlayer();
 
-        // 检查是否是左键动作，并且点击的是空气（不要问为什么不右键，因为右键的事件好像有问题）
-        if (action == Action.LEFT_CLICK_AIR) {
+        // 检查是否是右键空气或左键空气
+        if (action == Action.RIGHT_CLICK_AIR || action == Action.LEFT_CLICK_AIR) {
             // 检查权限
             if (!player.hasPermission("landmark.menu")) {
                 return;
             }
 
-            // 检查玩家是否在任意锚点范围内
-            for (Landmark landmark : plugin.getLandmarkManager().getLandmarks().values()) {
-                if (plugin.getLandmarkManager().isPlayerNearLandmark(player, landmark.getLocation())) {
-                    // 在锚点范围内,打开菜单
-                    plugin.getServer().getRegionScheduler().execute(plugin, player.getLocation(), () -> {
-                        new LandmarkMenu(plugin, player).open();
-                    });
-                    return;
+            // 检查玩家手上是否为空（避免与使用物品冲突）
+            if (action == Action.RIGHT_CLICK_AIR && player.getInventory().getItemInMainHand().getType().isAir() 
+                && player.getInventory().getItemInOffHand().getType().isAir()) {
+                
+                // 检查玩家是否在任意锚点范围内
+                for (Landmark landmark : plugin.getLandmarkManager().getLandmarks().values()) {
+                    if (plugin.getLandmarkManager().isPlayerNearLandmark(player, landmark.getLocation())) {
+                        // 在锚点范围内,打开菜单
+                        event.setCancelled(true); // 取消事件以防止其他交互
+                        plugin.getServer().getRegionScheduler().execute(plugin, player.getLocation(), () -> {
+                            new LandmarkMenu(plugin, player).open();
+                        });
+                        return;
+                    }
+                }
+            } else if (action == Action.LEFT_CLICK_AIR) {
+                // 左键空气也可以打开（作为备用）
+                for (Landmark landmark : plugin.getLandmarkManager().getLandmarks().values()) {
+                    if (plugin.getLandmarkManager().isPlayerNearLandmark(player, landmark.getLocation())) {
+                        // 在锚点范围内,打开菜单
+                        plugin.getServer().getRegionScheduler().execute(plugin, player.getLocation(), () -> {
+                            new LandmarkMenu(plugin, player).open();
+                        });
+                        return;
+                    }
                 }
             }
         }

src/main/java/ict/minesunshineone/landmark/manager/LandmarkManager.java

@@ -101,7 +101,7 @@ public void createLandmark(String name, Location location, String description) {
 
             normalizeMenuPositions();
 
-            plugin.getSLF4JLogger().info("成功创建锚点展示实体: {} (图标: {})", name, randomIcon.name());
+            plugin.getSLF4JLogger().info("成功创建锚点: {} (菜单图标: {})", name, randomIcon.name());
             saveData();
         } catch (IllegalArgumentException | IllegalStateException e) {
             plugin.getSLF4JLogger().error("创建锚点时发生错误: {}", e.getMessage());

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: LandmarkSystem
 version: '${project.version}'
 main: ict.minesunshineone.landmark.LandmarkPlugin
-api-version: '1.20'
+api-version: '1.21'
 description: '一个功能强大的锚点传送系统'
 author: MineSunshineone
 folia-supported: true
@@ -35,7 +35,7 @@ permissions:
     description: 允许打开锚点菜单
     default: true
   landmark.interact:
-    description: 允许与锚点展示实体交互
+    description: 允许在锚点范围内交互打开菜单
     default: true
   landmark.admin:
     description: 管理员权限