1
mirror of https://github.com/CarmJos/MineConfiguration.git synced 2026-06-04 13:55:03 +08:00

feat(deps): Update with EasyConfiguration

This commit is contained in:
2025-03-17 03:26:32 +08:00
parent b346fc7600
commit 420eb93366
12 changed files with 29 additions and 29 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@ public class ConfiguredMessage<M> extends ConfiguredText<M, CommandSender> {
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, M> compiler,
@NotNull BiConsumer<CommandSender, List<M>> dispatcher,
@@ -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);
}
@@ -83,7 +83,7 @@ public class ConfiguredSound extends ConfiguredValue<SoundConfig> {
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;
@@ -55,7 +55,7 @@ public class ConfiguredTitle extends ConfiguredValue<TitleConfig> {
protected final @NotNull UnaryOperator<String> paramBuilder;
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 ConfiguredTitle.TitleConsumer sendConsumer) {
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 TitleConfig title = TitleConfig.of(null, null);
@@ -40,7 +40,7 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
protected final @NotNull UnaryOperator<String> paramBuilder;
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) {
super(manifest, adapter);
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 @NotNull String[] params = new String[0];
@@ -40,7 +40,7 @@ public class ConfiguredNotify extends ConfiguredList<NotifyConfig> {
protected final @NotNull UnaryOperator<String> paramBuilder;
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 UnaryOperator<String> paramBuilder, @NotNull String[] params) {
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<>();
+3 -3
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -32,8 +32,8 @@
<dependency>
<groupId>cc.carm.lib</groupId>
<artifactId>easyconfiguration-yaml</artifactId>
<version>${deps.easyconfifuration.version}</version>
<artifactId>configured-yaml</artifactId>
<version>${deps.configured.version}</version>
<scope>compile</scope>
</dependency>
@@ -25,7 +25,7 @@ public class ConfiguredMessage extends ConfiguredText<BaseComponent[], CommandSe
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, BaseComponent[]> compiler,
@NotNull BiConsumer<CommandSender, List<BaseComponent[]>> dispatcher,
+3 -3
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>3.0.3</version>
<version>3.1.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -32,8 +32,8 @@
<dependency>
<groupId>cc.carm.lib</groupId>
<artifactId>easyconfiguration-yaml</artifactId>
<version>${deps.easyconfifuration.version}</version>
<artifactId>configured-yaml</artifactId>
<version>${deps.configured.version}</version>
<scope>compile</scope>
</dependency>
@@ -23,7 +23,7 @@ public class ConfiguredMessage extends ConfiguredText<Component, Audience> {
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, Component> compiler,
@NotNull BiConsumer<Audience, List<Component>> dispatcher,