From 67931094e66f7096962c7cf734e7c5e437e10542 Mon Sep 17 00:00:00 2001 From: carm Date: Fri, 16 Dec 2022 16:09:50 +0800 Subject: [PATCH] =?UTF-8?q?refactor(proj):=20=E6=94=BE=E5=BC=83spigot?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=EF=BC=8C=E5=B0=86Bukkit=E5=AD=90=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=8D=95=E7=8B=AC=E6=8F=90=E5=87=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 29 +++----- common/pom.xml | 7 +- .../common/value/BaseMessage.java | 20 ++++++ platform/bukkit/base/pom.xml | 38 ----------- platform/bukkit/general/pom.xml | 41 ------------ platform/bukkit/pom.xml | 31 ++++++--- .../bukkit/CraftConfigValue.java | 2 +- .../bukkit/MineConfiguration.java | 1 + .../bukkit/builder/AbstractCraftBuilder.java | 0 .../bukkit/builder/CraftConfigBuilder.java | 0 .../builder/item/ItemConfigBuilder.java | 0 .../builder/message/CraftMessageBuilder.java | 0 .../message/CraftMessageListBuilder.java | 0 .../message/CraftMessageValueBuilder.java | 0 .../serializable/SerializableBuilder.java | 0 .../builder/sound/SoundConfigBuilder.java | 0 .../builder/title/TitleConfigBuilder.java | 0 .../bukkit/data/ItemConfig.java | 0 .../bukkit/data/SoundConfig.java | 0 .../bukkit/data/TextConfig.java | 0 .../bukkit/data/TitleConfig.java | 0 .../bukkit/function/TitleSendConsumer.java | 0 .../bukkit/source/BukkitConfigProvider.java | 0 .../bukkit/source/BukkitYAMLComments.java | 0 .../bukkit/source/CraftConfigProvider.java | 0 .../bukkit/source/CraftSectionWrapper.java | 0 .../bukkit/utils/PlaceholderAPIHelper.java | 0 .../bukkit/utils/ProtocolLibHelper.java | 0 .../bukkit/utils/TextParser.java | 0 .../bukkit/value/ConfiguredItem.java | 0 .../bukkit/value/ConfiguredMessage.java | 0 .../bukkit/value/ConfiguredMessageList.java | 0 .../bukkit/value/ConfiguredSerializable.java | 0 .../bukkit/value/ConfiguredSound.java | 0 .../bukkit/value/ConfiguredTitle.java | 10 +-- platform/bungee/pom.xml | 7 +- platform/spigot/pom.xml | 67 ------------------- .../spigot/MineConfiguration.java | 42 ------------ .../spigot/source/SpigotConfigProvider.java | 32 --------- .../spigot/source/SpigotYAMLComments.java | 48 ------------- pom.xml | 5 +- 41 files changed, 72 insertions(+), 308 deletions(-) delete mode 100644 platform/bukkit/base/pom.xml delete mode 100644 platform/bukkit/general/pom.xml rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/CraftConfigValue.java (98%) rename platform/bukkit/{general => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/MineConfiguration.java (99%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/AbstractCraftBuilder.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/CraftConfigBuilder.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/item/ItemConfigBuilder.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageBuilder.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageListBuilder.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageValueBuilder.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/serializable/SerializableBuilder.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/sound/SoundConfigBuilder.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/title/TitleConfigBuilder.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/ItemConfig.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/SoundConfig.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/TextConfig.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/TitleConfig.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/function/TitleSendConsumer.java (100%) rename platform/bukkit/{general => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/BukkitConfigProvider.java (100%) rename platform/bukkit/{general => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/BukkitYAMLComments.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/CraftConfigProvider.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/CraftSectionWrapper.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/PlaceholderAPIHelper.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/ProtocolLibHelper.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/TextParser.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredItem.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessageList.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSerializable.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSound.java (100%) rename platform/bukkit/{base => }/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredTitle.java (92%) delete mode 100644 platform/spigot/pom.xml delete mode 100644 platform/spigot/src/main/java/cc/carm/lib/mineconfiguration/spigot/MineConfiguration.java delete mode 100644 platform/spigot/src/main/java/cc/carm/lib/mineconfiguration/spigot/source/SpigotConfigProvider.java delete mode 100644 platform/spigot/src/main/java/cc/carm/lib/mineconfiguration/spigot/source/SpigotYAMLComments.java diff --git a/README.md b/README.md index 6f8dce1..4a6300c 100644 --- a/README.md +++ b/README.md @@ -20,44 +20,35 @@ EasyConfiguration for MineCraft! ## 项目结构 -### **MineConfiguration-Common** +### **MineConfiguration-Common** [`common`](common) -全部版本的共用部分，包括 +全部版本的共用部分(均已被打包至下行包中)，包括 - `ConfigMessage` (实现类为 `ConfiguredMessage`) - `ConfigMessageList` (实现类为 `ConfiguredMessageList`) 如要使用，请访问对应实现类的builder() 方法来快速创建。 -### MineConfiguration-Bukkit +### **MineConfiguration-Bukkit** [`platform/bukkit`](platform/bukkit) -#### MineConfiguration-Bukkit-Base - -Bukkit系通用依赖，不包含实现部分，请使用 **MineConfiguration-Bukkit-General** 或 **MineConfiguration-Bukkit-Native** 。 +适用于Bukkit的版本，同时支持其他以Bukkit为基础的服务端 *(如Spigot、Paper、CatServer)* 。 相较于基础版本，额外提供了以下功能： - `ConfiguredSerializable` -- `ConfiguredItem` (快捷读取简单的物品配置文件) -- `ConfiguredSound` (快捷读取音效配置文件) +- `ConfiguredItem` (快捷读\写\使用简单的物品配置文件) +- `ConfiguredSound` (快捷读\写\使用音效配置文件) +- `ConfiguredTitle` (快速读\写\使用标题文字配置文件) 以上类型可以通过 `CraftConfigValue.builder()` 来创建，部分类型提供了 `of(...);` 方法来快速创建。 -#### **MineConfiguration-Bukkit** _(推荐)_ - -适用于Bukkit的版本，包含以Bukkit为基础的其他服务端 *(如Spigot、Paper、CatServer)* 。 - -#### **MineConfiguration-Spigot** - -适用于 Spigot(1.18+) 的版本，适配了1.18及以后版本Spigot原生自带的配置文件注释功能，随Spigot更新而优化，安全稳定。 - -### **MineConfiguration-Bungee** +### **MineConfiguration-Bungee** [`platform/bungee`](platform/bungee) 适用于BungeeCord的版本，可用JSON与YAML格式。其中JSON格式**不支持配置文件注释**。 ## 开发 -请详见 [EasyConfiguration](https://github.com/CarmJos/EasyConfiguration) +其他功能请详见 [EasyConfiguration](https://github.com/CarmJos/EasyConfiguration) 的 [开发介绍](https://github.com/CarmJos/EasyConfiguration/tree/master/.documentation) 。 ### 依赖方式 @@ -113,7 +104,7 @@ Bukkit系通用依赖，不包含实现部分，请使用 **MineConfiguration-Bu [LATEST RELEASE] compile - + cc.carm.lib mineconfiguration-spigot diff --git a/common/pom.xml b/common/pom.xml index 616108c..4cb4f51 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,15 +5,20 @@ mineconfiguration-parent cc.carm.lib - 2.2.1 + 2.3.0 4.0.0 ${project.jdk.version} ${project.jdk.version} + UTF-8 + UTF-8 mineconfiguration-common + MineConfiguration-Common + 轻松(做)配置，全部版本的共用部分。 + diff --git a/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/BaseMessage.java b/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/BaseMessage.java index befe3db..990a4a3 100644 --- a/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/BaseMessage.java +++ b/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/BaseMessage.java @@ -106,6 +106,26 @@ public interface BaseMessage { } } + + /** + * 广播此消息(包括后台) + * + * @param values 已定变量的对应参数(按定义顺序) + */ + default void sendToAll(@Nullable Object... values) { + broadcast(values); + } + + /** + * 广播此消息(包括后台) + * + * @param placeholders 消息中的变量与对应参数 + */ + default void sendToAll(@NotNull Map placeholders) { + broadcast(placeholders); + } + + /** * 广播此消息(包括后台) * diff --git a/platform/bukkit/base/pom.xml b/platform/bukkit/base/pom.xml deleted file mode 100644 index 0f7f3a4..0000000 --- a/platform/bukkit/base/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - mineconfiguration-bukkit-parent - cc.carm.lib - 2.2.1 - - 4.0.0 - - ${project.jdk.version} - ${project.jdk.version} - - mineconfiguration-bukkit-base - jar - - - - - ${project.parent.groupId} - mineconfiguration-common - ${project.parent.version} - compile - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - - \ No newline at end of file diff --git a/platform/bukkit/general/pom.xml b/platform/bukkit/general/pom.xml deleted file mode 100644 index 3c7183e..0000000 --- a/platform/bukkit/general/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - mineconfiguration-bukkit-parent - cc.carm.lib - 2.2.1 - - 4.0.0 - - ${project.jdk.version} - ${project.jdk.version} - - - mineconfiguration-bukkit - jar - - MineConfiguration-Bukkit - - - - - ${project.parent.groupId} - mineconfiguration-bukkit-base - ${project.parent.version} - compile - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - - \ No newline at end of file diff --git a/platform/bukkit/pom.xml b/platform/bukkit/pom.xml index 9a9214a..7e43c3c 100644 --- a/platform/bukkit/pom.xml +++ b/platform/bukkit/pom.xml @@ -5,25 +5,31 @@ mineconfiguration-parent cc.carm.lib - 2.2.1 + 2.3.0 ../../pom.xml 4.0.0 ${project.jdk.version} ${project.jdk.version} + UTF-8 + UTF-8 - mineconfiguration-bukkit-parent - pom - - base - general - + mineconfiguration-bukkit + jar - MineConfiguration-Bukkit-Parent + MineConfiguration-Bukkit + 轻松(做)配置，适用于Bukkit系服务端的版本。 + + ${project.parent.groupId} + mineconfiguration-common + ${project.parent.version} + compile + + org.bukkit @@ -50,4 +56,13 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + \ No newline at end of file diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/CraftConfigValue.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/CraftConfigValue.java similarity index 98% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/CraftConfigValue.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/CraftConfigValue.java index e770f8d..edec1ef 100644 --- a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/CraftConfigValue.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/CraftConfigValue.java @@ -25,7 +25,7 @@ public abstract class CraftConfigValue extends CachedConfigValue { public CraftConfigProvider getBukkitProvider() { ConfigurationProvider provider = getProvider(); if (provider instanceof CraftConfigProvider) return (CraftConfigProvider) getProvider(); - else throw new IllegalStateException("Provider is not a SpigotConfigProvider"); + else throw new IllegalStateException("Provider is not a CraftConfigProvider"); } public CraftSectionWrapper getBukkitConfig() { diff --git a/platform/bukkit/general/src/main/java/cc/carm/lib/mineconfiguration/bukkit/MineConfiguration.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/MineConfiguration.java similarity index 99% rename from platform/bukkit/general/src/main/java/cc/carm/lib/mineconfiguration/bukkit/MineConfiguration.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/MineConfiguration.java index a071922..fb4df82 100644 --- a/platform/bukkit/general/src/main/java/cc/carm/lib/mineconfiguration/bukkit/MineConfiguration.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/MineConfiguration.java @@ -38,4 +38,5 @@ public class MineConfiguration { public static BukkitConfigProvider from(Plugin plugin, String fileName, String source) { return from(new File(plugin.getDataFolder(), fileName), source); } + } diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/AbstractCraftBuilder.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/AbstractCraftBuilder.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/AbstractCraftBuilder.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/AbstractCraftBuilder.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/CraftConfigBuilder.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/CraftConfigBuilder.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/CraftConfigBuilder.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/CraftConfigBuilder.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/item/ItemConfigBuilder.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/item/ItemConfigBuilder.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/item/ItemConfigBuilder.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/item/ItemConfigBuilder.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageBuilder.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageBuilder.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageBuilder.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageBuilder.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageListBuilder.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageListBuilder.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageListBuilder.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageListBuilder.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageValueBuilder.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageValueBuilder.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageValueBuilder.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageValueBuilder.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/serializable/SerializableBuilder.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/serializable/SerializableBuilder.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/serializable/SerializableBuilder.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/serializable/SerializableBuilder.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/sound/SoundConfigBuilder.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/sound/SoundConfigBuilder.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/sound/SoundConfigBuilder.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/sound/SoundConfigBuilder.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/title/TitleConfigBuilder.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/title/TitleConfigBuilder.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/title/TitleConfigBuilder.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/title/TitleConfigBuilder.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/ItemConfig.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/ItemConfig.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/ItemConfig.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/ItemConfig.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/SoundConfig.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/SoundConfig.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/SoundConfig.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/SoundConfig.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/TextConfig.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/TextConfig.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/TextConfig.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/TextConfig.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/TitleConfig.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/TitleConfig.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/TitleConfig.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/TitleConfig.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/function/TitleSendConsumer.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/function/TitleSendConsumer.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/function/TitleSendConsumer.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/function/TitleSendConsumer.java diff --git a/platform/bukkit/general/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/BukkitConfigProvider.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/BukkitConfigProvider.java similarity index 100% rename from platform/bukkit/general/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/BukkitConfigProvider.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/BukkitConfigProvider.java diff --git a/platform/bukkit/general/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/BukkitYAMLComments.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/BukkitYAMLComments.java similarity index 100% rename from platform/bukkit/general/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/BukkitYAMLComments.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/BukkitYAMLComments.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/CraftConfigProvider.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/CraftConfigProvider.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/CraftConfigProvider.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/CraftConfigProvider.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/CraftSectionWrapper.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/CraftSectionWrapper.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/CraftSectionWrapper.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/CraftSectionWrapper.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/PlaceholderAPIHelper.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/PlaceholderAPIHelper.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/PlaceholderAPIHelper.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/PlaceholderAPIHelper.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/ProtocolLibHelper.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/ProtocolLibHelper.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/ProtocolLibHelper.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/ProtocolLibHelper.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/TextParser.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/TextParser.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/TextParser.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/TextParser.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredItem.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredItem.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredItem.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredItem.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessageList.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessageList.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessageList.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessageList.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSerializable.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSerializable.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSerializable.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSerializable.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSound.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSound.java similarity index 100% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSound.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSound.java diff --git a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredTitle.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredTitle.java similarity index 92% rename from platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredTitle.java rename to platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredTitle.java index 13b5d89..14d87a1 100644 --- a/platform/bukkit/base/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredTitle.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredTitle.java @@ -87,15 +87,15 @@ public class ConfiguredTitle extends ConfiguredSection { } } - public void sendAll(Object... values) { - sendAll(this.params, values); + public void sendToAll(Object... values) { + sendToAll(this.params, values); } - public void sendAll(@NotNull String[] params, @NotNull Object[] values) { - sendAll(ParamsUtils.buildParams(params, values)); + public void sendToAll(@NotNull String[] params, @NotNull Object[] values) { + sendToAll(ParamsUtils.buildParams(params, values)); } - public void sendAll(@NotNull Map placeholders) { + public void sendToAll(@NotNull Map placeholders) { TitleConfig config = get(); if (config == null) return; diff --git a/platform/bungee/pom.xml b/platform/bungee/pom.xml index f796d05..6298cdf 100644 --- a/platform/bungee/pom.xml +++ b/platform/bungee/pom.xml @@ -5,19 +5,22 @@ mineconfiguration-parent cc.carm.lib - 2.2.1 + 2.3.0 ../../pom.xml 4.0.0 ${project.jdk.version} ${project.jdk.version} + UTF-8 + UTF-8 mineconfiguration-bungee jar MineConfiguration-Bungee - + 轻松(做)配置，适用于BungeeCord的版本，可用JSON与YAML格式。 + diff --git a/platform/spigot/pom.xml b/platform/spigot/pom.xml deleted file mode 100644 index f1dddf2..0000000 --- a/platform/spigot/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - cc.carm.lib - mineconfiguration-parent - 2.2.1 - ../../pom.xml - - 4.0.0 - - ${project.jdk.version} - ${project.jdk.version} - - - mineconfiguration-spigot - jar - - MineConfiguration-Spigot - - - - - ${project.parent.groupId} - mineconfiguration-bukkit-base - ${project.parent.version} - compile - - - - org.spigotmc - spigot-api - 1.18.2-R0.1-SNAPSHOT - provided - - - - - - me.clip - placeholderapi - 2.11.2 - provided - - - - - com.comphenix.protocol - ProtocolLib - 4.8.0 - provided - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - - - \ No newline at end of file diff --git a/platform/spigot/src/main/java/cc/carm/lib/mineconfiguration/spigot/MineConfiguration.java b/platform/spigot/src/main/java/cc/carm/lib/mineconfiguration/spigot/MineConfiguration.java deleted file mode 100644 index aea6d39..0000000 --- a/platform/spigot/src/main/java/cc/carm/lib/mineconfiguration/spigot/MineConfiguration.java +++ /dev/null @@ -1,42 +0,0 @@ -package cc.carm.lib.mineconfiguration.spigot; - -import cc.carm.lib.mineconfiguration.spigot.source.SpigotConfigProvider; -import org.bukkit.plugin.Plugin; - -import java.io.File; -import java.io.IOException; - -public class MineConfiguration { - - public static SpigotConfigProvider from(File file, String source) { - SpigotConfigProvider provider = new SpigotConfigProvider(file); - try { - provider.initializeFile(source); - provider.initializeConfig(); - } catch (IOException e) { - e.printStackTrace(); - } - return provider; - } - - public static SpigotConfigProvider from(File file) { - return from(file, file.getName()); - } - - public static SpigotConfigProvider from(String fileName) { - return from(fileName, fileName); - } - - public static SpigotConfigProvider from(String fileName, String source) { - return from(new File(fileName), source); - } - - public static SpigotConfigProvider from(Plugin plugin, String fileName) { - return from(plugin, fileName, fileName); - } - - public static SpigotConfigProvider from(Plugin plugin, String fileName, String source) { - return from(new File(plugin.getDataFolder(), fileName), source); - } - -} diff --git a/platform/spigot/src/main/java/cc/carm/lib/mineconfiguration/spigot/source/SpigotConfigProvider.java b/platform/spigot/src/main/java/cc/carm/lib/mineconfiguration/spigot/source/SpigotConfigProvider.java deleted file mode 100644 index 4abee5d..0000000 --- a/platform/spigot/src/main/java/cc/carm/lib/mineconfiguration/spigot/source/SpigotConfigProvider.java +++ /dev/null @@ -1,32 +0,0 @@ -package cc.carm.lib.mineconfiguration.spigot.source; - -import cc.carm.lib.configuration.core.ConfigInitializer; -import cc.carm.lib.configuration.core.source.ConfigurationComments; -import cc.carm.lib.mineconfiguration.bukkit.source.CraftConfigProvider; -import org.bukkit.configuration.file.YamlConfiguration; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.io.File; - -public class SpigotConfigProvider extends CraftConfigProvider { - - public SpigotConfigProvider(@NotNull File file) { - super(file); - } - - protected SpigotYAMLComments comments = null; - - @Override - public void initializeConfig() { - this.configuration = YamlConfiguration.loadConfiguration(file); - this.comments = new SpigotYAMLComments(configuration); - this.initializer = new ConfigInitializer<>(this); - } - - @Override - public @Nullable ConfigurationComments getComments() { - return this.comments; - } - -} diff --git a/platform/spigot/src/main/java/cc/carm/lib/mineconfiguration/spigot/source/SpigotYAMLComments.java b/platform/spigot/src/main/java/cc/carm/lib/mineconfiguration/spigot/source/SpigotYAMLComments.java deleted file mode 100644 index 3ce4f71..0000000 --- a/platform/spigot/src/main/java/cc/carm/lib/mineconfiguration/spigot/source/SpigotYAMLComments.java +++ /dev/null @@ -1,48 +0,0 @@ -package cc.carm.lib.mineconfiguration.spigot.source; - -import cc.carm.lib.configuration.core.source.ConfigurationComments; -import org.bukkit.configuration.file.YamlConfiguration; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.Unmodifiable; - -import java.util.Collections; -import java.util.List; - -public class SpigotYAMLComments extends ConfigurationComments { - - protected final YamlConfiguration configuration; - - public SpigotYAMLComments(YamlConfiguration configuration) { - this.configuration = configuration; - } - - @Override - public void setHeaderComments(@Nullable String path, @Nullable List comments) { - if (path == null) { - this.configuration.options().setHeader(comments); - } else { - this.configuration.setComments(path, comments); - } - } - - @Override - public void setInlineComment(@NotNull String path, @Nullable String comment) { - if (comment == null) { - this.configuration.setInlineComments(path, null); - } else { - this.configuration.setComments(path, Collections.singletonList(comment)); - } - } - - @Override - public @Nullable @Unmodifiable List getHeaderComment(@Nullable String path) { - if (path == null) return Collections.unmodifiableList(this.configuration.options().getHeader()); - else return this.configuration.getComments(path); - } - - @Override - public @Nullable String getInlineComment(@NotNull String path) { - return String.join(" ", this.configuration.getInlineComments(path)); - } -} diff --git a/pom.xml b/pom.xml index 237ecf3..cdff032 100644 --- a/pom.xml +++ b/pom.xml @@ -9,20 +9,17 @@ ${project.jdk.version} UTF-8 UTF-8 - 3.3.1 cc.carm.lib mineconfiguration-parent - 2.2.1 + 2.3.0 pom common - platform/bungee platform/bukkit - platform/spigot MineConfiguration