diff --git a/pom.xml b/pom.xml index 95618ad..98e78d8 100644 --- a/pom.xml +++ b/pom.xml @@ -13,13 +13,13 @@ UTF-8 UTF-8 - 1.4.15 - 2.1.0 + 1.4.18 + 2.3.0 cc.carm.plugin userprefix - 3.0.3 + 3.1.0 UserPrefix 轻便、高效、实时的用户前缀系统。 diff --git a/src/main/java/cc/carm/plugin/userprefix/conf/PluginConfig.java b/src/main/java/cc/carm/plugin/userprefix/conf/PluginConfig.java index 3ca94c7..0898efa 100644 --- a/src/main/java/cc/carm/plugin/userprefix/conf/PluginConfig.java +++ b/src/main/java/cc/carm/plugin/userprefix/conf/PluginConfig.java @@ -38,7 +38,7 @@ public class PluginConfig extends ConfigurationRoot { public static final ConfigValue CHECK_UPDATE = ConfiguredValue.of(Boolean.class, true); @HeaderComment({"自定义存储位置设定", "可以规定到远程文件夹中去加载前缀配置"}) - public static final class CUSTOM_STORAGE { + public static final class CUSTOM_STORAGE extends ConfigurationRoot { @HeaderComment({"是否启用自定义存储位置"}) public static final ConfigValue ENABLE = ConfiguredValue.of(Boolean.class, false); @@ -53,7 +53,7 @@ public class PluginConfig extends ConfigurationRoot { } @HeaderComment("功能设定") - public static class FUNCTIONS { + public static class FUNCTIONS extends ConfigurationRoot { @ConfigPath("on-name-prefix") @HeaderComment({"头顶与TabList前缀功能，该方法用到了玩家名计分板接口，如有冲突请关掉哦~"}) @@ -79,28 +79,28 @@ public class PluginConfig extends ConfigurationRoot { "- 注意聊天格式需要遵守Bukkit原格式，即不得缺失 “%1$s” 和 “%2$s” 。", "- 本插件的聊天功能不影响其他插件对聊天事件的操作。" }) - public static final class CHAT { + public static final class CHAT extends ConfigurationRoot { @HeaderComment("是否开启本功能") - public static ConfigValue ENABLE = ConfiguredValue.of(Boolean.class, false); + public static final ConfigValue ENABLE = ConfiguredValue.of(Boolean.class, false); @HeaderComment({ "聊天的格式，注意 “%1$s” 和 “%2$s” 不可缺少。", "- %1$s -> 玩家名", "- %2$s -> 聊天内容" }) - public static ConfigValue FORMAT = ConfiguredValue.of(String.class, "<%1$s> %2$s"); + public static final ConfigValue FORMAT = ConfiguredValue.of(String.class, "<%1$s> %2$s"); } } @HeaderComment({"前缀GUI界面设定"}) - public static class GUI { + public static class GUI extends ConfigurationRoot { @HeaderComment("GUI的标题") public static final ConfigValue TITLE = ConfiguredValue.of(String.class, "&f&l我的前缀 &8| 列表"); @HeaderComment("GUI中的按钮") - public static final class ITEMS { + public static final class ITEMS extends ConfigurationRoot { @HeaderComment("前往下一页的物品 (只有存在下一页时才会显示)") public static final ConfiguredItem NEXT_PAGE = ConfiguredItem.create() @@ -137,7 +137,7 @@ public class PluginConfig extends ConfigurationRoot { } @HeaderComment({"相关的声音，留空则不播放声音", "格式为 【声音名:音量:音调】 或 【声音名:音量】 或 【声音名】"}) - public static final class SOUNDS { + public static final class SOUNDS extends ConfigurationRoot { public static final ConfiguredSound GUI_OPEN = ConfiguredSound.of("BLOCK_NOTE_BLOCK_PLING", 0.5F, 0.8F); public static final ConfiguredSound GUI_CLICK = ConfiguredSound.of("UI_BUTTON_CLICK"); @@ -147,7 +147,7 @@ public class PluginConfig extends ConfigurationRoot { } @HeaderComment({"默认前缀配置"}) - public static final class DEFAULT_PREFIX { + public static final class DEFAULT_PREFIX extends ConfigurationRoot { @HeaderComment("默认前缀的显示名称，用于在消息提示中显示。") public static final ConfigValue NAME = ConfiguredValue.of(String.class, "默认前缀"); @@ -164,7 +164,7 @@ public class PluginConfig extends ConfigurationRoot { .build(); @HeaderComment({"默认前缀的显示物品"}) - public static final class ITEM { + public static final class ITEM extends ConfigurationRoot { @HeaderComment({"当未选择默认前缀时显示的物品"}) public static final ConfiguredItem NOT_USING = ConfiguredItem.create() diff --git a/src/main/java/cc/carm/plugin/userprefix/conf/PluginMessages.java b/src/main/java/cc/carm/plugin/userprefix/conf/PluginMessages.java index 7a22b3a..b230948 100644 --- a/src/main/java/cc/carm/plugin/userprefix/conf/PluginMessages.java +++ b/src/main/java/cc/carm/plugin/userprefix/conf/PluginMessages.java @@ -6,7 +6,7 @@ import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredMessageList; public class PluginMessages extends ConfigurationRoot { - public static final class COMMAND_USAGE { + public static final class COMMAND_USAGE extends ConfigurationRoot { public static ConfiguredMessageList CONSOLE = ConfiguredMessageList.asStrings().defaults( "&f请输入 &b/prefix <玩家ID> &f为指定玩家打开前缀GUI。" @@ -47,7 +47,7 @@ public class PluginMessages extends ConfigurationRoot { .defaults("&7您先前使用的前缀已被移除，现在已为您重新调整为 &f%(newName) &7。") .params("newName").build(); - public static final class RELOAD { + public static final class RELOAD extends ConfigurationRoot { public static ConfiguredMessageList SUCCESS = ConfiguredMessageList.asStrings() .defaults("&a&l重载完成！&7耗时 &f%(time)ms&7，共加载了 &b%(count) &7个前缀。") @@ -58,7 +58,7 @@ public class PluginMessages extends ConfigurationRoot { .params("error").build(); } - public static final class SET { + public static final class SET extends ConfigurationRoot { public static ConfiguredMessageList SUCCESS = ConfiguredMessageList.asStrings() .defaults("&a&l设置成功！&7成功设定玩家 &b%(player) &f的前缀为 &r%(prefix) &f。") @@ -77,7 +77,7 @@ public class PluginMessages extends ConfigurationRoot { @HeaderComment("管理员使用的 “/upa list” 指令的格式") - public static final class LIST { + public static final class LIST extends ConfigurationRoot { public static ConfiguredMessageList HEADER = ConfiguredMessageList.asStrings() .defaults("&3&l用户前缀系统 &f前缀列表").build(); diff --git a/src/main/java/cc/carm/plugin/userprefix/conf/prefix/PrefixConfig.java b/src/main/java/cc/carm/plugin/userprefix/conf/prefix/PrefixConfig.java index 7019948..166ae8f 100644 --- a/src/main/java/cc/carm/plugin/userprefix/conf/prefix/PrefixConfig.java +++ b/src/main/java/cc/carm/plugin/userprefix/conf/prefix/PrefixConfig.java @@ -82,7 +82,7 @@ public class PrefixConfig { @Nullable public ItemStack getItemWhenUsing(@Nullable Player player) { - if (this.itemWhenUsing == null) return getItemHasPermission(player); + if (this.itemWhenUsing == null) return null; else return this.itemWhenUsing.getItemStack(player); } @@ -95,7 +95,7 @@ public class PrefixConfig { } public boolean isVisible(Player player) { - return this.itemWhenUsing != null || checkPermission(player); + return this.itemNoPermission != null || checkPermission(player); } /**