carm/MineConfiguration
1
Fork 0
mirror of https://github.com/CarmJos/MineConfiguration.git synced 2026-06-04 21:58:16 +08:00
Code Issues Releases Activity

feat(deps): Update with EasyConfiguration

Browse Source
This commit is contained in:
Carm Jos
2025-03-17 03:26:32 +08:00
parent b346fc7600
commit 420eb93366
12 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/pom.xml
+9 -9
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>3.0.3</version> <version>3.1.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
@@ -23,29 +23,29 @@
<dependency> <dependency>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<artifactId>easyconfiguration-core</artifactId> <artifactId>configured-core</artifactId>
<version>${deps.easyconfifuration.version}</version> <version>${deps.configured.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<artifactId>easyconfiguration-feature-commentable</artifactId> <artifactId>configured-feature-commentable</artifactId>
<version>${deps.easyconfifuration.version}</version> <version>${deps.configured.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<artifactId>easyconfiguration-feature-file</artifactId> <artifactId>configured-feature-file</artifactId>
<version>${deps.easyconfifuration.version}</version> <version>${deps.configured.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<artifactId>easyconfiguration-feature-text</artifactId> <artifactId>configured-feature-text</artifactId>
<version>${deps.easyconfifuration.version}</version> <version>${deps.configured.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
platform/bukkit/pom.xml
+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>3.0.3</version> <version>3.1.0</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class ConfiguredMessage<M> extends ConfiguredText<M, CommandSender> {
return asString().defaults(messages).build(); return asString().defaults(messages).build();
} }
public ConfiguredMessage(@NotNull ValueManifest<TextContents> manifest, public ConfiguredMessage(@NotNull ValueManifest<TextContents, TextContents> manifest,
@NotNull BiFunction<CommandSender, String, String> parser, @NotNull BiFunction<CommandSender, String, String> parser,
@NotNull BiFunction<CommandSender, String, M> compiler, @NotNull BiFunction<CommandSender, String, M> compiler,
@NotNull BiConsumer<CommandSender, List<M>> dispatcher, @NotNull BiConsumer<CommandSender, List<M>> dispatcher,
platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSound.java
+2 -2
View File
@@ -55,7 +55,7 @@ public class ConfiguredSound extends ConfiguredValue<SoundConfig> {
} }
); );
public ConfiguredSound(@NotNull ValueManifest<SoundConfig> manifest, @NotNull ValueAdapter<SoundConfig> adapter) { public ConfiguredSound(@NotNull ValueManifest<SoundConfig, SoundConfig> manifest, @NotNull ValueAdapter<SoundConfig> adapter) {
super(manifest, adapter); super(manifest, adapter);
} }
@@ -83,7 +83,7 @@ public class ConfiguredSound extends ConfiguredValue<SoundConfig> {
Optional.ofNullable(get()).ifPresent(s -> s.playAt(location)); Optional.ofNullable(get()).ifPresent(s -> s.playAt(location));
} }
public static class Builder extends AbstractConfigBuilder<SoundConfig, ConfiguredSound, ConfigurationHolder<?>, Builder> { public static class Builder extends AbstractConfigBuilder<SoundConfig, SoundConfig, ConfiguredSound, ConfigurationHolder<?>, Builder> {
protected @NotNull ValueAdapter<SoundConfig> adapter = SOUND_ADAPTER; protected @NotNull ValueAdapter<SoundConfig> adapter = SOUND_ADAPTER;
platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredTitle.java
+2 -2
View File
@@ -55,7 +55,7 @@ public class ConfiguredTitle extends ConfiguredValue<TitleConfig> {
protected final @NotNull UnaryOperator<String> paramBuilder; protected final @NotNull UnaryOperator<String> paramBuilder;
protected final @NotNull String[] params; protected final @NotNull String[] params;
public ConfiguredTitle(@NotNull ValueManifest<TitleConfig> manifest, ValueAdapter<TitleConfig> adapter, public ConfiguredTitle(@NotNull ValueManifest<TitleConfig, TitleConfig> manifest, ValueAdapter<TitleConfig> adapter,
@NotNull UnaryOperator<String> paramBuilder, @NotNull String[] params, @NotNull UnaryOperator<String> paramBuilder, @NotNull String[] params,
@NotNull ConfiguredTitle.TitleConsumer sendConsumer) { @NotNull ConfiguredTitle.TitleConsumer sendConsumer) {
super(manifest, adapter); super(manifest, adapter);
@@ -150,7 +150,7 @@ public class ConfiguredTitle extends ConfiguredValue<TitleConfig> {
} }
public static class Builder extends AbstractConfigBuilder<TitleConfig, ConfiguredTitle, ConfigurationHolder<?>, Builder> { public static class Builder extends AbstractConfigBuilder<TitleConfig, TitleConfig, ConfiguredTitle, ConfigurationHolder<?>, Builder> {
protected @NotNull ValueAdapter<TitleConfig> adapter = TITLE_ADAPTER; protected @NotNull ValueAdapter<TitleConfig> adapter = TITLE_ADAPTER;
protected @NotNull TitleConfig title = TitleConfig.of(null, null); protected @NotNull TitleConfig title = TitleConfig.of(null, null);
platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java
+2 -2
View File
@@ -40,7 +40,7 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
protected final @NotNull UnaryOperator<String> paramBuilder; protected final @NotNull UnaryOperator<String> paramBuilder;
protected final @NotNull String[] params; protected final @NotNull String[] params;
public ConfiguredItem(@NotNull ValueManifest<ItemStack> manifest, ValueAdapter<ItemStack> adapter, public ConfiguredItem(@NotNull ValueManifest<ItemStack, ItemStack> manifest, ValueAdapter<ItemStack> adapter,
@NotNull UnaryOperator<String> paramBuilder, @NotNull String[] params) { @NotNull UnaryOperator<String> paramBuilder, @NotNull String[] params) {
super(manifest, adapter); super(manifest, adapter);
this.paramBuilder = paramBuilder; this.paramBuilder = paramBuilder;
@@ -114,7 +114,7 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
} }
public static class Builder extends AbstractConfigBuilder<ItemStack, ConfiguredItem, ConfigurationHolder<?>, Builder> { public static class Builder extends AbstractConfigBuilder<ItemStack, ItemStack, ConfiguredItem, ConfigurationHolder<?>, Builder> {
protected @Nullable ItemStack item = null; protected @Nullable ItemStack item = null;
protected @NotNull String[] params = new String[0]; protected @NotNull String[] params = new String[0];
platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/notify/ConfiguredNotify.java
+2 -2
View File
@@ -40,7 +40,7 @@ public class ConfiguredNotify extends ConfiguredList<NotifyConfig> {
protected final @NotNull UnaryOperator<String> paramBuilder; protected final @NotNull UnaryOperator<String> paramBuilder;
protected final @NotNull String[] params; protected final @NotNull String[] params;
public ConfiguredNotify(@NotNull ValueManifest<List<NotifyConfig>> manifest, public ConfiguredNotify(@NotNull ValueManifest<List<NotifyConfig>, NotifyConfig> manifest,
@NotNull ValueAdapter<NotifyConfig> adapter, @NotNull ValueAdapter<NotifyConfig> adapter,
@NotNull UnaryOperator<String> paramBuilder, @NotNull String[] params) { @NotNull UnaryOperator<String> paramBuilder, @NotNull String[] params) {
super(manifest, ArrayList::new, adapter); super(manifest, ArrayList::new, adapter);
@@ -65,7 +65,7 @@ public class ConfiguredNotify extends ConfiguredList<NotifyConfig> {
} }
public static class NotifyBuilder extends AbstractConfigBuilder<List<NotifyConfig>, ConfiguredNotify, ConfigurationHolder<?>, NotifyBuilder> { public static class NotifyBuilder extends AbstractConfigBuilder<List<NotifyConfig>, NotifyConfig, ConfiguredNotify, ConfigurationHolder<?>, NotifyBuilder> {
protected final @NotNull List<NotifyConfig> notifications = new ArrayList<>(); protected final @NotNull List<NotifyConfig> notifications = new ArrayList<>();
platform/bungee/pom.xml
+3 -3
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>3.0.3</version> <version>3.1.0</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@@ -32,8 +32,8 @@
<dependency> <dependency>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<artifactId>easyconfiguration-yaml</artifactId> <artifactId>configured-yaml</artifactId>
<version>${deps.easyconfifuration.version}</version> <version>${deps.configured.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/value/ConfiguredMessage.java
+1 -1
View File
@@ -25,7 +25,7 @@ public class ConfiguredMessage extends ConfiguredText<BaseComponent[], CommandSe
return create().defaults(messages).build(); return create().defaults(messages).build();
} }
public ConfiguredMessage(@NotNull ValueManifest<TextContents> manifest, public ConfiguredMessage(@NotNull ValueManifest<TextContents, TextContents> manifest,
@NotNull BiFunction<CommandSender, String, String> parser, @NotNull BiFunction<CommandSender, String, String> parser,
@NotNull BiFunction<CommandSender, String, BaseComponent[]> compiler, @NotNull BiFunction<CommandSender, String, BaseComponent[]> compiler,
@NotNull BiConsumer<CommandSender, List<BaseComponent[]>> dispatcher, @NotNull BiConsumer<CommandSender, List<BaseComponent[]>> dispatcher,
platform/velocity/pom.xml
+3 -3
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>3.0.3</version> <version>3.1.0</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@@ -32,8 +32,8 @@
<dependency> <dependency>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<artifactId>easyconfiguration-yaml</artifactId> <artifactId>configured-yaml</artifactId>
<version>${deps.easyconfifuration.version}</version> <version>${deps.configured.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
platform/velocity/src/main/java/cc/carm/lib/mineconfiguration/velocity/value/ConfiguredMessage.java
+1 -1
View File
@@ -23,7 +23,7 @@ public class ConfiguredMessage extends ConfiguredText<Component, Audience> {
return create().defaults(messages).build(); return create().defaults(messages).build();
} }
public ConfiguredMessage(@NotNull ValueManifest<TextContents> manifest, public ConfiguredMessage(@NotNull ValueManifest<TextContents, TextContents> manifest,
@NotNull BiFunction<Audience, String, String> parser, @NotNull BiFunction<Audience, String, String> parser,
@NotNull BiFunction<Audience, String, Component> compiler, @NotNull BiFunction<Audience, String, Component> compiler,
@NotNull BiConsumer<Audience, List<Component>> dispatcher, @NotNull BiConsumer<Audience, List<Component>> dispatcher,
pom.xml
+2 -2
View File
@@ -10,14 +10,14 @@
<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>
<deps.easyconfifuration.version>4.0.11</deps.easyconfifuration.version> <deps.configured.version>4.1.1</deps.configured.version>
<deps.yamlcommentwriter.version>1.2.1</deps.yamlcommentwriter.version> <deps.yamlcommentwriter.version>1.2.1</deps.yamlcommentwriter.version>
<deps.easyplugin.version>1.5.12</deps.easyplugin.version> <deps.easyplugin.version>1.5.12</deps.easyplugin.version>
</properties> </properties>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<artifactId>mineconfiguration-parent</artifactId> <artifactId>mineconfiguration-parent</artifactId>
<version>3.0.3</version> <version>3.1.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>common</module> <module>common</module>