diff --git a/common/pom.xml b/common/pom.xml index 770e74b..f425a23 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-parent cc.carm.lib - 3.0.3 + 3.1.0 4.0.0 @@ -23,29 +23,29 @@ cc.carm.lib - easyconfiguration-core - ${deps.easyconfifuration.version} + configured-core + ${deps.configured.version} compile cc.carm.lib - easyconfiguration-feature-commentable - ${deps.easyconfifuration.version} + configured-feature-commentable + ${deps.configured.version} compile cc.carm.lib - easyconfiguration-feature-file - ${deps.easyconfifuration.version} + configured-feature-file + ${deps.configured.version} compile cc.carm.lib - easyconfiguration-feature-text - ${deps.easyconfifuration.version} + configured-feature-text + ${deps.configured.version} compile diff --git a/platform/bukkit/pom.xml b/platform/bukkit/pom.xml index e80ae5c..e5fd888 100644 --- a/platform/bukkit/pom.xml +++ b/platform/bukkit/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-parent cc.carm.lib - 3.0.3 + 3.1.0 ../../pom.xml 4.0.0 diff --git a/platform/bukkit/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 index 0efe089..6587727 100644 --- a/platform/bukkit/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 @@ -38,7 +38,7 @@ public class ConfiguredMessage extends ConfiguredText { return asString().defaults(messages).build(); } - public ConfiguredMessage(@NotNull ValueManifest manifest, + public ConfiguredMessage(@NotNull ValueManifest manifest, @NotNull BiFunction parser, @NotNull BiFunction compiler, @NotNull BiConsumer> dispatcher, diff --git a/platform/bukkit/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 index d4b662f..7924973 100644 --- a/platform/bukkit/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 @@ -55,7 +55,7 @@ public class ConfiguredSound extends ConfiguredValue { } ); - public ConfiguredSound(@NotNull ValueManifest manifest, @NotNull ValueAdapter adapter) { + public ConfiguredSound(@NotNull ValueManifest manifest, @NotNull ValueAdapter adapter) { super(manifest, adapter); } @@ -83,7 +83,7 @@ public class ConfiguredSound extends ConfiguredValue { Optional.ofNullable(get()).ifPresent(s -> s.playAt(location)); } - public static class Builder extends AbstractConfigBuilder, Builder> { + public static class Builder extends AbstractConfigBuilder, Builder> { protected @NotNull ValueAdapter adapter = SOUND_ADAPTER; diff --git a/platform/bukkit/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 index be78243..c8090e1 100644 --- a/platform/bukkit/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 @@ -55,7 +55,7 @@ public class ConfiguredTitle extends ConfiguredValue { protected final @NotNull UnaryOperator paramBuilder; protected final @NotNull String[] params; - public ConfiguredTitle(@NotNull ValueManifest manifest, ValueAdapter adapter, + public ConfiguredTitle(@NotNull ValueManifest manifest, ValueAdapter adapter, @NotNull UnaryOperator paramBuilder, @NotNull String[] params, @NotNull ConfiguredTitle.TitleConsumer sendConsumer) { super(manifest, adapter); @@ -150,7 +150,7 @@ public class ConfiguredTitle extends ConfiguredValue { } - public static class Builder extends AbstractConfigBuilder, Builder> { + public static class Builder extends AbstractConfigBuilder, Builder> { protected @NotNull ValueAdapter adapter = TITLE_ADAPTER; protected @NotNull TitleConfig title = TitleConfig.of(null, null); diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java index a991081..74f00d3 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java @@ -40,7 +40,7 @@ public class ConfiguredItem extends ConfiguredValue { protected final @NotNull UnaryOperator paramBuilder; protected final @NotNull String[] params; - public ConfiguredItem(@NotNull ValueManifest manifest, ValueAdapter adapter, + public ConfiguredItem(@NotNull ValueManifest manifest, ValueAdapter adapter, @NotNull UnaryOperator paramBuilder, @NotNull String[] params) { super(manifest, adapter); this.paramBuilder = paramBuilder; @@ -114,7 +114,7 @@ public class ConfiguredItem extends ConfiguredValue { } - public static class Builder extends AbstractConfigBuilder, Builder> { + public static class Builder extends AbstractConfigBuilder, Builder> { protected @Nullable ItemStack item = null; protected @NotNull String[] params = new String[0]; diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/notify/ConfiguredNotify.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/notify/ConfiguredNotify.java index 1f17e85..b7a4f86 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/notify/ConfiguredNotify.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/notify/ConfiguredNotify.java @@ -40,7 +40,7 @@ public class ConfiguredNotify extends ConfiguredList { protected final @NotNull UnaryOperator paramBuilder; protected final @NotNull String[] params; - public ConfiguredNotify(@NotNull ValueManifest> manifest, + public ConfiguredNotify(@NotNull ValueManifest, NotifyConfig> manifest, @NotNull ValueAdapter adapter, @NotNull UnaryOperator paramBuilder, @NotNull String[] params) { super(manifest, ArrayList::new, adapter); @@ -65,7 +65,7 @@ public class ConfiguredNotify extends ConfiguredList { } - public static class NotifyBuilder extends AbstractConfigBuilder, ConfiguredNotify, ConfigurationHolder, NotifyBuilder> { + public static class NotifyBuilder extends AbstractConfigBuilder, NotifyConfig, ConfiguredNotify, ConfigurationHolder, NotifyBuilder> { protected final @NotNull List notifications = new ArrayList<>(); diff --git a/platform/bungee/pom.xml b/platform/bungee/pom.xml index 15462dc..852f7da 100644 --- a/platform/bungee/pom.xml +++ b/platform/bungee/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-parent cc.carm.lib - 3.0.3 + 3.1.0 ../../pom.xml 4.0.0 @@ -32,8 +32,8 @@ cc.carm.lib - easyconfiguration-yaml - ${deps.easyconfifuration.version} + configured-yaml + ${deps.configured.version} compile diff --git a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/value/ConfiguredMessage.java b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/value/ConfiguredMessage.java index fd63cce..a783544 100644 --- a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/value/ConfiguredMessage.java +++ b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/value/ConfiguredMessage.java @@ -25,7 +25,7 @@ public class ConfiguredMessage extends ConfiguredText manifest, + public ConfiguredMessage(@NotNull ValueManifest manifest, @NotNull BiFunction parser, @NotNull BiFunction compiler, @NotNull BiConsumer> dispatcher, diff --git a/platform/velocity/pom.xml b/platform/velocity/pom.xml index 7b37244..e6c5cb0 100644 --- a/platform/velocity/pom.xml +++ b/platform/velocity/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-parent cc.carm.lib - 3.0.3 + 3.1.0 ../../pom.xml 4.0.0 @@ -32,8 +32,8 @@ cc.carm.lib - easyconfiguration-yaml - ${deps.easyconfifuration.version} + configured-yaml + ${deps.configured.version} compile diff --git a/platform/velocity/src/main/java/cc/carm/lib/mineconfiguration/velocity/value/ConfiguredMessage.java b/platform/velocity/src/main/java/cc/carm/lib/mineconfiguration/velocity/value/ConfiguredMessage.java index bda46bd..b310949 100644 --- a/platform/velocity/src/main/java/cc/carm/lib/mineconfiguration/velocity/value/ConfiguredMessage.java +++ b/platform/velocity/src/main/java/cc/carm/lib/mineconfiguration/velocity/value/ConfiguredMessage.java @@ -23,7 +23,7 @@ public class ConfiguredMessage extends ConfiguredText { return create().defaults(messages).build(); } - public ConfiguredMessage(@NotNull ValueManifest manifest, + public ConfiguredMessage(@NotNull ValueManifest manifest, @NotNull BiFunction parser, @NotNull BiFunction compiler, @NotNull BiConsumer> dispatcher, diff --git a/pom.xml b/pom.xml index ebcb5be..35b1a4b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,14 +10,14 @@ UTF-8 UTF-8 - 4.0.11 + 4.1.1 1.2.1 1.5.12 cc.carm.lib mineconfiguration-parent - 3.0.3 + 3.1.0 pom common