尝试

Author: MineSunshineone

src/main/java/ict/minesunshineone/landmark/gui/LandmarkMenu.java

@@ -16,6 +16,7 @@
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
@@ -26,24 +27,32 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 
-public class LandmarkMenu implements Listener {
+public class LandmarkMenu implements InventoryHolder, Listener {
 
     private static final String LANDMARK_KEY = "landmark_name";
     private final LandmarkPlugin plugin;
     private final Player player;
-    private final Inventory inventory;
+    private Inventory inventory;
     private final MiniMessage miniMessage = MiniMessage.miniMessage();
     private final NamespacedKey landmarkKey;
 
     public LandmarkMenu(LandmarkPlugin plugin, Player player) {
         this.plugin = plugin;
         this.player = player;
         this.landmarkKey = new NamespacedKey(plugin, LANDMARK_KEY);
+    }
+
+    @Override
+    public Inventory getInventory() {
+        return inventory;
+    }
+
+    public void open() {
         Component title = plugin.getConfigManager().getMessage("gui.title", "<gold>锚点传送菜单</gold>");
         int size = plugin.getConfigManager().getConfig().getInt("gui.size", 54);
-        this.inventory = Bukkit.createInventory(null, size, title);
-
+        this.inventory = Bukkit.createInventory(this, size, title);
         initializeItems();
+        player.openInventory(inventory);
     }
 
     private void initializeItems() {
@@ -281,57 +290,37 @@ private void addLockedLore(List<Component> lore, Landmark landmark) {
         }
     }
 
-    private void updateMenu() {
-        inventory.clear();
-        initializeItems();
-    }
-
-    public void open() {
-        // 在打开菜单时注册监听器并更新内容
-        plugin.getServer().getPluginManager().registerEvents(this, plugin);
-        updateMenu();
-        player.openInventory(inventory);
-    }
-
-    public static void handleClick(InventoryClickEvent event) {
-        if (!(event.getWhoClicked() instanceof Player player)) {
-            return;
-        }
-
-        LandmarkPlugin plugin = LandmarkPlugin.getInstance();
-        if (!event.getView().title().equals(plugin.getConfigManager().getMessage("gui.title", "<gold>锚点传送菜单</gold>"))) {
-            return;
-        }
-
+    public void onClick(int slot, InventoryClickEvent event) {
         event.setCancelled(true);
         ItemStack clickedItem = event.getCurrentItem();
         if (clickedItem == null || clickedItem.getType() == Material.AIR) {
             return;
         }
 
         try {
-            ItemMeta meta = clickedItem.getItemMeta();
-            if (meta == null) {
-                return;
-            }
-
-            PersistentDataContainer container = meta.getPersistentDataContainer();
-            String landmarkName = container.get(new NamespacedKey(plugin, LANDMARK_KEY), PersistentDataType.STRING);
-
-            if (landmarkName != null && plugin.getLandmarkManager().isLandmarkUnlocked(player, landmarkName)) {
-                plugin.getServer().getGlobalRegionScheduler().execute(plugin, () -> {
-                    if (event.getInventory().getHolder() instanceof LandmarkMenu menu) {
-                        menu.cleanup();
-                    }
-                    player.closeInventory();
-                    plugin.getLandmarkManager().teleport(player, landmarkName);
-                });
-            }
+            handleItemClick(clickedItem, (Player) event.getWhoClicked());
         } catch (Exception e) {
             plugin.getSLF4JLogger().error("GUI传送处理出错: {}", e.getMessage(), e);
         }
     }
 
+    private void handleItemClick(ItemStack item, Player player) {
+        ItemMeta meta = item.getItemMeta();
+        if (meta == null) {
+            return;
+        }
+
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        String landmarkName = container.get(landmarkKey, PersistentDataType.STRING);
+
+        if (landmarkName != null && plugin.getLandmarkManager().isLandmarkUnlocked(player, landmarkName)) {
+            plugin.getServer().getGlobalRegionScheduler().execute(plugin, () -> {
+                player.closeInventory();
+                plugin.getLandmarkManager().teleport(player, landmarkName);
+            });
+        }
+    }
+
     // 添加关闭菜单时的清理方法
     private void cleanup() {
         // 清理物品栏内容

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

@@ -14,13 +14,15 @@
 import org.bukkit.entity.Interaction;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerInteractAtEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.inventory.InventoryHolder;
 
 import ict.minesunshineone.landmark.LandmarkPlugin;
 import ict.minesunshineone.landmark.gui.LandmarkMenu;
@@ -38,9 +40,18 @@ public PlayerListener(LandmarkPlugin plugin) {
         this.plugin = plugin;
     }
 
-    @EventHandler
-    public void onInventoryClick(InventoryClickEvent event) {
-        LandmarkMenu.handleClick(event);
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onClickMenu(InventoryClickEvent event) {
+        if (event.getClickedInventory() == null) {
+            return;
+        }
+
+        InventoryHolder holder = event.getView().getTopInventory().getHolder();
+        if (!(holder instanceof LandmarkMenu menu)) {
+            return;
+        }
+
+        menu.onClick(event.getSlot(), event);
     }
 
     @EventHandler