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