From 6a4526521515049181f4008c47cba66998ad83c3 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Thu, 19 Oct 2023 15:01:34 +0800 Subject: [PATCH] =?UTF-8?q?style(core-bukkit):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/bukkit/command/ParentCommand.java | 16 ++++--------- .../command/core/ParentCoreCommand.java | 6 ++++- .../command/lore/ParentLoreCommand.java | 6 ++++- .../core/bukkit/constant/CoreMessage.java | 1 + .../core/bukkit/util/CoreBukkitUtils.java | 23 ++++++++++++++----- 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java index 1dcb799..23d6934 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java @@ -13,24 +13,16 @@ import java.util.stream.Collectors; @SuppressWarnings("unused") public abstract class ParentCommand extends ChildCommand { - @NotNull - private final String name; @NotNull private final List childCommands; - public ParentCommand(@NotNull String name) { - this.name = name; + public ParentCommand() { childCommands = new ArrayList<>(); } @NotNull public abstract JavaPlugin getPlugin(); - @Override - public @NotNull String getName() { - return name; - } - @Nullable public ParentCommand getParent() { return null; @@ -46,9 +38,9 @@ public abstract class ParentCommand extends ChildCommand { public String getUsage() { ParentCommand parent = getParent(); if (parent == null) { - return "/" + name; + return "/" + getName(); } - return parent.getUsage() + " " + name; + return parent.getUsage() + " " + getName(); } @Override @@ -103,7 +95,7 @@ public abstract class ParentCommand extends ChildCommand { } public void sendHelp(@NotNull CommandSender sender) { - sender.sendMessage("§e==================== [ " + name + " 使用帮助] ===================="); + sender.sendMessage("§e==================== [ " + getName() + " 使用帮助] ===================="); Map helpMap = getCommandHelp(sender); int maxLength = helpMap.keySet().stream() .map(String::length) diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/ParentCoreCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/ParentCoreCommand.java index 4c4de5f..5e0063a 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/ParentCoreCommand.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/ParentCoreCommand.java @@ -10,7 +10,6 @@ public class ParentCoreCommand extends ParentCommand { public static final ParentCoreCommand INSTANCE = new ParentCoreCommand(); private ParentCoreCommand() { - super("hamster-core"); addChildCommand(EnvCommand.INSTANCE); addChildCommand(GCCommand.INSTANCE); addChildCommand(YamlCommand.INSTANCE); @@ -20,6 +19,11 @@ public class ParentCoreCommand extends ParentCommand { addChildCommand(SystemCommand.INSTANCE); } + @Override + public @NotNull String getName() { + return "hamster-core"; + } + @Override public @NotNull JavaPlugin getPlugin() { return HamsterCorePlugin.getInstance(); diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/ParentLoreCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/ParentLoreCommand.java index a55a6de..f460561 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/ParentLoreCommand.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/ParentLoreCommand.java @@ -12,7 +12,6 @@ public final class ParentLoreCommand extends ParentCommand { public static final ParentLoreCommand INSTANCE = new ParentLoreCommand(); public ParentLoreCommand() { - super("lore"); addChildCommand(LoreAddCommand.INSTANCE); addChildCommand(LoreRemoveCommand.INSTANCE); addChildCommand(LoreSetCommand.INSTANCE); @@ -22,6 +21,11 @@ public final class ParentLoreCommand extends ParentCommand { addChildCommand(LoreFlagCommand.INSTANCE); } + @Override + public @NotNull String getName() { + return "lore"; + } + @Override public @NotNull JavaPlugin getPlugin() { return HamsterCorePlugin.getInstance(); diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java index 160e9f8..090745a 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java @@ -50,6 +50,7 @@ public enum CoreMessage { for (CoreMessage value : values()) { ConfigurationSection section = config.getConfigurationSection(value.name()); if (section == null) { + logger.warning("未找到消息设置: " + value.name()); continue; } try { diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java index 0c9d23d..d8c010a 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java @@ -241,18 +241,29 @@ public final class CoreBukkitUtils { return container.toString(); } - @NotNull - public static ItemStack deserializeItemStack(@NotNull String s) { - return NBTItem.convertNBTtoItem(new NBTContainer(s)); + @Nullable + public static ItemStack deserializeItemStack(@NotNull String string) { + ItemStack stack; + try { + stack = NBTItem.convertNBTtoItem(new NBTContainer(string)); + } catch (Exception ignored) { + stack = null; + } + return stack; } @NotNull - public static ItemStack deserializeItemStack(@NotNull String s, @NotNull ItemStack defaultValue) { + public static ItemStack deserializeItemStack(@NotNull String string, @NotNull ItemStack defaultValue) { + ItemStack stack; try { - return NBTItem.convertNBTtoItem(new NBTContainer(s)); - } catch (Exception e) { + stack = NBTItem.convertNBTtoItem(new NBTContainer(string)); + } catch (Exception ignored) { + stack = null; + } + if (stack == null) { return defaultValue; } + return stack; } @NotNull