[1.2.0]

- [A] 令 ConfiguredMessage 同时支持Bungee、Bukkit平台。
- [A] 为Bukkit相关平台原生支持PlaceholderAPI。

bungee/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.1.7</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>
@@ -40,6 +40,13 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>mineconfiguration-common</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

bungee/src/main/java/cc/carm/lib/configuration/MineConfiguration.java

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

bungee/src/main/java/cc/carm/lib/configuration/bungee/BungeeConfigValue.java

@@ -0,0 +1,33 @@
+package cc.carm.lib.configuration.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.core.source.ConfigCommentInfo;
+import cc.carm.lib.configuration.core.source.ConfigurationProvider;
+import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public abstract class BungeeConfigValue<T> extends CachedConfigValue<T> {
+
+    public static @NotNull BungeeConfigBuilder builder() {
+        return new BungeeConfigBuilder();
+    }
+
+    public BungeeConfigValue(@Nullable BungeeConfigProvider provider,
+                             @Nullable String configPath, @Nullable ConfigCommentInfo comments, @Nullable T defaultValue) {
+        super(provider, configPath, comments, defaultValue);
+    }
+
+    public BungeeConfigProvider getBukkitProvider() {
+        ConfigurationProvider<?> provider = getProvider();
+        if (provider instanceof BungeeConfigProvider) return (BungeeConfigProvider) getProvider();
+        else throw new IllegalStateException("Provider is not a SpigotConfigProvider");
+    }
+
+    public BungeeSectionWrapper getBukkitConfig() {
+        return getBukkitProvider().getConfiguration();
+    }
+
+}

bungee/src/main/java/cc/carm/lib/configuration/bungee/builder/AbstractBungeeBuilder.java

@@ -0,0 +1,13 @@
+package cc.carm.lib.configuration.bungee.builder;
+
+import cc.carm.lib.configuration.bungee.source.BungeeConfigProvider;
+import cc.carm.lib.configuration.core.builder.AbstractConfigBuilder;
+
+public abstract class AbstractBungeeBuilder<T, B extends AbstractBungeeBuilder<T, B>>
+        extends AbstractConfigBuilder<T, B, BungeeConfigProvider> {
+
+    public AbstractBungeeBuilder() {
+        super(BungeeConfigProvider.class);
+    }
+
+}

bungee/src/main/java/cc/carm/lib/configuration/bungee/builder/BungeeConfigBuilder.java

@@ -0,0 +1,14 @@
+package cc.carm.lib.configuration.bungee.builder;
+
+import cc.carm.lib.configuration.bungee.builder.message.BungeeMessageBuilder;
+import cc.carm.lib.configuration.core.builder.ConfigBuilder;
+import org.jetbrains.annotations.NotNull;
+
+public class BungeeConfigBuilder extends ConfigBuilder {
+
+    public @NotNull BungeeMessageBuilder createMessage() {
+        return new BungeeMessageBuilder();
+    }
+
+
+}

bungee/src/main/java/cc/carm/lib/configuration/bungee/builder/message/BungeeMessageBuilder.java

@@ -0,0 +1,43 @@
+package cc.carm.lib.configuration.bungee.builder.message;
+
+import cc.carm.lib.configuration.bungee.data.MessageText;
+import cc.carm.lib.configuration.common.builder.message.MessageConfigBuilder;
+import cc.carm.lib.configuration.common.utils.ColorParser;
+import net.md_5.bungee.api.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.BiFunction;
+
+public class BungeeMessageBuilder extends MessageConfigBuilder<CommandSender, MessageText> {
+
+
+    public BungeeMessageBuilder() {
+        super(CommandSender.class, MessageText.class);
+    }
+
+    @Override
+    public @NotNull <M> BungeeMessageValueBuilder<M> asValue(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> parser) {
+        return new BungeeMessageValueBuilder<>(parser);
+    }
+
+    @Override
+    public @NotNull <M> BungeeMessageListBuilder<M> asList(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> parser) {
+        return new BungeeMessageListBuilder<>(parser);
+    }
+
+    public @NotNull
+    BungeeMessageValueBuilder<String> asStringValue() {
+        return asValue(defaultParser()).whenSend(CommandSender::sendMessage);
+    }
+
+    public @NotNull
+    BungeeMessageListBuilder<String> asStringList() {
+        return asList(defaultParser()).whenSend((r, m) -> m.forEach(r::sendMessage));
+    }
+
+    protected static @NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable String> defaultParser() {
+        return (receiver, message) -> ColorParser.parse(message);
+    }
+
+}

bungee/src/main/java/cc/carm/lib/configuration/bungee/builder/message/BungeeMessageListBuilder.java

@@ -0,0 +1,34 @@
+package cc.carm.lib.configuration.bungee.builder.message;
+
+import cc.carm.lib.configuration.bungee.data.MessageText;
+import cc.carm.lib.configuration.bungee.value.ConfiguredMessageList;
+import cc.carm.lib.configuration.common.builder.message.MessageListBuilder;
+import net.md_5.bungee.api.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Optional;
+import java.util.function.BiFunction;
+
+public class BungeeMessageListBuilder<M>
+        extends MessageListBuilder<M, CommandSender, MessageText, BungeeMessageListBuilder<M>> {
+
+    public BungeeMessageListBuilder(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> parser) {
+        super(CommandSender.class, MessageText::of, parser);
+    }
+
+    @Override
+    protected @NotNull BungeeMessageListBuilder<M> getThis() {
+        return this;
+    }
+
+    @Override
+    public @NotNull ConfiguredMessageList<M> build() {
+        return new ConfiguredMessageList<>(
+                this.provider, this.path, buildComments(),
+                Optional.ofNullable(this.defaultValue).orElse(MessageText.of(new ArrayList<>())),
+                buildParams(), this.messageParser, this.sendFunction
+        );
+    }
+}

bungee/src/main/java/cc/carm/lib/configuration/bungee/builder/message/BungeeMessageValueBuilder.java

@@ -0,0 +1,35 @@
+package cc.carm.lib.configuration.bungee.builder.message;
+
+import cc.carm.lib.configuration.bungee.data.MessageText;
+import cc.carm.lib.configuration.bungee.value.ConfiguredMessage;
+import cc.carm.lib.configuration.common.builder.message.MessageValueBuilder;
+import net.md_5.bungee.api.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
+import java.util.function.BiFunction;
+
+public class BungeeMessageValueBuilder<M>
+        extends MessageValueBuilder<M, CommandSender, MessageText, BungeeMessageValueBuilder<M>> {
+
+    public BungeeMessageValueBuilder(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> parser) {
+        super(CommandSender.class, MessageText::new, parser);
+    }
+
+    @Override
+    protected @NotNull BungeeMessageValueBuilder<M> getThis() {
+        return this;
+    }
+
+    @Override
+    public @NotNull ConfiguredMessage<M> build() {
+        return new ConfiguredMessage<>(
+                this.provider, this.path, buildComments(),
+                Optional.ofNullable(this.defaultValue).orElse(MessageText.of("")),
+                buildParams(), this.messageParser, this.sendHandler
+        );
+    }
+
+
+}

bungee/src/main/java/cc/carm/lib/configuration/bungee/data/MessageText.java

@@ -0,0 +1,35 @@
+package cc.carm.lib.configuration.bungee.data;
+
+import cc.carm.lib.configuration.common.data.AbstractText;
+import net.md_5.bungee.api.CommandSender;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class MessageText extends AbstractText<CommandSender> {
+
+    public MessageText(@NotNull String message) {
+        super(CommandSender.class, message);
+    }
+
+    @Contract("!null,-> !null")
+    public static @Nullable MessageText of(@Nullable String message) {
+        if (message == null) return null;
+        else return new MessageText(message);
+    }
+
+    public static @NotNull List<MessageText> of(@Nullable List<String> messages) {
+        if (messages == null || messages.isEmpty()) return new ArrayList<>();
+        else return messages.stream().map(MessageText::of).collect(Collectors.toList());
+    }
+
+    public static @NotNull List<MessageText> of(@NotNull String... messages) {
+        return of(Arrays.asList(messages));
+    }
+
+}

bungee/src/main/java/cc/carm/lib/configuration/bungee/source/BungeeConfigProvider.java

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

bungee/src/main/java/cc/carm/lib/configuration/bungee/source/BungeeSectionWrapper.java

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

bungee/src/main/java/cc/carm/lib/configuration/bungee/value/ConfiguredMessage.java

@@ -0,0 +1,52 @@
+package cc.carm.lib.configuration.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.common.value.ConfigMessage;
+import cc.carm.lib.configuration.core.source.ConfigCommentInfo;
+import cc.carm.lib.configuration.core.source.ConfigurationProvider;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.ProxyServer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+
+public class ConfiguredMessage<M> extends ConfigMessage<M, MessageText, CommandSender> {
+
+    @NotNull
+    public static <M> BungeeMessageValueBuilder<@Nullable M> create(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser) {
+        return BungeeConfigValue.builder().createMessage().asValue(messageParser);
+    }
+
+    public static BungeeMessageValueBuilder<String> asString() {
+        return BungeeConfigValue.builder().createMessage().asStringValue();
+    }
+
+    public static ConfiguredMessage<String> ofString() {
+        return asString().build();
+    }
+
+    public static ConfiguredMessage<String> ofString(@NotNull String defaultMessage) {
+        return asString().defaults(defaultMessage).build();
+    }
+
+    public ConfiguredMessage(@Nullable ConfigurationProvider<?> provider,
+                             @Nullable String sectionPath, @Nullable ConfigCommentInfo comments,
+                             @NotNull MessageText defaultMessage, @NotNull String[] params,
+                             @NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser,
+                             @NotNull BiConsumer<@NotNull CommandSender, @NotNull M> sendFunction) {
+        super(provider, sectionPath, comments, MessageText.class, defaultMessage, params, messageParser, sendFunction, MessageText::of);
+    }
+
+
+    public void broadcast(@NotNull Map<String, Object> placeholders) {
+        ProxyServer.getInstance().getPlayers().forEach(pl -> send(pl, placeholders));
+        send(ProxyServer.getInstance().getConsole(), placeholders);
+    }
+
+
+}

bungee/src/main/java/cc/carm/lib/configuration/bungee/value/ConfiguredMessageList.java

@@ -0,0 +1,47 @@
+package cc.carm.lib.configuration.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.common.value.ConfigMessageList;
+import cc.carm.lib.configuration.core.source.ConfigCommentInfo;
+import cc.carm.lib.configuration.core.source.ConfigurationProvider;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.ProxyServer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+
+public class ConfiguredMessageList<M> extends ConfigMessageList<M, MessageText, CommandSender> {
+
+    @NotNull
+    public static <M> BungeeMessageListBuilder<M> create(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser) {
+        return BungeeConfigValue.builder().createMessage().asList(messageParser);
+    }
+
+    public static BungeeMessageListBuilder<String> asStrings() {
+        return BungeeConfigValue.builder().createMessage().asStringList();
+    }
+
+    public static ConfiguredMessageList<String> ofStrings(@NotNull String... defaultMessages) {
+        return asStrings().defaults(defaultMessages).build();
+    }
+
+    public ConfiguredMessageList(@Nullable ConfigurationProvider<?> provider,
+                                 @Nullable String sectionPath, @Nullable ConfigCommentInfo comments,
+                                 @NotNull List<MessageText> messages, @NotNull String[] params,
+                                 @NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser,
+                                 @NotNull BiConsumer<@NotNull CommandSender, @NotNull List<M>> sendFunction) {
+        super(provider, sectionPath, comments, MessageText.class, messages, params, messageParser, sendFunction, MessageText::of);
+    }
+
+    public void broadcast(@NotNull Map<String, Object> placeholders) {
+        ProxyServer.getInstance().getPlayers().forEach(pl -> send(pl, placeholders));
+        send(ProxyServer.getInstance().getConsole(), placeholders);
+    }
+
+}