1
mirror of https://github.com/CarmJos/MineConfiguration.git synced 2026-06-14 00:01:10 +08:00

Compare commits

...

4 Commits

Author SHA1 Message Date
carm 6aa220924d refactor(common): packages renamed. 2022-05-20 18:49:35 +08:00
carm f4a55f216b fix(impl): configuration reload problem 2022-05-20 18:39:14 +08:00
carm 34a51c42a5 fix(impl): configuration reload problem 2022-05-20 18:26:48 +08:00
carm c50df3bc56 修复依赖 2022-05-19 02:15:25 +08:00
33 changed files with 66 additions and 53 deletions
+8 -1
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>mineconfiguration-parent</artifactId> <artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>1.3.0</version> <version>1.3.2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
@@ -45,6 +45,13 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>4.8.0</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>mineconfiguration-parent</artifactId> <artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>1.3.0</version> <version>1.3.2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
@@ -1,8 +1,8 @@
package cc.carm.lib.configuration.bungee.builder.message; package cc.carm.lib.configuration.bungee.builder.message;
import cc.carm.lib.configuration.bungee.data.MessageText; import cc.carm.lib.configuration.bungee.data.MessageText;
import cc.carm.lib.configuration.common.builder.message.MessageConfigBuilder; import cc.carm.lib.configuration.minecraft.builder.message.MessageConfigBuilder;
import cc.carm.lib.configuration.common.utils.ColorParser; import cc.carm.lib.configuration.minecraft.utils.ColorParser;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -2,8 +2,8 @@ package cc.carm.lib.configuration.bungee.builder.message;
import cc.carm.lib.configuration.bungee.data.MessageText; import cc.carm.lib.configuration.bungee.data.MessageText;
import cc.carm.lib.configuration.bungee.value.ConfiguredMessageList; import cc.carm.lib.configuration.bungee.value.ConfiguredMessageList;
import cc.carm.lib.configuration.common.builder.message.MessageListBuilder; import cc.carm.lib.configuration.minecraft.builder.message.MessageListBuilder;
import cc.carm.lib.configuration.common.utils.ParamsUtils; import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -2,8 +2,8 @@ package cc.carm.lib.configuration.bungee.builder.message;
import cc.carm.lib.configuration.bungee.data.MessageText; import cc.carm.lib.configuration.bungee.data.MessageText;
import cc.carm.lib.configuration.bungee.value.ConfiguredMessage; import cc.carm.lib.configuration.bungee.value.ConfiguredMessage;
import cc.carm.lib.configuration.common.builder.message.MessageValueBuilder; import cc.carm.lib.configuration.minecraft.builder.message.MessageValueBuilder;
import cc.carm.lib.configuration.common.utils.ParamsUtils; import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -1,6 +1,6 @@
package cc.carm.lib.configuration.bungee.data; package cc.carm.lib.configuration.bungee.data;
import cc.carm.lib.configuration.common.data.AbstractText; import cc.carm.lib.configuration.minecraft.data.AbstractText;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -34,7 +34,7 @@ public class BungeeConfigProvider extends FileConfigProvider<BungeeSectionWrappe
} }
@Override @Override
public void reload() throws Exception { protected void onReload() throws Exception {
this.configuration = getLoader().load(file); this.configuration = getLoader().load(file);
} }
@@ -3,7 +3,7 @@ package cc.carm.lib.configuration.bungee.value;
import cc.carm.lib.configuration.bungee.BungeeConfigValue; import cc.carm.lib.configuration.bungee.BungeeConfigValue;
import cc.carm.lib.configuration.bungee.builder.message.BungeeMessageValueBuilder; import cc.carm.lib.configuration.bungee.builder.message.BungeeMessageValueBuilder;
import cc.carm.lib.configuration.bungee.data.MessageText; import cc.carm.lib.configuration.bungee.data.MessageText;
import cc.carm.lib.configuration.common.value.ConfigMessage; import cc.carm.lib.configuration.minecraft.value.ConfigMessage;
import cc.carm.lib.configuration.core.source.ConfigurationProvider; import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
@@ -3,7 +3,7 @@ package cc.carm.lib.configuration.bungee.value;
import cc.carm.lib.configuration.bungee.BungeeConfigValue; import cc.carm.lib.configuration.bungee.BungeeConfigValue;
import cc.carm.lib.configuration.bungee.builder.message.BungeeMessageListBuilder; import cc.carm.lib.configuration.bungee.builder.message.BungeeMessageListBuilder;
import cc.carm.lib.configuration.bungee.data.MessageText; import cc.carm.lib.configuration.bungee.data.MessageText;
import cc.carm.lib.configuration.common.value.ConfigMessageList; import cc.carm.lib.configuration.minecraft.value.ConfigMessageList;
import cc.carm.lib.configuration.core.source.ConfigurationProvider; import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
+1 -1
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>mineconfiguration-parent</artifactId> <artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>1.3.0</version> <version>1.3.2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
@@ -1,11 +1,10 @@
package cc.carm.lib.configuration.common.builder.message; package cc.carm.lib.configuration.minecraft.builder.message;
import cc.carm.lib.configuration.common.data.AbstractText; import cc.carm.lib.configuration.minecraft.data.AbstractText;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.function.Function;
public abstract class MessageConfigBuilder<R, T extends AbstractText<R>> { public abstract class MessageConfigBuilder<R, T extends AbstractText<R>> {
@@ -1,9 +1,9 @@
package cc.carm.lib.configuration.common.builder.message; package cc.carm.lib.configuration.minecraft.builder.message;
import cc.carm.lib.configuration.common.data.AbstractText; import cc.carm.lib.configuration.minecraft.data.AbstractText;
import cc.carm.lib.configuration.common.utils.ParamsUtils; import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.common.value.ConfigMessageList; import cc.carm.lib.configuration.minecraft.value.ConfigMessageList;
import cc.carm.lib.configuration.core.builder.CommonConfigBuilder; import cc.carm.lib.configuration.core.builder.CommonConfigBuilder;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -1,8 +1,8 @@
package cc.carm.lib.configuration.common.builder.message; package cc.carm.lib.configuration.minecraft.builder.message;
import cc.carm.lib.configuration.common.data.AbstractText; import cc.carm.lib.configuration.minecraft.data.AbstractText;
import cc.carm.lib.configuration.common.utils.ParamsUtils; import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.common.value.ConfigMessage; import cc.carm.lib.configuration.minecraft.value.ConfigMessage;
import cc.carm.lib.configuration.core.builder.CommonConfigBuilder; import cc.carm.lib.configuration.core.builder.CommonConfigBuilder;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -1,6 +1,6 @@
package cc.carm.lib.configuration.common.data; package cc.carm.lib.configuration.minecraft.data;
import cc.carm.lib.configuration.common.utils.ParamsUtils; import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -1,4 +1,4 @@
package cc.carm.lib.configuration.common.utils; package cc.carm.lib.configuration.minecraft.utils;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@@ -1,4 +1,4 @@
package cc.carm.lib.configuration.common.utils; package cc.carm.lib.configuration.minecraft.utils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -1,7 +1,7 @@
package cc.carm.lib.configuration.common.value; package cc.carm.lib.configuration.minecraft.value;
import cc.carm.lib.configuration.common.data.AbstractText; import cc.carm.lib.configuration.minecraft.data.AbstractText;
import cc.carm.lib.configuration.common.utils.ParamsUtils; import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.core.function.ConfigValueParser; import cc.carm.lib.configuration.core.function.ConfigValueParser;
import cc.carm.lib.configuration.core.source.ConfigurationProvider; import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.configuration.core.value.type.ConfiguredValue; import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
@@ -1,7 +1,7 @@
package cc.carm.lib.configuration.common.value; package cc.carm.lib.configuration.minecraft.value;
import cc.carm.lib.configuration.common.data.AbstractText; import cc.carm.lib.configuration.minecraft.data.AbstractText;
import cc.carm.lib.configuration.common.utils.ParamsUtils; import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.core.function.ConfigDataFunction; import cc.carm.lib.configuration.core.function.ConfigDataFunction;
import cc.carm.lib.configuration.core.source.ConfigurationProvider; import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.configuration.core.value.type.ConfiguredList; import cc.carm.lib.configuration.core.value.type.ConfiguredList;
+1 -1
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>mineconfiguration-parent</artifactId> <artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>1.3.0</version> <version>1.3.2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
@@ -1,6 +1,6 @@
package cc.carm.lib.configuration.craft.builder.item; package cc.carm.lib.configuration.craft.builder.item;
import cc.carm.lib.configuration.common.utils.ParamsUtils; import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.craft.builder.AbstractCraftBuilder; import cc.carm.lib.configuration.craft.builder.AbstractCraftBuilder;
import cc.carm.lib.configuration.craft.data.ItemConfig; import cc.carm.lib.configuration.craft.data.ItemConfig;
import cc.carm.lib.configuration.craft.value.ConfiguredItem; import cc.carm.lib.configuration.craft.value.ConfiguredItem;
@@ -1,6 +1,6 @@
package cc.carm.lib.configuration.craft.builder.message; package cc.carm.lib.configuration.craft.builder.message;
import cc.carm.lib.configuration.common.builder.message.MessageConfigBuilder; import cc.carm.lib.configuration.minecraft.builder.message.MessageConfigBuilder;
import cc.carm.lib.configuration.craft.data.TextConfig; import cc.carm.lib.configuration.craft.data.TextConfig;
import cc.carm.lib.configuration.craft.utils.TextParser; import cc.carm.lib.configuration.craft.utils.TextParser;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -1,7 +1,7 @@
package cc.carm.lib.configuration.craft.builder.message; package cc.carm.lib.configuration.craft.builder.message;
import cc.carm.lib.configuration.common.builder.message.MessageListBuilder; import cc.carm.lib.configuration.minecraft.builder.message.MessageListBuilder;
import cc.carm.lib.configuration.common.utils.ParamsUtils; import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.craft.data.TextConfig; import cc.carm.lib.configuration.craft.data.TextConfig;
import cc.carm.lib.configuration.craft.value.ConfiguredMessageList; import cc.carm.lib.configuration.craft.value.ConfiguredMessageList;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -1,7 +1,7 @@
package cc.carm.lib.configuration.craft.builder.message; package cc.carm.lib.configuration.craft.builder.message;
import cc.carm.lib.configuration.common.builder.message.MessageValueBuilder; import cc.carm.lib.configuration.minecraft.builder.message.MessageValueBuilder;
import cc.carm.lib.configuration.common.utils.ParamsUtils; import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.craft.data.TextConfig; import cc.carm.lib.configuration.craft.data.TextConfig;
import cc.carm.lib.configuration.craft.value.ConfiguredMessage; import cc.carm.lib.configuration.craft.value.ConfiguredMessage;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -1,6 +1,6 @@
package cc.carm.lib.configuration.craft.builder.title; package cc.carm.lib.configuration.craft.builder.title;
import cc.carm.lib.configuration.common.utils.ParamsUtils; import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.craft.builder.AbstractCraftBuilder; import cc.carm.lib.configuration.craft.builder.AbstractCraftBuilder;
import cc.carm.lib.configuration.craft.data.TitleConfig; import cc.carm.lib.configuration.craft.data.TitleConfig;
import cc.carm.lib.configuration.craft.function.TitleSendConsumer; import cc.carm.lib.configuration.craft.function.TitleSendConsumer;
@@ -1,6 +1,6 @@
package cc.carm.lib.configuration.craft.data; package cc.carm.lib.configuration.craft.data;
import cc.carm.lib.configuration.common.data.AbstractText; import cc.carm.lib.configuration.minecraft.data.AbstractText;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -26,7 +26,7 @@ public abstract class CraftConfigProvider extends FileConfigProvider<CraftSectio
} }
@Override @Override
public void reload() throws Exception { protected void onReload() throws Exception {
configuration.load(getFile()); configuration.load(getFile());
} }
@@ -1,7 +1,7 @@
package cc.carm.lib.configuration.craft.utils; package cc.carm.lib.configuration.craft.utils;
import cc.carm.lib.configuration.common.utils.ColorParser; import cc.carm.lib.configuration.minecraft.utils.ColorParser;
import cc.carm.lib.configuration.common.utils.ParamsUtils; import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -1,6 +1,6 @@
package cc.carm.lib.configuration.craft.value; package cc.carm.lib.configuration.craft.value;
import cc.carm.lib.configuration.common.utils.ParamsUtils; import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.core.function.ConfigValueParser; import cc.carm.lib.configuration.core.function.ConfigValueParser;
import cc.carm.lib.configuration.core.source.ConfigurationProvider; import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.configuration.core.source.ConfigurationWrapper; import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
@@ -1,6 +1,6 @@
package cc.carm.lib.configuration.craft.value; package cc.carm.lib.configuration.craft.value;
import cc.carm.lib.configuration.common.value.ConfigMessage; import cc.carm.lib.configuration.minecraft.value.ConfigMessage;
import cc.carm.lib.configuration.core.source.ConfigurationProvider; import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.configuration.craft.CraftConfigValue; import cc.carm.lib.configuration.craft.CraftConfigValue;
import cc.carm.lib.configuration.craft.builder.message.CraftMessageValueBuilder; import cc.carm.lib.configuration.craft.builder.message.CraftMessageValueBuilder;
@@ -1,6 +1,6 @@
package cc.carm.lib.configuration.craft.value; package cc.carm.lib.configuration.craft.value;
import cc.carm.lib.configuration.common.value.ConfigMessageList; import cc.carm.lib.configuration.minecraft.value.ConfigMessageList;
import cc.carm.lib.configuration.core.source.ConfigurationProvider; import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.configuration.craft.CraftConfigValue; import cc.carm.lib.configuration.craft.CraftConfigValue;
import cc.carm.lib.configuration.craft.builder.message.CraftMessageListBuilder; import cc.carm.lib.configuration.craft.builder.message.CraftMessageListBuilder;
@@ -1,6 +1,6 @@
package cc.carm.lib.configuration.craft.value; package cc.carm.lib.configuration.craft.value;
import cc.carm.lib.configuration.common.utils.ParamsUtils; import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.core.function.ConfigValueParser; import cc.carm.lib.configuration.core.function.ConfigValueParser;
import cc.carm.lib.configuration.core.source.ConfigurationProvider; import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.configuration.core.source.ConfigurationWrapper; import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
+2 -2
View File
@@ -18,11 +18,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding> <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<easyconfiguration.version>3.0.0</easyconfiguration.version> <easyconfiguration.version>3.1.0</easyconfiguration.version>
</properties> </properties>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<artifactId>mineconfiguration-parent</artifactId> <artifactId>mineconfiguration-parent</artifactId>
<version>1.3.0</version> <version>1.3.2</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>MineConfiguration</name> <name>MineConfiguration</name>
+8 -1
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>mineconfiguration-parent</artifactId> <artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>1.3.0</version> <version>1.3.2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
@@ -45,6 +45,13 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>4.8.0</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>