From 1863d04c6595631368dabe51834415b4375f5ac9 Mon Sep 17 00:00:00 2001 From: Coldsmile Date: Wed, 22 Apr 2026 00:35:57 +0800 Subject: [PATCH 1/3] fix: use inventory holders for menus and rework shulker box handling --- .../cn/infstar/essentialsC/LangManager.java | 3 +- .../essentialsC/commands/BaseCommand.java | 3 +- .../commands/BlocksMenuCommand.java | 111 ++-- .../essentialsC/commands/HelpCommand.java | 9 +- .../essentialsC/commands/MobDropCommand.java | 16 +- .../listeners/MobDropListener.java | 1 - .../listeners/MobDropMenuListener.java | 4 +- .../listeners/ShulkerBoxListener.java | 486 ++++++++---------- src/main/resources/paper-plugin.yml | 6 +- 9 files changed, 320 insertions(+), 319 deletions(-) diff --git a/src/main/java/cn/infstar/essentialsC/LangManager.java b/src/main/java/cn/infstar/essentialsC/LangManager.java index 6978b5a..ba25389 100644 --- a/src/main/java/cn/infstar/essentialsC/LangManager.java +++ b/src/main/java/cn/infstar/essentialsC/LangManager.java @@ -1,5 +1,6 @@ package cn.infstar.essentialsC; +import org.bukkit.ChatColor; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.plugin.java.JavaPlugin; @@ -147,6 +148,6 @@ public class LangManager { * 翻译颜色代码 */ private String translateColorCodes(String text) { - return text.replace("&", "§"); + return text == null ? "" : ChatColor.translateAlternateColorCodes('&', text); } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/BaseCommand.java b/src/main/java/cn/infstar/essentialsC/commands/BaseCommand.java index a8e8790..31f2bea 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/BaseCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/BaseCommand.java @@ -6,7 +6,6 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; public abstract class BaseCommand implements CommandExecutor { @@ -32,7 +31,7 @@ public abstract class BaseCommand implements CommandExecutor { } @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (sender instanceof Player player) { if (!player.hasPermission(permission)) { String message = getLang().getString("messages.no-permission", diff --git a/src/main/java/cn/infstar/essentialsC/commands/BlocksMenuCommand.java b/src/main/java/cn/infstar/essentialsC/commands/BlocksMenuCommand.java index fe7c5f9..780683d 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/BlocksMenuCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/BlocksMenuCommand.java @@ -1,6 +1,7 @@ package cn.infstar.essentialsC.commands; import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; @@ -8,61 +9,83 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; 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.PersistentDataType; -import org.jetbrains.annotations.NotNull; public class BlocksMenuCommand extends BaseCommand implements Listener { - + private static final int MENU_SIZE = 36; + private static boolean listenerRegistered = false; + private final NamespacedKey blockKey; - + + private static final class BlocksMenuHolder implements InventoryHolder { + private final Inventory inventory; + + private BlocksMenuHolder(String title) { + this.inventory = Bukkit.createInventory(this, MENU_SIZE, title); + } + + @Override + public Inventory getInventory() { + return inventory; + } + } + public BlocksMenuCommand() { super("essentialsc.command.blocks"); - plugin.getServer().getPluginManager().registerEvents(this, plugin); - blockKey = new NamespacedKey(plugin, "block_key"); + if (!listenerRegistered) { + plugin.getServer().getPluginManager().registerEvents(this, plugin); + listenerRegistered = true; + } + this.blockKey = new NamespacedKey(plugin, "block_key"); } - + @Override - protected boolean execute(@NotNull Player player, String[] args) { + protected boolean execute(Player player, String[] args) { openMenu(player); return true; } - + private void openMenu(Player player) { - String title = plugin.getConfig().getString("blocks-menu.title", "&6&lEssentialsC &8- &e&l功能方块菜单"); - Inventory menu = Bukkit.createInventory(null, MENU_SIZE, translateColor(title)); - - // 从配置中读取所有物品 + String title = plugin.getConfig().getString("blocks-menu.title", "&6&lEssentialsC &8- &e&l鍔熻兘鏂瑰潡鑿滃崟"); + Inventory menu = new BlocksMenuHolder(translateColor(title)).getInventory(); + var itemsConfig = plugin.getConfig().getConfigurationSection("blocks-menu.items"); - if (itemsConfig == null) return; - + if (itemsConfig == null) { + return; + } + for (String key : itemsConfig.getKeys(false)) { var section = itemsConfig.getConfigurationSection(key); - if (section == null) continue; - - // 检查权限 + if (section == null) { + continue; + } + String permission = section.getString("permission"); if (permission != null && !player.hasPermission(permission)) { continue; } - + int slot = section.getInt("slot"); Material material = Material.matchMaterial(section.getString("material", "STONE")); - if (material == null) material = Material.STONE; - + if (material == null) { + material = Material.STONE; + } + String name = translateColor(section.getString("name", "&fItem")); java.util.List lore = section.getStringList("lore").stream() .map(this::translateColor) - .collect(java.util.stream.Collectors.toList()); - + .toList(); + addItem(menu, slot, material, name, lore, key); } - + player.openInventory(menu); } - + private void addItem(Inventory inv, int slot, Material material, String name, java.util.List lore, String key) { ItemStack item = new ItemStack(material); ItemMeta meta = item.getItemMeta(); @@ -74,33 +97,30 @@ public class BlocksMenuCommand extends BaseCommand implements Listener { } inv.setItem(slot, item); } - + @EventHandler public void onMenuClick(InventoryClickEvent event) { - // 动态获取配置的标题 - String configTitle = plugin.getConfig().getString("blocks-menu.title", "&6&lEssentialsC &8- &e&l功能方块菜单"); - String actualTitle = translateColor(configTitle); - - if (!event.getView().getTitle().equals(actualTitle)) return; - if (!(event.getWhoClicked() instanceof Player player)) return; - + if (!(event.getView().getTopInventory().getHolder(false) instanceof BlocksMenuHolder)) { + return; + } + if (!(event.getWhoClicked() instanceof Player player)) { + return; + } + event.setCancelled(true); ItemStack clicked = event.getCurrentItem(); - if (clicked == null || !clicked.hasItemMeta()) return; - + if (clicked == null || !clicked.hasItemMeta()) { + return; + } + ItemMeta meta = clicked.getItemMeta(); String key = meta.getPersistentDataContainer().get(this.blockKey, PersistentDataType.STRING); - - // 点击后执行对应命令并播放音效（如果有） if (key != null && HelpCommand.COMMAND_CACHE.containsKey(key)) { playBlockOpenSound(player, key); - HelpCommand.COMMAND_CACHE.get(key).execute(player, new String[]{}); + HelpCommand.COMMAND_CACHE.get(key).execute(player, new String[0]); } } - - /** - * 播放对应方块的打开音效（优先使用交互音效） - */ + private void playBlockOpenSound(Player player, String key) { org.bukkit.Sound sound = switch (key) { case "workbench" -> org.bukkit.Sound.BLOCK_WOOD_HIT; @@ -113,16 +133,13 @@ public class BlocksMenuCommand extends BaseCommand implements Listener { case "enderchest" -> org.bukkit.Sound.BLOCK_ENDER_CHEST_OPEN; default -> null; }; - + if (sound != null) { player.playSound(player.getLocation(), sound, 1.0f, 1.0f); } } - - /** - * 转换颜色代码 & -> § - */ + private String translateColor(String text) { - return text.replace("&", "§"); + return text == null ? "" : ChatColor.translateAlternateColorCodes('&', text); } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/HelpCommand.java b/src/main/java/cn/infstar/essentialsC/commands/HelpCommand.java index 1b606fc..a25ad9f 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/HelpCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/HelpCommand.java @@ -7,10 +7,8 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabCompleter; import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; public class HelpCommand extends BaseCommand implements TabCompleter { @@ -44,7 +42,7 @@ public class HelpCommand extends BaseCommand implements TabCompleter { } @Override - protected boolean execute(@NotNull Player player, String[] args) { + protected boolean execute(Player player, String[] args) { return handleCommand(player, player, args); } @@ -223,11 +221,14 @@ public class HelpCommand extends BaseCommand implements TabCompleter { * 获取命令对应的权限节点 */ private String getPermissionForCommand(String command) { + if (command.equals("mobdrops")) { + return "essentialsc.mobdrops.enderman"; + } return "essentialsc.command." + command; } @Override - public List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { + public List onTabComplete(CommandSender sender, Command command, String label, String[] args) { if (args.length == 1) { List completions = new ArrayList<>(); String partial = args[0].toLowerCase(); diff --git a/src/main/java/cn/infstar/essentialsC/commands/MobDropCommand.java b/src/main/java/cn/infstar/essentialsC/commands/MobDropCommand.java index 53bdd12..882b42b 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/MobDropCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/MobDropCommand.java @@ -5,6 +5,7 @@ import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @@ -15,6 +16,19 @@ import java.util.Arrays; * /mobdrops - 打开控制菜单 */ public class MobDropCommand extends BaseCommand { + + public static final class MobDropMenuHolder implements InventoryHolder { + private final Inventory inventory; + + public MobDropMenuHolder(String title) { + this.inventory = Bukkit.createInventory(this, 27, title); + } + + @Override + public Inventory getInventory() { + return inventory; + } + } public MobDropCommand() { super("essentialsc.mobdrops.enderman"); @@ -34,7 +48,7 @@ public class MobDropCommand extends BaseCommand { boolean endermanEnabled = plugin.getConfig().getBoolean("mob-drops.enderman.enabled", true); // 创建菜单 - Inventory menu = Bukkit.createInventory(null, 27, "§6§l生物掉落控制"); + Inventory menu = new MobDropMenuHolder("§6§l生物掉落控制").getInventory(); // 末影人控制项 ItemStack endermanItem = new ItemStack(Material.ENDER_PEARL); diff --git a/src/main/java/cn/infstar/essentialsC/listeners/MobDropListener.java b/src/main/java/cn/infstar/essentialsC/listeners/MobDropListener.java index b33ac5b..dbe8be9 100644 --- a/src/main/java/cn/infstar/essentialsC/listeners/MobDropListener.java +++ b/src/main/java/cn/infstar/essentialsC/listeners/MobDropListener.java @@ -21,7 +21,6 @@ public class MobDropListener implements Listener { loadConfig(); // 注册监听器 - plugin.getServer().getPluginManager().registerEvents(this, plugin); } /** diff --git a/src/main/java/cn/infstar/essentialsC/listeners/MobDropMenuListener.java b/src/main/java/cn/infstar/essentialsC/listeners/MobDropMenuListener.java index 28f0f03..eb6d5d9 100644 --- a/src/main/java/cn/infstar/essentialsC/listeners/MobDropMenuListener.java +++ b/src/main/java/cn/infstar/essentialsC/listeners/MobDropMenuListener.java @@ -25,7 +25,7 @@ public class MobDropMenuListener implements Listener { @EventHandler public void onInventoryClick(InventoryClickEvent event) { - if (!event.getView().getTitle().equals("§6§l生物掉落控制")) { + if (!(event.getView().getTopInventory().getHolder(false) instanceof cn.infstar.essentialsC.commands.MobDropCommand.MobDropMenuHolder)) { return; } @@ -71,7 +71,7 @@ public class MobDropMenuListener implements Listener { private void openMobDropMenu(Player player) { boolean endermanEnabled = plugin.getConfig().getBoolean("mob-drops.enderman.enabled", true); - Inventory menu = Bukkit.createInventory(null, 27, "§6§l生物掉落控制"); + Inventory menu = new cn.infstar.essentialsC.commands.MobDropCommand.MobDropMenuHolder("§6§l生物掉落控制").getInventory(); ItemStack endermanItem = new ItemStack(Material.ENDER_PEARL); ItemMeta endermanMeta = endermanItem.getItemMeta(); diff --git a/src/main/java/cn/infstar/essentialsC/listeners/ShulkerBoxListener.java b/src/main/java/cn/infstar/essentialsC/listeners/ShulkerBoxListener.java index afc9e55..5ded0cf 100644 --- a/src/main/java/cn/infstar/essentialsC/listeners/ShulkerBoxListener.java +++ b/src/main/java/cn/infstar/essentialsC/listeners/ShulkerBoxListener.java @@ -2,19 +2,28 @@ package cn.infstar.essentialsC.listeners; import cn.infstar.essentialsC.EssentialsC; import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.block.ShulkerBox; 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.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryCloseEvent; +import org.bukkit.event.inventory.InventoryDragEvent; import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.event.server.PluginDisableEvent; +import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.InventoryHolder; +import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.meta.BlockStateMeta; -import org.jetbrains.annotations.NotNull; import java.util.HashMap; import java.util.Map; @@ -22,12 +31,9 @@ import java.util.Set; import java.util.UUID; public class ShulkerBoxListener implements Listener { - - private final EssentialsC plugin; - // 存储玩家打开的潜影盒：玩家UUID -> (原始物品快照, 当前物品引用) - private final Map openShulkerBoxes = new HashMap<>(); - - // 预定义所有潜影盒材质（性能优化） + + private static final int SHULKER_SIZE = 27; + private static final Set SHULKER_BOX_MATERIALS = Set.of( Material.SHULKER_BOX, Material.WHITE_SHULKER_BOX, @@ -47,310 +53,270 @@ public class ShulkerBoxListener implements Listener { Material.RED_SHULKER_BOX, Material.BLACK_SHULKER_BOX ); - - /** - * 潜影盒 Inventory Holder - 用于识别自定义 inventory - */ - private static class ShulkerBoxHolder implements org.bukkit.inventory.InventoryHolder { + + private final EssentialsC plugin; + private final Map openShulkerBoxes = new HashMap<>(); + + private static final class ShulkerBoxHolder implements InventoryHolder { private final Inventory inventory; - private final ItemStack shulkerBoxItem; - private final ItemStack[] currentContents; // 实时追踪的物品内容 - - ShulkerBoxHolder(ItemStack shulkerBoxItem, String title) { - this.shulkerBoxItem = shulkerBoxItem; - this.inventory = Bukkit.createInventory(this, 27, title); - this.currentContents = new ItemStack[27]; + + private ShulkerBoxHolder(String title) { + this.inventory = Bukkit.createInventory(this, SHULKER_SIZE, title); } - + @Override - public @NotNull Inventory getInventory() { + public Inventory getInventory() { return this.inventory; } - - public ItemStack getShulkerBoxItem() { - return shulkerBoxItem; - } - - /** - * 更新指定槽位的物品（供外部调用） - */ - public void updateSlot(int slot, ItemStack item) { - if (slot >= 0 && slot < 27) { - currentContents[slot] = item; - } - } - - /** - * 获取当前追踪的所有物品内容 - */ - public ItemStack[] getCurrentContents() { - return currentContents.clone(); + } + + private static final class OpenShulkerSession { + private final ItemStack sourceItem; + private final EquipmentSlot sourceHand; + private final int preferredSlot; + + private OpenShulkerSession(ItemStack sourceItem, EquipmentSlot sourceHand, int preferredSlot) { + this.sourceItem = sourceItem; + this.sourceHand = sourceHand; + this.preferredSlot = preferredSlot; } } - - /** - * 潜影盒数据记录 - */ - private static class ShulkerBoxData { - int slotIndex; // 玩家背包中的槽位索引 - ItemStack originalSnapshot; // 打开时的物品快照（用于验证） - int totalItems; // 打开时的物品总数（用于防刷） - - ShulkerBoxData(int slot, ItemStack snapshot, int items) { - this.slotIndex = slot; - this.originalSnapshot = snapshot; - this.totalItems = items; - } - } - + public ShulkerBoxListener(EssentialsC plugin) { this.plugin = plugin; - plugin.getServer().getPluginManager().registerEvents(this, plugin); } - - @EventHandler + + @EventHandler(priority = EventPriority.HIGHEST) public void onPlayerInteract(PlayerInteractEvent event) { - // 只处理右键点击空气或方块的事件 if (event.getAction() != Action.RIGHT_CLICK_AIR && event.getAction() != Action.RIGHT_CLICK_BLOCK) { return; } - + Player player = event.getPlayer(); - - // 检查权限 - if (!player.hasPermission("essentialsc.shulkerbox.open")) { + if (!player.isSneaking() || !player.hasPermission("essentialsc.shulkerbox.open")) { return; } - - ItemStack item = event.getItem(); - if (item == null || !isShulkerBox(item)) { + + if (openShulkerBoxes.containsKey(player.getUniqueId())) { return; } - - // 只有潜行+右键才打开潜影盒 - if (!player.isSneaking()) { + + EquipmentSlot hand = event.getHand() == EquipmentSlot.OFF_HAND ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND; + ItemStack sourceItem = getItemFromHand(player, hand); + if (!isShulkerBox(sourceItem)) { return; } - - // 取消默认行为（防止放置潜影盒） - event.setCancelled(true); - - // 查找物品在玩家背包中的槽位 - int slotIndex = -1; - for (int i = 0; i < player.getInventory().getSize(); i++) { - ItemStack invItem = player.getInventory().getItem(i); - if (invItem != null && invItem.isSimilar(item)) { - slotIndex = i; - break; + + if (!(sourceItem.getItemMeta() instanceof BlockStateMeta blockStateMeta)) { + return; + } + if (!(blockStateMeta.getBlockState() instanceof ShulkerBox shulkerBox)) { + return; + } + + event.setUseItemInHand(org.bukkit.event.Event.Result.DENY); + event.setUseInteractedBlock(org.bukkit.event.Event.Result.DENY); + + ItemStack sourceSnapshot = sourceItem.clone(); + plugin.getServer().getScheduler().runTask(plugin, () -> { + if (!player.isOnline() || openShulkerBoxes.containsKey(player.getUniqueId())) { + return; + } + openShulkerBox(player, hand, sourceSnapshot, shulkerBox); + }); + } + + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) + public void onInventoryClick(InventoryClickEvent event) { + if (!(event.getWhoClicked() instanceof Player player)) { + return; + } + + InventoryView view = event.getView(); + Inventory topInventory = view.getTopInventory(); + if (!(topInventory.getHolder(false) instanceof ShulkerBoxHolder)) { + return; + } + + int topSize = topInventory.getSize(); + boolean clickTopInventory = event.getRawSlot() >= 0 && event.getRawSlot() < topSize; + + if (clickTopInventory && isShulkerBox(event.getCursor())) { + event.setCancelled(true); + sendNestedMessage(player); + return; + } + + if (clickTopInventory && event.getClick() == ClickType.NUMBER_KEY) { + ItemStack hotbarItem = player.getInventory().getItem(event.getHotbarButton()); + if (isShulkerBox(hotbarItem)) { + event.setCancelled(true); + sendNestedMessage(player); + return; } } - - // 打开潜影盒（传入槽位索引） - openShulkerBox(player, item, slotIndex); + + if (event.isShiftClick() && isShulkerBox(event.getCurrentItem())) { + event.setCancelled(true); + sendNestedMessage(player); + } } - + + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) + public void onInventoryDrag(InventoryDragEvent event) { + InventoryView view = event.getView(); + Inventory topInventory = view.getTopInventory(); + if (!(topInventory.getHolder(false) instanceof ShulkerBoxHolder)) { + return; + } + + if (!isShulkerBox(event.getOldCursor())) { + return; + } + + int topSize = topInventory.getSize(); + for (int rawSlot : event.getRawSlots()) { + if (rawSlot >= 0 && rawSlot < topSize) { + event.setCancelled(true); + if (event.getWhoClicked() instanceof Player player) { + sendNestedMessage(player); + } + return; + } + } + } + @EventHandler public void onInventoryClose(InventoryCloseEvent event) { if (!(event.getPlayer() instanceof Player player)) { return; } - - Inventory closedInventory = event.getInventory(); - - // 检查是否是潜影盒 inventory - if (!(closedInventory.getHolder(false) instanceof ShulkerBoxHolder holder)) { - return; - } - - UUID playerId = player.getUniqueId(); - ShulkerBoxData data = openShulkerBoxes.remove(playerId); - - if (data == null) { - return; - } - - plugin.getLogger().info("=== 潜影盒关闭（数据已在点击时实时保存） ==="); + + commitOpenShulker(player, event.getInventory()); } - + @EventHandler - public void onInventoryOpen(org.bukkit.event.inventory.InventoryOpenEvent event) { - if (!(event.getPlayer() instanceof Player player)) { + public void onPlayerQuit(PlayerQuitEvent event) { + Player player = event.getPlayer(); + commitOpenShulker(player, player.getOpenInventory().getTopInventory()); + } + + @EventHandler + public void onPluginDisable(PluginDisableEvent event) { + if (event.getPlugin() != plugin) { return; } - - Inventory openedInventory = event.getInventory(); - if (openedInventory.getHolder(false) instanceof ShulkerBoxHolder) { - plugin.getLogger().info("[Open] ✅ 潜影盒 inventory 已打开"); + + for (Player player : Bukkit.getOnlinePlayers()) { + commitOpenShulker(player, player.getOpenInventory().getTopInventory()); } } - - @EventHandler(priority = org.bukkit.event.EventPriority.LOWEST) - public void onInventoryClickDebug(InventoryClickEvent event) { - if (!(event.getWhoClicked() instanceof Player player)) { + + private void commitOpenShulker(Player player, Inventory inventory) { + if (!(inventory.getHolder(false) instanceof ShulkerBoxHolder)) { return; } - - Inventory clickedInventory = event.getClickedInventory(); - if (clickedInventory == null) { + + OpenShulkerSession session = openShulkerBoxes.remove(player.getUniqueId()); + if (session == null) { return; } - - if (clickedInventory.getHolder(false) instanceof ShulkerBoxHolder) { - plugin.getLogger().info("[Click-LOWEST] 检测到点击事件 | 槽位: " + event.getSlot() + - " | 物品: " + (event.getCurrentItem() != null ? event.getCurrentItem().getType() : "null")); - } + + ItemStack updatedShulker = session.sourceItem.clone(); + writeInventoryBack(updatedShulker, inventory.getContents()); + restoreItemToPlayer(player, session, updatedShulker); } - if (!(event.getWhoClicked() instanceof Player player)) { + + private void openShulkerBox(Player player, EquipmentSlot hand, ItemStack sourceItem, ShulkerBox shulkerBox) { + removeItemFromHand(player, hand); + + ShulkerBoxHolder holder = new ShulkerBoxHolder(resolveTitle(sourceItem)); + holder.getInventory().setContents(cloneContents(shulkerBox.getInventory().getContents())); + + int preferredSlot = hand == EquipmentSlot.HAND ? player.getInventory().getHeldItemSlot() : -1; + openShulkerBoxes.put(player.getUniqueId(), new OpenShulkerSession(sourceItem, hand, preferredSlot)); + player.openInventory(holder.getInventory()); + } + + private void writeInventoryBack(ItemStack shulkerItem, ItemStack[] contents) { + if (!(shulkerItem.getItemMeta() instanceof BlockStateMeta blockStateMeta)) { + plugin.getLogger().warning("Failed to save shulker box contents: missing BlockStateMeta."); return; } - - Inventory clickedInventory = event.getClickedInventory(); - if (clickedInventory == null) { + + if (!(blockStateMeta.getBlockState() instanceof ShulkerBox shulkerBox)) { + plugin.getLogger().warning("Failed to save shulker box contents: block state is not a ShulkerBox."); return; } - - // 检查是否是潜影盒 inventory - if (!(clickedInventory.getHolder(false) instanceof ShulkerBoxHolder holder)) { - return; - } - - UUID playerId = player.getUniqueId(); - ShulkerBoxData data = openShulkerBoxes.get(playerId); - if (data == null) { - return; - } - - // 阻止嵌套潜影盒 - ItemStack clickedItem = event.getCurrentItem(); - if (clickedItem != null && isShulkerBox(clickedItem)) { - event.setCancelled(true); - player.sendMessage(EssentialsC.getLangManager().getString("prefix") + - EssentialsC.getLangManager().getString("messages.shulkerbox-nested")); - return; - } - - // ✅ CMILib 方式：延迟 1 tick 后立即保存到潜影盒 NBT - plugin.getServer().getScheduler().runTask(plugin, () -> { - plugin.getLogger().info("[Click] === 开始处理点击事件 ==="); - - // 读取当前 inventory 内容 - ItemStack[] contents = clickedInventory.getContents(); - - // 调试 - int nonEmpty = 0; - StringBuilder items = new StringBuilder(); - for (int i = 0; i < contents.length; i++) { - if (contents[i] != null && !contents[i].getType().isAir()) { - nonEmpty++; - items.append(String.format("\n [%d] %s x%d", i, contents[i].getType(), contents[i].getAmount())); - } - } - plugin.getLogger().info("[Click] 非空槽位: " + nonEmpty); - plugin.getLogger().info("[Click] 物品详情:" + items); - - // 获取玩家背包中的潜影盒物品 - ItemStack shulkerItem = null; - if (data.slotIndex >= 0 && data.slotIndex < player.getInventory().getSize()) { - shulkerItem = player.getInventory().getItem(data.slotIndex); - plugin.getLogger().info("[Click] 槽位 " + data.slotIndex + " 物品: " + - (shulkerItem != null ? shulkerItem.getType() : "null")); - } - - if (shulkerItem == null || shulkerItem.getType().isAir()) { - plugin.getLogger().warning("[Click] ❌ 潜影盒物品不存在"); + + shulkerBox.getInventory().setContents(cloneContents(contents)); + blockStateMeta.setBlockState(shulkerBox); + shulkerItem.setItemMeta(blockStateMeta); + } + + private void restoreItemToPlayer(Player player, OpenShulkerSession session, ItemStack shulkerItem) { + PlayerInventory inventory = player.getInventory(); + + if (session.sourceHand == EquipmentSlot.OFF_HAND) { + if (isEmpty(inventory.getItemInOffHand())) { + inventory.setItemInOffHand(shulkerItem); return; } - - // 更新潜影盒的 BlockState - if (shulkerItem.getItemMeta() instanceof BlockStateMeta blockStateMeta) { - if (blockStateMeta.getBlockState() instanceof ShulkerBox shulkerBox) { - // 设置 inventory 内容 - for (int i = 0; i < 27 && i < contents.length; i++) { - shulkerBox.getInventory().setItem(i, contents[i]); - } - - // 更新元数据 - blockStateMeta.setBlockState(shulkerBox); - shulkerItem.setItemMeta(blockStateMeta); - - // 写回玩家背包 - player.getInventory().setItem(data.slotIndex, shulkerItem); - - plugin.getLogger().info("[Click] ✅ 已实时保存 " + nonEmpty + " 个物品槽"); - } else { - plugin.getLogger().warning("[Click] ❌ BlockState 不是 ShulkerBox"); - } - } else { - plugin.getLogger().warning("[Click] ❌ 没有 BlockStateMeta"); - } - }); - } - + } else if (session.preferredSlot >= 0 && isEmpty(inventory.getItem(session.preferredSlot))) { + inventory.setItem(session.preferredSlot, shulkerItem); + return; + } - - /** - * 检查物品是否为潜影盒（O(1) 时间复杂度） - */ - private boolean isShulkerBox(ItemStack item) { - return SHULKER_BOX_MATERIALS.contains(item.getType()); + Map leftovers = inventory.addItem(shulkerItem); + for (ItemStack leftover : leftovers.values()) { + player.getWorld().dropItemNaturally(player.getLocation(), leftover); + } } - - /** - * 打开潜影盒 - */ - private void openShulkerBox(Player player, ItemStack shulkerBox, int slotIndex) { - // 获取潜影盒的 BlockStateMeta - if (!(shulkerBox.getItemMeta() instanceof BlockStateMeta blockStateMeta)) { - return; + + private ItemStack[] cloneContents(ItemStack[] contents) { + ItemStack[] copied = new ItemStack[SHULKER_SIZE]; + for (int i = 0; i < SHULKER_SIZE && i < contents.length; i++) { + copied[i] = contents[i] == null ? null : contents[i].clone(); } - - // 获取潜影盒的方块状态 - if (!(blockStateMeta.getBlockState() instanceof ShulkerBox shulkerBoxBlock)) { - return; - } - - // 创建物品快照（用于后续验证） - ItemStack snapshot = shulkerBox.clone(); - - // 计算当前物品总数（用于防刷检查） - int totalItems = 0; - for (ItemStack item : shulkerBoxBlock.getInventory().getContents()) { - if (item != null && !item.getType().isAir()) { - totalItems += item.getAmount(); - } - } - - // 获取潜影盒的自定义名称，如果没有则使用配置中的默认标题 - String title; - if (shulkerBox.hasItemMeta() && shulkerBox.getItemMeta().hasDisplayName()) { - // 使用潜影盒的自定义名称 - title = shulkerBox.getItemMeta().getDisplayName(); + return copied; + } + + private ItemStack getItemFromHand(Player player, EquipmentSlot hand) { + return hand == EquipmentSlot.OFF_HAND + ? player.getInventory().getItemInOffHand() + : player.getInventory().getItemInMainHand(); + } + + private void removeItemFromHand(Player player, EquipmentSlot hand) { + if (hand == EquipmentSlot.OFF_HAND) { + player.getInventory().setItemInOffHand(null); } else { - // 使用配置文件中的默认标题 - String defaultTitle = plugin.getConfig().getString("shulkerbox.default-title", ""); - if (defaultTitle != null && !defaultTitle.isEmpty()) { - // 转换颜色代码 & -> § - title = defaultTitle.replace('&', '§'); - } else { - // 如果配置为空，使用 "Shulker Box"（客户端会自动翻译） - title = "Shulker Box"; - } + player.getInventory().setItem(player.getInventory().getHeldItemSlot(), null); } - - // 创建 ShulkerBoxHolder（会自动创建 inventory） - ShulkerBoxHolder holder = new ShulkerBoxHolder(shulkerBox, title); - Inventory inventory = holder.getInventory(); - - // 复制潜影盒的内容到 inventory - ItemStack[] contents = shulkerBoxBlock.getInventory().getContents(); - for (int i = 0; i < 27 && i < contents.length; i++) { - inventory.setItem(i, contents[i]); + } + + private String resolveTitle(ItemStack shulkerBox) { + if (shulkerBox.hasItemMeta() && shulkerBox.getItemMeta().hasDisplayName()) { + return shulkerBox.getItemMeta().getDisplayName(); } - - // 记录玩家打开的潜影盒（保存槽位索引和快照） - openShulkerBoxes.put(player.getUniqueId(), new ShulkerBoxData(slotIndex, snapshot, totalItems)); - - // 打开 inventory - player.openInventory(inventory); + + String defaultTitle = plugin.getConfig().getString("shulkerbox.default-title", ""); + if (defaultTitle != null && !defaultTitle.isEmpty()) { + return ChatColor.translateAlternateColorCodes('&', defaultTitle); + } + return "Shulker Box"; + } + + private void sendNestedMessage(Player player) { + player.sendMessage(EssentialsC.getLangManager().getString("prefix") + + EssentialsC.getLangManager().getString("messages.shulkerbox-nested")); + } + + private boolean isShulkerBox(ItemStack item) { + return item != null && !item.getType().isAir() && SHULKER_BOX_MATERIALS.contains(item.getType()); + } + + private boolean isEmpty(ItemStack item) { + return item == null || item.getType().isAir(); } } diff --git a/src/main/resources/paper-plugin.yml b/src/main/resources/paper-plugin.yml index 03a41f2..c7363a6 100644 --- a/src/main/resources/paper-plugin.yml +++ b/src/main/resources/paper-plugin.yml @@ -5,7 +5,7 @@ version: ${version} main: cn.infstar.essentialsC.EssentialsC api-version: '1.21' load: POSTWORLD -folia-supported: true +folia-supported: false authors: [ Coldsmiles_7 ] website: www.infstar.cn @@ -62,6 +62,9 @@ permissions: essentialsc.command.repair: description: Allows use of /repair command default: op + essentialsc.command.repair.all: + description: Allows use of /repair all + default: op essentialsc.command.blocks: description: Allows use of /essc blocks command default: true @@ -99,6 +102,7 @@ permissions: essentialsc.command.reload: true essentialsc.command.feed: true essentialsc.command.repair: true + essentialsc.command.repair.all: true essentialsc.command.help: true essentialsc.shulkerbox.open: true essentialsc.mobdrops.enderman: true From 33ca8abd2a3b72ff0e3afbeed174aec2317e54ed Mon Sep 17 00:00:00 2001 From: Coldsmile Date: Wed, 22 Apr 2026 03:27:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=B9=B6=E8=B0=83=E6=95=B4=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E4=BB=A5=E5=85=BC=E5=AE=B9=20Paper=2026.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + build.gradle | 314 ++++++++---------- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45457 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 248 ++++++++++++++ gradlew.bat | 93 ++++++ .../cn/infstar/essentialsC/EssentialsC.java | 180 +++------- .../commands/BlocksMenuCommand.java | 13 +- .../essentialsC/commands/CommandRegistry.java | 111 +++++++ .../essentialsC/commands/HelpCommand.java | 182 ++++------ 10 files changed, 724 insertions(+), 420 deletions(-) create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 src/main/java/cn/infstar/essentialsC/commands/CommandRegistry.java diff --git a/.gitignore b/.gitignore index 7c81ce8..6aaf662 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ # Gradle .gradle/ +.gradle-user-home/ build/ !gradle-wrapper.jar !**/src/main/**/build/ diff --git a/build.gradle b/build.gradle index 352faff..c769a0e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,8 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import org.gradle.language.jvm.tasks.ProcessResources + +import java.util.Collections + plugins { id 'java' id 'io.papermc.paperweight.userdev' version '2.0.0-beta.21' @@ -23,207 +28,180 @@ java { toolchain.languageVersion.set(JavaLanguageVersion.of(21)) } -def excludedModules = project.hasProperty('excludeModules') ? - project.property('excludeModules').split(',')*.trim() : [] +def moduleExcludes = [ + 'blocks': [ + '**/commands/WorkbenchCommand.java', + '**/commands/AnvilCommand.java', + '**/commands/CartographyTableCommand.java', + '**/commands/GrindstoneCommand.java', + '**/commands/LoomCommand.java', + '**/commands/SmithingTableCommand.java', + '**/commands/StonecutterCommand.java', + '**/commands/EnderChestCommand.java', + '**/commands/BlocksMenuCommand.java', + '**/listeners/ShulkerBoxListener.java' + ], + 'player': [ + '**/commands/FlyCommand.java', + '**/commands/HealCommand.java', + '**/commands/FeedCommand.java', + '**/commands/VanishCommand.java', + '**/commands/SeenCommand.java', + '**/commands/HatCommand.java', + '**/commands/SuicideCommand.java', + '**/commands/RepairCommand.java' + ], + 'jei-fix': [ + '**/listeners/JeiRecipeSyncListener.java' + ], + 'mob-drops': [ + '**/listeners/MobDropListener.java', + '**/listeners/MobDropMenuListener.java', + '**/commands/MobDropCommand.java' + ] +] -def includeBlocks = !excludedModules.contains('blocks') -def includePlayer = !excludedModules.contains('player') -def includeJeiFix = !excludedModules.contains('jei-fix') -def includeMobDrops = !excludedModules.contains('mob-drops') +def variantDefinitions = [ + standard: [ + archiveFileName: "EssentialsC-${project.version}.jar", + excludedModules: ['mob-drops'] + ], + all: [ + archiveFileName: "EssentialsC-all-${project.version}.jar", + excludedModules: [] + ], + lite: [ + archiveFileName: "EssentialsC-lite-${project.version}.jar", + excludedModules: ['blocks'] + ] +] -println "\n📦 EssentialsC 模块配置:" -println " ✅ Core (核心)" -println " ${includeBlocks ? '✅' : '❌'} Blocks (便捷方块)" -println " ${includePlayer ? '✅' : '❌'} Player (玩家管理)" -println " ${includeJeiFix ? '✅' : '❌'} JEI Fix (JEI 修复)" -println " ${includeMobDrops ? '✅' : '❌'} Mob Drops (生物掉落物)" -println "" +if (project.hasProperty('excludeModules')) { + def customExcludedModules = project.property('excludeModules') + .split(',') + .collect { it.trim() } + .findAll { !it.isEmpty() } -sourceSets { - main { - java { - if (!includeBlocks) { - exclude '**/commands/WorkbenchCommand.java' - exclude '**/commands/AnvilCommand.java' - exclude '**/commands/CartographyTableCommand.java' - exclude '**/commands/GrindstoneCommand.java' - exclude '**/commands/LoomCommand.java' - exclude '**/commands/SmithingTableCommand.java' - exclude '**/commands/StonecutterCommand.java' - exclude '**/commands/EnderChestCommand.java' - exclude '**/commands/BlocksMenuCommand.java' - exclude '**/listeners/ShulkerBoxListener.java' - } - - if (!includePlayer) { - exclude '**/commands/FlyCommand.java' - exclude '**/commands/HealCommand.java' - exclude '**/commands/FeedCommand.java' - exclude '**/commands/VanishCommand.java' - exclude '**/commands/SeenCommand.java' - exclude '**/commands/HatCommand.java' - exclude '**/commands/SuicideCommand.java' - exclude '**/commands/RepairCommand.java' - } - - if (!includeJeiFix) { - exclude '**/listeners/JeiRecipeSyncListener.java' - } - - if (!includeMobDrops) { - exclude '**/listeners/MobDropListener.java' - exclude '**/listeners/MobDropMenuListener.java' - exclude '**/commands/MobDropCommand.java' - } - } + variantDefinitions.custom = [ + archiveFileName: "EssentialsC-custom-${project.version}.jar", + excludedModules: customExcludedModules + ] +} + +def resolveExcludePatterns = { Collection modules -> + modules.collectMany { module -> moduleExcludes.get(module, Collections.emptyList()) }.unique() +} + +variantDefinitions.each { variantName, variantConfig -> + def unknownModules = variantConfig.excludedModules.findAll { !moduleExcludes.containsKey(it) } + if (!unknownModules.isEmpty()) { + throw new GradleException("Unknown modules for variant '${variantName}': ${unknownModules.join(', ')}") } } +def variantSourceSets = [:] + +variantDefinitions.each { variantName, variantConfig -> + def sourceSet = sourceSets.create(variantName) + sourceSet.java.srcDirs = sourceSets.main.java.srcDirs + sourceSet.resources.srcDirs = sourceSets.main.resources.srcDirs + resolveExcludePatterns(variantConfig.excludedModules).each { pattern -> + sourceSet.java.exclude(pattern) + } + sourceSet.compileClasspath += sourceSets.main.compileClasspath + sourceSet.runtimeClasspath += sourceSet.output + sourceSet.compileClasspath + variantSourceSets[variantName] = sourceSet +} + tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' } -processResources { +tasks.withType(ProcessResources).configureEach { filteringCharset = 'UTF-8' - inputs.property('version', project.version) - filesMatching('paper-plugin.yml') { - expand('version': project.version) +} + +variantDefinitions.keySet().each { variantName -> + def sourceSet = variantSourceSets[variantName] + def processTaskName = sourceSet.processResourcesTaskName + tasks.named(processTaskName, ProcessResources).configure { + inputs.property('version', project.version) + filesMatching('paper-plugin.yml') { + expand('version': project.version) + } } } -shadowJar { +tasks.named('jar').configure { enabled = false } -// ========== 多版本构建任务 ========== - -task shadowJarStandard(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { - from sourceSets.main.output - configurations = [project.configurations.runtimeClasspath] - - exclude '**/listeners/MobDropListener.class' - exclude '**/listeners/MobDropMenuListener.class' - exclude '**/commands/MobDropCommand.class' - - archiveFileName.set("EssentialsC-${project.version}.jar") +tasks.named('shadowJar').configure { + enabled = false } -task shadowJarAll(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { - from sourceSets.main.output - configurations = [project.configurations.runtimeClasspath] - - archiveFileName.set("EssentialsC-all-${project.version}.jar") -} +def variantJarTasks = variantDefinitions.collect { variantName, variantConfig -> + def taskName = "shadowJar${variantName.capitalize()}" + def sourceSet = variantSourceSets[variantName] -task shadowJarLite(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { - from sourceSets.main.output - configurations = [project.configurations.runtimeClasspath] - - exclude '**/commands/WorkbenchCommand.class' - exclude '**/commands/AnvilCommand.class' - exclude '**/commands/CartographyTableCommand.class' - exclude '**/commands/GrindstoneCommand.class' - exclude '**/commands/LoomCommand.class' - exclude '**/commands/SmithingTableCommand.class' - exclude '**/commands/StonecutterCommand.class' - exclude '**/commands/EnderChestCommand.class' - exclude '**/commands/BlocksMenuCommand.class' - exclude '**/listeners/ShulkerBoxListener.class' - - archiveFileName.set("EssentialsC-lite-${project.version}.jar") -} - -build { - dependsOn shadowJarAll -} - -// ========== 部署任务 ========== - -task deployToPaper12111(type: Copy) { - group = 'deployment' - description = '部署到 Paper 1.21.11 测试服务器（仅完整版）' - dependsOn shadowJarAll - from shadowJarAll - into "${projectDir}/test-server/paper-1.21.11/plugins" - doLast { - println "✅ 插件已部署到 Paper 1.21.11: ${projectDir}/test-server/paper-1.21.11/plugins" + tasks.register(taskName, ShadowJar) { + group = 'build' + description = "Builds the ${variantName} plugin jar." + archiveFileName.set(variantConfig.archiveFileName as String) + from(sourceSet.output) + configurations = [project.configurations.runtimeClasspath] + dependsOn(tasks.named(sourceSet.classesTaskName)) } } -task deployToPaper26 { +tasks.named('assemble').configure { + dependsOn(variantJarTasks) +} + +tasks.register('buildAllVersions') { + group = 'build' + description = 'Builds standard, all, and lite plugin jars.' + dependsOn(variantJarTasks) +} + +tasks.register('deployToPaper12111', Copy) { group = 'deployment' - description = '部署到 Paper 26.1.2 测试服务器（仅完整版）' - dependsOn shadowJarAll - + description = 'Deploys the all variant to the local Paper 1.21.11 test server.' + def artifact = tasks.named('shadowJarAll').flatMap { it.archiveFile } + dependsOn(tasks.named('shadowJarAll')) + from(artifact) + into(layout.projectDirectory.dir('test-server/paper-1.21.11/plugins')) +} + +tasks.register('deployToPaper26') { + group = 'deployment' + description = 'Deploys the all variant to the local Paper 26.1.2 test server.' + dependsOn(tasks.named('shadowJarAll')) + doFirst { def pluginsDir = file("${projectDir}/test-server/paper-26.1.2/plugins") - if (pluginsDir.exists()) { - // 删除所有 EssentialsC 相关的 JAR 文件 - fileTree(pluginsDir).include('EssentialsC*.jar').each { file -> - println "🗑️ 删除旧插件: ${file.name}" - file.delete() - } - // 删除配置文件夹 - def configDir = file("${pluginsDir}/EssentialsC") - if (configDir.exists()) { - println "🗑️ 删除旧配置文件夹" - configDir.deleteDir() - } - println "✅ 清理完成" - } else { - println "⚠️ plugins 目录不存在，跳过清理" + if (!pluginsDir.exists()) { + return + } + + fileTree(pluginsDir).matching { + include 'EssentialsC*.jar' + }.each { pluginJar -> + pluginJar.delete() } } - + doLast { + def artifact = tasks.named('shadowJarAll').flatMap { it.archiveFile } copy { - from shadowJarAll.archiveFile - into "${projectDir}/test-server/paper-26.1.2/plugins" + from(artifact) + into("${projectDir}/test-server/paper-26.1.2/plugins") } - println "✅ 插件已部署到 Paper 26.1.2: ${projectDir}/test-server/paper-26.1.2/plugins" } } -// Paper 26.1.2 一键构建和部署任务 -task buildAndDeployToPaper26 { +tasks.register('buildAndDeployToPaper26') { group = 'deployment' - description = '一键构建并部署到 Paper 26.1.2' - dependsOn clean, deployToPaper26 -} - -// 默认部署到 Paper 1.21.11 -task deployToTestServer { - dependsOn deployToPaper12111 -} - -build.finalizedBy deployToTestServer - -task buildAllVersions { - group = 'build' - description = '构建所有版本的插件' - dependsOn shadowJarStandard, shadowJarAll, shadowJarLite - - doLast { - println "\n🎉 所有版本构建完成！" - println "📦 标准版: EssentialsC-${project.version}.jar" - println "📦 完整版: EssentialsC-all-${project.version}.jar" - println "📦 轻量版: EssentialsC-lite-${project.version}.jar" - println "📁 输出目录: ${buildDir}/libs/" - - def standardFile = file("${buildDir}/libs/EssentialsC-${project.version}.jar") - def allFile = file("${buildDir}/libs/EssentialsC-all-${project.version}.jar") - def liteFile = file("${buildDir}/libs/EssentialsC-lite-${project.version}.jar") - - if (!standardFile.exists()) { - throw new GradleException("❌ 标准版文件不存在！") - } - if (!allFile.exists()) { - throw new GradleException("❌ 完整版文件不存在！") - } - if (!liteFile.exists()) { - throw new GradleException("❌ 轻量版文件不存在！") - } - - println "✅ 所有文件验证通过！" - } + description = 'Builds and deploys the all variant to the local Paper 26.1.2 test server.' + dependsOn(tasks.named('clean'), tasks.named('deployToPaper26')) } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..8bdaf60c75ab801e22807dde59e12a8735a34077 GIT binary patch literal 45457 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 c82=K%QXLKFx%@O{wJjEi6Y56o#$)Bpeg literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e11132..1844133 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionUrl=https\://mirrors.aliyun.com/gradle/distributions/v9.1.0/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..adff685 --- /dev/null +++ b/gradlew @@ -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 +# + +############################################################################## +# +# Gradle 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 Gradle +# +# 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/HEAD/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" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..c4bdd3a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@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 Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +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 + +goto fail + +: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 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/cn/infstar/essentialsC/EssentialsC.java b/src/main/java/cn/infstar/essentialsC/EssentialsC.java index eabadc0..48c1c86 100644 --- a/src/main/java/cn/infstar/essentialsC/EssentialsC.java +++ b/src/main/java/cn/infstar/essentialsC/EssentialsC.java @@ -1,6 +1,8 @@ package cn.infstar.essentialsC; -import cn.infstar.essentialsC.commands.*; +import cn.infstar.essentialsC.commands.BaseCommand; +import cn.infstar.essentialsC.commands.CommandRegistry; +import cn.infstar.essentialsC.commands.HelpCommand; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -18,200 +20,112 @@ public final class EssentialsC extends JavaPlugin { registerPluginChannels(); registerListeners(); registerCommands(); - - getLogger().info("插件已启用！版本: " + getDescription().getVersion()); + + getLogger().info("EssentialsC enabled. Version: " + getDescription().getVersion()); } @Override public void onDisable() { - getLogger().info("EssentialsC 插件已禁用！"); + getLogger().info("EssentialsC disabled."); } - + public static LangManager getLangManager() { return langManager; } - - /** - * 注册 JEI 配方同步所需的插件频道 - */ + private void registerPluginChannels() { org.bukkit.plugin.messaging.Messenger messenger = getServer().getMessenger(); - // 注册 Fabric 和 NeoForge 的配方同步频道 messenger.registerOutgoingPluginChannel(this, "fabric:recipe_sync"); messenger.registerOutgoingPluginChannel(this, "neoforge:recipe_content"); } - + private void registerListeners() { if (registerListener("cn.infstar.essentialsC.listeners.ShulkerBoxListener")) { - getLogger().info("- 潜影盒模块"); + getLogger().info("- Shulker box module"); } - + if (registerListener("cn.infstar.essentialsC.listeners.JeiRecipeSyncListener")) { - getLogger().info("- JEI 配方同步"); + getLogger().info("- JEI recipe sync"); } - + if (registerListener("cn.infstar.essentialsC.listeners.MobDropListener")) { - try { - Class.forName("cn.infstar.essentialsC.listeners.MobDropMenuListener"); - new cn.infstar.essentialsC.listeners.MobDropMenuListener(this); - } catch (ClassNotFoundException e) { - } - getLogger().info("- 生物掉落控制"); + createOptionalInstance("cn.infstar.essentialsC.listeners.MobDropMenuListener"); + getLogger().info("- Mob drop control"); } } - + private boolean registerListener(String className) { try { Class listenerClass = Class.forName(className); Object listenerInstance = listenerClass.getConstructor(EssentialsC.class).newInstance(this); getServer().getPluginManager().registerEvents((org.bukkit.event.Listener) listenerInstance, this); return true; - } catch (Exception e) { + } catch (Exception ignored) { return false; } } - + + private void createOptionalInstance(String className) { + try { + Class targetClass = Class.forName(className); + targetClass.getConstructor(EssentialsC.class).newInstance(this); + } catch (Exception ignored) { + } + } + private void registerCommands() { try { Field bukkitCommandMap = Bukkit.getServer().getClass().getDeclaredField("commandMap"); bukkitCommandMap.setAccessible(true); org.bukkit.command.CommandMap commandMap = (org.bukkit.command.CommandMap) bukkitCommandMap.get(Bukkit.getServer()); - - int commandCount = 0; - - if (classExists("cn.infstar.essentialsC.commands.WorkbenchCommand")) { - registerCommandWithAliases(commandMap, "workbench", new WorkbenchCommand(), "wb"); - commandCount++; + + for (CommandRegistry.CommandSpec spec : CommandRegistry.getCommandSpecs()) { + BaseCommand executor = CommandRegistry.getCommand(spec.name()); + if (executor == null) { + continue; + } + registerCommandWithAliases(commandMap, spec.name(), executor, spec.aliases().toArray(String[]::new)); } - if (classExists("cn.infstar.essentialsC.commands.AnvilCommand")) { - registerCommandWithAliases(commandMap, "anvil", new AnvilCommand()); - commandCount++; - } - if (classExists("cn.infstar.essentialsC.commands.CartographyTableCommand")) { - registerCommandWithAliases(commandMap, "cartographytable", new CartographyTableCommand(), "ct", "cartography"); - commandCount++; - } - if (classExists("cn.infstar.essentialsC.commands.GrindstoneCommand")) { - registerCommandWithAliases(commandMap, "grindstone", new GrindstoneCommand(), "gs"); - commandCount++; - } - if (classExists("cn.infstar.essentialsC.commands.LoomCommand")) { - registerCommandWithAliases(commandMap, "loom", new LoomCommand()); - commandCount++; - } - if (classExists("cn.infstar.essentialsC.commands.SmithingTableCommand")) { - registerCommandWithAliases(commandMap, "smithingtable", new SmithingTableCommand(), "st", "smithing"); - commandCount++; - } - if (classExists("cn.infstar.essentialsC.commands.StonecutterCommand")) { - registerCommandWithAliases(commandMap, "stonecutter", new StonecutterCommand(), "sc"); - commandCount++; - } - if (classExists("cn.infstar.essentialsC.commands.EnderChestCommand")) { - registerCommandWithAliases(commandMap, "enderchest", new EnderChestCommand(), "ec"); - commandCount++; - } - if (classExists("cn.infstar.essentialsC.commands.BlocksMenuCommand")) { - registerCommandWithAliases(commandMap, "blocks", new BlocksMenuCommand()); - commandCount++; - } - - if (classExists("cn.infstar.essentialsC.commands.FlyCommand")) { - registerCommandWithAliases(commandMap, "fly", new FlyCommand()); - commandCount++; - } - if (classExists("cn.infstar.essentialsC.commands.HealCommand")) { - registerCommandWithAliases(commandMap, "heal", new HealCommand()); - commandCount++; - } - if (classExists("cn.infstar.essentialsC.commands.FeedCommand")) { - registerCommandWithAliases(commandMap, "feed", new FeedCommand()); - commandCount++; - } - if (classExists("cn.infstar.essentialsC.commands.VanishCommand")) { - registerCommandWithAliases(commandMap, "vanish", new VanishCommand(), "v"); - commandCount++; - } - if (classExists("cn.infstar.essentialsC.commands.SeenCommand")) { - registerCommandWithAliases(commandMap, "seen", new SeenCommand(), "info"); - commandCount++; - } - if (classExists("cn.infstar.essentialsC.commands.HatCommand")) { - registerCommandWithAliases(commandMap, "hat", new HatCommand()); - commandCount++; - } - if (classExists("cn.infstar.essentialsC.commands.SuicideCommand")) { - registerCommandWithAliases(commandMap, "suicide", new SuicideCommand(), "die"); - commandCount++; - } - if (classExists("cn.infstar.essentialsC.commands.RepairCommand")) { - registerCommandWithAliases(commandMap, "repair", new RepairCommand(), "rep"); - commandCount++; - } - - if (classExists("cn.infstar.essentialsC.commands.MobDropCommand")) { - registerCommandWithAliases(commandMap, "mobdrops", new MobDropCommand()); - commandCount++; - } - + registerCommandWithAliases(commandMap, "essentialsc", new HelpCommand(), "essc"); - commandCount++; } catch (Exception e) { - getLogger().severe("无法注册命令: " + e.getMessage()); + getLogger().severe("Failed to register commands: " + e.getMessage()); e.printStackTrace(); } } - - private boolean classExists(String className) { - try { - Class.forName(className); - return true; - } catch (ClassNotFoundException e) { - return false; - } - } - - /** - * 注册命令并支持别名 - * @param commandMap Bukkit CommandMap - * @param name 主命令名 - * @param executor 命令执行器 - * @param aliases 别名列表（可选） - */ - private void registerCommandWithAliases(org.bukkit.command.CommandMap commandMap, String name, cn.infstar.essentialsC.commands.BaseCommand executor, String... aliases) { + + private void registerCommandWithAliases(org.bukkit.command.CommandMap commandMap, String name, BaseCommand executor, String... aliases) { Command command = new Command(name) { @Override public boolean execute(CommandSender sender, String commandLabel, String[] args) { return executor.onCommand(sender, this, commandLabel, args); } - + @Override public java.util.List tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException { - if (executor instanceof org.bukkit.command.TabCompleter) { - return ((org.bukkit.command.TabCompleter) executor).onTabComplete(sender, this, alias, args); + if (executor instanceof org.bukkit.command.TabCompleter completer) { + return completer.onTabComplete(sender, this, alias, args); } return super.tabComplete(sender, alias, args); } }; - + command.setPermission(executor.getPermission()); - // 注册到默认命名空间，使玩家可以直接使用 /workbench 而不是 /essentialsc:workbench commandMap.register("", command); - - // 注册别名 + for (String alias : aliases) { Command aliasCmd = new Command(alias) { @Override public boolean execute(CommandSender sender, String commandLabel, String[] args) { return executor.onCommand(sender, this, commandLabel, args); } - + @Override - public java.util.List tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException { - if (executor instanceof org.bukkit.command.TabCompleter) { - return ((org.bukkit.command.TabCompleter) executor).onTabComplete(sender, this, alias, args); + public java.util.List tabComplete(CommandSender sender, String label, String[] args) throws IllegalArgumentException { + if (executor instanceof org.bukkit.command.TabCompleter completer) { + return completer.onTabComplete(sender, this, label, args); } - return super.tabComplete(sender, alias, args); + return super.tabComplete(sender, label, args); } }; aliasCmd.setPermission(executor.getPermission()); diff --git a/src/main/java/cn/infstar/essentialsC/commands/BlocksMenuCommand.java b/src/main/java/cn/infstar/essentialsC/commands/BlocksMenuCommand.java index 780683d..9feec41 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/BlocksMenuCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/BlocksMenuCommand.java @@ -14,6 +14,8 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.persistence.PersistentDataType; +import java.util.List; + public class BlocksMenuCommand extends BaseCommand implements Listener { private static final int MENU_SIZE = 36; @@ -50,7 +52,7 @@ public class BlocksMenuCommand extends BaseCommand implements Listener { } private void openMenu(Player player) { - String title = plugin.getConfig().getString("blocks-menu.title", "&6&lEssentialsC &8- &e&l鍔熻兘鏂瑰潡鑿滃崟"); + String title = plugin.getConfig().getString("blocks-menu.title", "&6&lEssentialsC &8- &e&lBlocks Menu"); Inventory menu = new BlocksMenuHolder(translateColor(title)).getInventory(); var itemsConfig = plugin.getConfig().getConfigurationSection("blocks-menu.items"); @@ -76,7 +78,7 @@ public class BlocksMenuCommand extends BaseCommand implements Listener { } String name = translateColor(section.getString("name", "&fItem")); - java.util.List lore = section.getStringList("lore").stream() + List lore = section.getStringList("lore").stream() .map(this::translateColor) .toList(); @@ -86,7 +88,7 @@ public class BlocksMenuCommand extends BaseCommand implements Listener { player.openInventory(menu); } - private void addItem(Inventory inv, int slot, Material material, String name, java.util.List lore, String key) { + private void addItem(Inventory inv, int slot, Material material, String name, List lore, String key) { ItemStack item = new ItemStack(material); ItemMeta meta = item.getItemMeta(); if (meta != null) { @@ -115,9 +117,10 @@ public class BlocksMenuCommand extends BaseCommand implements Listener { ItemMeta meta = clicked.getItemMeta(); String key = meta.getPersistentDataContainer().get(this.blockKey, PersistentDataType.STRING); - if (key != null && HelpCommand.COMMAND_CACHE.containsKey(key)) { + BaseCommand blockCommand = CommandRegistry.getCommand(key); + if (blockCommand != null) { playBlockOpenSound(player, key); - HelpCommand.COMMAND_CACHE.get(key).execute(player, new String[0]); + blockCommand.execute(player, new String[0]); } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/CommandRegistry.java b/src/main/java/cn/infstar/essentialsC/commands/CommandRegistry.java new file mode 100644 index 0000000..2eeca77 --- /dev/null +++ b/src/main/java/cn/infstar/essentialsC/commands/CommandRegistry.java @@ -0,0 +1,111 @@ +package cn.infstar.essentialsC.commands; + +import java.lang.reflect.Constructor; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public final class CommandRegistry { + + private static final Map COMMANDS = new LinkedHashMap<>(); + private static final Map ALIAS_TO_COMMAND = new HashMap<>(); + private static final Map COMMAND_CACHE = new HashMap<>(); + private static final Set UNAVAILABLE_COMMANDS = new java.util.HashSet<>(); + + static { + register("workbench", "essentialsc.command.workbench", "cn.infstar.essentialsC.commands.WorkbenchCommand", "wb"); + register("anvil", "essentialsc.command.anvil", "cn.infstar.essentialsC.commands.AnvilCommand"); + register("cartographytable", "essentialsc.command.cartographytable", "cn.infstar.essentialsC.commands.CartographyTableCommand", "ct", "cartography"); + register("grindstone", "essentialsc.command.grindstone", "cn.infstar.essentialsC.commands.GrindstoneCommand", "gs"); + register("loom", "essentialsc.command.loom", "cn.infstar.essentialsC.commands.LoomCommand"); + register("smithingtable", "essentialsc.command.smithingtable", "cn.infstar.essentialsC.commands.SmithingTableCommand", "st", "smithing"); + register("stonecutter", "essentialsc.command.stonecutter", "cn.infstar.essentialsC.commands.StonecutterCommand", "sc"); + register("enderchest", "essentialsc.command.enderchest", "cn.infstar.essentialsC.commands.EnderChestCommand", "ec"); + register("blocks", "essentialsc.command.blocks", "cn.infstar.essentialsC.commands.BlocksMenuCommand"); + register("hat", "essentialsc.command.hat", "cn.infstar.essentialsC.commands.HatCommand"); + register("suicide", "essentialsc.command.suicide", "cn.infstar.essentialsC.commands.SuicideCommand", "die"); + register("fly", "essentialsc.command.fly", "cn.infstar.essentialsC.commands.FlyCommand"); + register("heal", "essentialsc.command.heal", "cn.infstar.essentialsC.commands.HealCommand"); + register("vanish", "essentialsc.command.vanish", "cn.infstar.essentialsC.commands.VanishCommand", "v"); + register("seen", "essentialsc.command.seen", "cn.infstar.essentialsC.commands.SeenCommand", "info"); + register("feed", "essentialsc.command.feed", "cn.infstar.essentialsC.commands.FeedCommand"); + register("repair", "essentialsc.command.repair", "cn.infstar.essentialsC.commands.RepairCommand", "rep"); + register("mobdrops", "essentialsc.mobdrops.enderman", "cn.infstar.essentialsC.commands.MobDropCommand"); + } + + private CommandRegistry() { + } + + private static void register(String name, String permission, String className, String... aliases) { + List aliasList = List.of(aliases); + CommandSpec spec = new CommandSpec(name, permission, className, aliasList); + COMMANDS.put(name, spec); + ALIAS_TO_COMMAND.put(name, name); + for (String alias : aliasList) { + ALIAS_TO_COMMAND.put(alias, name); + } + } + + public static Collection getCommandSpecs() { + return Collections.unmodifiableCollection(COMMANDS.values()); + } + + public static String resolveCommandName(String input) { + if (input == null) { + return null; + } + return ALIAS_TO_COMMAND.get(input.toLowerCase()); + } + + public static boolean isAvailable(String name) { + return getCommand(name) != null; + } + + public static String getPermission(String name) { + CommandSpec spec = COMMANDS.get(name); + return spec == null ? null : spec.permission(); + } + + public static BaseCommand getCommand(String name) { + String resolvedName = resolveCommandName(name); + if (resolvedName == null) { + return null; + } + + BaseCommand cached = COMMAND_CACHE.get(resolvedName); + if (cached != null) { + return cached; + } + if (UNAVAILABLE_COMMANDS.contains(resolvedName)) { + return null; + } + + CommandSpec spec = COMMANDS.get(resolvedName); + if (spec == null) { + return null; + } + + try { + Class rawClass = Class.forName(spec.className()); + if (!BaseCommand.class.isAssignableFrom(rawClass)) { + UNAVAILABLE_COMMANDS.add(resolvedName); + return null; + } + + Constructor constructor = rawClass.asSubclass(BaseCommand.class).getDeclaredConstructor(); + BaseCommand command = constructor.newInstance(); + COMMAND_CACHE.put(resolvedName, command); + return command; + } catch (ReflectiveOperationException | LinkageError ignored) { + UNAVAILABLE_COMMANDS.add(resolvedName); + return null; + } + } + + public record CommandSpec(String name, String permission, String className, List aliases) { + } +} diff --git a/src/main/java/cn/infstar/essentialsC/commands/HelpCommand.java b/src/main/java/cn/infstar/essentialsC/commands/HelpCommand.java index a25ad9f..eea4b79 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/HelpCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/HelpCommand.java @@ -10,44 +10,21 @@ import org.bukkit.entity.Player; import java.util.ArrayList; import java.util.List; +import java.util.Map; public class HelpCommand extends BaseCommand implements TabCompleter { - - // 缓存命令实例，避免重复创建 - static final java.util.Map COMMAND_CACHE = new java.util.HashMap<>(); - - static { - COMMAND_CACHE.put("workbench", new WorkbenchCommand()); - COMMAND_CACHE.put("anvil", new AnvilCommand()); - COMMAND_CACHE.put("cartographytable", new CartographyTableCommand()); - COMMAND_CACHE.put("grindstone", new GrindstoneCommand()); - COMMAND_CACHE.put("loom", new LoomCommand()); - COMMAND_CACHE.put("smithingtable", new SmithingTableCommand()); - COMMAND_CACHE.put("stonecutter", new StonecutterCommand()); - COMMAND_CACHE.put("enderchest", new EnderChestCommand()); - COMMAND_CACHE.put("hat", new HatCommand()); - COMMAND_CACHE.put("suicide", new SuicideCommand()); - COMMAND_CACHE.put("fly", new FlyCommand()); - COMMAND_CACHE.put("heal", new HealCommand()); - COMMAND_CACHE.put("vanish", new VanishCommand()); - COMMAND_CACHE.put("seen", new SeenCommand()); - COMMAND_CACHE.put("feed", new FeedCommand()); - COMMAND_CACHE.put("repair", new RepairCommand()); - COMMAND_CACHE.put("blocks", new BlocksMenuCommand()); - COMMAND_CACHE.put("mobdrops", new MobDropCommand()); - } - + public HelpCommand() { super("essentialsc.command.help"); } - + @Override protected boolean execute(Player player, String[] args) { return handleCommand(player, player, args); } - + @Override - protected boolean executeConsole(org.bukkit.command.CommandSender sender, String[] args) { + protected boolean executeConsole(CommandSender sender, String[] args) { if (args.length > 0 && args[0].equalsIgnoreCase("reload")) { if (!sender.hasPermission("essentialsc.command.reload")) { sender.sendMessage(getLang().getString("messages.no-permission")); @@ -55,17 +32,17 @@ public class HelpCommand extends BaseCommand implements TabCompleter { } plugin.reloadConfig(); EssentialsC.getLangManager().reload(); - sender.sendMessage(getLang().getString("prefix") + "§a配置已重载！"); + sender.sendMessage(getLang().getString("prefix") + "Configuration reloaded."); return true; } sender.sendMessage(getLang().getString("messages.player-only")); return true; } - + private boolean handleCommand(CommandSender sender, Player player, String[] args) { if (args.length > 0) { String subCommand = args[0].toLowerCase(); - + if (subCommand.equals("reload")) { if (!sender.hasPermission("essentialsc.command.reload")) { sender.sendMessage(getLang().getString("messages.no-permission")); @@ -73,167 +50,140 @@ public class HelpCommand extends BaseCommand implements TabCompleter { } plugin.reloadConfig(); EssentialsC.getLangManager().reload(); - sender.sendMessage(getLang().getString("prefix") + "§a配置已重载！"); + sender.sendMessage(getLang().getString("prefix") + "Configuration reloaded."); return true; } - // 功能方块和其他命令 - 使用别名映射 + String actualCommand = getActualCommand(subCommand); - if (actualCommand != null && COMMAND_CACHE.containsKey(actualCommand)) { - String permission = getPermissionForCommand(actualCommand); - if (!player.hasPermission(permission)) { + BaseCommand targetCommand = CommandRegistry.getCommand(actualCommand); + if (actualCommand != null && targetCommand != null) { + String permission = CommandRegistry.getPermission(actualCommand); + if (permission != null && !player.hasPermission(permission)) { player.sendMessage(getLang().getString("messages.no-permission")); return true; } - - // seen 需要特殊处理参数 + if (actualCommand.equals("seen")) { if (args.length < 2) { player.sendMessage(getLang().getString("prefix") + getLang().getString("messages.seen-usage-console")); return true; } - COMMAND_CACHE.get("seen").execute(player, new String[]{args[1]}); + targetCommand.execute(player, new String[]{args[1]}); } else { - COMMAND_CACHE.get(actualCommand).execute(player, new String[]{}); + targetCommand.execute(player, new String[0]); } return true; - } else if (subCommand.equals("version") || subCommand.equals("v")) { - player.sendMessage(getLang().getString("prefix") + "§6EssentialsC §fv" + plugin.getDescription().getVersion()); - player.sendMessage(getLang().getString("prefix") + "§7运行在 Paper " + Bukkit.getVersion()); - return true; - } else { - player.sendMessage(getLang().getString("prefix") + getLang().getString("messages.unknown-subcommand", - java.util.Map.of("command", subCommand))); - player.sendMessage(getLang().getString("prefix") + getLang().getString("messages.help-usage")); + } + + if (subCommand.equals("version") || subCommand.equals("v")) { + player.sendMessage(getLang().getString("prefix") + "EssentialsC v" + plugin.getDescription().getVersion()); + player.sendMessage(getLang().getString("prefix") + "Running on Paper " + Bukkit.getVersion()); return true; } + + player.sendMessage(getLang().getString("prefix") + getLang().getString("messages.unknown-subcommand", + Map.of("command", subCommand))); + player.sendMessage(getLang().getString("prefix") + getLang().getString("messages.help-usage")); + return true; } - - // 显示帮助 + LangManager lang = getLang(); String version = plugin.getDescription().getVersion(); - + player.sendMessage(lang.getString("help.title")); - player.sendMessage(lang.getString("help.version", - java.util.Map.of("version", version))); + player.sendMessage(lang.getString("help.version", Map.of("version", version))); player.sendMessage(""); - - // 功能方块命令（检查权限后显示） + boolean hasBlockCommands = false; StringBuilder blockCommands = new StringBuilder(); - - if (player.hasPermission("essentialsc.command.workbench")) { + + if (CommandRegistry.isAvailable("workbench") && player.hasPermission("essentialsc.command.workbench")) { blockCommands.append(lang.getString("help.commands.workbench")).append("\n"); hasBlockCommands = true; } - if (player.hasPermission("essentialsc.command.anvil")) { + if (CommandRegistry.isAvailable("anvil") && player.hasPermission("essentialsc.command.anvil")) { blockCommands.append(lang.getString("help.commands.anvil")).append("\n"); hasBlockCommands = true; } - if (player.hasPermission("essentialsc.command.cartographytable")) { + if (CommandRegistry.isAvailable("cartographytable") && player.hasPermission("essentialsc.command.cartographytable")) { blockCommands.append(lang.getString("help.commands.cartographytable")).append("\n"); hasBlockCommands = true; } - if (player.hasPermission("essentialsc.command.grindstone")) { + if (CommandRegistry.isAvailable("grindstone") && player.hasPermission("essentialsc.command.grindstone")) { blockCommands.append(lang.getString("help.commands.grindstone")).append("\n"); hasBlockCommands = true; } - if (player.hasPermission("essentialsc.command.loom")) { + if (CommandRegistry.isAvailable("loom") && player.hasPermission("essentialsc.command.loom")) { blockCommands.append(lang.getString("help.commands.loom")).append("\n"); hasBlockCommands = true; } - if (player.hasPermission("essentialsc.command.smithingtable")) { + if (CommandRegistry.isAvailable("smithingtable") && player.hasPermission("essentialsc.command.smithingtable")) { blockCommands.append(lang.getString("help.commands.smithingtable")).append("\n"); hasBlockCommands = true; } - if (player.hasPermission("essentialsc.command.stonecutter")) { + if (CommandRegistry.isAvailable("stonecutter") && player.hasPermission("essentialsc.command.stonecutter")) { blockCommands.append(lang.getString("help.commands.stonecutter")).append("\n"); hasBlockCommands = true; } - if (player.hasPermission("essentialsc.command.enderchest")) { + if (CommandRegistry.isAvailable("enderchest") && player.hasPermission("essentialsc.command.enderchest")) { blockCommands.append(lang.getString("help.commands.enderchest")).append("\n"); hasBlockCommands = true; } - + if (hasBlockCommands) { player.sendMessage(lang.getString("help.section-blocks")); player.sendMessage(blockCommands.toString().trim()); player.sendMessage(""); } - - // 其他命令（检查权限后显示） + boolean hasOtherCommands = false; StringBuilder otherCommands = new StringBuilder(); - - if (player.hasPermission("essentialsc.command.hat")) { + + if (CommandRegistry.isAvailable("hat") && player.hasPermission("essentialsc.command.hat")) { otherCommands.append(lang.getString("help.commands.hat")).append("\n"); hasOtherCommands = true; } - if (player.hasPermission("essentialsc.command.suicide")) { + if (CommandRegistry.isAvailable("suicide") && player.hasPermission("essentialsc.command.suicide")) { otherCommands.append(lang.getString("help.commands.suicide")).append("\n"); hasOtherCommands = true; } - if (player.hasPermission("essentialsc.command.fly")) { + if (CommandRegistry.isAvailable("fly") && player.hasPermission("essentialsc.command.fly")) { otherCommands.append(lang.getString("help.commands.fly")).append("\n"); hasOtherCommands = true; } - if (player.hasPermission("essentialsc.command.heal")) { + if (CommandRegistry.isAvailable("heal") && player.hasPermission("essentialsc.command.heal")) { otherCommands.append(lang.getString("help.commands.heal")).append("\n"); hasOtherCommands = true; } - if (player.hasPermission("essentialsc.command.vanish")) { + if (CommandRegistry.isAvailable("vanish") && player.hasPermission("essentialsc.command.vanish")) { otherCommands.append(lang.getString("help.commands.vanish")).append("\n"); hasOtherCommands = true; } - if (player.hasPermission("essentialsc.command.seen")) { + if (CommandRegistry.isAvailable("seen") && player.hasPermission("essentialsc.command.seen")) { otherCommands.append(lang.getString("help.commands.seen")).append("\n"); hasOtherCommands = true; } - + if (hasOtherCommands) { player.sendMessage(lang.getString("help.section-other")); player.sendMessage(otherCommands.toString().trim()); player.sendMessage(""); } - + player.sendMessage(lang.getString("help.footer")); return true; } - - /** - * 将别名映射到实际命令名 - */ + private String getActualCommand(String alias) { - return switch (alias) { - case "wb" -> "workbench"; - case "cartography", "ct" -> "cartographytable"; - case "gs" -> "grindstone"; - case "smithing", "st" -> "smithingtable"; - case "sc" -> "stonecutter"; - case "ec" -> "enderchest"; - case "die" -> "suicide"; - case "info" -> "seen"; - case "rep" -> "repair"; - default -> alias; - }; + return CommandRegistry.resolveCommandName(alias); } - - /** - * 获取命令对应的权限节点 - */ - private String getPermissionForCommand(String command) { - if (command.equals("mobdrops")) { - return "essentialsc.mobdrops.enderman"; - } - return "essentialsc.command." + command; - } - + @Override public List onTabComplete(CommandSender sender, Command command, String label, String[] args) { if (args.length == 1) { List completions = new ArrayList<>(); String partial = args[0].toLowerCase(); - - // 所有可能的子命令及其权限（包括别名） + String[][] subCommands = { {"reload", "essentialsc.command.reload"}, {"blocks", "essentialsc.command.blocks"}, @@ -269,17 +219,23 @@ public class HelpCommand extends BaseCommand implements TabCompleter { {"version", null}, {"help", null} }; - + for (String[] subCmd : subCommands) { - if (subCmd[0].startsWith(partial)) { - if (subCmd[1] == null || sender.hasPermission(subCmd[1])) { - completions.add(subCmd[0]); - } + if (!subCmd[0].startsWith(partial)) { + continue; + } + + String actualCommand = getActualCommand(subCmd[0]); + boolean available = actualCommand == null || CommandRegistry.isAvailable(actualCommand); + if (available && (subCmd[1] == null || sender.hasPermission(subCmd[1]))) { + completions.add(subCmd[0]); } } - + return completions; - } else if (args.length == 2) { + } + + if (args.length == 2) { String subCmd = args[0].toLowerCase(); if ((subCmd.equals("seen") || subCmd.equals("info")) && sender.hasPermission("essentialsc.command.seen")) { List players = new ArrayList<>(); @@ -292,7 +248,7 @@ public class HelpCommand extends BaseCommand implements TabCompleter { return players; } } - + return new ArrayList<>(); } } From 00aa10a44e60fc18f9190016805dd620bdeb1f5e Mon Sep 17 00:00:00 2001 From: Coldsmile Date: Fri, 24 Apr 2026 04:37:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=20Paper=2026.1?= =?UTF-8?q?=20=E9=80=82=E9=85=8D=E5=B9=B6=E6=95=B4=E7=90=86=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 9 +- .../cn/infstar/essentialsC/EssentialsC.java | 38 ++ .../cn/infstar/essentialsC/LangManager.java | 221 +++++----- .../essentialsC/admin/AdminModeManager.java | 341 +++++++++++++++ .../essentialsC/commands/AdminCommand.java | 16 + .../essentialsC/commands/AnvilCommand.java | 8 +- .../essentialsC/commands/BaseCommand.java | 67 ++- .../commands/BlocksMenuCommand.java | 251 +++++++++-- .../commands/CartographyTableCommand.java | 8 +- .../essentialsC/commands/CommandRegistry.java | 36 +- .../commands/EnderChestCommand.java | 14 +- .../essentialsC/commands/FeedCommand.java | 44 +- .../essentialsC/commands/FlyCommand.java | 4 +- .../essentialsC/commands/GlowCommand.java | 59 +++ .../commands/GrindstoneCommand.java | 8 +- .../essentialsC/commands/HatCommand.java | 30 +- .../essentialsC/commands/HealCommand.java | 44 +- .../essentialsC/commands/HelpCommand.java | 123 ++++-- .../essentialsC/commands/LoomCommand.java | 8 +- .../essentialsC/commands/MobDropCommand.java | 83 ++-- .../commands/NightVisionCommand.java | 61 +++ .../essentialsC/commands/RepairCommand.java | 83 ++-- .../essentialsC/commands/SeenCommand.java | 42 +- .../commands/SmithingTableCommand.java | 8 +- .../commands/StonecutterCommand.java | 8 +- .../essentialsC/commands/SuicideCommand.java | 9 +- .../essentialsC/commands/TpsBarCommand.java | 89 ++++ .../essentialsC/commands/VanishCommand.java | 23 +- .../commands/WorkbenchCommand.java | 8 +- .../listeners/JeiRecipeSyncListener.java | 235 ++++------- .../listeners/MobDropListener.java | 34 +- .../listeners/MobDropMenuListener.java | 83 ++-- .../listeners/ShulkerBoxListener.java | 73 +++- .../essentialsC/tpsbar/TpsBarManager.java | 390 ++++++++++++++++++ .../essentialsC/tpsbar/TpsBarService.java | 28 ++ src/main/resources/config.yml | 178 ++++---- src/main/resources/lang/en_US.yml | 137 +++++- src/main/resources/lang/zh_CN.yml | 182 ++++++-- src/main/resources/paper-plugin.yml | 111 ++--- 39 files changed, 2345 insertions(+), 849 deletions(-) create mode 100644 src/main/java/cn/infstar/essentialsC/admin/AdminModeManager.java create mode 100644 src/main/java/cn/infstar/essentialsC/commands/AdminCommand.java create mode 100644 src/main/java/cn/infstar/essentialsC/commands/GlowCommand.java create mode 100644 src/main/java/cn/infstar/essentialsC/commands/NightVisionCommand.java create mode 100644 src/main/java/cn/infstar/essentialsC/commands/TpsBarCommand.java create mode 100644 src/main/java/cn/infstar/essentialsC/tpsbar/TpsBarManager.java create mode 100644 src/main/java/cn/infstar/essentialsC/tpsbar/TpsBarService.java diff --git a/build.gradle b/build.gradle index c769a0e..fe7688b 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ plugins { } group = 'cn.infstar' -version = '1.3.0' +version = '1.3.1' repositories { mavenCentral() @@ -43,13 +43,18 @@ def moduleExcludes = [ ], 'player': [ '**/commands/FlyCommand.java', + '**/commands/NightVisionCommand.java', + '**/commands/GlowCommand.java', '**/commands/HealCommand.java', '**/commands/FeedCommand.java', '**/commands/VanishCommand.java', '**/commands/SeenCommand.java', '**/commands/HatCommand.java', '**/commands/SuicideCommand.java', - '**/commands/RepairCommand.java' + '**/commands/RepairCommand.java', + '**/commands/AdminCommand.java', + '**/commands/TpsBarCommand.java', + '**/tpsbar/TpsBarManager.java' ], 'jei-fix': [ '**/listeners/JeiRecipeSyncListener.java' diff --git a/src/main/java/cn/infstar/essentialsC/EssentialsC.java b/src/main/java/cn/infstar/essentialsC/EssentialsC.java index 48c1c86..cf914b9 100644 --- a/src/main/java/cn/infstar/essentialsC/EssentialsC.java +++ b/src/main/java/cn/infstar/essentialsC/EssentialsC.java @@ -1,11 +1,14 @@ package cn.infstar.essentialsC; +import cn.infstar.essentialsC.admin.AdminModeManager; import cn.infstar.essentialsC.commands.BaseCommand; import cn.infstar.essentialsC.commands.CommandRegistry; import cn.infstar.essentialsC.commands.HelpCommand; +import cn.infstar.essentialsC.tpsbar.TpsBarService; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; +import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; import java.lang.reflect.Field; @@ -13,10 +16,18 @@ import java.lang.reflect.Field; public final class EssentialsC extends JavaPlugin { private static LangManager langManager; + private AdminModeManager adminModeManager; + private TpsBarService tpsBarManager; @Override public void onEnable() { langManager = new LangManager(this); + adminModeManager = new AdminModeManager(this); + getServer().getPluginManager().registerEvents(adminModeManager, this); + tpsBarManager = createOptionalService("cn.infstar.essentialsC.tpsbar.TpsBarManager", TpsBarService.class); + if (tpsBarManager instanceof Listener listener) { + getServer().getPluginManager().registerEvents(listener, this); + } registerPluginChannels(); registerListeners(); registerCommands(); @@ -26,6 +37,12 @@ public final class EssentialsC extends JavaPlugin { @Override public void onDisable() { + if (tpsBarManager != null) { + tpsBarManager.shutdown(); + } + if (adminModeManager != null) { + adminModeManager.shutdown(); + } getLogger().info("EssentialsC disabled."); } @@ -33,6 +50,14 @@ public final class EssentialsC extends JavaPlugin { return langManager; } + public AdminModeManager getAdminModeManager() { + return adminModeManager; + } + + public TpsBarService getTpsBarManager() { + return tpsBarManager; + } + private void registerPluginChannels() { org.bukkit.plugin.messaging.Messenger messenger = getServer().getMessenger(); messenger.registerOutgoingPluginChannel(this, "fabric:recipe_sync"); @@ -73,6 +98,16 @@ public final class EssentialsC extends JavaPlugin { } } + private T createOptionalService(String className, Class serviceType) { + try { + Class targetClass = Class.forName(className); + Object instance = targetClass.getConstructor(EssentialsC.class).newInstance(this); + return serviceType.cast(instance); + } catch (Exception ignored) { + return null; + } + } + private void registerCommands() { try { Field bukkitCommandMap = Bukkit.getServer().getClass().getDeclaredField("commandMap"); @@ -80,6 +115,9 @@ public final class EssentialsC extends JavaPlugin { org.bukkit.command.CommandMap commandMap = (org.bukkit.command.CommandMap) bukkitCommandMap.get(Bukkit.getServer()); for (CommandRegistry.CommandSpec spec : CommandRegistry.getCommandSpecs()) { + if (!spec.standalone()) { + continue; + } BaseCommand executor = CommandRegistry.getCommand(spec.name()); if (executor == null) { continue; diff --git a/src/main/java/cn/infstar/essentialsC/LangManager.java b/src/main/java/cn/infstar/essentialsC/LangManager.java index ba25389..1b81975 100644 --- a/src/main/java/cn/infstar/essentialsC/LangManager.java +++ b/src/main/java/cn/infstar/essentialsC/LangManager.java @@ -6,147 +6,166 @@ import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.plugin.java.JavaPlugin; import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.StandardCopyOption; +import java.util.ArrayList; +import java.util.List; import java.util.Map; public class LangManager { - + + private static final int CURRENT_CONFIG_VERSION = 2; + private final JavaPlugin plugin; private FileConfiguration config; private FileConfiguration langFile; private String currentLanguage; - + public LangManager(JavaPlugin plugin) { this.plugin = plugin; loadConfig(); loadLanguage(); } - - private void loadConfig() { - File configFile = new File(plugin.getDataFolder(), "config.yml"); - - if (!configFile.exists()) { - plugin.saveResource("config.yml", false); - } - - config = YamlConfiguration.loadConfiguration(configFile); - - // 设置默认值 - config.addDefault("language", "zh_CN"); - config.addDefault("settings.enable-feedback", true); - config.addDefault("settings.message-prefix", "&6[EssentialsC] &r"); - config.options().copyDefaults(true); - - try { - config.save(configFile); - } catch (Exception e) { - plugin.getLogger().severe("无法保存配置文件: " + e.getMessage()); - } - } - - private void loadLanguage() { - currentLanguage = config.getString("language", "zh_CN"); - - File langFolder = new File(plugin.getDataFolder(), "lang"); - if (!langFolder.exists()) { - langFolder.mkdirs(); - } - - File langFileObj = new File(langFolder, currentLanguage + ".yml"); - - // 如果语言文件不存在，从资源中复制 - if (!langFileObj.exists()) { - InputStream inputStream = plugin.getResource("lang/" + currentLanguage + ".yml"); - if (inputStream != null) { - plugin.saveResource("lang/" + currentLanguage + ".yml", false); - } else { - plugin.getLogger().warning("未找到语言文件: " + currentLanguage + ".yml，使用默认语言 en_US"); - currentLanguage = "en_US"; - plugin.saveResource("lang/en_US.yml", false); - langFileObj = new File(langFolder, "en_US.yml"); - } - } - - langFile = YamlConfiguration.loadConfiguration(langFileObj); - - // 尝试加载默认语言作为后备 - if (!currentLanguage.equals("en_US")) { - InputStream defaultLangStream = plugin.getResource("lang/en_US.yml"); - if (defaultLangStream != null) { - YamlConfiguration defaultLang = YamlConfiguration.loadConfiguration( - new InputStreamReader(defaultLangStream, StandardCharsets.UTF_8) - ); - langFile.setDefaults(defaultLang); - } - } - } - - /** - * 获取插件前缀 - */ + public String getPrefix() { return translateColorCodes(langFile.getString("prefix", "&6[EssentialsC] &r")); } - - /** - * 获取翻译文本 - */ + public String getString(String path) { String value = langFile.getString(path); if (value == null) { - return "&cMissing translation: " + path; + return translateColorCodes("&cMissing translation: " + path); } return translateColorCodes(value); } - - /** - * 获取翻译文本并替换占位符 - */ + public String getString(String path, Map placeholders) { - String value = getString(path); - for (Map.Entry entry : placeholders.entrySet()) { - value = value.replace("{" + entry.getKey() + "}", entry.getValue()); - } - return value; + return applyPlaceholders(getString(path), placeholders); } - - /** - * 获取字符串列表（用于 Lore 等多行文本） - */ - public java.util.List getStringList(String path) { - java.util.List values = langFile.getStringList(path); + + public String getPrefixedString(String path) { + return getPrefix() + getString(path); + } + + public String getPrefixedString(String path, Map placeholders) { + return getPrefix() + getString(path, placeholders); + } + + public List getStringList(String path) { + List values = langFile.getStringList(path); if (values.isEmpty()) { - // 如果找不到，返回包含错误信息的列表 - return java.util.Arrays.asList("&cMissing translation: " + path); + values = List.of("&cMissing translation: " + path); } - // 翻译颜色代码 - java.util.List translated = new java.util.ArrayList<>(); + + List translated = new ArrayList<>(); for (String value : values) { translated.add(translateColorCodes(value)); } return translated; } - - /** - * 重新加载配置和语言 - */ + public void reload() { loadConfig(); loadLanguage(); } - - /** - * 获取当前语言 - */ + public String getCurrentLanguage() { return currentLanguage; } - - /** - * 翻译颜色代码 - */ + + private void loadConfig() { + File configFile = new File(plugin.getDataFolder(), "config.yml"); + if (!configFile.exists()) { + plugin.saveResource("config.yml", false); + } + + migrateConfigIfNeeded(configFile); + config = YamlConfiguration.loadConfiguration(configFile); + config.addDefault("config-version", CURRENT_CONFIG_VERSION); + config.addDefault("language", "zh_CN"); + config.options().copyDefaults(true); + + try { + config.save(configFile); + } catch (Exception e) { + plugin.getLogger().severe("Failed to save config.yml: " + e.getMessage()); + } + } + + private void migrateConfigIfNeeded(File configFile) { + FileConfiguration existingConfig = YamlConfiguration.loadConfiguration(configFile); + int existingVersion = existingConfig.getInt("config-version", 0); + if (existingVersion <= 0 || existingVersion >= CURRENT_CONFIG_VERSION) { + return; + } + + String language = existingConfig.getString("language", "zh_CN"); + File backupFile = new File(plugin.getDataFolder(), + "config.v" + existingVersion + ".bak-" + System.currentTimeMillis() + ".yml"); + + try { + Files.copy(configFile.toPath(), backupFile.toPath(), StandardCopyOption.REPLACE_EXISTING); + plugin.saveResource("config.yml", true); + + FileConfiguration newConfig = YamlConfiguration.loadConfiguration(configFile); + newConfig.set("language", language); + newConfig.save(configFile); + + plugin.getLogger().info("Migrated config.yml from version " + existingVersion + + " to " + CURRENT_CONFIG_VERSION + ". Backup saved to " + backupFile.getName()); + } catch (IOException e) { + plugin.getLogger().severe("Failed to migrate config.yml: " + e.getMessage()); + } + } + + private void loadLanguage() { + currentLanguage = config.getString("language", "zh_CN"); + + File langFolder = new File(plugin.getDataFolder(), "lang"); + if (!langFolder.exists() && !langFolder.mkdirs()) { + plugin.getLogger().warning("Failed to create language folder: " + langFolder.getAbsolutePath()); + } + + File langFileObj = new File(langFolder, currentLanguage + ".yml"); + if (!langFileObj.exists()) { + if (plugin.getResource("lang/" + currentLanguage + ".yml") != null) { + plugin.saveResource("lang/" + currentLanguage + ".yml", false); + } else { + plugin.getLogger().warning("Language file not found: " + currentLanguage + ".yml, falling back to en_US"); + currentLanguage = "en_US"; + plugin.saveResource("lang/en_US.yml", false); + langFileObj = new File(langFolder, "en_US.yml"); + } + } + + langFile = YamlConfiguration.loadConfiguration(langFileObj); + loadDefaultLanguageFallback(); + } + + private void loadDefaultLanguageFallback() { + InputStream defaultLangStream = plugin.getResource("lang/en_US.yml"); + if (defaultLangStream == null) { + return; + } + + YamlConfiguration defaultLang = YamlConfiguration.loadConfiguration( + new InputStreamReader(defaultLangStream, StandardCharsets.UTF_8) + ); + langFile.setDefaults(defaultLang); + } + + private String applyPlaceholders(String value, Map placeholders) { + String result = value; + for (Map.Entry entry : placeholders.entrySet()) { + result = result.replace("{" + entry.getKey() + "}", entry.getValue()); + } + return result; + } + private String translateColorCodes(String text) { return text == null ? "" : ChatColor.translateAlternateColorCodes('&', text); } diff --git a/src/main/java/cn/infstar/essentialsC/admin/AdminModeManager.java b/src/main/java/cn/infstar/essentialsC/admin/AdminModeManager.java new file mode 100644 index 0000000..19f694c --- /dev/null +++ b/src/main/java/cn/infstar/essentialsC/admin/AdminModeManager.java @@ -0,0 +1,341 @@ +package cn.infstar.essentialsC.admin; + +import cn.infstar.essentialsC.EssentialsC; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; +import org.bukkit.GameMode; +import org.bukkit.Material; +import org.bukkit.attribute.Attribute; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.PlayerInventory; +import org.bukkit.scheduler.BukkitTask; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; + +public final class AdminModeManager implements Listener { + + private static final float VANILLA_FLY_SPEED = 0.1F; + + private final EssentialsC plugin; + private final File dataFile; + private final YamlConfiguration data; + private final Set activePlayers = new HashSet<>(); + + private BukkitTask actionBarTask; + + public AdminModeManager(EssentialsC plugin) { + this.plugin = plugin; + addConfigDefaults(); + this.dataFile = new File(plugin.getDataFolder(), "admin-mode.yml"); + this.data = YamlConfiguration.loadConfiguration(dataFile); + } + + public boolean isAdminMode(Player player) { + return activePlayers.contains(player.getUniqueId()); + } + + public void toggle(Player player) { + if (isAdminMode(player)) { + disable(player, true); + } else { + enable(player); + } + } + + public void shutdown() { + for (UUID uuid : new ArrayList<>(activePlayers)) { + Player player = plugin.getServer().getPlayer(uuid); + if (player != null) { + disable(player, false); + } + } + + if (actionBarTask != null) { + actionBarTask.cancel(); + actionBarTask = null; + } + saveData(); + } + + @EventHandler + public void onPlayerJoin(PlayerJoinEvent event) { + Player player = event.getPlayer(); + String playerPath = getPlayerPath(player); + if (!data.getBoolean(playerPath + ".active", false)) { + return; + } + + saveProfile(player, playerPath + ".admin"); + restoreNormalProfile(player); + data.set(playerPath + ".active", false); + saveData(); + sendLangMessage(player, "admin-mode.messages.crash-restored"); + } + + @EventHandler + public void onPlayerQuit(PlayerQuitEvent event) { + Player player = event.getPlayer(); + if (isAdminMode(player)) { + disable(player, false); + } + } + + private void enable(Player player) { + String playerPath = getPlayerPath(player); + player.closeInventory(); + saveProfile(player, playerPath + ".normal"); + + if (!loadProfile(player, playerPath + ".admin")) { + clearInventory(player); + } + + activePlayers.add(player.getUniqueId()); + data.set(playerPath + ".active", true); + + player.setGameMode(GameMode.CREATIVE); + player.setAllowFlight(true); + player.setFlying(true); + player.setFlySpeed(getAdminFlySpeed()); + saveData(); + + sendLangMessage(player, "admin-mode.messages.enabled"); + sendActionBar(player); + startActionBarTask(); + } + + private void disable(Player player, boolean notify) { + String playerPath = getPlayerPath(player); + player.closeInventory(); + saveProfile(player, playerPath + ".admin"); + restoreNormalProfile(player); + + activePlayers.remove(player.getUniqueId()); + data.set(playerPath + ".active", false); + saveData(); + + if (notify) { + sendLangMessage(player, "admin-mode.messages.disabled"); + } + stopActionBarTaskIfIdle(); + } + + private void restoreNormalProfile(Player player) { + String playerPath = getPlayerPath(player); + if (!loadProfile(player, playerPath + ".normal")) { + clearInventory(player); + player.setGameMode(GameMode.SURVIVAL); + player.setAllowFlight(false); + player.setFlying(false); + player.setFlySpeed(VANILLA_FLY_SPEED); + } + } + + private void saveProfile(Player player, String path) { + PlayerInventory inventory = player.getInventory(); + data.set(path + ".storage", Arrays.asList(inventory.getStorageContents())); + data.set(path + ".armor", Arrays.asList(inventory.getArmorContents())); + data.set(path + ".extra", Arrays.asList(inventory.getExtraContents())); + data.set(path + ".cursor", player.getItemOnCursor()); + data.set(path + ".held-slot", inventory.getHeldItemSlot()); + data.set(path + ".game-mode", player.getGameMode().name()); + data.set(path + ".allow-flight", player.getAllowFlight()); + data.set(path + ".flying", player.isFlying()); + data.set(path + ".fly-speed", player.getFlySpeed()); + data.set(path + ".health", player.getHealth()); + data.set(path + ".food-level", player.getFoodLevel()); + data.set(path + ".saturation", player.getSaturation()); + data.set(path + ".exhaustion", player.getExhaustion()); + data.set(path + ".exp", player.getExp()); + data.set(path + ".level", player.getLevel()); + data.set(path + ".total-experience", player.getTotalExperience()); + data.set(path + ".fire-ticks", player.getFireTicks()); + } + + private boolean loadProfile(Player player, String path) { + if (!data.contains(path)) { + return false; + } + + PlayerInventory inventory = player.getInventory(); + clearInventory(player); + inventory.setStorageContents(readItemArray(path + ".storage", inventory.getStorageContents().length)); + inventory.setArmorContents(readItemArray(path + ".armor", inventory.getArmorContents().length)); + inventory.setExtraContents(readItemArray(path + ".extra", inventory.getExtraContents().length)); + inventory.setHeldItemSlot(clampHeldSlot(data.getInt(path + ".held-slot", inventory.getHeldItemSlot()))); + player.setItemOnCursor(readItem(path + ".cursor")); + + player.setGameMode(readGameMode(path + ".game-mode", player.getGameMode())); + player.setAllowFlight(data.getBoolean(path + ".allow-flight", player.getAllowFlight())); + player.setFlying(data.getBoolean(path + ".flying", false) && player.getAllowFlight()); + player.setFlySpeed(clampFlySpeed(data.getDouble(path + ".fly-speed", VANILLA_FLY_SPEED))); + player.setHealth(readHealth(player, path + ".health")); + player.setFoodLevel(clampFoodLevel(data.getInt(path + ".food-level", player.getFoodLevel()))); + player.setSaturation(clampSaturation(data.getDouble(path + ".saturation", player.getSaturation()))); + player.setExhaustion(clampExhaustion(data.getDouble(path + ".exhaustion", player.getExhaustion()))); + player.setExp(clampExp(data.getDouble(path + ".exp", player.getExp()))); + player.setLevel(Math.max(0, data.getInt(path + ".level", player.getLevel()))); + player.setTotalExperience(Math.max(0, data.getInt(path + ".total-experience", player.getTotalExperience()))); + player.setFireTicks(Math.max(0, data.getInt(path + ".fire-ticks", player.getFireTicks()))); + return true; + } + + private ItemStack[] readItemArray(String path, int size) { + ItemStack[] items = new ItemStack[size]; + List list = data.getList(path); + if (list == null) { + return items; + } + + for (int index = 0; index < Math.min(size, list.size()); index++) { + Object value = list.get(index); + if (value instanceof ItemStack itemStack) { + items[index] = itemStack; + } + } + return items; + } + + private GameMode readGameMode(String path, GameMode fallback) { + try { + return GameMode.valueOf(data.getString(path, fallback.name())); + } catch (IllegalArgumentException ignored) { + return fallback; + } + } + + private double readHealth(Player player, String path) { + double maxHealth = player.getAttribute(Attribute.MAX_HEALTH) != null + ? player.getAttribute(Attribute.MAX_HEALTH).getValue() + : player.getHealth(); + double health = data.getDouble(path, player.getHealth()); + if (!Double.isFinite(health)) { + return Math.min(Math.max(1.0D, player.getHealth()), maxHealth); + } + return Math.min(Math.max(1.0D, health), maxHealth); + } + + private ItemStack readItem(String path) { + Object value = data.get(path); + if (value instanceof ItemStack itemStack) { + return itemStack; + } + return new ItemStack(Material.AIR); + } + + private void clearInventory(Player player) { + PlayerInventory inventory = player.getInventory(); + inventory.clear(); + inventory.setArmorContents(new ItemStack[inventory.getArmorContents().length]); + inventory.setExtraContents(new ItemStack[inventory.getExtraContents().length]); + player.setItemOnCursor(new ItemStack(Material.AIR)); + } + + private void startActionBarTask() { + if (actionBarTask != null) { + return; + } + + int interval = Math.max(10, plugin.getConfig().getInt("admin-mode.actionbar.interval-ticks", 40)); + actionBarTask = plugin.getServer().getScheduler().runTaskTimer(plugin, () -> { + for (UUID uuid : new ArrayList<>(activePlayers)) { + Player player = plugin.getServer().getPlayer(uuid); + if (player != null && player.isOnline()) { + sendActionBar(player); + } + } + stopActionBarTaskIfIdle(); + }, 0L, interval); + } + + private void stopActionBarTaskIfIdle() { + if (!activePlayers.isEmpty() || actionBarTask == null) { + return; + } + + actionBarTask.cancel(); + actionBarTask = null; + } + + private void sendActionBar(Player player) { + String text = EssentialsC.getLangManager().getString("admin-mode.actionbar"); + Component component = LegacyComponentSerializer.legacyAmpersand().deserialize(text); + player.sendActionBar(component); + } + + private float getAdminFlySpeed() { + double speed = plugin.getConfig().getDouble("admin-mode.fly-speed", 0.2D); + return clampFlySpeed(speed); + } + + private float clampFlySpeed(double speed) { + if (!Double.isFinite(speed)) { + return VANILLA_FLY_SPEED; + } + return (float) Math.max(-1.0D, Math.min(1.0D, speed)); + } + + private int clampHeldSlot(int slot) { + return Math.max(0, Math.min(8, slot)); + } + + private int clampFoodLevel(int foodLevel) { + return Math.max(0, Math.min(20, foodLevel)); + } + + private float clampSaturation(double saturation) { + if (!Double.isFinite(saturation)) { + return 0.0F; + } + return (float) Math.max(0.0D, Math.min(20.0D, saturation)); + } + + private float clampExhaustion(double exhaustion) { + if (!Double.isFinite(exhaustion)) { + return 0.0F; + } + return (float) Math.max(0.0D, exhaustion); + } + + private float clampExp(double exp) { + if (!Double.isFinite(exp)) { + return 0.0F; + } + return (float) Math.max(0.0D, Math.min(1.0D, exp)); + } + + private String getPlayerPath(Player player) { + return "players." + player.getUniqueId(); + } + + private void sendLangMessage(Player player, String path) { + player.sendMessage(EssentialsC.getLangManager().getPrefixedString(path)); + } + + private void saveData() { + try { + data.save(dataFile); + } catch (IOException e) { + plugin.getLogger().warning("Failed to save admin-mode.yml: " + e.getMessage()); + } + } + + private void addConfigDefaults() { + plugin.getConfig().addDefault("admin-mode.fly-speed", 0.2D); + plugin.getConfig().addDefault("admin-mode.actionbar.interval-ticks", 40); + plugin.getConfig().options().copyDefaults(true); + plugin.saveConfig(); + } +} diff --git a/src/main/java/cn/infstar/essentialsC/commands/AdminCommand.java b/src/main/java/cn/infstar/essentialsC/commands/AdminCommand.java new file mode 100644 index 0000000..bc6072c --- /dev/null +++ b/src/main/java/cn/infstar/essentialsC/commands/AdminCommand.java @@ -0,0 +1,16 @@ +package cn.infstar.essentialsC.commands; + +import org.bukkit.entity.Player; + +public class AdminCommand extends BaseCommand { + + public AdminCommand() { + super("essentialsc.command.admin"); + } + + @Override + protected boolean execute(Player player, String[] args) { + plugin.getAdminModeManager().toggle(player); + return true; + } +} diff --git a/src/main/java/cn/infstar/essentialsC/commands/AnvilCommand.java b/src/main/java/cn/infstar/essentialsC/commands/AnvilCommand.java index 05f64b6..11b361b 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/AnvilCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/AnvilCommand.java @@ -1,17 +1,19 @@ package cn.infstar.essentialsC.commands; +import org.bukkit.Material; +import org.bukkit.Sound; import org.bukkit.entity.Player; public class AnvilCommand extends BaseCommand { - + public AnvilCommand() { super("essentialsc.command.anvil"); } - + @Override protected boolean execute(Player player, String[] args) { - // 使用 Paper API 打开铁砧（标题跟随客户端语言） player.openAnvil(null, true); + playBlockShortcutSound(player, Material.ANVIL, Sound.BLOCK_ANVIL_USE); return true; } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/BaseCommand.java b/src/main/java/cn/infstar/essentialsC/commands/BaseCommand.java index 31f2bea..541d50d 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/BaseCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/BaseCommand.java @@ -2,53 +2,84 @@ package cn.infstar.essentialsC.commands; import cn.infstar.essentialsC.EssentialsC; import cn.infstar.essentialsC.LangManager; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.SoundGroup; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import java.util.Map; + public abstract class BaseCommand implements CommandExecutor { - + protected String permission; - protected static cn.infstar.essentialsC.EssentialsC plugin; - + protected static EssentialsC plugin; + public BaseCommand(String permission) { this.permission = permission; if (plugin == null) { - plugin = cn.infstar.essentialsC.EssentialsC.getPlugin(cn.infstar.essentialsC.EssentialsC.class); + plugin = EssentialsC.getPlugin(EssentialsC.class); } } - + public String getPermission() { return permission; } - - /** - * 获取语言管理器 - */ + protected LangManager getLang() { return EssentialsC.getLangManager(); } - + + protected void playBlockShortcutSound(Player player, Material material, Sound fallbackSound) { + Sound sound = resolvePlaceSound(material); + if (sound == null) { + sound = fallbackSound; + } + + if (sound != null) { + player.playSound(player.getLocation(), sound, 1.0F, 1.0F); + } + } + + protected void playShortcutSound(Player player, Sound sound) { + if (sound != null) { + player.playSound(player.getLocation(), sound, 1.0F, 1.0F); + } + } + @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (sender instanceof Player player) { if (!player.hasPermission(permission)) { - String message = getLang().getString("messages.no-permission", - java.util.Map.of("permission", permission)); - player.sendMessage(message); + player.sendMessage(getLang().getPrefixedString("messages.no-permission", + Map.of("permission", permission))); return true; } return execute(player, args); - } else { - return executeConsole(sender, args); } + + return executeConsole(sender, args); } - + protected abstract boolean execute(Player player, String[] args); - + protected boolean executeConsole(CommandSender sender, String[] args) { - sender.sendMessage(getLang().getString("messages.player-only")); + sender.sendMessage(getLang().getPrefixedString("messages.player-only")); return true; } + + private Sound resolvePlaceSound(Material material) { + if (material == null || !material.isBlock()) { + return null; + } + + try { + SoundGroup soundGroup = material.createBlockData().getSoundGroup(); + return soundGroup.getPlaceSound(); + } catch (IllegalArgumentException ignored) { + return null; + } + } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/BlocksMenuCommand.java b/src/main/java/cn/infstar/essentialsC/commands/BlocksMenuCommand.java index 9feec41..1011f6c 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/BlocksMenuCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/BlocksMenuCommand.java @@ -8,17 +8,21 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.event.inventory.InventoryDragEvent; 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.PersistentDataType; +import java.util.ArrayList; import java.util.List; +import java.util.Map; public class BlocksMenuCommand extends BaseCommand implements Listener { private static final int MENU_SIZE = 36; + private static final int[] DIVIDER_SLOTS = {4, 13, 22, 31}; private static boolean listenerRegistered = false; private final NamespacedKey blockKey; @@ -38,6 +42,7 @@ public class BlocksMenuCommand extends BaseCommand implements Listener { public BlocksMenuCommand() { super("essentialsc.command.blocks"); + addConfigDefaults(); if (!listenerRegistered) { plugin.getServer().getPluginManager().registerEvents(this, plugin); listenerRegistered = true; @@ -52,14 +57,70 @@ public class BlocksMenuCommand extends BaseCommand implements Listener { } private void openMenu(Player player) { - String title = plugin.getConfig().getString("blocks-menu.title", "&6&lEssentialsC &8- &e&lBlocks Menu"); - Inventory menu = new BlocksMenuHolder(translateColor(title)).getInventory(); + Inventory menu = new BlocksMenuHolder(getLang().getString("blocks-menu.title")).getInventory(); + + var sectionsConfig = plugin.getConfig().getConfigurationSection("blocks-menu.sections"); + if (sectionsConfig != null) { + int visibleSections = renderSections(menu, player, sectionsConfig); + if (visibleSections > 1) { + renderDivider(menu); + } + if (menu.isEmpty()) { + player.sendMessage(getLang().getPrefixedString("messages.blocks-menu-empty")); + return; + } + player.openInventory(menu); + return; + } var itemsConfig = plugin.getConfig().getConfigurationSection("blocks-menu.items"); if (itemsConfig == null) { return; } + renderItems(menu, player, itemsConfig); + if (menu.isEmpty()) { + player.sendMessage(getLang().getPrefixedString("messages.blocks-menu-empty")); + return; + } + + player.openInventory(menu); + } + + private int renderSections(Inventory menu, Player player, org.bukkit.configuration.ConfigurationSection sectionsConfig) { + int visibleSections = 0; + for (String sectionKey : sectionsConfig.getKeys(false)) { + var section = sectionsConfig.getConfigurationSection(sectionKey); + if (section == null) { + continue; + } + + var itemsConfig = section.getConfigurationSection("items"); + if (itemsConfig == null) { + continue; + } + + List visibleItems = collectVisibleItems(player, itemsConfig); + if (visibleItems.isEmpty()) { + continue; + } + + visibleSections++; + for (MenuItem item : visibleItems) { + addItem(menu, item); + } + } + return visibleSections; + } + + private void renderItems(Inventory menu, Player player, org.bukkit.configuration.ConfigurationSection itemsConfig) { + for (MenuItem item : collectVisibleItems(player, itemsConfig)) { + addItem(menu, item); + } + } + + private List collectVisibleItems(Player player, org.bukkit.configuration.ConfigurationSection itemsConfig) { + List items = new ArrayList<>(); for (String key : itemsConfig.getKeys(false)) { var section = itemsConfig.getConfigurationSection(key); if (section == null) { @@ -67,37 +128,66 @@ public class BlocksMenuCommand extends BaseCommand implements Listener { } String permission = section.getString("permission"); - if (permission != null && !player.hasPermission(permission)) { + if (permission != null && !permission.isBlank() && !player.hasPermission(permission)) { continue; } - int slot = section.getInt("slot"); - Material material = Material.matchMaterial(section.getString("material", "STONE")); - if (material == null) { - material = Material.STONE; + String commandKey = section.getString("command", key); + if (!CommandRegistry.isAvailable(commandKey)) { + continue; } - String name = translateColor(section.getString("name", "&fItem")); - List lore = section.getStringList("lore").stream() - .map(this::translateColor) - .toList(); - - addItem(menu, slot, material, name, lore, key); + MenuItem item = createMenuItem(section, commandKey); + if (item != null) { + items.add(item); + } } - - player.openInventory(menu); + return items; } - private void addItem(Inventory inv, int slot, Material material, String name, List lore, String key) { - ItemStack item = new ItemStack(material); + private MenuItem createMenuItem(org.bukkit.configuration.ConfigurationSection section, String commandKey) { + int slot = section.getInt("slot", -1); + if (slot < 0 || slot >= MENU_SIZE) { + return null; + } + + Material material = Material.matchMaterial(section.getString("material", "STONE")); + if (material == null) { + material = Material.STONE; + } + + String name = getLang().getString("blocks-menu.items." + commandKey + ".name"); + List lore = getLang().getStringList("blocks-menu.items." + commandKey + ".lore"); + return new MenuItem(slot, material, name, lore, commandKey); + } + + private void addItem(Inventory inventory, MenuItem menuItem) { + ItemStack item = new ItemStack(menuItem.material()); ItemMeta meta = item.getItemMeta(); if (meta != null) { - meta.setDisplayName(name); - meta.setLore(lore); - meta.getPersistentDataContainer().set(this.blockKey, PersistentDataType.STRING, key); + meta.setDisplayName(menuItem.name()); + meta.setLore(menuItem.lore().isEmpty() ? null : menuItem.lore()); + if (menuItem.commandKey() != null && !menuItem.commandKey().isBlank()) { + meta.getPersistentDataContainer().set(blockKey, PersistentDataType.STRING, menuItem.commandKey()); + } item.setItemMeta(meta); } - inv.setItem(slot, item); + inventory.setItem(menuItem.slot(), item); + } + + private void renderDivider(Inventory inventory) { + ItemStack divider = new ItemStack(Material.GRAY_STAINED_GLASS_PANE); + ItemMeta meta = divider.getItemMeta(); + if (meta != null) { + meta.setDisplayName(" "); + divider.setItemMeta(meta); + } + + for (int slot : DIVIDER_SLOTS) { + if (inventory.getItem(slot) == null) { + inventory.setItem(slot, divider); + } + } } @EventHandler @@ -105,44 +195,123 @@ public class BlocksMenuCommand extends BaseCommand implements Listener { if (!(event.getView().getTopInventory().getHolder(false) instanceof BlocksMenuHolder)) { return; } + event.setCancelled(true); + if (!(event.getWhoClicked() instanceof Player player)) { return; } + if (event.getClickedInventory() != event.getView().getTopInventory()) { + return; + } - event.setCancelled(true); ItemStack clicked = event.getCurrentItem(); if (clicked == null || !clicked.hasItemMeta()) { return; } ItemMeta meta = clicked.getItemMeta(); - String key = meta.getPersistentDataContainer().get(this.blockKey, PersistentDataType.STRING); - BaseCommand blockCommand = CommandRegistry.getCommand(key); - if (blockCommand != null) { - playBlockOpenSound(player, key); - blockCommand.execute(player, new String[0]); + String key = meta.getPersistentDataContainer().get(blockKey, PersistentDataType.STRING); + if (key == null || key.isBlank()) { + return; } + + BaseCommand blockCommand = CommandRegistry.getCommand(key); + if (blockCommand == null) { + return; + } + + String permission = blockCommand.getPermission(); + if (permission != null && !permission.isBlank() && !player.hasPermission(permission)) { + player.sendMessage(getLang().getPrefixedString("messages.no-permission", + Map.of("permission", permission))); + return; + } + + blockCommand.execute(player, new String[0]); } - private void playBlockOpenSound(Player player, String key) { - org.bukkit.Sound sound = switch (key) { - case "workbench" -> org.bukkit.Sound.BLOCK_WOOD_HIT; - case "anvil" -> org.bukkit.Sound.BLOCK_ANVIL_USE; - case "cartographytable" -> org.bukkit.Sound.UI_CARTOGRAPHY_TABLE_TAKE_RESULT; - case "grindstone" -> org.bukkit.Sound.BLOCK_GRINDSTONE_USE; - case "loom" -> org.bukkit.Sound.UI_LOOM_TAKE_RESULT; - case "smithingtable" -> org.bukkit.Sound.BLOCK_SMITHING_TABLE_USE; - case "stonecutter" -> org.bukkit.Sound.BLOCK_STONE_HIT; - case "enderchest" -> org.bukkit.Sound.BLOCK_ENDER_CHEST_OPEN; - default -> null; - }; + @EventHandler + public void onMenuDrag(InventoryDragEvent event) { + if (!(event.getView().getTopInventory().getHolder(false) instanceof BlocksMenuHolder)) { + return; + } - if (sound != null) { - player.playSound(player.getLocation(), sound, 1.0f, 1.0f); + int topSize = event.getView().getTopInventory().getSize(); + for (int rawSlot : event.getRawSlots()) { + if (rawSlot >= 0 && rawSlot < topSize) { + event.setCancelled(true); + return; + } } } private String translateColor(String text) { return text == null ? "" : ChatColor.translateAlternateColorCodes('&', text); } + + private void addConfigDefaults() { + plugin.getConfig().addDefault("blocks-menu.layout-version", 2); + + addMenuItemDefaults("blocks-menu.sections.blocks.items.workbench", 10, "CRAFTING_TABLE", + "essentialsc.command.workbench", "workbench"); + addMenuItemDefaults("blocks-menu.sections.blocks.items.enderchest", 11, "ENDER_CHEST", + "essentialsc.command.enderchest", "enderchest"); + addMenuItemDefaults("blocks-menu.sections.blocks.items.anvil", 12, "ANVIL", + "essentialsc.command.anvil", "anvil"); + addMenuItemDefaults("blocks-menu.sections.blocks.items.grindstone", 19, "GRINDSTONE", + "essentialsc.command.grindstone", "grindstone"); + addMenuItemDefaults("blocks-menu.sections.blocks.items.smithingtable", 20, "SMITHING_TABLE", + "essentialsc.command.smithingtable", "smithingtable"); + addMenuItemDefaults("blocks-menu.sections.blocks.items.stonecutter", 21, "STONECUTTER", + "essentialsc.command.stonecutter", "stonecutter"); + addMenuItemDefaults("blocks-menu.sections.blocks.items.loom", 28, "LOOM", + "essentialsc.command.loom", "loom"); + addMenuItemDefaults("blocks-menu.sections.blocks.items.cartographytable", 29, "CARTOGRAPHY_TABLE", + "essentialsc.command.cartographytable", "cartographytable"); + + addMenuItemDefaults("blocks-menu.sections.shortcuts.items.nightvision", 14, "TINTED_GLASS", + "essentialsc.command.nightvision", "nightvision"); + addMenuItemDefaults("blocks-menu.sections.shortcuts.items.glow", 15, "GLOWSTONE", + "essentialsc.command.glow", "glow"); + + plugin.getConfig().options().copyDefaults(true); + migrateLayoutIfNeeded(); + plugin.saveConfig(); + } + + private void migrateLayoutIfNeeded() { + boolean hasStoredLayoutVersion = plugin.getConfig().contains("blocks-menu.layout-version", true); + if (hasStoredLayoutVersion && plugin.getConfig().getInt("blocks-menu.layout-version", 0) >= 2) { + return; + } + + applySlot("blocks", "workbench", 10); + applySlot("blocks", "enderchest", 11); + applySlot("blocks", "anvil", 12); + applySlot("blocks", "grindstone", 19); + applySlot("blocks", "smithingtable", 20); + applySlot("blocks", "stonecutter", 21); + applySlot("blocks", "loom", 28); + applySlot("blocks", "cartographytable", 29); + applySlot("shortcuts", "nightvision", 14); + applySlot("shortcuts", "glow", 15); + + plugin.getConfig().set("blocks-menu.sections.blocks.title-item", null); + plugin.getConfig().set("blocks-menu.sections.shortcuts.title-item", null); + plugin.getConfig().set("blocks-menu.layout-version", 2); + } + + private void applySlot(String section, String key, int slot) { + plugin.getConfig().set("blocks-menu.sections." + section + ".items." + key + ".slot", slot); + } + + private void addMenuItemDefaults(String path, int slot, String material, String permission, String command) { + plugin.getConfig().addDefault(path + ".slot", slot); + plugin.getConfig().addDefault(path + ".material", material); + plugin.getConfig().addDefault(path + ".permission", permission); + plugin.getConfig().addDefault(path + ".command", command); + } + + private record MenuItem(int slot, Material material, String name, List lore, String commandKey) { + } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/CartographyTableCommand.java b/src/main/java/cn/infstar/essentialsC/commands/CartographyTableCommand.java index 626b829..afa5063 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/CartographyTableCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/CartographyTableCommand.java @@ -1,17 +1,19 @@ package cn.infstar.essentialsC.commands; +import org.bukkit.Material; +import org.bukkit.Sound; import org.bukkit.entity.Player; public class CartographyTableCommand extends BaseCommand { - + public CartographyTableCommand() { super("essentialsc.command.cartographytable"); } - + @Override protected boolean execute(Player player, String[] args) { - // 使用 Paper API 打开制图台（标题跟随客户端语言） player.openCartographyTable(null, true); + playBlockShortcutSound(player, Material.CARTOGRAPHY_TABLE, Sound.ENTITY_VILLAGER_WORK_CARTOGRAPHER); return true; } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/CommandRegistry.java b/src/main/java/cn/infstar/essentialsC/commands/CommandRegistry.java index 2eeca77..90146dc 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/CommandRegistry.java +++ b/src/main/java/cn/infstar/essentialsC/commands/CommandRegistry.java @@ -1,5 +1,8 @@ package cn.infstar.essentialsC.commands; +import cn.infstar.essentialsC.EssentialsC; +import cn.infstar.essentialsC.tpsbar.TpsBarService; + import java.lang.reflect.Constructor; import java.util.Collection; import java.util.Collections; @@ -29,20 +32,32 @@ public final class CommandRegistry { register("hat", "essentialsc.command.hat", "cn.infstar.essentialsC.commands.HatCommand"); register("suicide", "essentialsc.command.suicide", "cn.infstar.essentialsC.commands.SuicideCommand", "die"); register("fly", "essentialsc.command.fly", "cn.infstar.essentialsC.commands.FlyCommand"); + register("nightvision", "essentialsc.command.nightvision", "cn.infstar.essentialsC.commands.NightVisionCommand", "nv"); + register("glow", "essentialsc.command.glow", "cn.infstar.essentialsC.commands.GlowCommand"); register("heal", "essentialsc.command.heal", "cn.infstar.essentialsC.commands.HealCommand"); register("vanish", "essentialsc.command.vanish", "cn.infstar.essentialsC.commands.VanishCommand", "v"); register("seen", "essentialsc.command.seen", "cn.infstar.essentialsC.commands.SeenCommand", "info"); register("feed", "essentialsc.command.feed", "cn.infstar.essentialsC.commands.FeedCommand"); register("repair", "essentialsc.command.repair", "cn.infstar.essentialsC.commands.RepairCommand", "rep"); + register("tpsbar", "essentialsc.command.tpsbar", "cn.infstar.essentialsC.commands.TpsBarCommand"); register("mobdrops", "essentialsc.mobdrops.enderman", "cn.infstar.essentialsC.commands.MobDropCommand"); + registerSubCommand("admin", "essentialsc.command.admin", "cn.infstar.essentialsC.commands.AdminCommand"); } private CommandRegistry() { } private static void register(String name, String permission, String className, String... aliases) { + register(name, permission, className, true, aliases); + } + + private static void registerSubCommand(String name, String permission, String className, String... aliases) { + register(name, permission, className, false, aliases); + } + + private static void register(String name, String permission, String className, boolean standalone, String... aliases) { List aliasList = List.of(aliases); - CommandSpec spec = new CommandSpec(name, permission, className, aliasList); + CommandSpec spec = new CommandSpec(name, permission, className, aliasList, standalone); COMMANDS.put(name, spec); ALIAS_TO_COMMAND.put(name, name); for (String alias : aliasList) { @@ -83,6 +98,9 @@ public final class CommandRegistry { if (UNAVAILABLE_COMMANDS.contains(resolvedName)) { return null; } + if (isRuntimeDisabled(resolvedName)) { + return null; + } CommandSpec spec = COMMANDS.get(resolvedName); if (spec == null) { @@ -106,6 +124,20 @@ public final class CommandRegistry { } } - public record CommandSpec(String name, String permission, String className, List aliases) { + private static boolean isRuntimeDisabled(String resolvedName) { + if (!"tpsbar".equals(resolvedName)) { + return false; + } + + try { + EssentialsC plugin = EssentialsC.getPlugin(EssentialsC.class); + TpsBarService tpsBarService = plugin.getTpsBarManager(); + return tpsBarService == null || !tpsBarService.isPluginCommandEnabled(); + } catch (IllegalStateException ignored) { + return false; + } + } + + public record CommandSpec(String name, String permission, String className, List aliases, boolean standalone) { } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/EnderChestCommand.java b/src/main/java/cn/infstar/essentialsC/commands/EnderChestCommand.java index ce1947b..c738c99 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/EnderChestCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/EnderChestCommand.java @@ -1,23 +1,19 @@ package cn.infstar.essentialsC.commands; +import org.bukkit.Material; +import org.bukkit.Sound; import org.bukkit.entity.Player; -/** - * 末影箱命令 - 参考 EssentialsX 实现 - * 直接打开玩家的末影箱，确保数据安全 - */ public class EnderChestCommand extends BaseCommand { - + public EnderChestCommand() { super("essentialsc.command.enderchest"); } - + @Override protected boolean execute(Player player, String[] args) { - // 直接打开玩家的末影箱（EssentialsX 方式） - // 优点：100% 安全，不会吞物品或刷物品 - // 缺点：标题显示为 "Ender Chest"（由客户端语言决定） player.openInventory(player.getEnderChest()); + playBlockShortcutSound(player, Material.ENDER_CHEST, Sound.BLOCK_ENDER_CHEST_OPEN); return true; } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/FeedCommand.java b/src/main/java/cn/infstar/essentialsC/commands/FeedCommand.java index 9253a6c..6f4ad3e 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/FeedCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/FeedCommand.java @@ -2,42 +2,40 @@ package cn.infstar.essentialsC.commands; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; import java.util.Map; public class FeedCommand extends BaseCommand { - + public FeedCommand() { super("essentialsc.command.feed"); } - + @Override - protected boolean execute(@NotNull Player player, String[] args) { + protected boolean execute(Player player, String[] args) { if (args.length == 0) { - // 喂饱自己 feedPlayer(player); - player.sendMessage(getLang().getString("messages.feed-self")); - } else { - // 检查是否有喂饱他人的权限 - if (!player.hasPermission("essentialsc.command.feed.others")) { - player.sendMessage(getLang().getString("messages.no-permission-others")); - return true; - } - - Player target = Bukkit.getPlayer(args[0]); - if (target == null) { - player.sendMessage(getLang().getString("messages.player-not-found", Map.of("player", args[0]))); - return true; - } - - feedPlayer(target); - player.sendMessage(getLang().getString("messages.feed-other", Map.of("player", target.getName()))); - target.sendMessage(getLang().getString("messages.feed-by-other", Map.of("admin", player.getName()))); + player.sendMessage(getLang().getPrefixedString("messages.feed-self")); + return true; } + + if (!player.hasPermission("essentialsc.command.feed.others")) { + player.sendMessage(getLang().getPrefixedString("messages.no-permission-others")); + return true; + } + + Player target = Bukkit.getPlayer(args[0]); + if (target == null) { + player.sendMessage(getLang().getPrefixedString("messages.player-not-found", Map.of("player", args[0]))); + return true; + } + + feedPlayer(target); + player.sendMessage(getLang().getPrefixedString("messages.feed-other", Map.of("player", target.getName()))); + target.sendMessage(getLang().getPrefixedString("messages.feed-by-other", Map.of("admin", player.getName()))); return true; } - + private void feedPlayer(Player player) { player.setFoodLevel(20); player.setSaturation(20f); diff --git a/src/main/java/cn/infstar/essentialsC/commands/FlyCommand.java b/src/main/java/cn/infstar/essentialsC/commands/FlyCommand.java index 87d4bf6..68b00c1 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/FlyCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/FlyCommand.java @@ -15,11 +15,11 @@ public class FlyCommand extends BaseCommand { if (currentFlyState) { player.setAllowFlight(false); player.setFlying(false); - player.sendMessage(getLang().getString("messages.fly-disabled")); + player.sendMessage(getLang().getPrefixedString("messages.fly-disabled")); } else { player.setAllowFlight(true); player.setFlying(true); - player.sendMessage(getLang().getString("messages.fly-enabled")); + player.sendMessage(getLang().getPrefixedString("messages.fly-enabled")); } return true; diff --git a/src/main/java/cn/infstar/essentialsC/commands/GlowCommand.java b/src/main/java/cn/infstar/essentialsC/commands/GlowCommand.java new file mode 100644 index 0000000..b9c139c --- /dev/null +++ b/src/main/java/cn/infstar/essentialsC/commands/GlowCommand.java @@ -0,0 +1,59 @@ +package cn.infstar.essentialsC.commands; + +import org.bukkit.NamespacedKey; +import org.bukkit.Sound; +import org.bukkit.entity.Player; +import org.bukkit.persistence.PersistentDataType; + +public class GlowCommand extends BaseCommand { + + private final NamespacedKey enabledKey; + + public GlowCommand() { + super("essentialsc.command.glow"); + this.enabledKey = new NamespacedKey(plugin, "glow_enabled"); + } + + @Override + protected boolean execute(Player player, String[] args) { + boolean currentState = isPluginGlowEnabled(player); + Boolean targetState = resolveTargetState(currentState, args); + if (targetState == null) { + player.sendMessage(getLang().getPrefixedString("messages.glow-usage")); + return true; + } + + if (targetState) { + player.setGlowing(true); + player.getPersistentDataContainer().set(enabledKey, PersistentDataType.BYTE, (byte) 1); + playShortcutSound(player, Sound.BLOCK_AMETHYST_BLOCK_CHIME); + player.sendMessage(getLang().getPrefixedString("messages.glow-enabled")); + } else { + if (currentState) { + player.setGlowing(false); + player.getPersistentDataContainer().remove(enabledKey); + } + playShortcutSound(player, Sound.BLOCK_AMETHYST_CLUSTER_FALL); + player.sendMessage(getLang().getPrefixedString("messages.glow-disabled")); + } + return true; + } + + private Boolean resolveTargetState(boolean currentState, String[] args) { + if (args.length == 0) { + return !currentState; + } + + return switch (args[0].toLowerCase()) { + case "on", "true", "enable", "enabled" -> true; + case "off", "false", "disable", "disabled" -> false; + case "toggle" -> !currentState; + default -> null; + }; + } + + private boolean isPluginGlowEnabled(Player player) { + Byte value = player.getPersistentDataContainer().get(enabledKey, PersistentDataType.BYTE); + return value != null && value == (byte) 1; + } +} diff --git a/src/main/java/cn/infstar/essentialsC/commands/GrindstoneCommand.java b/src/main/java/cn/infstar/essentialsC/commands/GrindstoneCommand.java index afd8af7..58cca76 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/GrindstoneCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/GrindstoneCommand.java @@ -1,17 +1,19 @@ package cn.infstar.essentialsC.commands; +import org.bukkit.Material; +import org.bukkit.Sound; import org.bukkit.entity.Player; public class GrindstoneCommand extends BaseCommand { - + public GrindstoneCommand() { super("essentialsc.command.grindstone"); } - + @Override protected boolean execute(Player player, String[] args) { - // 使用 Paper API 打开砂轮（标题跟随客户端语言） player.openGrindstone(null, true); + playBlockShortcutSound(player, Material.GRINDSTONE, Sound.BLOCK_GRINDSTONE_USE); return true; } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/HatCommand.java b/src/main/java/cn/infstar/essentialsC/commands/HatCommand.java index b3c652c..1091d4d 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/HatCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/HatCommand.java @@ -6,37 +6,27 @@ import org.bukkit.inventory.ItemStack; import java.util.Map; public class HatCommand extends BaseCommand { - + public HatCommand() { super("essentialsc.command.hat"); } - + @Override protected boolean execute(Player player, String[] args) { ItemStack handItem = player.getInventory().getItemInMainHand(); - + if (handItem == null || handItem.isEmpty()) { - player.sendMessage(getLang().getString("messages.hat-no-item")); + player.sendMessage(getLang().getPrefixedString("messages.hat-no-item")); return true; } - + ItemStack helmet = player.getInventory().getHelmet(); - - // 如果头盔栏有物品，先放回背包 - if (helmet != null && !helmet.isEmpty()) { - player.getInventory().setHelmet(handItem); - player.getInventory().setItemInMainHand(helmet); - } else { - player.getInventory().setHelmet(handItem); - player.getInventory().setItemInMainHand(null); - } - + player.getInventory().setHelmet(handItem); + player.getInventory().setItemInMainHand(helmet == null || helmet.isEmpty() ? null : helmet); player.updateInventory(); - - String itemName = handItem.getType().toString(); - String message = getLang().getString("messages.hat-success", - Map.of("item", itemName)); - player.sendMessage(message); + + player.sendMessage(getLang().getPrefixedString("messages.hat-success", + Map.of("item", handItem.getType().toString()))); return true; } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/HealCommand.java b/src/main/java/cn/infstar/essentialsC/commands/HealCommand.java index 0ba905e..c33924a 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/HealCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/HealCommand.java @@ -2,42 +2,40 @@ package cn.infstar.essentialsC.commands; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; import java.util.Map; public class HealCommand extends BaseCommand { - + public HealCommand() { super("essentialsc.command.heal"); } - + @Override - protected boolean execute(@NotNull Player player, String[] args) { + protected boolean execute(Player player, String[] args) { if (args.length == 0) { - // 治疗自己 healPlayer(player); - player.sendMessage(getLang().getString("messages.heal-self")); - } else { - // 检查是否有治疗他人的权限 - if (!player.hasPermission("essentialsc.command.heal.others")) { - player.sendMessage(getLang().getString("messages.no-permission-others")); - return true; - } - - Player target = Bukkit.getPlayer(args[0]); - if (target == null) { - player.sendMessage(getLang().getString("messages.player-not-found", Map.of("player", args[0]))); - return true; - } - - healPlayer(target); - player.sendMessage(getLang().getString("messages.heal-other", Map.of("player", target.getName()))); - target.sendMessage(getLang().getString("messages.heal-by-other", Map.of("admin", player.getName()))); + player.sendMessage(getLang().getPrefixedString("messages.heal-self")); + return true; } + + if (!player.hasPermission("essentialsc.command.heal.others")) { + player.sendMessage(getLang().getPrefixedString("messages.no-permission-others")); + return true; + } + + Player target = Bukkit.getPlayer(args[0]); + if (target == null) { + player.sendMessage(getLang().getPrefixedString("messages.player-not-found", Map.of("player", args[0]))); + return true; + } + + healPlayer(target); + player.sendMessage(getLang().getPrefixedString("messages.heal-other", Map.of("player", target.getName()))); + target.sendMessage(getLang().getPrefixedString("messages.heal-by-other", Map.of("admin", player.getName()))); return true; } - + private void healPlayer(Player player) { player.setHealth(player.getMaxHealth()); player.setFoodLevel(20); diff --git a/src/main/java/cn/infstar/essentialsC/commands/HelpCommand.java b/src/main/java/cn/infstar/essentialsC/commands/HelpCommand.java index eea4b79..45c3ea7 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/HelpCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/HelpCommand.java @@ -2,12 +2,14 @@ package cn.infstar.essentialsC.commands; import cn.infstar.essentialsC.EssentialsC; import cn.infstar.essentialsC.LangManager; +import cn.infstar.essentialsC.tpsbar.TpsBarService; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabCompleter; import org.bukkit.entity.Player; +import java.util.Arrays; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -27,15 +29,19 @@ public class HelpCommand extends BaseCommand implements TabCompleter { protected boolean executeConsole(CommandSender sender, String[] args) { if (args.length > 0 && args[0].equalsIgnoreCase("reload")) { if (!sender.hasPermission("essentialsc.command.reload")) { - sender.sendMessage(getLang().getString("messages.no-permission")); + sendNoPermission(sender, "essentialsc.command.reload"); return true; } plugin.reloadConfig(); EssentialsC.getLangManager().reload(); - sender.sendMessage(getLang().getString("prefix") + "Configuration reloaded."); + TpsBarService tpsBarService = plugin.getTpsBarManager(); + if (tpsBarService != null) { + tpsBarService.reloadSettings(); + } + sender.sendMessage(getLang().getPrefixedString("messages.config-reloaded")); return true; } - sender.sendMessage(getLang().getString("messages.player-only")); + sender.sendMessage(getLang().getPrefixedString("messages.player-only")); return true; } @@ -45,12 +51,16 @@ public class HelpCommand extends BaseCommand implements TabCompleter { if (subCommand.equals("reload")) { if (!sender.hasPermission("essentialsc.command.reload")) { - sender.sendMessage(getLang().getString("messages.no-permission")); + sendNoPermission(sender, "essentialsc.command.reload"); return true; } plugin.reloadConfig(); EssentialsC.getLangManager().reload(); - sender.sendMessage(getLang().getString("prefix") + "Configuration reloaded."); + TpsBarService tpsBarService = plugin.getTpsBarManager(); + if (tpsBarService != null) { + tpsBarService.reloadSettings(); + } + sender.sendMessage(getLang().getPrefixedString("messages.config-reloaded")); return true; } @@ -59,39 +69,38 @@ public class HelpCommand extends BaseCommand implements TabCompleter { if (actualCommand != null && targetCommand != null) { String permission = CommandRegistry.getPermission(actualCommand); if (permission != null && !player.hasPermission(permission)) { - player.sendMessage(getLang().getString("messages.no-permission")); + sendNoPermission(player, permission); return true; } - if (actualCommand.equals("seen")) { - if (args.length < 2) { - player.sendMessage(getLang().getString("prefix") + getLang().getString("messages.seen-usage-console")); + String[] forwardedArgs = Arrays.copyOfRange(args, 1, args.length); + if (actualCommand.equals("seen") && forwardedArgs.length == 0) { + player.sendMessage(getLang().getPrefixedString("messages.seen-usage-console")); return true; - } - targetCommand.execute(player, new String[]{args[1]}); - } else { - targetCommand.execute(player, new String[0]); } + targetCommand.execute(player, forwardedArgs); return true; } if (subCommand.equals("version") || subCommand.equals("v")) { - player.sendMessage(getLang().getString("prefix") + "EssentialsC v" + plugin.getDescription().getVersion()); - player.sendMessage(getLang().getString("prefix") + "Running on Paper " + Bukkit.getVersion()); + player.sendMessage(getLang().getPrefixedString("messages.version", + Map.of("version", plugin.getDescription().getVersion()))); + player.sendMessage(getLang().getPrefixedString("messages.paper-version", + Map.of("version", Bukkit.getVersion()))); return true; } - player.sendMessage(getLang().getString("prefix") + getLang().getString("messages.unknown-subcommand", + player.sendMessage(getLang().getPrefixedString("messages.unknown-subcommand", Map.of("command", subCommand))); - player.sendMessage(getLang().getString("prefix") + getLang().getString("messages.help-usage")); + player.sendMessage(getLang().getPrefixedString("messages.help-usage")); return true; } LangManager lang = getLang(); String version = plugin.getDescription().getVersion(); - player.sendMessage(lang.getString("help.title")); - player.sendMessage(lang.getString("help.version", Map.of("version", version))); + sendPrefixed(player, lang.getString("help.title")); + sendPrefixed(player, lang.getString("help.version", Map.of("version", version))); player.sendMessage(""); boolean hasBlockCommands = false; @@ -131,8 +140,8 @@ public class HelpCommand extends BaseCommand implements TabCompleter { } if (hasBlockCommands) { - player.sendMessage(lang.getString("help.section-blocks")); - player.sendMessage(blockCommands.toString().trim()); + sendPrefixed(player, lang.getString("help.section-blocks")); + sendPrefixedLines(player, blockCommands.toString().trim()); player.sendMessage(""); } @@ -151,6 +160,14 @@ public class HelpCommand extends BaseCommand implements TabCompleter { otherCommands.append(lang.getString("help.commands.fly")).append("\n"); hasOtherCommands = true; } + if (CommandRegistry.isAvailable("nightvision") && player.hasPermission("essentialsc.command.nightvision")) { + otherCommands.append(lang.getString("help.commands.nightvision")).append("\n"); + hasOtherCommands = true; + } + if (CommandRegistry.isAvailable("glow") && player.hasPermission("essentialsc.command.glow")) { + otherCommands.append(lang.getString("help.commands.glow")).append("\n"); + hasOtherCommands = true; + } if (CommandRegistry.isAvailable("heal") && player.hasPermission("essentialsc.command.heal")) { otherCommands.append(lang.getString("help.commands.heal")).append("\n"); hasOtherCommands = true; @@ -163,17 +180,40 @@ public class HelpCommand extends BaseCommand implements TabCompleter { otherCommands.append(lang.getString("help.commands.seen")).append("\n"); hasOtherCommands = true; } + if (CommandRegistry.isAvailable("admin") && player.hasPermission("essentialsc.command.admin")) { + otherCommands.append(lang.getString("help.commands.admin")).append("\n"); + hasOtherCommands = true; + } + if (CommandRegistry.isAvailable("tpsbar") && player.hasPermission("essentialsc.command.tpsbar")) { + otherCommands.append(lang.getString("help.commands.tpsbar")).append("\n"); + hasOtherCommands = true; + } if (hasOtherCommands) { - player.sendMessage(lang.getString("help.section-other")); - player.sendMessage(otherCommands.toString().trim()); + sendPrefixed(player, lang.getString("help.section-other")); + sendPrefixedLines(player, otherCommands.toString().trim()); player.sendMessage(""); } - player.sendMessage(lang.getString("help.footer")); + sendPrefixed(player, lang.getString("help.footer")); return true; } + private void sendNoPermission(CommandSender sender, String permission) { + sender.sendMessage(getLang().getPrefixedString("messages.no-permission", + Map.of("permission", permission))); + } + + private void sendPrefixed(CommandSender sender, String message) { + sender.sendMessage(message); + } + + private void sendPrefixedLines(CommandSender sender, String message) { + for (String line : message.split("\\R")) { + sendPrefixed(sender, line); + } + } + private String getActualCommand(String alias) { return CommandRegistry.resolveCommandName(alias); } @@ -207,6 +247,9 @@ public class HelpCommand extends BaseCommand implements TabCompleter { {"suicide", "essentialsc.command.suicide"}, {"die", "essentialsc.command.suicide"}, {"fly", "essentialsc.command.fly"}, + {"nightvision", "essentialsc.command.nightvision"}, + {"nv", "essentialsc.command.nightvision"}, + {"glow", "essentialsc.command.glow"}, {"heal", "essentialsc.command.heal"}, {"vanish", "essentialsc.command.vanish"}, {"v", "essentialsc.command.vanish"}, @@ -215,7 +258,9 @@ public class HelpCommand extends BaseCommand implements TabCompleter { {"feed", "essentialsc.command.feed"}, {"repair", "essentialsc.command.repair"}, {"rep", "essentialsc.command.repair"}, + {"tpsbar", "essentialsc.command.tpsbar"}, {"mobdrops", "essentialsc.mobdrops.enderman"}, + {"admin", "essentialsc.command.admin"}, {"version", null}, {"help", null} }; @@ -247,8 +292,38 @@ public class HelpCommand extends BaseCommand implements TabCompleter { } return players; } + + if ((subCmd.equals("nightvision") || subCmd.equals("nv")) && sender.hasPermission("essentialsc.command.nightvision")) { + return completeToggleArgs(args[1]); + } + + if (subCmd.equals("glow") && sender.hasPermission("essentialsc.command.glow")) { + return completeToggleArgs(args[1]); + } + + if (subCmd.equals("tpsbar") && sender.hasPermission("essentialsc.command.tpsbar.others")) { + List players = new ArrayList<>(); + String partial = args[1].toLowerCase(); + for (Player p : Bukkit.getOnlinePlayers()) { + if (p.getName().toLowerCase().startsWith(partial)) { + players.add(p.getName()); + } + } + return players; + } } return new ArrayList<>(); } + + private List completeToggleArgs(String partialInput) { + List completions = new ArrayList<>(); + String partial = partialInput.toLowerCase(); + for (String option : List.of("on", "off", "toggle")) { + if (option.startsWith(partial)) { + completions.add(option); + } + } + return completions; + } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/LoomCommand.java b/src/main/java/cn/infstar/essentialsC/commands/LoomCommand.java index 5c233bc..17fb14e 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/LoomCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/LoomCommand.java @@ -1,17 +1,19 @@ package cn.infstar.essentialsC.commands; +import org.bukkit.Material; +import org.bukkit.Sound; import org.bukkit.entity.Player; public class LoomCommand extends BaseCommand { - + public LoomCommand() { super("essentialsc.command.loom"); } - + @Override protected boolean execute(Player player, String[] args) { - // 使用 Paper API 打开织布机（标题跟随客户端语言） player.openLoom(null, true); + playBlockShortcutSound(player, Material.LOOM, Sound.UI_LOOM_SELECT_PATTERN); return true; } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/MobDropCommand.java b/src/main/java/cn/infstar/essentialsC/commands/MobDropCommand.java index 882b42b..4835b8c 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/MobDropCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/MobDropCommand.java @@ -9,19 +9,19 @@ import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import java.util.Arrays; +import java.util.List; +import java.util.Map; -/** - * 生物掉落物控制命令 - * /mobdrops - 打开控制菜单 - */ public class MobDropCommand extends BaseCommand { + private static final int MENU_SIZE = 27; + private static final int ENDERMAN_SLOT = 13; + public static final class MobDropMenuHolder implements InventoryHolder { private final Inventory inventory; public MobDropMenuHolder(String title) { - this.inventory = Bukkit.createInventory(this, 27, title); + this.inventory = Bukkit.createInventory(this, MENU_SIZE, title); } @Override @@ -29,53 +29,60 @@ public class MobDropCommand extends BaseCommand { return inventory; } } - + public MobDropCommand() { super("essentialsc.mobdrops.enderman"); } - + @Override protected boolean execute(Player player, String[] args) { openMobDropMenu(player); return true; } - - /** - * 打开生物掉落控制菜单 - */ - private void openMobDropMenu(Player player) { - // 读取当前配置 + + public static void openMobDropMenu(EssentialsC plugin, Player player) { + var lang = EssentialsC.getLangManager(); boolean endermanEnabled = plugin.getConfig().getBoolean("mob-drops.enderman.enabled", true); - - // 创建菜单 - Inventory menu = new MobDropMenuHolder("§6§l生物掉落控制").getInventory(); - - // 末影人控制项 + String status = lang.getString(endermanEnabled + ? "mobdrops-menu.status.enabled" + : "mobdrops-menu.status.disabled"); + + Inventory menu = new MobDropMenuHolder(lang.getString("mobdrops-menu.title")).getInventory(); + ItemStack endermanItem = new ItemStack(Material.ENDER_PEARL); ItemMeta endermanMeta = endermanItem.getItemMeta(); - endermanMeta.setDisplayName("§d末影人掉落"); - endermanMeta.setLore(Arrays.asList( - "§7当前状态: " + (endermanEnabled ? "§a✅ 开启" : "§c❌ 关闭"), - "", - "§e点击切换状态" - )); - endermanItem.setItemMeta(endermanMeta); - - // 放置在中间 - menu.setItem(13, endermanItem); - - // 装饰物品 + if (endermanMeta != null) { + endermanMeta.setDisplayName(lang.getString("mobdrops-menu.enderman.name")); + endermanMeta.setLore(List.of( + lang.getString("mobdrops-menu.enderman.status", Map.of("status", status)), + "", + lang.getString("mobdrops-menu.enderman.toggle") + )); + endermanItem.setItemMeta(endermanMeta); + } + menu.setItem(ENDERMAN_SLOT, endermanItem); + ItemStack glass = new ItemStack(Material.BLACK_STAINED_GLASS_PANE); ItemMeta glassMeta = glass.getItemMeta(); - glassMeta.setDisplayName(" "); - glass.setItemMeta(glassMeta); - - for (int i = 0; i < 27; i++) { - if (menu.getItem(i) == null) { - menu.setItem(i, glass); + if (glassMeta != null) { + glassMeta.setDisplayName(" "); + glass.setItemMeta(glassMeta); + } + + for (int slot = 0; slot < MENU_SIZE; slot++) { + if (menu.getItem(slot) == null) { + menu.setItem(slot, glass); } } - + player.openInventory(menu); } + + public static int getEndermanSlot() { + return ENDERMAN_SLOT; + } + + private void openMobDropMenu(Player player) { + openMobDropMenu(plugin, player); + } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/NightVisionCommand.java b/src/main/java/cn/infstar/essentialsC/commands/NightVisionCommand.java new file mode 100644 index 0000000..5ff1d71 --- /dev/null +++ b/src/main/java/cn/infstar/essentialsC/commands/NightVisionCommand.java @@ -0,0 +1,61 @@ +package cn.infstar.essentialsC.commands; + +import org.bukkit.NamespacedKey; +import org.bukkit.Sound; +import org.bukkit.entity.Player; +import org.bukkit.potion.PotionEffect; +import org.bukkit.potion.PotionEffectType; +import org.bukkit.persistence.PersistentDataType; + +public class NightVisionCommand extends BaseCommand { + + private final NamespacedKey enabledKey; + + public NightVisionCommand() { + super("essentialsc.command.nightvision"); + this.enabledKey = new NamespacedKey(plugin, "nightvision_enabled"); + } + + @Override + protected boolean execute(Player player, String[] args) { + boolean currentState = isPluginNightVisionEnabled(player); + Boolean targetState = resolveTargetState(currentState, args); + if (targetState == null) { + player.sendMessage(getLang().getPrefixedString("messages.nightvision-usage")); + return true; + } + + if (targetState) { + player.addPotionEffect(new PotionEffect(PotionEffectType.NIGHT_VISION, Integer.MAX_VALUE, 0, false, false, false)); + player.getPersistentDataContainer().set(enabledKey, PersistentDataType.BYTE, (byte) 1); + playShortcutSound(player, Sound.BLOCK_BEACON_POWER_SELECT); + player.sendMessage(getLang().getPrefixedString("messages.nightvision-enabled")); + } else { + if (currentState) { + player.removePotionEffect(PotionEffectType.NIGHT_VISION); + player.getPersistentDataContainer().remove(enabledKey); + } + playShortcutSound(player, Sound.BLOCK_BEACON_DEACTIVATE); + player.sendMessage(getLang().getPrefixedString("messages.nightvision-disabled")); + } + return true; + } + + private Boolean resolveTargetState(boolean currentState, String[] args) { + if (args.length == 0) { + return !currentState; + } + + return switch (args[0].toLowerCase()) { + case "on", "true", "enable", "enabled" -> true; + case "off", "false", "disable", "disabled" -> false; + case "toggle" -> !currentState; + default -> null; + }; + } + + private boolean isPluginNightVisionEnabled(Player player) { + Byte value = player.getPersistentDataContainer().get(enabledKey, PersistentDataType.BYTE); + return value != null && value == (byte) 1; + } +} diff --git a/src/main/java/cn/infstar/essentialsC/commands/RepairCommand.java b/src/main/java/cn/infstar/essentialsC/commands/RepairCommand.java index a2a0d68..411cffe 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/RepairCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/RepairCommand.java @@ -3,80 +3,71 @@ package cn.infstar.essentialsC.commands; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.Damageable; -import org.jetbrains.annotations.NotNull; + +import java.util.Map; public class RepairCommand extends BaseCommand { - + public RepairCommand() { super("essentialsc.command.repair"); } - + @Override - protected boolean execute(@NotNull Player player, String[] args) { + protected boolean execute(Player player, String[] args) { if (args.length > 0 && args[0].equalsIgnoreCase("all")) { - // 检查是否有修复全部的权限 if (!player.hasPermission("essentialsc.command.repair.all")) { - player.sendMessage(getLang().getString("messages.no-permission-repair-all")); + player.sendMessage(getLang().getPrefixedString("messages.no-permission-repair-all")); return true; } - + int repairedCount = repairAll(player); if (repairedCount > 0) { - player.sendMessage(getLang().getString("messages.repair-all-success", java.util.Map.of("count", String.valueOf(repairedCount)))); + player.sendMessage(getLang().getPrefixedString("messages.repair-all-success", + Map.of("count", String.valueOf(repairedCount)))); } else { - player.sendMessage(getLang().getString("messages.repair-no-items")); + player.sendMessage(getLang().getPrefixedString("messages.repair-no-items")); } + return true; + } + + ItemStack item = player.getInventory().getItemInMainHand(); + if (item == null || item.getType().isAir()) { + player.sendMessage(getLang().getPrefixedString("messages.repair-no-item-in-hand")); + return true; + } + + if (repairItem(item)) { + player.sendMessage(getLang().getPrefixedString("messages.repair-hand-success")); } else { - // 修复手中物品 - ItemStack item = player.getInventory().getItemInMainHand(); - if (item == null || item.getType().isAir()) { - player.sendMessage(getLang().getString("messages.repair-no-item-in-hand")); - return true; - } - - if (repairItem(item)) { - player.sendMessage(getLang().getString("messages.repair-hand-success")); - } else { - player.sendMessage(getLang().getString("messages.repair-not-damaged")); - } + player.sendMessage(getLang().getPrefixedString("messages.repair-not-damaged")); } return true; } - + private boolean repairItem(ItemStack item) { - if (item.getItemMeta() instanceof Damageable damageable) { - if (damageable.hasDamage()) { - Damageable newMeta = (Damageable) damageable.clone(); - newMeta.setDamage(0); - item.setItemMeta((org.bukkit.inventory.meta.ItemMeta) newMeta); - return true; - } + if (item.getItemMeta() instanceof Damageable damageable && damageable.hasDamage()) { + Damageable newMeta = (Damageable) damageable.clone(); + newMeta.setDamage(0); + item.setItemMeta((org.bukkit.inventory.meta.ItemMeta) newMeta); + return true; } return false; } - + private int repairAll(Player player) { int count = 0; - ItemStack[] contents = player.getInventory().getContents(); - - for (ItemStack item : contents) { - if (item != null && !item.getType().isAir()) { - if (repairItem(item)) { - count++; - } + for (ItemStack item : player.getInventory().getContents()) { + if (item != null && !item.getType().isAir() && repairItem(item)) { + count++; } } - - // 也修复盔甲栏 - ItemStack[] armor = player.getInventory().getArmorContents(); - for (ItemStack item : armor) { - if (item != null && !item.getType().isAir()) { - if (repairItem(item)) { - count++; - } + + for (ItemStack item : player.getInventory().getArmorContents()) { + if (item != null && !item.getType().isAir() && repairItem(item)) { + count++; } } - + player.updateInventory(); return count; } diff --git a/src/main/java/cn/infstar/essentialsC/commands/SeenCommand.java b/src/main/java/cn/infstar/essentialsC/commands/SeenCommand.java index 19d5f34..e1a72f1 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/SeenCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/SeenCommand.java @@ -1,55 +1,57 @@ package cn.infstar.essentialsC.commands; import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; public class SeenCommand extends BaseCommand { - + public SeenCommand() { super("essentialsc.command.seen"); } - + @Override - protected boolean execute(@NotNull Player player, String[] args) { + protected boolean execute(Player player, String[] args) { if (args.length == 0) { - player.sendMessage(getLang().getString("messages.seen-usage")); + player.sendMessage(getLang().getPrefixedString("messages.seen-usage")); return true; } - + OfflinePlayer target = Bukkit.getOfflinePlayer(args[0]); if (!target.hasPlayedBefore() && !target.isOnline()) { - player.sendMessage(getLang().getString("messages.player-not-found", Map.of("player", args[0]))); + player.sendMessage(getLang().getPrefixedString("messages.player-not-found", Map.of("player", args[0]))); return true; } - + + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); StringBuilder info = new StringBuilder(); - info.append("§6========== §e玩家信息 §6==========\n"); - info.append("§7玩家名称: §f").append(target.getName()).append("\n"); - + info.append(getLang().getPrefix()).append(ChatColor.GOLD).append("Player info: ") + .append(ChatColor.WHITE).append(target.getName()).append("\n"); + if (target.isOnline()) { - info.append("§7状态: §a在线\n"); + info.append(ChatColor.GRAY).append("Status: ").append(ChatColor.GREEN).append("Online").append("\n"); Player onlinePlayer = target.getPlayer(); if (onlinePlayer != null) { - info.append("§7所在世界: §f").append(onlinePlayer.getWorld().getName()).append("\n"); + info.append(ChatColor.GRAY).append("World: ").append(ChatColor.WHITE) + .append(onlinePlayer.getWorld().getName()).append("\n"); } } else { - info.append("§7状态: §c离线\n"); + info.append(ChatColor.GRAY).append("Status: ").append(ChatColor.RED).append("Offline").append("\n"); long lastSeen = target.getLastSeen(); if (lastSeen > 0) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - info.append("§7最后上线: §f").append(sdf.format(new Date(lastSeen))).append("\n"); + info.append(ChatColor.GRAY).append("Last seen: ").append(ChatColor.WHITE) + .append(format.format(new Date(lastSeen))).append("\n"); } } - - info.append("§7首次加入: §f").append(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(target.getFirstPlayed()))).append("\n"); - info.append("§6============================="); - + + info.append(ChatColor.GRAY).append("First joined: ").append(ChatColor.WHITE) + .append(format.format(new Date(target.getFirstPlayed()))); + player.sendMessage(info.toString()); return true; } diff --git a/src/main/java/cn/infstar/essentialsC/commands/SmithingTableCommand.java b/src/main/java/cn/infstar/essentialsC/commands/SmithingTableCommand.java index 34289ca..125fed7 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/SmithingTableCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/SmithingTableCommand.java @@ -1,17 +1,19 @@ package cn.infstar.essentialsC.commands; +import org.bukkit.Material; +import org.bukkit.Sound; import org.bukkit.entity.Player; public class SmithingTableCommand extends BaseCommand { - + public SmithingTableCommand() { super("essentialsc.command.smithingtable"); } - + @Override protected boolean execute(Player player, String[] args) { - // 使用 Paper API 打开锻造台（标题跟随客户端语言） player.openSmithingTable(null, true); + playBlockShortcutSound(player, Material.SMITHING_TABLE, Sound.BLOCK_SMITHING_TABLE_USE); return true; } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/StonecutterCommand.java b/src/main/java/cn/infstar/essentialsC/commands/StonecutterCommand.java index 7ea46f2..40e7ba6 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/StonecutterCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/StonecutterCommand.java @@ -1,17 +1,19 @@ package cn.infstar.essentialsC.commands; +import org.bukkit.Material; +import org.bukkit.Sound; import org.bukkit.entity.Player; public class StonecutterCommand extends BaseCommand { - + public StonecutterCommand() { super("essentialsc.command.stonecutter"); } - + @Override protected boolean execute(Player player, String[] args) { - // 使用 Paper API 打开切石机（标题跟随客户端语言） player.openStonecutter(null, true); + playBlockShortcutSound(player, Material.STONECUTTER, Sound.UI_STONECUTTER_SELECT_RECIPE); return true; } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/SuicideCommand.java b/src/main/java/cn/infstar/essentialsC/commands/SuicideCommand.java index f7f900e..6994d1b 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/SuicideCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/SuicideCommand.java @@ -2,20 +2,15 @@ package cn.infstar.essentialsC.commands; import org.bukkit.entity.Player; -import java.util.Map; - public class SuicideCommand extends BaseCommand { - + public SuicideCommand() { super("essentialsc.command.suicide"); } - + @Override protected boolean execute(Player player, String[] args) { - String message = getLang().getString("messages.suicide-message", - Map.of("player", player.getName())); player.setHealth(0); - // 消息会在玩家死亡后显示，所以这里不发送 return true; } } diff --git a/src/main/java/cn/infstar/essentialsC/commands/TpsBarCommand.java b/src/main/java/cn/infstar/essentialsC/commands/TpsBarCommand.java new file mode 100644 index 0000000..d3b2ba6 --- /dev/null +++ b/src/main/java/cn/infstar/essentialsC/commands/TpsBarCommand.java @@ -0,0 +1,89 @@ +package cn.infstar.essentialsC.commands; + +import cn.infstar.essentialsC.tpsbar.TpsBarService; +import org.bukkit.Bukkit; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.command.TabCompleter; +import org.bukkit.entity.Player; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +public class TpsBarCommand extends BaseCommand implements TabCompleter { + + public TpsBarCommand() { + super("essentialsc.command.tpsbar"); + } + + @Override + protected boolean execute(Player player, String[] args) { + TpsBarService tpsBarService = plugin.getTpsBarManager(); + if (tpsBarService == null) { + player.sendMessage(getLang().getPrefixedString("messages.player-only")); + return true; + } + + if (args.length == 0) { + boolean enabled = tpsBarService.toggle(player); + tpsBarService.sendToggleMessage(player, player, enabled); + return true; + } + + if (args.length != 1) { + player.sendMessage(tpsBarService.getUsageMessage()); + return true; + } + + if (!player.hasPermission("essentialsc.command.tpsbar.others")) { + player.sendMessage(getLang().getPrefixedString("messages.no-permission", + Map.of("permission", "essentialsc.command.tpsbar.others"))); + return true; + } + + Collection targets = tpsBarService.resolveTargets(player, args[0]); + if (targets.isEmpty()) { + Player exactPlayer = Bukkit.getPlayerExact(args[0]); + if (exactPlayer == null) { + player.sendMessage(tpsBarService.getPlayerNotFoundMessage(args[0])); + } else { + player.sendMessage(tpsBarService.getNoTargetsMessage()); + } + return true; + } + + for (Player target : targets) { + boolean enabled = tpsBarService.toggle(target); + tpsBarService.sendToggleMessage(player, target, enabled); + } + return true; + } + + @Override + protected boolean executeConsole(CommandSender sender, String[] args) { + sender.sendMessage(getLang().getPrefixedString("messages.player-only")); + return true; + } + + @Override + public List onTabComplete(CommandSender sender, Command command, String label, String[] args) { + if (args.length != 1 || !(sender instanceof Player player)) { + return List.of(); + } + + if (!player.hasPermission("essentialsc.command.tpsbar.others")) { + return List.of(); + } + + String partial = args[0].toLowerCase(); + List completions = new ArrayList<>(); + for (Player onlinePlayer : Bukkit.getOnlinePlayers()) { + if (onlinePlayer.getName().toLowerCase().startsWith(partial)) { + completions.add(onlinePlayer.getName()); + } + } + return completions; + } +} diff --git a/src/main/java/cn/infstar/essentialsC/commands/VanishCommand.java b/src/main/java/cn/infstar/essentialsC/commands/VanishCommand.java index 1eaff7a..6327767 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/VanishCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/VanishCommand.java @@ -1,38 +1,35 @@ package cn.infstar.essentialsC.commands; import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; import java.util.HashSet; import java.util.Set; import java.util.UUID; public class VanishCommand extends BaseCommand { - + private static final Set vanishedPlayers = new HashSet<>(); - + public VanishCommand() { super("essentialsc.command.vanish"); } - + @Override - protected boolean execute(@NotNull Player player, String[] args) { + protected boolean execute(Player player, String[] args) { UUID uuid = player.getUniqueId(); - + if (vanishedPlayers.contains(uuid)) { - // 取消隐身 vanishedPlayers.remove(uuid); showPlayerToAll(player); - player.sendMessage(getLang().getString("messages.vanish-disabled")); + player.sendMessage(getLang().getPrefixedString("messages.vanish-disabled")); } else { - // 开启隐身 vanishedPlayers.add(uuid); hidePlayerFromAll(player); - player.sendMessage(getLang().getString("messages.vanish-enabled")); + player.sendMessage(getLang().getPrefixedString("messages.vanish-enabled")); } return true; } - + private void hidePlayerFromAll(Player player) { for (Player online : player.getServer().getOnlinePlayers()) { if (online != player) { @@ -40,7 +37,7 @@ public class VanishCommand extends BaseCommand { } } } - + private void showPlayerToAll(Player player) { for (Player online : player.getServer().getOnlinePlayers()) { if (online != player) { @@ -48,7 +45,7 @@ public class VanishCommand extends BaseCommand { } } } - + public static boolean isVanished(Player player) { return vanishedPlayers.contains(player.getUniqueId()); } diff --git a/src/main/java/cn/infstar/essentialsC/commands/WorkbenchCommand.java b/src/main/java/cn/infstar/essentialsC/commands/WorkbenchCommand.java index 00a7278..058b2da 100644 --- a/src/main/java/cn/infstar/essentialsC/commands/WorkbenchCommand.java +++ b/src/main/java/cn/infstar/essentialsC/commands/WorkbenchCommand.java @@ -1,17 +1,19 @@ package cn.infstar.essentialsC.commands; +import org.bukkit.Material; +import org.bukkit.Sound; import org.bukkit.entity.Player; public class WorkbenchCommand extends BaseCommand { - + public WorkbenchCommand() { super("essentialsc.command.workbench"); } - + @Override protected boolean execute(Player player, String[] args) { - // 打开工作台（标题由客户端语言决定） player.openWorkbench(null, true); + playBlockShortcutSound(player, Material.CRAFTING_TABLE, Sound.BLOCK_CRAFTER_CRAFT); return true; } } diff --git a/src/main/java/cn/infstar/essentialsC/listeners/JeiRecipeSyncListener.java b/src/main/java/cn/infstar/essentialsC/listeners/JeiRecipeSyncListener.java index afe9187..44cc5a5 100644 --- a/src/main/java/cn/infstar/essentialsC/listeners/JeiRecipeSyncListener.java +++ b/src/main/java/cn/infstar/essentialsC/listeners/JeiRecipeSyncListener.java @@ -22,38 +22,35 @@ import org.bukkit.event.player.PlayerJoinEvent; import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import java.util.Set; /** - * JEI 配方同步监听器 - * 解决 Minecraft 1.21.2+ 配方不同步问题 - * 支持 Fabric 和 NeoForge 客户端 + * 为 Fabric / NeoForge 客户端补发配方同步数据，修复 1.21.2+ 的 JEI 配方显示问题。 */ public class JeiRecipeSyncListener implements Listener { - + private final EssentialsC plugin; private final boolean enabled; private final boolean debug; private final boolean sendPlayerMessage; - + public JeiRecipeSyncListener(EssentialsC plugin) { this.plugin = plugin; - + FileConfiguration config = plugin.getConfig(); this.enabled = config.getBoolean("jei-sync.enabled", true); this.debug = config.getBoolean("jei-sync.debug", false); this.sendPlayerMessage = config.getBoolean("jei-sync.send-player-message", true); } - + @EventHandler public void onPlayerJoin(PlayerJoinEvent event) { if (!enabled) { return; } - + Player player = event.getPlayer(); String clientBrand = player.getClientBrandName(); - + if (debug) { plugin.getLogger().info("========================================"); plugin.getLogger().info("玩家 " + player.getName() + " 加入"); @@ -61,44 +58,43 @@ public class JeiRecipeSyncListener implements Listener { plugin.getLogger().info("JEI 同步功能: " + (enabled ? "启用" : "禁用")); plugin.getLogger().info("========================================"); } - + if (clientBrand == null || clientBrand.isEmpty()) { if (debug) { plugin.getLogger().info("跳过 " + player.getName() + "：客户端品牌为空"); } return; } - - // 统一转换为小写进行比较，支持更多变体 + String brandLower = clientBrand.toLowerCase(); - if (brandLower.contains("fabric")) { if (debug) { plugin.getLogger().info("检测到 Fabric 客户端，开始发送配方同步..."); } sendPlayerMessage(player, "Fabric"); sendFabricRecipeSync(player); - } else if (brandLower.contains("neoforge") || brandLower.contains("forge")) { + return; + } + + if (brandLower.contains("neoforge") || brandLower.contains("forge")) { if (debug) { plugin.getLogger().info("检测到 NeoForge/Forge 客户端，开始发送配方同步..."); } sendPlayerMessage(player, "NeoForge"); sendNeoForgeRecipeSync(player); - } else { - if (debug) { - plugin.getLogger().info("跳过 " + player.getName() + "：不支持的客户端类型 '" + clientBrand + "'"); - } + return; + } + + if (debug) { + plugin.getLogger().info("跳过 " + player.getName() + "：不支持的客户端类型 '" + clientBrand + "'"); } } - - /** - * 发送提示消息给玩家 - */ + private void sendPlayerMessage(Player player, String clientType) { if (!sendPlayerMessage) { return; } - + String messageKey; if (clientType.equalsIgnoreCase("fabric")) { messageKey = "messages.jei-sync-fabric"; @@ -107,182 +103,142 @@ public class JeiRecipeSyncListener implements Listener { } else { return; } - - // 使用统一前缀 + 消息内容 - String prefix = EssentialsC.getLangManager().getString("prefix"); - String message = EssentialsC.getLangManager().getString(messageKey); - String fullMessage = prefix + " " + message; - - net.kyori.adventure.text.Component component = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacyAmpersand().deserialize(fullMessage); + + String fullMessage = EssentialsC.getLangManager().getPrefixedString(messageKey); + net.kyori.adventure.text.Component component = + net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacyAmpersand().deserialize(fullMessage); player.sendMessage(component); } - - /** - * 发送 Fabric 格式的配方同步数据包 - */ + @SuppressWarnings({"unchecked", "deprecation"}) private void sendFabricRecipeSync(Player player) { try { ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle(); MinecraftServer server = serverPlayer.level().getServer(); if (server == null) { - if (debug) plugin.getLogger().warning("服务器实例为 null"); + if (debug) { + plugin.getLogger().warning("服务端实例为 null"); + } return; } - + RecipeMap recipeMap = server.getRecipeManager().recipes; - if (debug) { plugin.getLogger().info("开始构建 Fabric 配方数据"); } - - // 创建 Fabric Payload（与参考插件完全一致） + var list = new ArrayList(); var seen = new HashSet>(); - + for (RecipeSerializer serializer : BuiltInRegistries.RECIPE_SERIALIZER) { - if (!seen.add(serializer)) continue; - + if (!seen.add(serializer)) { + continue; + } + List> recipes = new ArrayList<>(); for (RecipeHolder holder : recipeMap.values()) { if (holder.value().getSerializer() == serializer) { recipes.add(holder); } } - + if (!recipes.isEmpty()) { RecipeSerializer entrySerializer = recipes.get(0).value().getSerializer(); list.add(new FabricRecipeEntry(entrySerializer, recipes)); } } - + var payload = new FabricRecipeSyncPayload(list); - if (debug) { plugin.getLogger().info("Fabric 配方条目数: " + list.size()); } - - // 构建 buffer - RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf( - Unpooled.buffer(), - server.registryAccess() - ); - - // 使用 CODEC 编码（与参考插件完全一致） - var codec = getFabricCodec(); - codec.encode(buffer, payload); - - // 发送数据包 + + RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess()); + getFabricCodec().encode(buffer, payload); + byte[] bytes = new byte[buffer.writerIndex()]; buffer.getBytes(0, bytes); - + Identifier id = Identifier.fromNamespaceAndPath("fabric", "recipe_sync"); DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes); serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload)); - + if (debug) { plugin.getLogger().info("已发送 Fabric 配方同步 [" + id + "], 大小: " + bytes.length + " bytes"); } - } catch (Exception e) { plugin.getLogger().warning("发送 Fabric 配方同步失败: " + e.getMessage()); e.printStackTrace(); } } - - /** - * 获取 Fabric Codec - */ + @SuppressWarnings({"unchecked", "deprecation"}) private net.minecraft.network.codec.StreamCodec getFabricCodec() { return FabricRecipeEntry.CODEC.apply(net.minecraft.network.codec.ByteBufCodecs.list()) .map(FabricRecipeSyncPayload::new, FabricRecipeSyncPayload::entries); } - - /** - * 发送 NeoForge 格式的配方同步数据包 - */ + @SuppressWarnings({"unchecked", "deprecation"}) private void sendNeoForgeRecipeSync(Player player) { try { ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle(); MinecraftServer server = serverPlayer.level().getServer(); if (server == null) { - if (debug) plugin.getLogger().warning("服务器实例为 null"); + if (debug) { + plugin.getLogger().warning("服务端实例为 null"); + } return; } - + RecipeMap recipeMap = server.getRecipeManager().recipes; - if (debug) { plugin.getLogger().info("开始构建 NeoForge 配方数据"); } - - // 获取所有配方类型 - java.util.List> allRecipeTypes = + + java.util.List> allRecipeTypes = BuiltInRegistries.RECIPE_TYPE.stream().toList(); - if (debug) { plugin.getLogger().info("NeoForge 配方类型数: " + allRecipeTypes.size()); } - - // 创建 NeoForge Payload（与参考插件完全一致） + var payload = createNeoForgePayload(allRecipeTypes, recipeMap); - - // 构建 buffer - RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf( - Unpooled.buffer(), - server.registryAccess() - ); - - // 使用 STREAM_CODEC 编码（与参考插件完全一致） - var streamCodec = getNeoForgeStreamCodec(); - streamCodec.encode(buffer, payload); - - // 发送数据包 + RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess()); + getNeoForgeStreamCodec().encode(buffer, payload); + byte[] bytes = new byte[buffer.writerIndex()]; buffer.getBytes(0, bytes); - + Identifier id = Identifier.fromNamespaceAndPath("neoforge", "recipe_content"); DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes); serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload)); - - // 发送 Tags 同步（NeoForge 需要） serverPlayer.connection.send(new net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket( net.minecraft.tags.TagNetworkSerialization.serializeTagsToNetwork(server.registries()) )); - + if (debug) { plugin.getLogger().info("已发送 NeoForge 配方同步 [" + id + "], 大小: " + bytes.length + " bytes"); } - } catch (Exception e) { plugin.getLogger().warning("发送 NeoForge 配方同步失败: " + e.getMessage()); e.printStackTrace(); } } - - /** - * 创建 NeoForge 配载对象 - */ + private NeoForgeRecipeSyncPayload createNeoForgePayload( - java.util.List> recipeTypes, - RecipeMap recipeMap) { + java.util.List> recipeTypes, + RecipeMap recipeMap + ) { var recipeTypeSet = new java.util.HashSet<>(recipeTypes); - if (recipeTypeSet.isEmpty()) { return new NeoForgeRecipeSyncPayload(recipeTypeSet, java.util.List.of()); - } else { - var recipeSubset = recipeMap.values().stream() - .filter(h -> recipeTypeSet.contains(h.value().getType())) - .toList(); - return new NeoForgeRecipeSyncPayload(recipeTypeSet, recipeSubset); } + + var recipeSubset = recipeMap.values().stream() + .filter(h -> recipeTypeSet.contains(h.value().getType())) + .toList(); + return new NeoForgeRecipeSyncPayload(recipeTypeSet, recipeSubset); } - - /** - * 获取 NeoForge StreamCodec - */ + @SuppressWarnings({"unchecked", "deprecation"}) private net.minecraft.network.codec.StreamCodec getNeoForgeStreamCodec() { return net.minecraft.network.codec.StreamCodec.composite( @@ -294,47 +250,43 @@ public class JeiRecipeSyncListener implements Listener { NeoForgeRecipeSyncPayload::new ); } - - /** - * Fabric 配方条目 - */ + @SuppressWarnings("deprecation") private static class FabricRecipeEntry { - final Object serializer; // 使用 Object 避免 NMS 类型不兼容 + // 这里保留 Object，是为了避免直接绑定易变的 NMS 泛型签名。 + final Object serializer; final List> recipes; - + FabricRecipeEntry(Object serializer, List> recipes) { this.serializer = serializer; this.recipes = recipes; } - - static final net.minecraft.network.codec.StreamCodec CODEC = + + static final net.minecraft.network.codec.StreamCodec CODEC = net.minecraft.network.codec.StreamCodec.ofMember( FabricRecipeEntry::write, FabricRecipeEntry::read ); - + @SuppressWarnings("unchecked") private static FabricRecipeEntry read(RegistryFriendlyByteBuf buf) { Identifier recipeSerializerId = buf.readIdentifier(); RecipeSerializer recipeSerializer = BuiltInRegistries.RECIPE_SERIALIZER.getValue(recipeSerializerId); - + if (recipeSerializer == null) { throw new RuntimeException("Tried syncing unsupported packet serializer '" + recipeSerializerId + "'!"); } - + int count = buf.readVarInt(); var list = new ArrayList>(); - for (int i = 0; i < count; i++) { - net.minecraft.resources.ResourceKey> id = + net.minecraft.resources.ResourceKey> id = buf.readResourceKey(net.minecraft.core.registries.Registries.RECIPE); - - // 使用反射获取 streamCodec，避免 NMS 类型不兼容 + try { var streamCodecMethod = recipeSerializer.getClass().getMethod("streamCodec"); var streamCodec = streamCodecMethod.invoke(recipeSerializer); - net.minecraft.world.item.crafting.Recipe recipe = + net.minecraft.world.item.crafting.Recipe recipe = ((net.minecraft.network.codec.StreamCodec>) streamCodec) .decode(buf); list.add(new RecipeHolder<>(id, recipe)); @@ -342,12 +294,11 @@ public class JeiRecipeSyncListener implements Listener { throw new RuntimeException("Failed to decode recipe: " + e.getMessage(), e); } } - + return new FabricRecipeEntry(recipeSerializer, list); } - + private void write(RegistryFriendlyByteBuf buf) { - // 使用反射获取 key，避免 NMS 类型不兼容 try { var getKeyMethod = BuiltInRegistries.RECIPE_SERIALIZER.getClass().getMethod("getKey", Object.class); Identifier identifier = (Identifier) getKeyMethod.invoke(BuiltInRegistries.RECIPE_SERIALIZER, this.serializer); @@ -355,16 +306,15 @@ public class JeiRecipeSyncListener implements Listener { } catch (Exception e) { throw new RuntimeException("Failed to get serializer key: " + e.getMessage(), e); } - + buf.writeVarInt(this.recipes.size()); - - // 使用反射获取 streamCodec，避免 NMS 类型不兼容 + try { var streamCodecMethod = this.serializer.getClass().getMethod("streamCodec"); @SuppressWarnings("unchecked") - var codec = (net.minecraft.network.codec.StreamCodec>) + var codec = (net.minecraft.network.codec.StreamCodec>) streamCodecMethod.invoke(this.serializer); - + for (RecipeHolder recipe : this.recipes) { buf.writeResourceKey(recipe.id()); codec.encode(buf, recipe.value()); @@ -374,18 +324,13 @@ public class JeiRecipeSyncListener implements Listener { } } } - - /** - * Fabric 配方同步 Payload - */ + private record FabricRecipeSyncPayload(List entries) { } - - /** - * NeoForge 配方同步 Payload - */ + private record NeoForgeRecipeSyncPayload( - java.util.Set> recipeTypes, - java.util.List> recipes) { + java.util.Set> recipeTypes, + java.util.List> recipes + ) { } } diff --git a/src/main/java/cn/infstar/essentialsC/listeners/MobDropListener.java b/src/main/java/cn/infstar/essentialsC/listeners/MobDropListener.java index dbe8be9..67d1828 100644 --- a/src/main/java/cn/infstar/essentialsC/listeners/MobDropListener.java +++ b/src/main/java/cn/infstar/essentialsC/listeners/MobDropListener.java @@ -7,57 +7,43 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDeathEvent; -/** - * 生物掉落物控制监听器 - * 当前仅支持末影人 - */ public class MobDropListener implements Listener { - + private final EssentialsC plugin; private boolean endermanDropEnabled; - + public MobDropListener(EssentialsC plugin) { this.plugin = plugin; loadConfig(); - - // 注册监听器 } - - /** - * 加载配置 - */ + private void loadConfig() { FileConfiguration config = plugin.getConfig(); config.addDefault("mob-drops.enderman.enabled", true); config.options().copyDefaults(true); - + try { config.save(plugin.getDataFolder().toPath().resolve("config.yml").toFile()); } catch (Exception e) { plugin.getLogger().warning("无法保存配置文件: " + e.getMessage()); } - + this.endermanDropEnabled = config.getBoolean("mob-drops.enderman.enabled", true); } - + @EventHandler public void onEntityDeath(EntityDeathEvent event) { if (event.getEntityType() != EntityType.ENDERMAN) { return; } - - boolean enabled = plugin.getConfig().getBoolean("mob-drops.enderman.enabled", true); - - if (!enabled) { + + if (!plugin.getConfig().getBoolean("mob-drops.enderman.enabled", true)) { event.getDrops().clear(); } } - - /** - * 重新加载配置 - */ + public void reload() { loadConfig(); - plugin.getLogger().info("生物掉落物配置已重载（末影人: " + (endermanDropEnabled ? "开启" : "关闭") + "）"); + plugin.getLogger().info("生物掉落配置已重载（末影人: " + (endermanDropEnabled ? "开启" : "关闭") + "）"); } } diff --git a/src/main/java/cn/infstar/essentialsC/listeners/MobDropMenuListener.java b/src/main/java/cn/infstar/essentialsC/listeners/MobDropMenuListener.java index eb6d5d9..680b92c 100644 --- a/src/main/java/cn/infstar/essentialsC/listeners/MobDropMenuListener.java +++ b/src/main/java/cn/infstar/essentialsC/listeners/MobDropMenuListener.java @@ -1,101 +1,66 @@ package cn.infstar.essentialsC.listeners; import cn.infstar.essentialsC.EssentialsC; +import cn.infstar.essentialsC.commands.MobDropCommand; import org.bukkit.Bukkit; -import org.bukkit.Material; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; -import java.util.Arrays; +import java.util.Map; public class MobDropMenuListener implements Listener { - + private final EssentialsC plugin; - + public MobDropMenuListener(EssentialsC plugin) { this.plugin = plugin; plugin.getServer().getPluginManager().registerEvents(this, plugin); } - + @EventHandler public void onInventoryClick(InventoryClickEvent event) { - if (!(event.getView().getTopInventory().getHolder(false) instanceof cn.infstar.essentialsC.commands.MobDropCommand.MobDropMenuHolder)) { + if (!(event.getView().getTopInventory().getHolder(false) instanceof MobDropCommand.MobDropMenuHolder)) { return; } - + event.setCancelled(true); - + if (!(event.getWhoClicked() instanceof Player player)) { return; } - + ItemStack clickedItem = event.getCurrentItem(); - if (clickedItem == null) { + if (clickedItem == null || clickedItem.getType().isAir()) { return; } - - if (event.getSlot() == 13) { + + if (event.getRawSlot() == MobDropCommand.getEndermanSlot()) { toggleEndermanDrops(player); - Bukkit.getScheduler().runTaskLater(plugin, () -> openMobDropMenu(player), 2L); + Bukkit.getScheduler().runTaskLater(plugin, () -> MobDropCommand.openMobDropMenu(plugin, player), 2L); } } - + private void toggleEndermanDrops(Player player) { FileConfiguration config = plugin.getConfig(); - boolean currentValue = config.getBoolean("mob-drops.enderman.enabled", true); - boolean newValue = !currentValue; - + boolean newValue = !config.getBoolean("mob-drops.enderman.enabled", true); config.set("mob-drops.enderman.enabled", newValue); - + try { config.save(plugin.getDataFolder().toPath().resolve("config.yml").toFile()); } catch (Exception e) { - player.sendMessage(EssentialsC.getLangManager().getString("prefix") + - EssentialsC.getLangManager().getString("messages.mobdrop-save-failed", - java.util.Map.of("error", e.getMessage()))); + player.sendMessage(EssentialsC.getLangManager().getPrefixedString("messages.mobdrop-save-failed", + Map.of("error", e.getMessage()))); return; } - - String status = newValue ? "§a开启" : "§c关闭"; - player.sendMessage(EssentialsC.getLangManager().getString("prefix") + - EssentialsC.getLangManager().getString("messages.mobdrop-toggled", - java.util.Map.of("status", status))); - } - - private void openMobDropMenu(Player player) { - boolean endermanEnabled = plugin.getConfig().getBoolean("mob-drops.enderman.enabled", true); - - Inventory menu = new cn.infstar.essentialsC.commands.MobDropCommand.MobDropMenuHolder("§6§l生物掉落控制").getInventory(); - - ItemStack endermanItem = new ItemStack(Material.ENDER_PEARL); - ItemMeta endermanMeta = endermanItem.getItemMeta(); - endermanMeta.setDisplayName("§d末影人掉落"); - endermanMeta.setLore(Arrays.asList( - "§7当前状态: " + (endermanEnabled ? "§a✅ 开启" : "§c❌ 关闭"), - "", - "§e点击切换状态" - )); - endermanItem.setItemMeta(endermanMeta); - - menu.setItem(13, endermanItem); - - ItemStack glass = new ItemStack(Material.BLACK_STAINED_GLASS_PANE); - ItemMeta glassMeta = glass.getItemMeta(); - glassMeta.setDisplayName(" "); - glass.setItemMeta(glassMeta); - - for (int i = 0; i < 27; i++) { - if (menu.getItem(i) == null) { - menu.setItem(i, glass); - } - } - - player.openInventory(menu); + + String status = EssentialsC.getLangManager().getString(newValue + ? "mobdrops-menu.status.enabled" + : "mobdrops-menu.status.disabled"); + player.sendMessage(EssentialsC.getLangManager().getPrefixedString("messages.mobdrop-toggled", + Map.of("status", status))); } } diff --git a/src/main/java/cn/infstar/essentialsC/listeners/ShulkerBoxListener.java b/src/main/java/cn/infstar/essentialsC/listeners/ShulkerBoxListener.java index 5ded0cf..878a764 100644 --- a/src/main/java/cn/infstar/essentialsC/listeners/ShulkerBoxListener.java +++ b/src/main/java/cn/infstar/essentialsC/listeners/ShulkerBoxListener.java @@ -2,8 +2,8 @@ package cn.infstar.essentialsC.listeners; import cn.infstar.essentialsC.EssentialsC; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.Material; +import org.bukkit.Sound; import org.bukkit.block.ShulkerBox; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -15,6 +15,7 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.inventory.InventoryDragEvent; import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.event.player.PlayerKickEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.inventory.EquipmentSlot; @@ -24,6 +25,10 @@ import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.meta.BlockStateMeta; +import org.bukkit.inventory.meta.ItemMeta; + +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import java.util.HashMap; import java.util.Map; @@ -60,7 +65,7 @@ public class ShulkerBoxListener implements Listener { private static final class ShulkerBoxHolder implements InventoryHolder { private final Inventory inventory; - private ShulkerBoxHolder(String title) { + private ShulkerBoxHolder(Component title) { this.inventory = Bukkit.createInventory(this, SHULKER_SIZE, title); } @@ -106,6 +111,10 @@ public class ShulkerBoxListener implements Listener { if (!isShulkerBox(sourceItem)) { return; } + if (sourceItem.getAmount() != 1) { + player.sendMessage(EssentialsC.getLangManager().getPrefixedString("messages.shulkerbox-unstack-first")); + return; + } if (!(sourceItem.getItemMeta() instanceof BlockStateMeta blockStateMeta)) { return; @@ -122,6 +131,12 @@ public class ShulkerBoxListener implements Listener { if (!player.isOnline() || openShulkerBoxes.containsKey(player.getUniqueId())) { return; } + + ItemStack currentItem = getItemFromHand(player, hand); + if (!isSameShulkerItem(currentItem, sourceSnapshot)) { + return; + } + openShulkerBox(player, hand, sourceSnapshot, shulkerBox); }); } @@ -156,6 +171,15 @@ public class ShulkerBoxListener implements Listener { } } + if (clickTopInventory && event.getClick() == ClickType.SWAP_OFFHAND) { + ItemStack offHandItem = player.getInventory().getItemInOffHand(); + if (isShulkerBox(offHandItem)) { + event.setCancelled(true); + sendNestedMessage(player); + return; + } + } + if (event.isShiftClick() && isShulkerBox(event.getCurrentItem())) { event.setCancelled(true); sendNestedMessage(player); @@ -192,7 +216,9 @@ public class ShulkerBoxListener implements Listener { return; } - commitOpenShulker(player, event.getInventory()); + if (commitOpenShulker(player, event.getInventory())) { + player.playSound(player.getLocation(), Sound.BLOCK_SHULKER_BOX_CLOSE, 0.8F, 1.0F); + } } @EventHandler @@ -201,6 +227,12 @@ public class ShulkerBoxListener implements Listener { commitOpenShulker(player, player.getOpenInventory().getTopInventory()); } + @EventHandler + public void onPlayerKick(PlayerKickEvent event) { + Player player = event.getPlayer(); + commitOpenShulker(player, player.getOpenInventory().getTopInventory()); + } + @EventHandler public void onPluginDisable(PluginDisableEvent event) { if (event.getPlugin() != plugin) { @@ -212,19 +244,20 @@ public class ShulkerBoxListener implements Listener { } } - private void commitOpenShulker(Player player, Inventory inventory) { + private boolean commitOpenShulker(Player player, Inventory inventory) { if (!(inventory.getHolder(false) instanceof ShulkerBoxHolder)) { - return; + return false; } OpenShulkerSession session = openShulkerBoxes.remove(player.getUniqueId()); if (session == null) { - return; + return false; } ItemStack updatedShulker = session.sourceItem.clone(); writeInventoryBack(updatedShulker, inventory.getContents()); restoreItemToPlayer(player, session, updatedShulker); + return true; } private void openShulkerBox(Player player, EquipmentSlot hand, ItemStack sourceItem, ShulkerBox shulkerBox) { @@ -236,6 +269,7 @@ public class ShulkerBoxListener implements Listener { int preferredSlot = hand == EquipmentSlot.HAND ? player.getInventory().getHeldItemSlot() : -1; openShulkerBoxes.put(player.getUniqueId(), new OpenShulkerSession(sourceItem, hand, preferredSlot)); player.openInventory(holder.getInventory()); + player.playSound(player.getLocation(), Sound.BLOCK_SHULKER_BOX_OPEN, 0.8F, 1.0F); } private void writeInventoryBack(ItemStack shulkerItem, ItemStack[] contents) { @@ -295,21 +329,21 @@ public class ShulkerBoxListener implements Listener { } } - private String resolveTitle(ItemStack shulkerBox) { - if (shulkerBox.hasItemMeta() && shulkerBox.getItemMeta().hasDisplayName()) { - return shulkerBox.getItemMeta().getDisplayName(); + private Component resolveTitle(ItemStack shulkerBox) { + ItemMeta itemMeta = shulkerBox.getItemMeta(); + if (itemMeta != null && itemMeta.hasDisplayName()) { + Component displayName = itemMeta.displayName(); + if (displayName != null) { + return displayName; + } + return LegacyComponentSerializer.legacySection().deserialize(itemMeta.getDisplayName()); } - String defaultTitle = plugin.getConfig().getString("shulkerbox.default-title", ""); - if (defaultTitle != null && !defaultTitle.isEmpty()) { - return ChatColor.translateAlternateColorCodes('&', defaultTitle); - } - return "Shulker Box"; + return Component.translatable(shulkerBox.getType().getItemTranslationKey()); } private void sendNestedMessage(Player player) { - player.sendMessage(EssentialsC.getLangManager().getString("prefix") - + EssentialsC.getLangManager().getString("messages.shulkerbox-nested")); + player.sendMessage(EssentialsC.getLangManager().getPrefixedString("messages.shulkerbox-nested")); } private boolean isShulkerBox(ItemStack item) { @@ -319,4 +353,11 @@ public class ShulkerBoxListener implements Listener { private boolean isEmpty(ItemStack item) { return item == null || item.getType().isAir(); } + + private boolean isSameShulkerItem(ItemStack currentItem, ItemStack sourceSnapshot) { + if (!isShulkerBox(currentItem) || sourceSnapshot == null) { + return false; + } + return currentItem.getAmount() == sourceSnapshot.getAmount() && currentItem.isSimilar(sourceSnapshot); + } } diff --git a/src/main/java/cn/infstar/essentialsC/tpsbar/TpsBarManager.java b/src/main/java/cn/infstar/essentialsC/tpsbar/TpsBarManager.java new file mode 100644 index 0000000..e97be10 --- /dev/null +++ b/src/main/java/cn/infstar/essentialsC/tpsbar/TpsBarManager.java @@ -0,0 +1,390 @@ +package cn.infstar.essentialsC.tpsbar; + +import cn.infstar.essentialsC.EssentialsC; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.boss.BarColor; +import org.bukkit.boss.BarStyle; +import org.bukkit.boss.BossBar; +import org.bukkit.command.CommandMap; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.scheduler.BukkitTask; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + +public final class TpsBarManager implements Listener, TpsBarService { + + private static final double MAX_TPS = 20.0D; + private static final int UPDATE_INTERVAL_TICKS = 20; + private static final BarStyle BAR_STYLE = BarStyle.SEGMENTED_20; + private static final double TPS_WARN_THRESHOLD = 18.0D; + private static final double TPS_CRITICAL_THRESHOLD = 15.0D; + private static final double MSPT_WARN_THRESHOLD = 40.0D; + private static final double MSPT_CRITICAL_THRESHOLD = 50.0D; + private static final double PING_WARN_THRESHOLD = 100.0D; + private static final double PING_CRITICAL_THRESHOLD = 200.0D; + + private final EssentialsC plugin; + private final Set enabledPlayers = new LinkedHashSet<>(); + private final Map activeBars = new java.util.HashMap<>(); + + private BukkitTask updateTask; + private Mode mode; + private boolean pluginCommandEnabled; + private boolean nativeCommandAvailable; + private String titleFormat; + private String enabledSelfMessage; + private String disabledSelfMessage; + private String enabledOtherMessage; + private String disabledOtherMessage; + private String usageMessage; + private String playerNotFoundMessage; + private String noTargetsMessage; + private String nativeDetectedMessage; + private String pluginEnabledMessage; + private String pluginForcedButNativeExistsMessage; + private String modeChangedReloadMessage; + + public TpsBarManager(EssentialsC plugin) { + this.plugin = plugin; + addConfigDefaults(); + reloadSettings(); + } + + @Override + public boolean isPluginCommandEnabled() { + return pluginCommandEnabled; + } + + @Override + public boolean isNativeCommandAvailable() { + return nativeCommandAvailable; + } + + @Override + public void reloadSettings() { + FileConfiguration config = plugin.getConfig(); + var lang = EssentialsC.getLangManager(); + Mode previousMode = this.mode; + + this.mode = Mode.fromString(config.getString("tpsbar.mode", "auto")); + this.titleFormat = lang.getString("tpsbar.title-format"); + this.enabledSelfMessage = lang.getString("tpsbar.messages.enabled-self"); + this.disabledSelfMessage = lang.getString("tpsbar.messages.disabled-self"); + this.enabledOtherMessage = lang.getString("tpsbar.messages.enabled-other"); + this.disabledOtherMessage = lang.getString("tpsbar.messages.disabled-other"); + this.usageMessage = lang.getString("tpsbar.messages.usage"); + this.playerNotFoundMessage = lang.getString("tpsbar.messages.player-not-found"); + this.noTargetsMessage = lang.getString("tpsbar.messages.no-targets"); + this.nativeDetectedMessage = lang.getString("tpsbar.messages.native-detected"); + this.pluginEnabledMessage = lang.getString("tpsbar.messages.plugin-enabled"); + this.pluginForcedButNativeExistsMessage = lang.getString("tpsbar.messages.plugin-forced-but-native-exists"); + this.modeChangedReloadMessage = lang.getString("tpsbar.messages.mode-changed-reload"); + + this.nativeCommandAvailable = detectNativeTpsBar(); + this.pluginCommandEnabled = switch (mode) { + case OFF -> false; + case AUTO -> !nativeCommandAvailable; + case ON -> !nativeCommandAvailable; + }; + + if (previousMode != null && previousMode != mode) { + plugin.getLogger().info(stripColor(modeChangedReloadMessage)); + } + + if (nativeCommandAvailable) { + if (mode == Mode.AUTO) { + plugin.getLogger().info(stripColor(nativeDetectedMessage)); + } else if (mode == Mode.ON) { + plugin.getLogger().warning(stripColor(pluginForcedButNativeExistsMessage)); + } + } else if (pluginCommandEnabled) { + plugin.getLogger().info(stripColor(pluginEnabledMessage)); + } + + if (!pluginCommandEnabled) { + clearActiveBars(); + return; + } + + restartTaskIfNeeded(); + refreshBars(); + } + + @Override + public void shutdown() { + clearActiveBars(); + } + + @Override + public boolean toggle(Player target) { + if (enabledPlayers.contains(target.getUniqueId())) { + disable(target); + return false; + } + + enable(target); + return true; + } + + @Override + public void sendToggleMessage(Player actor, Player target, boolean enabled) { + if (actor.getUniqueId().equals(target.getUniqueId())) { + actor.sendMessage(prefixed(enabled ? enabledSelfMessage : disabledSelfMessage)); + return; + } + + actor.sendMessage(prefixed(applyPlaceholders( + enabled ? enabledOtherMessage : disabledOtherMessage, + Map.of("player", target.getName()) + ))); + } + + @Override + public String getUsageMessage() { + return prefixed(usageMessage); + } + + @Override + public String getPlayerNotFoundMessage(String input) { + return prefixed(applyPlaceholders(playerNotFoundMessage, Map.of("player", input))); + } + + @Override + public String getNoTargetsMessage() { + return prefixed(noTargetsMessage); + } + + @Override + public Collection resolveTargets(Player sender, String input) { + Set targets = new LinkedHashSet<>(); + try { + for (Entity entity : Bukkit.selectEntities(sender, input)) { + if (entity instanceof Player target) { + targets.add(target); + } + } + } catch (IllegalArgumentException ignored) { + } + + if (!targets.isEmpty()) { + return targets; + } + + Player target = Bukkit.getPlayerExact(input); + if (target != null) { + targets.add(target); + } + return targets; + } + + @EventHandler + public void onPlayerQuit(PlayerQuitEvent event) { + disable(event.getPlayer()); + } + + private void clearActiveBars() { + if (updateTask != null) { + updateTask.cancel(); + updateTask = null; + } + + for (BossBar bossBar : activeBars.values()) { + bossBar.removeAll(); + } + activeBars.clear(); + enabledPlayers.clear(); + } + + private void enable(Player player) { + enabledPlayers.add(player.getUniqueId()); + + BossBar bossBar = activeBars.computeIfAbsent(player.getUniqueId(), uuid -> + Bukkit.createBossBar("", BarColor.GREEN, BAR_STYLE) + ); + bossBar.setVisible(true); + bossBar.addPlayer(player); + + updateBar(player, bossBar); + startTaskIfNeeded(); + } + + private void disable(Player player) { + UUID uuid = player.getUniqueId(); + enabledPlayers.remove(uuid); + + BossBar bossBar = activeBars.remove(uuid); + if (bossBar != null) { + bossBar.removeAll(); + } + + stopTaskIfIdle(); + } + + private void startTaskIfNeeded() { + if (updateTask != null || enabledPlayers.isEmpty()) { + return; + } + + updateTask = Bukkit.getScheduler().runTaskTimer(plugin, this::refreshBars, 0L, UPDATE_INTERVAL_TICKS); + } + + private void restartTaskIfNeeded() { + if (updateTask != null) { + updateTask.cancel(); + updateTask = null; + } + startTaskIfNeeded(); + } + + private void stopTaskIfIdle() { + if (!enabledPlayers.isEmpty() || updateTask == null) { + return; + } + + updateTask.cancel(); + updateTask = null; + } + + private void refreshBars() { + List stalePlayers = new ArrayList<>(); + for (UUID uuid : enabledPlayers) { + Player player = Bukkit.getPlayer(uuid); + if (player == null || !player.isOnline()) { + stalePlayers.add(uuid); + continue; + } + + BossBar bossBar = activeBars.computeIfAbsent(uuid, ignored -> + Bukkit.createBossBar("", BarColor.GREEN, BAR_STYLE) + ); + if (!bossBar.getPlayers().contains(player)) { + bossBar.addPlayer(player); + } + updateBar(player, bossBar); + } + + for (UUID uuid : stalePlayers) { + enabledPlayers.remove(uuid); + BossBar bossBar = activeBars.remove(uuid); + if (bossBar != null) { + bossBar.removeAll(); + } + } + + stopTaskIfIdle(); + } + + private void updateBar(Player player, BossBar bossBar) { + double tps = clampTps(plugin.getServer().getTPS()[0]); + double mspt = clampMspt(plugin.getServer().getAverageTickTime()); + int ping = Math.max(0, player.getPing()); + + bossBar.setTitle(buildTitle(tps, mspt, ping)); + bossBar.setColor(resolveBarColor(tps, mspt, ping)); + bossBar.setStyle(BAR_STYLE); + bossBar.setProgress(clamp(tps / MAX_TPS, 0.0D, 1.0D)); + } + + private String buildTitle(double tps, double mspt, int ping) { + return ChatColor.translateAlternateColorCodes('&', applyPlaceholders(titleFormat, Map.of( + "tps_1m", formatDouble(tps), + "mspt", formatDouble(mspt), + "ping", Integer.toString(ping) + ))); + } + + private BarColor resolveBarColor(double tps, double mspt, int ping) { + if (tps <= TPS_CRITICAL_THRESHOLD || mspt >= MSPT_CRITICAL_THRESHOLD || ping >= PING_CRITICAL_THRESHOLD) { + return BarColor.RED; + } + if (tps <= TPS_WARN_THRESHOLD || mspt >= MSPT_WARN_THRESHOLD || ping >= PING_WARN_THRESHOLD) { + return BarColor.YELLOW; + } + return BarColor.GREEN; + } + + private boolean detectNativeTpsBar() { + try { + CommandMap commandMap = Bukkit.getCommandMap(); + org.bukkit.command.Command command = commandMap.getCommand("tpsbar"); + return command != null; + } catch (Exception ignored) { + return false; + } + } + + private void addConfigDefaults() { + FileConfiguration config = plugin.getConfig(); + config.addDefault("tpsbar.mode", "auto"); + config.options().copyDefaults(true); + plugin.saveConfig(); + } + + private String prefixed(String message) { + return EssentialsC.getLangManager().getPrefix() + ChatColor.translateAlternateColorCodes('&', message); + } + + private String applyPlaceholders(String text, Map placeholders) { + String result = text == null ? "" : text; + for (Map.Entry entry : placeholders.entrySet()) { + result = result.replace("{" + entry.getKey() + "}", entry.getValue()); + } + return result; + } + + private String stripColor(String message) { + return ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', message)); + } + + private String formatDouble(double value) { + return String.format(Locale.US, "%.2f", value); + } + + private double clampTps(double value) { + if (!Double.isFinite(value)) { + return 0.0D; + } + return clamp(value, 0.0D, MAX_TPS); + } + + private double clampMspt(double value) { + if (!Double.isFinite(value)) { + return 0.0D; + } + return Math.max(0.0D, value); + } + + private double clamp(double value, double min, double max) { + return Math.max(min, Math.min(max, value)); + } + + private enum Mode { + OFF, + AUTO, + ON; + + private static Mode fromString(String value) { + if (value == null) { + return AUTO; + } + return switch (value.toLowerCase(Locale.ROOT)) { + case "off", "false", "disabled" -> OFF; + case "on", "enabled", "plugin" -> ON; + default -> AUTO; + }; + } + } +} diff --git a/src/main/java/cn/infstar/essentialsC/tpsbar/TpsBarService.java b/src/main/java/cn/infstar/essentialsC/tpsbar/TpsBarService.java new file mode 100644 index 0000000..d31c8f9 --- /dev/null +++ b/src/main/java/cn/infstar/essentialsC/tpsbar/TpsBarService.java @@ -0,0 +1,28 @@ +package cn.infstar.essentialsC.tpsbar; + +import org.bukkit.entity.Player; + +import java.util.Collection; + +public interface TpsBarService { + + boolean isPluginCommandEnabled(); + + boolean isNativeCommandAvailable(); + + void reloadSettings(); + + void shutdown(); + + boolean toggle(Player target); + + void sendToggleMessage(Player actor, Player target, boolean enabled); + + String getUsageMessage(); + + String getPlayerNotFoundMessage(String input); + + String getNoTargetsMessage(); + + Collection resolveTargets(Player sender, String input); +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 26f6c22..94cdb02 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,104 +1,96 @@ -# EssentialsC 配置文件 -# 你可以编辑此文件来自定义插件行为 +# EssentialsC 主配置文件 -# 语言设置 -# 可用语言: en_US, zh_CN (你可以添加更多) +# 配置文件版本号 +config-version: 2 + +# 语言文件名称，对应插件数据目录下 lang/<语言名>.yml language: "zh_CN" -# 通用设置 -settings: - # 启用或禁用命令反馈消息 - enable-feedback: true +admin-mode: + # 原版默认飞行速度为 0.1，这里 0.2 表示两倍飞行速度 + fly-speed: 0.2 + actionbar: + # 管理模式状态提示的刷新间隔，单位为 tick + interval-ticks: 40 -# 功能方块菜单配置 -blocks-menu: - title: "&6&lEssentialsC &8- &e&l功能方块菜单" - items: - workbench: - slot: 10 - material: CRAFTING_TABLE - name: "&e工作台" - lore: - - "&7/workbench" - - "&7打开工作台" - permission: essentialsc.command.workbench - anvil: - slot: 11 - material: ANVIL - name: "&e铁砧" - lore: - - "&7/anvil" - - "&7打开铁砧" - permission: essentialsc.command.anvil - cartographytable: - slot: 19 - material: CARTOGRAPHY_TABLE - name: "&e制图台" - lore: - - "&7/cartographytable" - - "&7打开制图台" - permission: essentialsc.command.cartographytable - grindstone: - slot: 20 - material: GRINDSTONE - name: "&e砂轮" - lore: - - "&7/grindstone" - - "&7打开砂轮" - permission: essentialsc.command.grindstone - loom: - slot: 21 - material: LOOM - name: "&e织布机" - lore: - - "&7/loom" - - "&7打开织布机" - permission: essentialsc.command.loom - smithingtable: - slot: 22 - material: SMITHING_TABLE - name: "&e锻造台" - lore: - - "&7/smithingtable" - - "&7打开锻造台" - permission: essentialsc.command.smithingtable - stonecutter: - slot: 23 - material: STONECUTTER - name: "&e切石机" - lore: - - "&7/stonecutter" - - "&7打开切石机" - permission: essentialsc.command.stonecutter - enderchest: - slot: 31 - material: ENDER_CHEST - name: "&e末影箱" - lore: - - "&7/enderchest" - - "&7打开末影箱" - permission: essentialsc.command.enderchest - -# 潜影盒设置 -shulkerbox: - # 潜影盒默认标题（当潜影盒没有自定义名称时使用） - # 支持颜色代码（使用 & 符号） - # 留空则使用 "Shulker Box"（客户端语言） - default-title: "&e潜影盒" - -# JEI/REI 配方同步设置（MC 1.21.2+） -# 解决 Fabric/NeoForge 客户端配方不同步问题 jei-sync: - # 是否启用 JEI 配方同步功能 + # 是否启用 JEI 配方同步修复 enabled: true - # 是否在控制台显示同步日志 - debug: true - # 是否向玩家发送同步提示消息 + # 是否输出调试日志 + debug: false + # 是否在玩家加入时发送同步提示 send-player-message: true -# 生物掉落物控制 mob-drops: - # 末影人掉落物控制 enderman: - # 是否允许末影人死亡后掉落物品和经验 + # 是否允许末影人掉落方块 enabled: true + +tpsbar: + # 可选值：off / auto / on + # auto: 若服务端没有原生 /tpsbar，则启用插件实现 + # on: 始终启用插件实现；若服务端已有原生命令，则自动跳过以避免冲突 + mode: auto + +blocks-menu: + # 菜单布局版本，用于后续自动迁移槽位布局 + layout-version: 2 + sections: + blocks: + items: + workbench: + # 物品所在槽位 + slot: 10 + # 菜单图标材质 + material: CRAFTING_TABLE + # 所需权限 + permission: essentialsc.command.workbench + # 点击后执行的命令键 + command: workbench + enderchest: + slot: 11 + material: ENDER_CHEST + permission: essentialsc.command.enderchest + command: enderchest + anvil: + slot: 12 + material: ANVIL + permission: essentialsc.command.anvil + command: anvil + grindstone: + slot: 19 + material: GRINDSTONE + permission: essentialsc.command.grindstone + command: grindstone + smithingtable: + slot: 20 + material: SMITHING_TABLE + permission: essentialsc.command.smithingtable + command: smithingtable + stonecutter: + slot: 21 + material: STONECUTTER + permission: essentialsc.command.stonecutter + command: stonecutter + loom: + slot: 28 + material: LOOM + permission: essentialsc.command.loom + command: loom + cartographytable: + slot: 29 + material: CARTOGRAPHY_TABLE + permission: essentialsc.command.cartographytable + command: cartographytable + shortcuts: + items: + nightvision: + slot: 14 + material: TINTED_GLASS + permission: essentialsc.command.nightvision + command: nightvision + glow: + slot: 15 + material: GLOWSTONE + permission: essentialsc.command.glow + command: glow diff --git a/src/main/resources/lang/en_US.yml b/src/main/resources/lang/en_US.yml index 892677a..95cdce3 100644 --- a/src/main/resources/lang/en_US.yml +++ b/src/main/resources/lang/en_US.yml @@ -1,22 +1,36 @@ -# English Language File (en_US) -# You can customize all messages here +# English language file -# Plugin prefix prefix: "&6[EssentialsC] &r" -# Command messages messages: no-permission: "&cYou don't have permission to use this command!\n&7Required permission: {permission}" player-only: "&cThis command can only be executed by players!" + config-reloaded: "&aConfiguration reloaded." + version: "&fEssentialsC v{version}" + paper-version: "&7Running on Paper {version}" + unknown-subcommand: "&cUnknown subcommand: {command}" + help-usage: "&7Use &f/essc help &7to view available commands." + blocks-menu-empty: "&cYou do not currently have any available shortcut menu entries." + hat-success: "&aYou are now wearing {item} on your head!" - hat-failed: "&cFailed to wear item on head!" + hat-failed: "&cFailed to wear the item on your head!" hat-no-item: "&cYou need to hold an item in your hand!" suicide-message: "&e{player} has committed suicide!" fly-enabled: "&aFlight mode enabled!" fly-disabled: "&cFlight mode disabled!" + nightvision-enabled: "&aNight vision enabled!" + nightvision-disabled: "&cNight vision disabled!" + nightvision-usage: "&cUsage: /nightvision [on|off|toggle]" + glow-enabled: "&aGlowing enabled!" + glow-disabled: "&cGlowing disabled!" + glow-usage: "&cUsage: /glow [on|off|toggle]" vanish-enabled: "&aYou are now vanished!" vanish-disabled: "&cYou are no longer vanished!" seen-usage: "&cUsage: /seen " + seen-usage-console: "&cUsage: /seen " + player-not-found: "&cPlayer not found: {player}" + no-permission-others: "&cYou don't have permission to affect other players!" + anvil-opened: "&aAnvil opened!" enchantingtable-opened: "&aEnchanting table opened!" heal-self: "&aYour health and hunger have been restored!" @@ -31,19 +45,23 @@ messages: repair-no-item-in-hand: "&cYou don't have an item in your hand!" repair-no-items: "&cNo repairable items in inventory!" no-permission-repair-all: "&cYou don't have permission to repair all items!" - player-not-found: "&cPlayer not found: {player}" - no-permission-others: "&cYou don't have permission to heal others!" - -# Help command + + mobdrop-save-failed: "&cFailed to save config: {error}" + mobdrop-toggled: "&aEnderman drops are now {status}&a." + shulkerbox-nested: "&cYou cannot put a shulker box inside another shulker box." + shulkerbox-unstack-first: "&cPlease unstack the shulker box before using quick open." + jei-sync-fabric: "&6JEI-FIX&8(&bFabric&8): &eSynchronizing recipes..." + jei-sync-neoforge: "&6JEI-FIX&8(&bNeoForge&8): &eSynchronizing recipes..." + help: title: "&6========== &eEssentialsC Help &6==========" version: "&7Plugin Version: &f{version}" section-blocks: "&6Functional Block Commands:" section-other: "&6Other Commands:" - footer: "&7Permissions required for each command" - + footer: "&7Each command requires the corresponding permission." + commands: - workbench: " &f/workbench &7- Open a workbench" + workbench: " &f/workbench &7- Open a crafting table" anvil: " &f/anvil &7- Open an anvil" enchantingtable: " &f/enchantingtable &7- Open an enchanting table" cartographytable: " &f/cartographytable &7- Open a cartography table" @@ -52,11 +70,102 @@ help: smithingtable: " &f/smithingtable &7- Open a smithing table" stonecutter: " &f/stonecutter &7- Open a stonecutter" enderchest: " &f/enderchest &7- Open your ender chest" - hat: " &f/hat &7- Wear held item as a hat" + blocks: " &f/blocks &7- Open the shortcut menu" + hat: " &f/hat &7- Wear the held item as a hat" suicide: " &f/suicide &7- Commit suicide" fly: " &f/fly &7- Toggle flight mode" + nightvision: " &f/nightvision &7- Toggle night vision" + glow: " &f/glow &7- Toggle glowing" heal: " &f/heal &7- Restore health and hunger" vanish: " &f/vanish &7- Toggle vanish mode" seen: " &f/seen &7- View player information" feed: " &f/feed &7- Restore hunger" - repair: " &f/repair &7- Repair hand or all items" + repair: " &f/repair &7- Repair held or all items" + admin: " &f/essc admin &7- Toggle admin mode" + tpsbar: " &f/tpsbar [player] &7- Toggle TPS boss bar" + +blocks-menu: + title: "&6&lEssentialsC &8- &e&lShortcut Menu" + items: + workbench: + name: "&eWorkbench" + lore: + - "&7/workbench" + - "&7Open a crafting table" + enderchest: + name: "&eEnder Chest" + lore: + - "&7/enderchest" + - "&7Open your ender chest" + anvil: + name: "&eAnvil" + lore: + - "&7/anvil" + - "&7Open an anvil" + grindstone: + name: "&eGrindstone" + lore: + - "&7/grindstone" + - "&7Open a grindstone" + smithingtable: + name: "&eSmithing Table" + lore: + - "&7/smithingtable" + - "&7Open a smithing table" + stonecutter: + name: "&eStonecutter" + lore: + - "&7/stonecutter" + - "&7Open a stonecutter" + loom: + name: "&eLoom" + lore: + - "&7/loom" + - "&7Open a loom" + cartographytable: + name: "&eCartography Table" + lore: + - "&7/cartographytable" + - "&7Open a cartography table" + nightvision: + name: "&bNight Vision" + lore: + - "&7/nightvision" + - "&7Toggle night vision" + glow: + name: "&eGlow" + lore: + - "&7/glow" + - "&7Toggle your glowing effect" + +admin-mode: + actionbar: "&c&lAdmin Mode" + messages: + enabled: "&aAdmin mode enabled, normal inventory has been saved." + disabled: "&cAdmin mode disabled, normal inventory has been restored." + crash-restored: "&eThe previous admin mode session has been restored safely." + +tpsbar: + title-format: "&eTPS&7: {tps_1m} &8| &eMSPT&7: {mspt} &8| &ePing&7: {ping}" + messages: + enabled-self: "&aTPSBar enabled." + disabled-self: "&cTPSBar disabled." + enabled-other: "&aEnabled TPSBar for {player}." + disabled-other: "&cDisabled TPSBar for {player}." + usage: "&cUsage: /tpsbar [player]" + player-not-found: "&cPlayer not found: {player}" + no-targets: "&cNo matching players were found to toggle." + native-detected: "&7Detected a native /tpsbar command on this server, skipped plugin implementation." + plugin-enabled: "&7No native /tpsbar command was detected, plugin implementation enabled." + plugin-forced-but-native-exists: "&eThe configuration requests the plugin TPSBar, but a native /tpsbar already exists, so the plugin implementation was skipped to avoid conflicts." + mode-changed-reload: "&eTPSBar mode has been updated, but command registration changes require a server restart to fully take effect." + +mobdrops-menu: + title: "&6&lMob Drop Control" + status: + enabled: "&aEnabled" + disabled: "&cDisabled" + enderman: + name: "&dEnderman Drops" + status: "&7Current status: {status}" + toggle: "&eClick to toggle" diff --git a/src/main/resources/lang/zh_CN.yml b/src/main/resources/lang/zh_CN.yml index f110f8a..c86c40a 100644 --- a/src/main/resources/lang/zh_CN.yml +++ b/src/main/resources/lang/zh_CN.yml @@ -1,55 +1,65 @@ -# Chinese Language File (zh_CN) -# 中文语言文件 +# 简体中文语言文件 -# 插件前缀 -prefix: "&7[&6EssentialsC&7]&f:" +prefix: "&7[&6EssentialsC&7]&f：&r" -# 命令消息 messages: - no-permission: "&c你没有权限执行此命令！\n&7需要权限: {permission}" - player-only: "&c该命令只能由玩家执行！" - hat-success: "&a你现在将 {item} 戴在头上！" - hat-failed: "&c无法将物品戴在头上！" - hat-no-item: "&c你需要在手中持有物品！" + no-permission: "&c你没有权限执行此命令！\n&7需要权限：{permission}" + player-only: "&c此命令只能由玩家执行！" + config-reloaded: "&a配置已重载。" + version: "&fEssentialsC v{version}" + paper-version: "&7当前运行于 Paper {version}" + unknown-subcommand: "&c未知子命令：{command}" + help-usage: "&7使用 &f/essc help &7查看可用命令。" + blocks-menu-empty: "&c你当前没有可用的便捷菜单项目。" + + hat-success: "&a你已将 {item} 戴在头上！" + hat-failed: "&c无法将该物品戴在头上！" + hat-no-item: "&c你需要手持一个物品！" suicide-message: "&e{player} 自杀了！" - fly-enabled: "&a飞行模式已启用！" - fly-disabled: "&c飞行模式已禁用！" + fly-enabled: "&a飞行模式已开启！" + fly-disabled: "&c飞行模式已关闭！" + nightvision-enabled: "&a夜视已开启！" + nightvision-disabled: "&c夜视已关闭！" + nightvision-usage: "&c用法：/nightvision [on|off|toggle]" + glow-enabled: "&a发光已开启！" + glow-disabled: "&c发光已关闭！" + glow-usage: "&c用法：/glow [on|off|toggle]" vanish-enabled: "&a你已进入隐身模式！" vanish-disabled: "&c你已退出隐身模式！" - seen-usage: "&c用法: /seen <玩家名>" + seen-usage: "&c用法：/seen <玩家>" + seen-usage-console: "&c用法：/seen <玩家>" + player-not-found: "&c未找到玩家：{player}" + no-permission-others: "&c你没有权限影响其他玩家！" + anvil-opened: "&a已打开铁砧！" enchantingtable-opened: "&a已打开附魔台！" - heal-self: "&a你的生命值和饱食度已补满！" - heal-other: "&a你已治疗了玩家 {player}！" - heal-by-other: "&a你被管理员 {admin} 治疗了！" - feed-self: "&a你的饱食度已补满！" + heal-self: "&a你的生命值和饥饿值已恢复！" + heal-other: "&a你已治疗玩家 {player}！" + heal-by-other: "&a管理员 {admin} 治疗了你！" + feed-self: "&a你的饥饿值已恢复！" feed-other: "&a你已喂饱玩家 {player}！" - feed-by-other: "&a你被管理员 {admin} 喂饱了！" + feed-by-other: "&a管理员 {admin} 喂饱了你！" repair-hand-success: "&a手中物品已修复！" - repair-all-success: "&a已修复 {count} 件物品！" + repair-all-success: "&a已修复 {count} 个物品！" repair-not-damaged: "&c该物品没有损坏！" repair-no-item-in-hand: "&c你手中没有物品！" repair-no-items: "&c背包中没有可修复的物品！" - no-permission-repair-all: "&c你没有权限修复所有物品！" - player-not-found: "&c未找到玩家: {player}" - no-permission-others: "&c你没有权限治疗其他玩家！" - seen-usage-console: "&c用法: /seen <玩家名>" - unknown-subcommand: "&c未知子命令: {command}" - help-usage: "&7使用 §f/essc help &7查看所有可用命令" - mobdrop-save-failed: "&c保存配置失败: {error}" - mobdrop-toggled: "&a末影人掉落已{status}！" - shulkerbox-nested: "&c不能在潜影盒中放入另一个潜影盒！" - jei-sync-fabric: "&6JEI-FIX&8(&bFabric&8):&e正在同步合成配方..." - jei-sync-neoforge: "&6JEI-FIX&8(&bNeoForge&8):&e正在同步合成配方..." + no-permission-repair-all: "&c你没有权限修复全部物品！" + + mobdrop-save-failed: "&c保存配置失败：{error}" + mobdrop-toggled: "&a末影人掉落已切换为 {status}&a。" + shulkerbox-nested: "&c不能将潜影盒放入另一个潜影盒。" + shulkerbox-unstack-first: "&c请先将潜影盒拆分为单个后再快捷打开。" + jei-sync-fabric: "&6JEI-FIX&8(&bFabric&8): &e正在同步配方..." + jei-sync-neoforge: "&6JEI-FIX&8(&bNeoForge&8): &e正在同步配方..." -# 帮助命令 help: title: "&6========== &eEssentialsC 帮助 &6==========" - version: "&7插件版本: &f{version}" - section-blocks: "&6功能方块命令:" - section-other: "&6其他功能命令:" - footer: "&7需要权限才能使用各个命令" - + version: "&7插件版本：&f{version}" + section-blocks: "&6功能方块命令：" + section-other: "&6其他命令：" + footer: "&7每个命令都需要对应权限。" + commands: workbench: " &f/workbench &7- 打开工作台" anvil: " &f/anvil &7- 打开铁砧" @@ -60,12 +70,102 @@ help: smithingtable: " &f/smithingtable &7- 打开锻造台" stonecutter: " &f/stonecutter &7- 打开切石机" enderchest: " &f/enderchest &7- 打开末影箱" - hat: " &f/hat &7- 将手中物品戴在头上" + blocks: " &f/blocks &7- 打开便捷菜单" + hat: " &f/hat &7- 将手持物品戴在头上" suicide: " &f/suicide &7- 自杀" fly: " &f/fly &7- 切换飞行模式" - heal: " &f/heal &7- 恢复生命值和饱食度" + nightvision: " &f/nightvision &7- 切换夜视" + glow: " &f/glow &7- 切换发光" + heal: " &f/heal &7- 恢复生命值和饥饿值" vanish: " &f/vanish &7- 切换隐身模式" seen: " &f/seen &7- 查看玩家信息" - feed: " &f/feed &7- 补满饱食度" - repair: " &f/repair &7- 修复手中或所有物品" - blocks: " &f/blocks &7- 打开功能方块菜单" + feed: " &f/feed &7- 恢复饥饿值" + repair: " &f/repair &7- 修复手中或全部物品" + admin: " &f/essc admin &7- 切换管理模式" + tpsbar: " &f/tpsbar [玩家] &7- 切换 TPS 状态栏" + +blocks-menu: + title: "&6&lEssentialsC &8- &e&l便捷菜单" + items: + workbench: + name: "&e工作台" + lore: + - "&7/workbench" + - "&7打开工作台" + enderchest: + name: "&e末影箱" + lore: + - "&7/enderchest" + - "&7打开末影箱" + anvil: + name: "&e铁砧" + lore: + - "&7/anvil" + - "&7打开铁砧" + grindstone: + name: "&e砂轮" + lore: + - "&7/grindstone" + - "&7打开砂轮" + smithingtable: + name: "&e锻造台" + lore: + - "&7/smithingtable" + - "&7打开锻造台" + stonecutter: + name: "&e切石机" + lore: + - "&7/stonecutter" + - "&7打开切石机" + loom: + name: "&e织布机" + lore: + - "&7/loom" + - "&7打开织布机" + cartographytable: + name: "&e制图台" + lore: + - "&7/cartographytable" + - "&7打开制图台" + nightvision: + name: "&b夜视开关" + lore: + - "&7/nightvision" + - "&7切换夜视效果" + glow: + name: "&e发光开关" + lore: + - "&7/glow" + - "&7切换自身发光效果" + +admin-mode: + actionbar: "&c&l管理模式" + messages: + enabled: "&a管理模式已开启，普通背包已保存。" + disabled: "&c管理模式已关闭，普通背包已恢复。" + crash-restored: "&e上一次管理模式会话已安全恢复。" + +tpsbar: + title-format: "&eTPS&7: {tps_1m} &8| &eMSPT&7: {mspt} &8| &ePing&7: {ping}" + messages: + enabled-self: "&a已开启 TPSBar。" + disabled-self: "&c已关闭 TPSBar。" + enabled-other: "&a已为 {player} 开启 TPSBar。" + disabled-other: "&c已为 {player} 关闭 TPSBar。" + usage: "&c用法：/tpsbar [玩家]" + player-not-found: "&c未找到玩家：{player}" + no-targets: "&c没有匹配到可切换的玩家。" + native-detected: "&7检测到服务端已内置 /tpsbar，已跳过插件实现。" + plugin-enabled: "&7未检测到服务端内置 /tpsbar，已启用插件实现。" + plugin-forced-but-native-exists: "&e配置要求启用插件版 TPSBar，但服务端已存在原生 /tpsbar，已跳过插件实现以避免冲突。" + mode-changed-reload: "&eTPSBar 模式已更新，但命令注册状态需要重启服务器后才会完全生效。" + +mobdrops-menu: + title: "&6&l生物掉落控制" + status: + enabled: "&a开启" + disabled: "&c关闭" + enderman: + name: "&d末影人掉落" + status: "&7当前状态：{status}" + toggle: "&e点击切换" diff --git a/src/main/resources/paper-plugin.yml b/src/main/resources/paper-plugin.yml index c7363a6..78b3124 100644 --- a/src/main/resources/paper-plugin.yml +++ b/src/main/resources/paper-plugin.yml @@ -1,5 +1,5 @@ name: EssentialsC -description: 精简版基础插件 +description: 适用于 Paper 服务端的轻量基础插件。 version: ${version} main: cn.infstar.essentialsC.EssentialsC @@ -12,97 +12,114 @@ website: www.infstar.cn permissions: essentialsc.command.workbench: - description: Allows use of /workbench command + description: 允许使用 /workbench default: op essentialsc.command.anvil: - description: Allows use of /anvil command - default: op - essentialsc.command.enchantingtable: - description: Allows use of /enchantingtable command + description: 允许使用 /anvil default: op essentialsc.command.cartographytable: - description: Allows use of /cartographytable command + description: 允许使用 /cartographytable default: op essentialsc.command.grindstone: - description: Allows use of /grindstone command + description: 允许使用 /grindstone default: op essentialsc.command.loom: - description: Allows use of /loom command + description: 允许使用 /loom default: op essentialsc.command.smithingtable: - description: Allows use of /smithingtable command + description: 允许使用 /smithingtable default: op essentialsc.command.stonecutter: - description: Allows use of /stonecutter command + description: 允许使用 /stonecutter default: op essentialsc.command.enderchest: - description: Allows use of /enderchest command - default: op - essentialsc.command.hat: - description: Allows use of /hat command - default: op - essentialsc.command.suicide: - description: Allows use of /suicide command - default: op - essentialsc.command.fly: - description: Allows use of /fly command - default: op - essentialsc.command.heal: - description: Allows use of /heal command - default: op - essentialsc.command.vanish: - description: Allows use of /vanish command - default: op - essentialsc.command.seen: - description: Allows use of /seen command - default: op - essentialsc.command.feed: - description: Allows use of /feed command - default: op - essentialsc.command.repair: - description: Allows use of /repair command - default: op - essentialsc.command.repair.all: - description: Allows use of /repair all + description: 允许使用 /enderchest default: op essentialsc.command.blocks: - description: Allows use of /essc blocks command + description: 允许使用 /essc blocks default: true + essentialsc.command.hat: + description: 允许使用 /hat + default: op + essentialsc.command.suicide: + description: 允许使用 /suicide + default: op + essentialsc.command.fly: + description: 允许使用 /fly + default: op + essentialsc.command.nightvision: + description: 允许使用 /nightvision + default: op + essentialsc.command.glow: + description: 允许使用 /glow + default: op + essentialsc.command.heal: + description: 允许使用 /heal + default: op + essentialsc.command.heal.others: + description: 允许治疗其他玩家 + default: op + essentialsc.command.vanish: + description: 允许使用 /vanish + default: op + essentialsc.command.seen: + description: 允许使用 /seen + default: op + essentialsc.command.feed: + description: 允许使用 /feed + default: op + essentialsc.command.feed.others: + description: 允许为其他玩家补食 + default: op + essentialsc.command.repair: + description: 允许使用 /repair + default: op + essentialsc.command.repair.all: + description: 允许使用 /repair all + default: op + essentialsc.command.admin: + description: 允许使用 /essc admin + default: op essentialsc.command.help: - description: Allows use of /essentialsc help command + description: 允许使用 /essc help default: true essentialsc.command.reload: - description: Allows use of /essc reload command + description: 允许使用 /essc reload default: op essentialsc.shulkerbox.open: - description: Allows right-click to open shulker boxes without placing them + description: 允许通过 Shift+右键快捷打开潜影盒 default: op essentialsc.mobdrops.enderman: - description: Allows control of enderman drops + description: 允许控制末影人掉落 default: op essentialsc.*: - description: All EssentialsC permissions + description: 授予 EssentialsC 的全部权限 default: false children: essentialsc.command.workbench: true essentialsc.command.anvil: true - essentialsc.command.enchantingtable: true essentialsc.command.cartographytable: true essentialsc.command.grindstone: true essentialsc.command.loom: true essentialsc.command.smithingtable: true essentialsc.command.stonecutter: true essentialsc.command.enderchest: true + essentialsc.command.blocks: true essentialsc.command.hat: true essentialsc.command.suicide: true essentialsc.command.fly: true + essentialsc.command.nightvision: true + essentialsc.command.glow: true essentialsc.command.heal: true + essentialsc.command.heal.others: true essentialsc.command.vanish: true essentialsc.command.seen: true - essentialsc.command.reload: true essentialsc.command.feed: true + essentialsc.command.feed.others: true essentialsc.command.repair: true essentialsc.command.repair.all: true + essentialsc.command.admin: true essentialsc.command.help: true + essentialsc.command.reload: true essentialsc.shulkerbox.open: true essentialsc.mobdrops.enderman: true