diff --git a/README.md b/README.md index 591f555..ab5c2b6 100644 --- a/README.md +++ b/README.md @@ -92,11 +92,11 @@ README LANGUAGES [ [**中文**](README.md) | [English](README-en.md) ] ## 配置文件示例 -### 基础配置文件 ([`config.yml`](src/main/java/cc/carm/plugin/userprefix/configuration/PluginConfig.java)) +### 基础配置文件 ([`config.yml`](src/main/java/cc/carm/plugin/userprefix/conf/PluginConfig.java)) 将会在服务器首次启动时生成,如果您想要修改配置,请在服务器启动后打开配置文件。 -### 消息配置文件 ([`messages.yml`](src/main/java/cc/carm/plugin/userprefix/configuration/PluginMessages.java)) +### 消息配置文件 ([`messages.yml`](src/main/java/cc/carm/plugin/userprefix/conf/PluginMessages.java)) 将会在服务器首次启动时生成,如果您想要修改配置,请在服务器启动后打开配置文件 。 diff --git a/src/main/java/cc/carm/plugin/userprefix/Main.java b/src/main/java/cc/carm/plugin/userprefix/Main.java index 9ba2eb6..94f2c93 100644 --- a/src/main/java/cc/carm/plugin/userprefix/Main.java +++ b/src/main/java/cc/carm/plugin/userprefix/Main.java @@ -2,11 +2,12 @@ package cc.carm.plugin.userprefix; import cc.carm.lib.easyplugin.EasyPlugin; import cc.carm.lib.easyplugin.gui.GUI; +import cc.carm.lib.easyplugin.gui.paged.AutoPagedGUI; import cc.carm.lib.easyplugin.updatechecker.GHUpdateChecker; import cc.carm.lib.easyplugin.utils.MessageUtils; import cc.carm.plugin.userprefix.command.AdminCommand; import cc.carm.plugin.userprefix.command.UserCommand; -import cc.carm.plugin.userprefix.configuration.PluginConfig; +import cc.carm.plugin.userprefix.conf.PluginConfig; import cc.carm.plugin.userprefix.hooker.UserPrefixExpansion; import cc.carm.plugin.userprefix.listener.ChatListener; import cc.carm.plugin.userprefix.listener.UserListener; @@ -50,7 +51,6 @@ public class Main extends EasyPlugin { registerCommand("UserPrefixAdmin", new AdminCommand()); log("注册监听器..."); - GUI.initialize(this); registerListener(new UserListener()); registerListener(new ChatListener()); ServiceManager.getService().getEventBus().subscribe( @@ -58,6 +58,11 @@ public class Main extends EasyPlugin { UserNodeUpdateProcessor::process ); + log("初始化GUI管理器..."); + GUI.initialize(this); + AutoPagedGUI.defaultNextPage = (PluginConfig.GUI.ITEMS.NEXT_PAGE::getItem); + AutoPagedGUI.defaultPreviousPage = (PluginConfig.GUI.ITEMS.PREV_PAGE::getItem); + if (MessageUtils.hasPlaceholderAPI()) { log("注册变量..."); new UserPrefixExpansion(getInstance()).register(); diff --git a/src/main/java/cc/carm/plugin/userprefix/UserPrefixAPI.java b/src/main/java/cc/carm/plugin/userprefix/UserPrefixAPI.java index f028ae0..92761ba 100644 --- a/src/main/java/cc/carm/plugin/userprefix/UserPrefixAPI.java +++ b/src/main/java/cc/carm/plugin/userprefix/UserPrefixAPI.java @@ -1,6 +1,6 @@ package cc.carm.plugin.userprefix; -import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig; +import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig; import cc.carm.plugin.userprefix.manager.ConfigManager; import cc.carm.plugin.userprefix.manager.PrefixManager; import cc.carm.plugin.userprefix.manager.UserManager; diff --git a/src/main/java/cc/carm/plugin/userprefix/command/AdminCommand.java b/src/main/java/cc/carm/plugin/userprefix/command/AdminCommand.java index 0b43b74..1b0cd54 100644 --- a/src/main/java/cc/carm/plugin/userprefix/command/AdminCommand.java +++ b/src/main/java/cc/carm/plugin/userprefix/command/AdminCommand.java @@ -1,8 +1,8 @@ package cc.carm.plugin.userprefix.command; import cc.carm.plugin.userprefix.UserPrefixAPI; -import cc.carm.plugin.userprefix.configuration.PluginMessages; -import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig; +import cc.carm.plugin.userprefix.conf.PluginMessages; +import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig; import cc.carm.plugin.userprefix.ui.PrefixSelectGUI; import org.bukkit.Bukkit; import org.bukkit.command.Command; diff --git a/src/main/java/cc/carm/plugin/userprefix/command/UserCommand.java b/src/main/java/cc/carm/plugin/userprefix/command/UserCommand.java index 3a1e000..81256bc 100644 --- a/src/main/java/cc/carm/plugin/userprefix/command/UserCommand.java +++ b/src/main/java/cc/carm/plugin/userprefix/command/UserCommand.java @@ -1,6 +1,6 @@ package cc.carm.plugin.userprefix.command; -import cc.carm.plugin.userprefix.configuration.PluginMessages; +import cc.carm.plugin.userprefix.conf.PluginMessages; import cc.carm.plugin.userprefix.ui.PrefixSelectGUI; import org.bukkit.Bukkit; import org.bukkit.command.Command; diff --git a/src/main/java/cc/carm/plugin/userprefix/configuration/PluginConfig.java b/src/main/java/cc/carm/plugin/userprefix/conf/PluginConfig.java similarity index 98% rename from src/main/java/cc/carm/plugin/userprefix/configuration/PluginConfig.java rename to src/main/java/cc/carm/plugin/userprefix/conf/PluginConfig.java index efce420..4fba1e9 100644 --- a/src/main/java/cc/carm/plugin/userprefix/configuration/PluginConfig.java +++ b/src/main/java/cc/carm/plugin/userprefix/conf/PluginConfig.java @@ -1,4 +1,4 @@ -package cc.carm.plugin.userprefix.configuration; +package cc.carm.plugin.userprefix.conf; import cc.carm.lib.configuration.core.ConfigurationRoot; import cc.carm.lib.configuration.core.annotation.ConfigPath; @@ -10,7 +10,7 @@ import cc.carm.lib.easyplugin.gui.configuration.GUIActionType; import cc.carm.lib.easyplugin.gui.configuration.GUIItemConfiguration; import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredItem; import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredSound; -import cc.carm.plugin.userprefix.configuration.reader.GUIItemReader; +import cc.carm.plugin.userprefix.conf.reader.GUIItemReader; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemFlag; diff --git a/src/main/java/cc/carm/plugin/userprefix/configuration/PluginMessages.java b/src/main/java/cc/carm/plugin/userprefix/conf/PluginMessages.java similarity index 98% rename from src/main/java/cc/carm/plugin/userprefix/configuration/PluginMessages.java rename to src/main/java/cc/carm/plugin/userprefix/conf/PluginMessages.java index 4302b92..e97b666 100644 --- a/src/main/java/cc/carm/plugin/userprefix/configuration/PluginMessages.java +++ b/src/main/java/cc/carm/plugin/userprefix/conf/PluginMessages.java @@ -1,4 +1,4 @@ -package cc.carm.plugin.userprefix.configuration; +package cc.carm.plugin.userprefix.conf; import cc.carm.lib.configuration.core.ConfigurationRoot; import cc.carm.lib.configuration.core.annotation.HeaderComment; diff --git a/src/main/java/cc/carm/plugin/userprefix/configuration/prefix/PrefixConfig.java b/src/main/java/cc/carm/plugin/userprefix/conf/prefix/PrefixConfig.java similarity index 98% rename from src/main/java/cc/carm/plugin/userprefix/configuration/prefix/PrefixConfig.java rename to src/main/java/cc/carm/plugin/userprefix/conf/prefix/PrefixConfig.java index 246ee49..5ac2ed7 100644 --- a/src/main/java/cc/carm/plugin/userprefix/configuration/prefix/PrefixConfig.java +++ b/src/main/java/cc/carm/plugin/userprefix/conf/prefix/PrefixConfig.java @@ -1,4 +1,4 @@ -package cc.carm.plugin.userprefix.configuration.prefix; +package cc.carm.plugin.userprefix.conf.prefix; import cc.carm.lib.easyplugin.utils.ColorParser; import cc.carm.lib.mineconfiguration.bukkit.data.ItemConfig; diff --git a/src/main/java/cc/carm/plugin/userprefix/configuration/reader/GUIItemReader.java b/src/main/java/cc/carm/plugin/userprefix/conf/reader/GUIItemReader.java similarity index 96% rename from src/main/java/cc/carm/plugin/userprefix/configuration/reader/GUIItemReader.java rename to src/main/java/cc/carm/plugin/userprefix/conf/reader/GUIItemReader.java index effe75f..c6f5cb1 100644 --- a/src/main/java/cc/carm/plugin/userprefix/configuration/reader/GUIItemReader.java +++ b/src/main/java/cc/carm/plugin/userprefix/conf/reader/GUIItemReader.java @@ -1,4 +1,4 @@ -package cc.carm.plugin.userprefix.configuration.reader; +package cc.carm.plugin.userprefix.conf.reader; import cc.carm.lib.configuration.core.source.ConfigurationWrapper; import cc.carm.lib.easyplugin.gui.configuration.GUIActionConfiguration; diff --git a/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixChangeEvent.java b/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixChangeEvent.java index f3265f9..4c3272c 100644 --- a/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixChangeEvent.java +++ b/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixChangeEvent.java @@ -1,7 +1,7 @@ package cc.carm.plugin.userprefix.event; import cc.carm.plugin.userprefix.Main; -import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig; +import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixExpireEvent.java b/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixExpireEvent.java index 773e4d9..8b70a7e 100644 --- a/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixExpireEvent.java +++ b/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixExpireEvent.java @@ -1,7 +1,7 @@ package cc.carm.plugin.userprefix.event; import cc.carm.plugin.userprefix.Main; -import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig; +import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/cc/carm/plugin/userprefix/hooker/UserPrefixExpansion.java b/src/main/java/cc/carm/plugin/userprefix/hooker/UserPrefixExpansion.java index 53f938b..f10bbfd 100644 --- a/src/main/java/cc/carm/plugin/userprefix/hooker/UserPrefixExpansion.java +++ b/src/main/java/cc/carm/plugin/userprefix/hooker/UserPrefixExpansion.java @@ -2,7 +2,7 @@ package cc.carm.plugin.userprefix.hooker; import cc.carm.plugin.userprefix.Main; import cc.carm.plugin.userprefix.UserPrefixAPI; -import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig; +import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/cc/carm/plugin/userprefix/listener/ChatListener.java b/src/main/java/cc/carm/plugin/userprefix/listener/ChatListener.java index 595b68b..088e6c4 100644 --- a/src/main/java/cc/carm/plugin/userprefix/listener/ChatListener.java +++ b/src/main/java/cc/carm/plugin/userprefix/listener/ChatListener.java @@ -2,8 +2,7 @@ package cc.carm.plugin.userprefix.listener; import cc.carm.lib.easyplugin.utils.MessageUtils; import cc.carm.plugin.userprefix.Main; -import cc.carm.plugin.userprefix.configuration.PluginConfig; -import me.clip.placeholderapi.PlaceholderAPI; +import cc.carm.plugin.userprefix.conf.PluginConfig; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.AsyncPlayerChatEvent; diff --git a/src/main/java/cc/carm/plugin/userprefix/manager/ConfigManager.java b/src/main/java/cc/carm/plugin/userprefix/manager/ConfigManager.java index c07bcc0..8c32435 100644 --- a/src/main/java/cc/carm/plugin/userprefix/manager/ConfigManager.java +++ b/src/main/java/cc/carm/plugin/userprefix/manager/ConfigManager.java @@ -3,8 +3,8 @@ package cc.carm.plugin.userprefix.manager; import cc.carm.lib.configuration.core.source.ConfigurationProvider; import cc.carm.lib.easyplugin.utils.JarResourceUtils; import cc.carm.lib.mineconfiguration.bukkit.MineConfiguration; -import cc.carm.plugin.userprefix.configuration.PluginConfig; -import cc.carm.plugin.userprefix.configuration.PluginMessages; +import cc.carm.plugin.userprefix.conf.PluginConfig; +import cc.carm.plugin.userprefix.conf.PluginMessages; import java.io.File; import java.io.IOException; diff --git a/src/main/java/cc/carm/plugin/userprefix/manager/PrefixManager.java b/src/main/java/cc/carm/plugin/userprefix/manager/PrefixManager.java index 02c9c83..970d78d 100644 --- a/src/main/java/cc/carm/plugin/userprefix/manager/PrefixManager.java +++ b/src/main/java/cc/carm/plugin/userprefix/manager/PrefixManager.java @@ -3,8 +3,8 @@ package cc.carm.plugin.userprefix.manager; import cc.carm.lib.mineconfiguration.bukkit.data.ItemConfig; import cc.carm.lib.mineconfiguration.bukkit.source.CraftSectionWrapper; import cc.carm.plugin.userprefix.Main; -import cc.carm.plugin.userprefix.configuration.PluginConfig; -import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig; +import cc.carm.plugin.userprefix.conf.PluginConfig; +import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/cc/carm/plugin/userprefix/manager/UserManager.java b/src/main/java/cc/carm/plugin/userprefix/manager/UserManager.java index 8a65a28..c2bbad9 100644 --- a/src/main/java/cc/carm/plugin/userprefix/manager/UserManager.java +++ b/src/main/java/cc/carm/plugin/userprefix/manager/UserManager.java @@ -3,9 +3,9 @@ package cc.carm.plugin.userprefix.manager; import cc.carm.lib.easyplugin.gui.GUI; import cc.carm.plugin.userprefix.Main; import cc.carm.plugin.userprefix.UserPrefixAPI; -import cc.carm.plugin.userprefix.configuration.PluginConfig; -import cc.carm.plugin.userprefix.configuration.PluginMessages; -import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig; +import cc.carm.plugin.userprefix.conf.PluginConfig; +import cc.carm.plugin.userprefix.conf.PluginMessages; +import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig; import cc.carm.plugin.userprefix.event.UserPrefixChangeEvent; import cc.carm.plugin.userprefix.event.UserPrefixExpireEvent; import cc.carm.plugin.userprefix.hooker.UserNameTag; diff --git a/src/main/java/cc/carm/plugin/userprefix/ui/PrefixSelectGUI.java b/src/main/java/cc/carm/plugin/userprefix/ui/PrefixSelectGUI.java index 0084ac5..e3071f1 100644 --- a/src/main/java/cc/carm/plugin/userprefix/ui/PrefixSelectGUI.java +++ b/src/main/java/cc/carm/plugin/userprefix/ui/PrefixSelectGUI.java @@ -4,9 +4,9 @@ import cc.carm.lib.easyplugin.gui.GUIItem; import cc.carm.lib.easyplugin.gui.GUIType; import cc.carm.lib.easyplugin.gui.paged.AutoPagedGUI; import cc.carm.plugin.userprefix.UserPrefixAPI; -import cc.carm.plugin.userprefix.configuration.PluginConfig; -import cc.carm.plugin.userprefix.configuration.PluginMessages; -import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig; +import cc.carm.plugin.userprefix.conf.PluginConfig; +import cc.carm.plugin.userprefix.conf.PluginMessages; +import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType;