carm/MineConfiguration
carm/MineConfiguration
1
Fork 0
mirror of https://github.com/CarmJos/MineConfiguration.git synced 2024-09-19 20:05:49 +00:00
Code Issues Releases Activity

[1.4.0]refactor(all): project reformatted.

Browse Source 
BREAKING CHANGE: reformatted projects including project settings and package paths.
This commit is contained in:
Carm Jos 2022-05-20 21:50:00 +08:00
parent 6aa220924d
commit 65d7a32108
58 changed files with 235 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.2</version>
<version>1.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>

4
common/src/main/java/cc/carm/lib/configuration/minecraft/builder/message/MessageConfigBuilder.java → common/src/main/java/cc/carm/lib/configuration/minecraft/common/builder/message/MessageConfigBuilder.java
View File

@ -1,6 +1,6 @@
package cc.carm.lib.configuration.minecraft.builder.message;
package cc.carm.lib.configuration.minecraft.common.builder.message;
import cc.carm.lib.configuration.minecraft.data.AbstractText;
import cc.carm.lib.configuration.minecraft.common.data.AbstractText;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

8
common/src/main/java/cc/carm/lib/configuration/minecraft/builder/message/MessageListBuilder.java → common/src/main/java/cc/carm/lib/configuration/minecraft/common/builder/message/MessageListBuilder.java
View File

@ -1,9 +1,9 @@
package cc.carm.lib.configuration.minecraft.builder.message;
package cc.carm.lib.configuration.minecraft.common.builder.message;
import cc.carm.lib.configuration.minecraft.data.AbstractText;
import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.minecraft.value.ConfigMessageList;
import cc.carm.lib.configuration.minecraft.common.data.AbstractText;
import cc.carm.lib.configuration.minecraft.common.utils.ParamsUtils;
import cc.carm.lib.configuration.minecraft.common.value.ConfigMessageList;
import cc.carm.lib.configuration.core.builder.CommonConfigBuilder;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

8
common/src/main/java/cc/carm/lib/configuration/minecraft/builder/message/MessageValueBuilder.java → common/src/main/java/cc/carm/lib/configuration/minecraft/common/builder/message/MessageValueBuilder.java
View File

@ -1,8 +1,8 @@
package cc.carm.lib.configuration.minecraft.builder.message;
package cc.carm.lib.configuration.minecraft.common.builder.message;
import cc.carm.lib.configuration.minecraft.data.AbstractText;
import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.minecraft.value.ConfigMessage;
import cc.carm.lib.configuration.minecraft.common.data.AbstractText;
import cc.carm.lib.configuration.minecraft.common.utils.ParamsUtils;
import cc.carm.lib.configuration.minecraft.common.value.ConfigMessage;
import cc.carm.lib.configuration.core.builder.CommonConfigBuilder;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

4
common/src/main/java/cc/carm/lib/configuration/minecraft/data/AbstractText.java → common/src/main/java/cc/carm/lib/configuration/minecraft/common/data/AbstractText.java
View File

@ -1,6 +1,6 @@
package cc.carm.lib.configuration.minecraft.data;
package cc.carm.lib.configuration.minecraft.common.data;
import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.minecraft.common.utils.ParamsUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

2
common/src/main/java/cc/carm/lib/configuration/minecraft/utils/ColorParser.java → common/src/main/java/cc/carm/lib/configuration/minecraft/common/utils/ColorParser.java
View File

@ -1,4 +1,4 @@
package cc.carm.lib.configuration.minecraft.utils;
package cc.carm.lib.configuration.minecraft.common.utils;
import java.util.Arrays;
import java.util.List;

2
common/src/main/java/cc/carm/lib/configuration/minecraft/utils/ParamsUtils.java → common/src/main/java/cc/carm/lib/configuration/minecraft/common/utils/ParamsUtils.java
View File

@ -1,4 +1,4 @@
package cc.carm.lib.configuration.minecraft.utils;
package cc.carm.lib.configuration.minecraft.common.utils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

6
common/src/main/java/cc/carm/lib/configuration/minecraft/value/ConfigMessage.java → common/src/main/java/cc/carm/lib/configuration/minecraft/common/value/ConfigMessage.java
View File

@ -1,7 +1,7 @@
package cc.carm.lib.configuration.minecraft.value;
package cc.carm.lib.configuration.minecraft.common.value;
import cc.carm.lib.configuration.minecraft.data.AbstractText;
import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.minecraft.common.data.AbstractText;
import cc.carm.lib.configuration.minecraft.common.utils.ParamsUtils;
import cc.carm.lib.configuration.core.function.ConfigValueParser;
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.configuration.core.value.type.ConfiguredValue;

6
common/src/main/java/cc/carm/lib/configuration/minecraft/value/ConfigMessageList.java → common/src/main/java/cc/carm/lib/configuration/minecraft/common/value/ConfigMessageList.java
View File

@ -1,7 +1,7 @@
package cc.carm.lib.configuration.minecraft.value;
package cc.carm.lib.configuration.minecraft.common.value;
import cc.carm.lib.configuration.minecraft.data.AbstractText;
import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.minecraft.common.utils.ParamsUtils;
import cc.carm.lib.configuration.minecraft.common.data.AbstractText;
import cc.carm.lib.configuration.core.function.ConfigDataFunction;
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.configuration.core.value.type.ConfiguredList;

29
craftbukkit/pom.xml → platform/bukkit/base/pom.xml
View File

@ -3,16 +3,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>mineconfiguration-parent</artifactId>
<artifactId>mineconfiguration-bukkit</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.2</version>
<version>1.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
<artifactId>mineconfiguration-craftbukkit</artifactId>
<artifactId>mineconfiguration-bukkit-base</artifactId>
<packaging>jar</packaging>
<dependencies>
@ -30,28 +30,7 @@
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.8.8-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>4.8.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>

8
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/CraftConfigValue.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/CraftConfigValue.java
View File

@ -1,10 +1,10 @@
package cc.carm.lib.configuration.craft;
package cc.carm.lib.configuration.minecraft.bukkit;
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
import cc.carm.lib.configuration.craft.builder.CraftConfigBuilder;
import cc.carm.lib.configuration.craft.source.CraftConfigProvider;
import cc.carm.lib.configuration.craft.source.CraftSectionWrapper;
import cc.carm.lib.configuration.minecraft.bukkit.builder.CraftConfigBuilder;
import cc.carm.lib.configuration.minecraft.bukkit.source.CraftConfigProvider;
import cc.carm.lib.configuration.minecraft.bukkit.source.CraftSectionWrapper;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

4
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/builder/AbstractCraftBuilder.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/builder/AbstractCraftBuilder.java
View File

@ -1,6 +1,6 @@
package cc.carm.lib.configuration.craft.builder;
package cc.carm.lib.configuration.minecraft.bukkit.builder;
import cc.carm.lib.configuration.craft.source.CraftConfigProvider;
import cc.carm.lib.configuration.minecraft.bukkit.source.CraftConfigProvider;
import cc.carm.lib.configuration.core.builder.AbstractConfigBuilder;
public abstract class AbstractCraftBuilder<T, B extends AbstractCraftBuilder<T, B>>

16
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/builder/CraftConfigBuilder.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/builder/CraftConfigBuilder.java
View File

@ -1,13 +1,13 @@
package cc.carm.lib.configuration.craft.builder;
package cc.carm.lib.configuration.minecraft.bukkit.builder;
import cc.carm.lib.configuration.core.builder.ConfigBuilder;
import cc.carm.lib.configuration.craft.builder.item.ItemConfigBuilder;
import cc.carm.lib.configuration.craft.builder.message.CraftMessageBuilder;
import cc.carm.lib.configuration.craft.builder.serializable.SerializableBuilder;
import cc.carm.lib.configuration.craft.builder.sound.SoundConfigBuilder;
import cc.carm.lib.configuration.craft.builder.title.TitleConfigBuilder;
import cc.carm.lib.configuration.craft.data.ItemConfig;
import cc.carm.lib.configuration.craft.value.ConfiguredItem;
import cc.carm.lib.configuration.minecraft.bukkit.builder.item.ItemConfigBuilder;
import cc.carm.lib.configuration.minecraft.bukkit.builder.message.CraftMessageBuilder;
import cc.carm.lib.configuration.minecraft.bukkit.builder.serializable.SerializableBuilder;
import cc.carm.lib.configuration.minecraft.bukkit.builder.sound.SoundConfigBuilder;
import cc.carm.lib.configuration.minecraft.bukkit.builder.title.TitleConfigBuilder;
import cc.carm.lib.configuration.minecraft.bukkit.data.ItemConfig;
import cc.carm.lib.configuration.minecraft.bukkit.value.ConfiguredItem;
import org.bukkit.configuration.serialization.ConfigurationSerializable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

10
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/builder/item/ItemConfigBuilder.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/builder/item/ItemConfigBuilder.java
View File

@ -1,9 +1,9 @@
package cc.carm.lib.configuration.craft.builder.item;
package cc.carm.lib.configuration.minecraft.bukkit.builder.item;
import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.craft.builder.AbstractCraftBuilder;
import cc.carm.lib.configuration.craft.data.ItemConfig;
import cc.carm.lib.configuration.craft.value.ConfiguredItem;
import cc.carm.lib.configuration.minecraft.bukkit.builder.AbstractCraftBuilder;
import cc.carm.lib.configuration.minecraft.bukkit.data.ItemConfig;
import cc.carm.lib.configuration.minecraft.bukkit.value.ConfiguredItem;
import cc.carm.lib.configuration.minecraft.common.utils.ParamsUtils;
import org.bukkit.Material;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

8
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/builder/message/CraftMessageBuilder.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/builder/message/CraftMessageBuilder.java
View File

@ -1,8 +1,8 @@
package cc.carm.lib.configuration.craft.builder.message;
package cc.carm.lib.configuration.minecraft.bukkit.builder.message;
import cc.carm.lib.configuration.minecraft.builder.message.MessageConfigBuilder;
import cc.carm.lib.configuration.craft.data.TextConfig;
import cc.carm.lib.configuration.craft.utils.TextParser;
import cc.carm.lib.configuration.minecraft.bukkit.data.TextConfig;
import cc.carm.lib.configuration.minecraft.bukkit.utils.TextParser;
import cc.carm.lib.configuration.minecraft.common.builder.message.MessageConfigBuilder;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

10
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/builder/message/CraftMessageListBuilder.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/builder/message/CraftMessageListBuilder.java
View File

@ -1,9 +1,9 @@
package cc.carm.lib.configuration.craft.builder.message;
package cc.carm.lib.configuration.minecraft.bukkit.builder.message;
import cc.carm.lib.configuration.minecraft.builder.message.MessageListBuilder;
import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.craft.data.TextConfig;
import cc.carm.lib.configuration.craft.value.ConfiguredMessageList;
import cc.carm.lib.configuration.minecraft.bukkit.data.TextConfig;
import cc.carm.lib.configuration.minecraft.bukkit.value.ConfiguredMessageList;
import cc.carm.lib.configuration.minecraft.common.builder.message.MessageListBuilder;
import cc.carm.lib.configuration.minecraft.common.utils.ParamsUtils;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

10
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/builder/message/CraftMessageValueBuilder.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/builder/message/CraftMessageValueBuilder.java
View File

@ -1,9 +1,9 @@
package cc.carm.lib.configuration.craft.builder.message;
package cc.carm.lib.configuration.minecraft.bukkit.builder.message;
import cc.carm.lib.configuration.minecraft.builder.message.MessageValueBuilder;
import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.craft.data.TextConfig;
import cc.carm.lib.configuration.craft.value.ConfiguredMessage;
import cc.carm.lib.configuration.minecraft.bukkit.data.TextConfig;
import cc.carm.lib.configuration.minecraft.bukkit.value.ConfiguredMessage;
import cc.carm.lib.configuration.minecraft.common.builder.message.MessageValueBuilder;
import cc.carm.lib.configuration.minecraft.common.utils.ParamsUtils;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

6
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/builder/serializable/SerializableBuilder.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/builder/serializable/SerializableBuilder.java
View File

@ -1,7 +1,7 @@
package cc.carm.lib.configuration.craft.builder.serializable;
package cc.carm.lib.configuration.minecraft.bukkit.builder.serializable;
import cc.carm.lib.configuration.craft.builder.AbstractCraftBuilder;
import cc.carm.lib.configuration.craft.value.ConfiguredSerializable;
import cc.carm.lib.configuration.minecraft.bukkit.builder.AbstractCraftBuilder;
import cc.carm.lib.configuration.minecraft.bukkit.value.ConfiguredSerializable;
import org.bukkit.configuration.serialization.ConfigurationSerializable;
import org.jetbrains.annotations.NotNull;

8
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/builder/sound/SoundConfigBuilder.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/builder/sound/SoundConfigBuilder.java
View File

@ -1,8 +1,8 @@
package cc.carm.lib.configuration.craft.builder.sound;
package cc.carm.lib.configuration.minecraft.bukkit.builder.sound;
import cc.carm.lib.configuration.craft.builder.AbstractCraftBuilder;
import cc.carm.lib.configuration.craft.data.SoundConfig;
import cc.carm.lib.configuration.craft.value.ConfiguredSound;
import cc.carm.lib.configuration.minecraft.bukkit.builder.AbstractCraftBuilder;
import cc.carm.lib.configuration.minecraft.bukkit.data.SoundConfig;
import cc.carm.lib.configuration.minecraft.bukkit.value.ConfiguredSound;
import org.bukkit.Sound;
import org.jetbrains.annotations.NotNull;

14
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/builder/title/TitleConfigBuilder.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/builder/title/TitleConfigBuilder.java
View File

@ -1,11 +1,11 @@
package cc.carm.lib.configuration.craft.builder.title;
package cc.carm.lib.configuration.minecraft.bukkit.builder.title;
import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.craft.builder.AbstractCraftBuilder;
import cc.carm.lib.configuration.craft.data.TitleConfig;
import cc.carm.lib.configuration.craft.function.TitleSendConsumer;
import cc.carm.lib.configuration.craft.utils.ProtocolLibHelper;
import cc.carm.lib.configuration.craft.value.ConfiguredTitle;
import cc.carm.lib.configuration.minecraft.bukkit.builder.AbstractCraftBuilder;
import cc.carm.lib.configuration.minecraft.bukkit.data.TitleConfig;
import cc.carm.lib.configuration.minecraft.bukkit.function.TitleSendConsumer;
import cc.carm.lib.configuration.minecraft.bukkit.utils.ProtocolLibHelper;
import cc.carm.lib.configuration.minecraft.bukkit.value.ConfiguredTitle;
import cc.carm.lib.configuration.minecraft.common.utils.ParamsUtils;
import org.bukkit.Bukkit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

4
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/data/ItemConfig.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/data/ItemConfig.java
View File

@ -1,7 +1,7 @@
package cc.carm.lib.configuration.craft.data;
package cc.carm.lib.configuration.minecraft.bukkit.data;
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
import cc.carm.lib.configuration.craft.utils.TextParser;
import cc.carm.lib.configuration.minecraft.bukkit.utils.TextParser;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

2
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/data/SoundConfig.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/data/SoundConfig.java
View File

@ -1,4 +1,4 @@
package cc.carm.lib.configuration.craft.data;
package cc.carm.lib.configuration.minecraft.bukkit.data;
import org.bukkit.Bukkit;
import org.bukkit.Sound;

4
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/data/TextConfig.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/data/TextConfig.java
View File

@ -1,6 +1,6 @@
package cc.carm.lib.configuration.craft.data;
package cc.carm.lib.configuration.minecraft.bukkit.data;
import cc.carm.lib.configuration.minecraft.data.AbstractText;
import cc.carm.lib.configuration.minecraft.common.data.AbstractText;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;

6
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/data/TitleConfig.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/data/TitleConfig.java
View File

@ -1,8 +1,8 @@
package cc.carm.lib.configuration.craft.data;
package cc.carm.lib.configuration.minecraft.bukkit.data;
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
import cc.carm.lib.configuration.craft.function.TitleSendConsumer;
import cc.carm.lib.configuration.craft.utils.TextParser;
import cc.carm.lib.configuration.minecraft.bukkit.function.TitleSendConsumer;
import cc.carm.lib.configuration.minecraft.bukkit.utils.TextParser;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

2
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/function/TitleSendConsumer.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/function/TitleSendConsumer.java
View File

@ -1,4 +1,4 @@
package cc.carm.lib.configuration.craft.function;
package cc.carm.lib.configuration.minecraft.bukkit.function;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

2
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/source/CraftConfigProvider.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/source/CraftConfigProvider.java
View File

@ -1,4 +1,4 @@
package cc.carm.lib.configuration.craft.source;
package cc.carm.lib.configuration.minecraft.bukkit.source;
import cc.carm.lib.configuration.core.ConfigInitializer;
import cc.carm.lib.configuration.core.source.impl.FileConfigProvider;

2
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/source/CraftSectionWrapper.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/source/CraftSectionWrapper.java
View File

@ -1,4 +1,4 @@
package cc.carm.lib.configuration.craft.source;
package cc.carm.lib.configuration.minecraft.bukkit.source;
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
import org.bukkit.configuration.ConfigurationSection;

2
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/utils/PlaceholderAPIHelper.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/utils/PlaceholderAPIHelper.java
View File

@ -1,4 +1,4 @@
package cc.carm.lib.configuration.craft.utils;
package cc.carm.lib.configuration.minecraft.bukkit.utils;
import me.clip.placeholderapi.PlaceholderAPI;
import org.bukkit.entity.Player;

2
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/utils/ProtocolLibHelper.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/utils/ProtocolLibHelper.java
View File

@ -1,4 +1,4 @@
package cc.carm.lib.configuration.craft.utils;
package cc.carm.lib.configuration.minecraft.bukkit.utils;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary;

6
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/utils/TextParser.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/utils/TextParser.java
View File

@ -1,7 +1,7 @@
package cc.carm.lib.configuration.craft.utils;
package cc.carm.lib.configuration.minecraft.bukkit.utils;
import cc.carm.lib.configuration.minecraft.utils.ColorParser;
import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.minecraft.common.utils.ColorParser;
import cc.carm.lib.configuration.minecraft.common.utils.ParamsUtils;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

10
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredItem.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/value/ConfiguredItem.java
View File

@ -1,13 +1,13 @@
package cc.carm.lib.configuration.craft.value;
package cc.carm.lib.configuration.minecraft.bukkit.value;
import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.minecraft.bukkit.CraftConfigValue;
import cc.carm.lib.configuration.minecraft.bukkit.data.ItemConfig;
import cc.carm.lib.configuration.minecraft.common.utils.ParamsUtils;
import cc.carm.lib.configuration.core.function.ConfigValueParser;
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
import cc.carm.lib.configuration.core.value.type.ConfiguredSection;
import cc.carm.lib.configuration.craft.CraftConfigValue;
import cc.carm.lib.configuration.craft.builder.item.ItemConfigBuilder;
import cc.carm.lib.configuration.craft.data.ItemConfig;
import cc.carm.lib.configuration.minecraft.bukkit.builder.item.ItemConfigBuilder;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

10
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredMessage.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/value/ConfiguredMessage.java
View File

@ -1,10 +1,10 @@
package cc.carm.lib.configuration.craft.value;
package cc.carm.lib.configuration.minecraft.bukkit.value;
import cc.carm.lib.configuration.minecraft.value.ConfigMessage;
import cc.carm.lib.configuration.minecraft.bukkit.CraftConfigValue;
import cc.carm.lib.configuration.minecraft.bukkit.data.TextConfig;
import cc.carm.lib.configuration.minecraft.common.value.ConfigMessage;
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.configuration.craft.CraftConfigValue;
import cc.carm.lib.configuration.craft.builder.message.CraftMessageValueBuilder;
import cc.carm.lib.configuration.craft.data.TextConfig;
import cc.carm.lib.configuration.minecraft.bukkit.builder.message.CraftMessageValueBuilder;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

10
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredMessageList.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/value/ConfiguredMessageList.java
View File

@ -1,10 +1,10 @@
package cc.carm.lib.configuration.craft.value;
package cc.carm.lib.configuration.minecraft.bukkit.value;
import cc.carm.lib.configuration.minecraft.value.ConfigMessageList;
import cc.carm.lib.configuration.minecraft.bukkit.CraftConfigValue;
import cc.carm.lib.configuration.minecraft.bukkit.data.TextConfig;
import cc.carm.lib.configuration.minecraft.common.value.ConfigMessageList;
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.configuration.craft.CraftConfigValue;
import cc.carm.lib.configuration.craft.builder.message.CraftMessageListBuilder;
import cc.carm.lib.configuration.craft.data.TextConfig;
import cc.carm.lib.configuration.minecraft.bukkit.builder.message.CraftMessageListBuilder;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

6
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredSerializable.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/value/ConfiguredSerializable.java
View File

@ -1,7 +1,7 @@
package cc.carm.lib.configuration.craft.value;
package cc.carm.lib.configuration.minecraft.bukkit.value;
import cc.carm.lib.configuration.craft.CraftConfigValue;
import cc.carm.lib.configuration.craft.source.CraftConfigProvider;
import cc.carm.lib.configuration.minecraft.bukkit.CraftConfigValue;
import cc.carm.lib.configuration.minecraft.bukkit.source.CraftConfigProvider;
import org.bukkit.configuration.serialization.ConfigurationSerializable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

8
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredSound.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/value/ConfiguredSound.java
View File

@ -1,11 +1,11 @@
package cc.carm.lib.configuration.craft.value;
package cc.carm.lib.configuration.minecraft.bukkit.value;
import cc.carm.lib.configuration.core.function.ConfigValueParser;
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
import cc.carm.lib.configuration.craft.CraftConfigValue;
import cc.carm.lib.configuration.craft.builder.sound.SoundConfigBuilder;
import cc.carm.lib.configuration.craft.data.SoundConfig;
import cc.carm.lib.configuration.minecraft.bukkit.CraftConfigValue;
import cc.carm.lib.configuration.minecraft.bukkit.builder.sound.SoundConfigBuilder;
import cc.carm.lib.configuration.minecraft.bukkit.data.SoundConfig;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

12
craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredTitle.java → platform/bukkit/base/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/value/ConfiguredTitle.java
View File

@ -1,14 +1,14 @@
package cc.carm.lib.configuration.craft.value;
package cc.carm.lib.configuration.minecraft.bukkit.value;
import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.minecraft.bukkit.CraftConfigValue;
import cc.carm.lib.configuration.minecraft.bukkit.data.TitleConfig;
import cc.carm.lib.configuration.minecraft.common.utils.ParamsUtils;
import cc.carm.lib.configuration.core.function.ConfigValueParser;
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
import cc.carm.lib.configuration.core.value.type.ConfiguredSection;
import cc.carm.lib.configuration.craft.CraftConfigValue;
import cc.carm.lib.configuration.craft.builder.title.TitleConfigBuilder;
import cc.carm.lib.configuration.craft.data.TitleConfig;
import cc.carm.lib.configuration.craft.function.TitleSendConsumer;
import cc.carm.lib.configuration.minecraft.bukkit.builder.title.TitleConfigBuilder;
import cc.carm.lib.configuration.minecraft.bukkit.function.TitleSendConsumer;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

37
bukkit/pom.xml → platform/bukkit/general/pom.xml
View File

@ -3,55 +3,28 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>mineconfiguration-parent</artifactId>
<artifactId>mineconfiguration-bukkit</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.2</version>
<version>1.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
<artifactId>mineconfiguration-bukkit</artifactId>
<artifactId>mineconfiguration-bukkit-general</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyconfiguration-core</artifactId>
<version>${easyconfiguration.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>mineconfiguration-craftbukkit</artifactId>
<artifactId>mineconfiguration-bukkit-base</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.8.8-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>4.8.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>

4
bukkit/src/main/java/cc/carm/lib/configuration/MineConfiguration.java → platform/bukkit/general/src/main/java/cc/carm/lib/configuration/minecraft/MineConfiguration.java
View File

@ -1,6 +1,6 @@
package cc.carm.lib.configuration;
package cc.carm.lib.configuration.minecraft;
import cc.carm.lib.configuration.bukkit.source.BukkitConfigProvider;
import cc.carm.lib.configuration.minecraft.bukkit.source.BukkitConfigProvider;
import org.bukkit.plugin.Plugin;
import java.io.File;

4
bukkit/src/main/java/cc/carm/lib/configuration/bukkit/source/BukkitConfigProvider.java → platform/bukkit/general/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/source/BukkitConfigProvider.java
View File

@ -1,8 +1,6 @@
package cc.carm.lib.configuration.bukkit.source;
package cc.carm.lib.configuration.minecraft.bukkit.source;
import cc.carm.lib.configuration.core.ConfigInitializer;
import cc.carm.lib.configuration.craft.source.CraftConfigProvider;
import cc.carm.lib.configuration.craft.source.CraftSectionWrapper;
import org.bukkit.configuration.file.YamlConfiguration;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

4
bukkit/src/main/java/cc/carm/lib/configuration/bukkit/source/BukkitYAMLComments.java → platform/bukkit/general/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/source/BukkitYAMLComments.java
View File

@ -1,4 +1,4 @@
package cc.carm.lib.configuration.bukkit.source;
package cc.carm.lib.configuration.minecraft.bukkit.source;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
@ -13,7 +13,7 @@ import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import static cc.carm.lib.configuration.craft.source.CraftConfigProvider.SEPARATOR;
import static cc.carm.lib.configuration.minecraft.bukkit.source.CraftConfigProvider.SEPARATOR;
public class BukkitYAMLComments {

30
spigot/pom.xml → platform/bukkit/native/pom.xml
View File

@ -3,30 +3,24 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>mineconfiguration-parent</artifactId>
<artifactId>mineconfiguration-bukkit</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.2</version>
<version>1.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
<artifactId>mineconfiguration-spigot</artifactId>
<artifactId>mineconfiguration-bukkit-native</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyconfiguration-core</artifactId>
<version>${easyconfiguration.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>mineconfiguration-craftbukkit</artifactId>
<artifactId>mineconfiguration-bukkit-base</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
@ -38,20 +32,6 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>4.8.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>

4
spigot/src/main/java/cc/carm/lib/configuration/MineConfiguration.java → platform/bukkit/native/src/main/java/cc/carm/lib/configuration/minecraft/MineConfiguration.java
View File

@ -1,6 +1,6 @@
package cc.carm.lib.configuration;
package cc.carm.lib.configuration.minecraft;
import cc.carm.lib.configuration.spigot.source.SpigotConfigProvider;
import cc.carm.lib.configuration.minecraft.bukkit.source.SpigotConfigProvider;
import org.bukkit.plugin.Plugin;
import java.io.File;

4
spigot/src/main/java/cc/carm/lib/configuration/spigot/source/SpigotConfigProvider.java → platform/bukkit/native/src/main/java/cc/carm/lib/configuration/minecraft/bukkit/source/SpigotConfigProvider.java
View File

@ -1,7 +1,7 @@
package cc.carm.lib.configuration.spigot.source;
package cc.carm.lib.configuration.minecraft.bukkit.source;
import cc.carm.lib.configuration.core.ConfigInitializer;
import cc.carm.lib.configuration.craft.source.CraftConfigProvider;
import cc.carm.lib.configuration.minecraft.bukkit.source.CraftConfigProvider;
import org.bukkit.configuration.file.YamlConfiguration;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

54
platform/bukkit/pom.xml Normal file
View File

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
<artifactId>mineconfiguration-bukkit</artifactId>
<packaging>pom</packaging>
<modules>
<module>base</module>
<module>general</module>
<module>native</module>
</modules>
<name>MineConfiguration-Bukkit</name>
<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.8.8-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!--PlaceholderAPI for general placeholder's support-->
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.1</version>
<scope>provided</scope>
</dependency>
<!--ProtocolLib for general packet's function support-->
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>4.8.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

5
bungee/pom.xml → platform/bungee/pom.xml
View File

@ -5,7 +5,8 @@
<parent>
<artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.2</version>
<version>1.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
@ -15,6 +16,8 @@
<artifactId>mineconfiguration-bungee</artifactId>
<packaging>jar</packaging>
<name>MineConfiguration-Bungee</name>
<dependencies>
<dependency>

4
bungee/src/main/java/cc/carm/lib/configuration/MineConfiguration.java → platform/bungee/src/main/java/cc/carm/lib/configuration/minecraft/MineConfiguration.java
View File

@ -1,6 +1,6 @@
package cc.carm.lib.configuration;
package cc.carm.lib.configuration.minecraft;
import cc.carm.lib.configuration.bungee.source.BungeeConfigProvider;
import cc.carm.lib.configuration.minecraft.bungee.source.BungeeConfigProvider;
import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.config.ConfigurationProvider;
import net.md_5.bungee.config.JsonConfiguration;

8
bungee/src/main/java/cc/carm/lib/configuration/bungee/BungeeConfigValue.java → platform/bungee/src/main/java/cc/carm/lib/configuration/minecraft/bungee/BungeeConfigValue.java
View File

@ -1,8 +1,8 @@
package cc.carm.lib.configuration.bungee;
package cc.carm.lib.configuration.minecraft.bungee;
import cc.carm.lib.configuration.bungee.builder.BungeeConfigBuilder;
import cc.carm.lib.configuration.bungee.source.BungeeConfigProvider;
import cc.carm.lib.configuration.bungee.source.BungeeSectionWrapper;
import cc.carm.lib.configuration.minecraft.bungee.builder.BungeeConfigBuilder;
import cc.carm.lib.configuration.minecraft.bungee.source.BungeeConfigProvider;
import cc.carm.lib.configuration.minecraft.bungee.source.BungeeSectionWrapper;
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
import org.jetbrains.annotations.NotNull;

4
bungee/src/main/java/cc/carm/lib/configuration/bungee/builder/AbstractBungeeBuilder.java → platform/bungee/src/main/java/cc/carm/lib/configuration/minecraft/bungee/builder/AbstractBungeeBuilder.java
View File

@ -1,6 +1,6 @@
package cc.carm.lib.configuration.bungee.builder;
package cc.carm.lib.configuration.minecraft.bungee.builder;
import cc.carm.lib.configuration.bungee.source.BungeeConfigProvider;
import cc.carm.lib.configuration.minecraft.bungee.source.BungeeConfigProvider;
import cc.carm.lib.configuration.core.builder.AbstractConfigBuilder;
public abstract class AbstractBungeeBuilder<T, B extends AbstractBungeeBuilder<T, B>>

4
bungee/src/main/java/cc/carm/lib/configuration/bungee/builder/BungeeConfigBuilder.java → platform/bungee/src/main/java/cc/carm/lib/configuration/minecraft/bungee/builder/BungeeConfigBuilder.java
View File

@ -1,6 +1,6 @@
package cc.carm.lib.configuration.bungee.builder;
package cc.carm.lib.configuration.minecraft.bungee.builder;
import cc.carm.lib.configuration.bungee.builder.message.BungeeMessageBuilder;
import cc.carm.lib.configuration.minecraft.bungee.builder.message.BungeeMessageBuilder;
import cc.carm.lib.configuration.core.builder.ConfigBuilder;
import org.jetbrains.annotations.NotNull;

8
bungee/src/main/java/cc/carm/lib/configuration/bungee/builder/message/BungeeMessageBuilder.java → platform/bungee/src/main/java/cc/carm/lib/configuration/minecraft/bungee/builder/message/BungeeMessageBuilder.java
View File

@ -1,8 +1,8 @@
package cc.carm.lib.configuration.bungee.builder.message;
package cc.carm.lib.configuration.minecraft.bungee.builder.message;
import cc.carm.lib.configuration.bungee.data.MessageText;
import cc.carm.lib.configuration.minecraft.builder.message.MessageConfigBuilder;
import cc.carm.lib.configuration.minecraft.utils.ColorParser;
import cc.carm.lib.configuration.minecraft.bungee.data.MessageText;
import cc.carm.lib.configuration.minecraft.common.builder.message.MessageConfigBuilder;
import cc.carm.lib.configuration.minecraft.common.utils.ColorParser;
import net.md_5.bungee.api.CommandSender;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

10
bungee/src/main/java/cc/carm/lib/configuration/bungee/builder/message/BungeeMessageListBuilder.java → platform/bungee/src/main/java/cc/carm/lib/configuration/minecraft/bungee/builder/message/BungeeMessageListBuilder.java
View File

@ -1,9 +1,9 @@
package cc.carm.lib.configuration.bungee.builder.message;
package cc.carm.lib.configuration.minecraft.bungee.builder.message;
import cc.carm.lib.configuration.bungee.data.MessageText;
import cc.carm.lib.configuration.bungee.value.ConfiguredMessageList;
import cc.carm.lib.configuration.minecraft.builder.message.MessageListBuilder;
import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.minecraft.bungee.data.MessageText;
import cc.carm.lib.configuration.minecraft.bungee.value.ConfiguredMessageList;
import cc.carm.lib.configuration.minecraft.common.builder.message.MessageListBuilder;
import cc.carm.lib.configuration.minecraft.common.utils.ParamsUtils;
import net.md_5.bungee.api.CommandSender;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

10
bungee/src/main/java/cc/carm/lib/configuration/bungee/builder/message/BungeeMessageValueBuilder.java → platform/bungee/src/main/java/cc/carm/lib/configuration/minecraft/bungee/builder/message/BungeeMessageValueBuilder.java
View File

@ -1,9 +1,9 @@
package cc.carm.lib.configuration.bungee.builder.message;
package cc.carm.lib.configuration.minecraft.bungee.builder.message;
import cc.carm.lib.configuration.bungee.data.MessageText;
import cc.carm.lib.configuration.bungee.value.ConfiguredMessage;
import cc.carm.lib.configuration.minecraft.builder.message.MessageValueBuilder;
import cc.carm.lib.configuration.minecraft.utils.ParamsUtils;
import cc.carm.lib.configuration.minecraft.bungee.data.MessageText;
import cc.carm.lib.configuration.minecraft.bungee.value.ConfiguredMessage;
import cc.carm.lib.configuration.minecraft.common.builder.message.MessageValueBuilder;
import cc.carm.lib.configuration.minecraft.common.utils.ParamsUtils;
import net.md_5.bungee.api.CommandSender;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

4
bungee/src/main/java/cc/carm/lib/configuration/bungee/data/MessageText.java → platform/bungee/src/main/java/cc/carm/lib/configuration/minecraft/bungee/data/MessageText.java
View File

@ -1,6 +1,6 @@
package cc.carm.lib.configuration.bungee.data;
package cc.carm.lib.configuration.minecraft.bungee.data;
import cc.carm.lib.configuration.minecraft.data.AbstractText;
import cc.carm.lib.configuration.minecraft.common.data.AbstractText;
import net.md_5.bungee.api.CommandSender;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;

2
bungee/src/main/java/cc/carm/lib/configuration/bungee/source/BungeeConfigProvider.java → platform/bungee/src/main/java/cc/carm/lib/configuration/minecraft/bungee/source/BungeeConfigProvider.java
View File

@ -1,4 +1,4 @@
package cc.carm.lib.configuration.bungee.source;
package cc.carm.lib.configuration.minecraft.bungee.source;
import cc.carm.lib.configuration.core.ConfigInitializer;
import cc.carm.lib.configuration.core.source.impl.FileConfigProvider;

2
bungee/src/main/java/cc/carm/lib/configuration/bungee/source/BungeeSectionWrapper.java → platform/bungee/src/main/java/cc/carm/lib/configuration/minecraft/bungee/source/BungeeSectionWrapper.java
View File

@ -1,4 +1,4 @@
package cc.carm.lib.configuration.bungee.source;
package cc.carm.lib.configuration.minecraft.bungee.source;
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
import net.md_5.bungee.config.Configuration;

10
bungee/src/main/java/cc/carm/lib/configuration/bungee/value/ConfiguredMessage.java → platform/bungee/src/main/java/cc/carm/lib/configuration/minecraft/bungee/value/ConfiguredMessage.java
View File

@ -1,9 +1,9 @@
package cc.carm.lib.configuration.bungee.value;
package cc.carm.lib.configuration.minecraft.bungee.value;
import cc.carm.lib.configuration.bungee.BungeeConfigValue;
import cc.carm.lib.configuration.bungee.builder.message.BungeeMessageValueBuilder;
import cc.carm.lib.configuration.bungee.data.MessageText;
import cc.carm.lib.configuration.minecraft.value.ConfigMessage;
import cc.carm.lib.configuration.minecraft.bungee.BungeeConfigValue;
import cc.carm.lib.configuration.minecraft.bungee.builder.message.BungeeMessageValueBuilder;
import cc.carm.lib.configuration.minecraft.bungee.data.MessageText;
import cc.carm.lib.configuration.minecraft.common.value.ConfigMessage;
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;

10
bungee/src/main/java/cc/carm/lib/configuration/bungee/value/ConfiguredMessageList.java → platform/bungee/src/main/java/cc/carm/lib/configuration/minecraft/bungee/value/ConfiguredMessageList.java
View File

@ -1,9 +1,9 @@
package cc.carm.lib.configuration.bungee.value;
package cc.carm.lib.configuration.minecraft.bungee.value;
import cc.carm.lib.configuration.bungee.BungeeConfigValue;
import cc.carm.lib.configuration.bungee.builder.message.BungeeMessageListBuilder;
import cc.carm.lib.configuration.bungee.data.MessageText;
import cc.carm.lib.configuration.minecraft.value.ConfigMessageList;
import cc.carm.lib.configuration.minecraft.bungee.BungeeConfigValue;
import cc.carm.lib.configuration.minecraft.bungee.builder.message.BungeeMessageListBuilder;
import cc.carm.lib.configuration.minecraft.bungee.data.MessageText;
import cc.carm.lib.configuration.minecraft.common.value.ConfigMessageList;
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;

11
pom.xml
View File

@ -4,12 +4,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<modules>
<module>bungee</module>
<module>craftbukkit</module>
<module>bukkit</module>
<module>spigot</module>
<module>common</module>
<module>platform/bungee</module>
<module>platform/bukkit</module>
</modules>
<properties>
<java.version>1.8</java.version>
@ -22,7 +20,7 @@
</properties>
<groupId>cc.carm.lib</groupId>
<artifactId>mineconfiguration-parent</artifactId>
<version>1.3.2</version>
<version>1.4.0</version>
<packaging>pom</packaging>
<name>MineConfiguration</name>
@ -169,7 +167,6 @@
<charset>UTF-8</charset>
<docencoding>UTF-8</docencoding>
<locale>zh_CN</locale>
<includeDependencySources>true</includeDependencySources>
<dependencySourceIncludes>
<dependencySourceInclude>cc.carm.lib:*</dependencySourceInclude>