diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java index c84046a..65a40e6 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java @@ -59,8 +59,8 @@ public class HamsterCorePlugin extends JavaPlugin { logger.info("已注册 CallbackListener."); Bukkit.getPluginManager().registerEvents(DebugListener.INSTANCE, this); logger.info("已注册 DebugListener."); - ParentCoreCommand.INSTANCE.hook(); - ParentLoreCommand.INSTANCE.hook(); + ParentCoreCommand.INSTANCE.register(); + ParentLoreCommand.INSTANCE.register(); long time = System.currentTimeMillis() - start; Bukkit.getScheduler().runTaskLater(this, () -> { PointAPI.reloadPlayerPointAPIHook(); diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ChildCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ChildCommand.java index 816fdec..8f5a958 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ChildCommand.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ChildCommand.java @@ -11,9 +11,8 @@ public abstract class ChildCommand implements TabExecutor { @NotNull public abstract String getUsage(); - public abstract boolean hasPermission(@NotNull CommandSender sender); - @NotNull public abstract String getDescription(); + public abstract boolean hasPermission(@NotNull CommandSender sender); } 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 23d6934..894a70d 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 @@ -53,6 +53,25 @@ public abstract class ParentCommand extends ChildCommand { return ""; } + public void register() { + JavaPlugin plugin = getPlugin(); + PluginCommand command = plugin.getCommand(getName()); + if (command == null) { + throw new IllegalArgumentException("在插件 " + plugin.getName() + " 中未找到指令 " + getName() + "."); + } + command.setExecutor(this); + command.setTabCompleter(this); + plugin.getLogger().info("已注册指令 " + getUsage() + "."); + } + + /** + * 建议使用 {@link #register()} + */ + @Deprecated + public void hook() { + register(); + } + /** * 获取所有子命令 *
@@ -108,17 +127,6 @@ public abstract class ParentCommand extends ChildCommand { } } - public void hook() { - JavaPlugin plugin = getPlugin(); - PluginCommand command = plugin.getCommand(getName()); - if (command == null) { - throw new IllegalArgumentException("在插件 " + plugin.getName() + " 中未找到指令 " + getName() + "."); - } - command.setExecutor(this); - command.setTabCompleter(this); - plugin.getLogger().info("已注册指令 " + getUsage() + "."); - } - @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { if (!hasPermission(sender)) { diff --git a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java index 40b67cc..652cc8a 100644 --- a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java +++ b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java @@ -1,5 +1,7 @@ package cn.hamster3.mc.plugin.core.common.util; +import cn.hamster3.mc.plugin.core.common.api.CoreAPI; +import com.google.gson.Gson; import com.google.gson.JsonObject; import net.kyori.adventure.key.Key; import net.kyori.adventure.sound.Sound; @@ -16,6 +18,17 @@ import java.util.zip.ZipOutputStream; @SuppressWarnings("unused") public final class CoreUtils { + /** + * @deprecated 建议使用 {@link CoreAPI#getGson()} + */ + @Deprecated + public static Gson GSON = CoreAPI.getInstance().getGson(); + /** + * @deprecated 建议使用 {@link CoreAPI#getHumanGson()} + */ + @Deprecated + public static Gson GSON_HUMAN = CoreAPI.getInstance().getHumanGson(); + private CoreUtils() { }