mirror of
https://github.com/CarmJos/MineConfiguration.git
synced 2026-06-04 13:55:03 +08:00
[1.2.0]
- [A] 令 ConfiguredMessage 同时支持Bungee、Bukkit平台。 - [A] 为Bukkit相关平台原生支持PlaceholderAPI。
This commit is contained in:
+15
-1
@@ -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>
|
||||
@@ -24,6 +24,13 @@
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>${project.parent.groupId}</groupId>
|
||||
<artifactId>mineconfiguration-common</artifactId>
|
||||
<version>${project.parent.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.bukkit</groupId>
|
||||
<artifactId>bukkit</artifactId>
|
||||
@@ -31,6 +38,13 @@
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>me.clip</groupId>
|
||||
<artifactId>placeholderapi</artifactId>
|
||||
<version>2.10.9</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
||||
+3
-3
@@ -2,7 +2,7 @@ package cc.carm.lib.configuration.craft.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.MessageConfigBuilder;
|
||||
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.data.ItemConfig;
|
||||
@@ -21,8 +21,8 @@ public class CraftConfigBuilder extends ConfigBuilder {
|
||||
return new ItemConfigBuilder();
|
||||
}
|
||||
|
||||
public @NotNull MessageConfigBuilder createMessage() {
|
||||
return new MessageConfigBuilder();
|
||||
public @NotNull CraftMessageBuilder createMessage() {
|
||||
return new CraftMessageBuilder();
|
||||
}
|
||||
|
||||
public <V extends ConfigurationSerializable> @NotNull SerializableBuilder<V> ofSerializable(@NotNull Class<V> valueClass) {
|
||||
|
||||
+58
@@ -0,0 +1,58 @@
|
||||
package cc.carm.lib.configuration.craft.builder.message;
|
||||
|
||||
import cc.carm.lib.configuration.common.builder.message.MessageConfigBuilder;
|
||||
import cc.carm.lib.configuration.common.utils.ColorParser;
|
||||
import cc.carm.lib.configuration.craft.data.MessageText;
|
||||
import cc.carm.lib.configuration.craft.utils.PAPIHelper;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.function.BiFunction;
|
||||
|
||||
public class CraftMessageBuilder extends MessageConfigBuilder<CommandSender, MessageText> {
|
||||
|
||||
|
||||
public CraftMessageBuilder() {
|
||||
super(CommandSender.class, MessageText.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull
|
||||
<M> CraftMessageValueBuilder<M> asValue(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> parser) {
|
||||
return new CraftMessageValueBuilder<>(parser);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull
|
||||
<M> CraftMessageListBuilder<M> asList(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> parser) {
|
||||
return new CraftMessageListBuilder<>(parser);
|
||||
}
|
||||
|
||||
public @NotNull
|
||||
CraftMessageValueBuilder<String> asStringValue() {
|
||||
return asValue(defaultParser()).whenSend(CommandSender::sendMessage);
|
||||
}
|
||||
|
||||
public @NotNull
|
||||
CraftMessageListBuilder<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) -> {
|
||||
if (receiver instanceof Player && hasPlaceholderAPI()) {
|
||||
message = PAPIHelper.parseMessages((Player) receiver, message);
|
||||
}
|
||||
return ColorParser.parse(message);
|
||||
};
|
||||
}
|
||||
|
||||
public static boolean hasPlaceholderAPI() {
|
||||
return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
|
||||
}
|
||||
|
||||
}
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
package cc.carm.lib.configuration.craft.builder.message;
|
||||
|
||||
import cc.carm.lib.configuration.common.builder.message.MessageListBuilder;
|
||||
import cc.carm.lib.configuration.craft.data.MessageText;
|
||||
import cc.carm.lib.configuration.craft.value.ConfiguredMessageList;
|
||||
import org.bukkit.command.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 CraftMessageListBuilder<M>
|
||||
extends MessageListBuilder<M, CommandSender, MessageText, CraftMessageListBuilder<M>> {
|
||||
|
||||
public CraftMessageListBuilder(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> parser) {
|
||||
super(CommandSender.class, MessageText::of, parser);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected @NotNull CraftMessageListBuilder<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
|
||||
);
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package cc.carm.lib.configuration.craft.builder.message;
|
||||
|
||||
import cc.carm.lib.configuration.common.builder.message.MessageValueBuilder;
|
||||
import cc.carm.lib.configuration.craft.data.MessageText;
|
||||
import cc.carm.lib.configuration.craft.value.ConfiguredMessage;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.function.BiFunction;
|
||||
|
||||
public class CraftMessageValueBuilder<M>
|
||||
extends MessageValueBuilder<M, CommandSender, MessageText, CraftMessageValueBuilder<M>> {
|
||||
|
||||
public CraftMessageValueBuilder(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> parser) {
|
||||
super(CommandSender.class, MessageText::new, parser);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected @NotNull CraftMessageValueBuilder<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
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
-45
@@ -1,45 +0,0 @@
|
||||
package cc.carm.lib.configuration.craft.builder.message;
|
||||
|
||||
import cc.carm.lib.configuration.craft.utils.ColorParser;
|
||||
import cc.carm.lib.configuration.craft.value.ConfiguredMessage;
|
||||
import cc.carm.lib.configuration.craft.value.ConfiguredMessageList;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.function.BiFunction;
|
||||
|
||||
public class MessageConfigBuilder {
|
||||
|
||||
public <M> @NotNull MessageValueBuilder<M> asValue(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser) {
|
||||
return new MessageValueBuilder<>(messageParser);
|
||||
}
|
||||
|
||||
public <M> @NotNull MessageListBuilder<M> asList(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser) {
|
||||
return new MessageListBuilder<>(messageParser);
|
||||
}
|
||||
|
||||
public @NotNull MessageValueBuilder<String> asStringValue() {
|
||||
return asValue((sender, message) -> ColorParser.parseColor(message))
|
||||
.whenSend(CommandSender::sendMessage);
|
||||
}
|
||||
|
||||
public @NotNull ConfiguredMessage<String> valueOfString() {
|
||||
return valueOfString("");
|
||||
}
|
||||
|
||||
public @NotNull ConfiguredMessage<String> valueOfString(@NotNull String defaultMessage) {
|
||||
return asStringValue().defaults(defaultMessage).build();
|
||||
}
|
||||
|
||||
|
||||
public @NotNull MessageListBuilder<String> asStringList() {
|
||||
return asList((sender, message) -> ColorParser.parseColor(message))
|
||||
.whenSend((sender, messages) -> messages.forEach(sender::sendMessage));
|
||||
}
|
||||
|
||||
public @NotNull ConfiguredMessageList<String> listOfString(@NotNull String... defaultMessages) {
|
||||
return asStringList().defaults(defaultMessages).build();
|
||||
}
|
||||
|
||||
}
|
||||
-81
@@ -1,81 +0,0 @@
|
||||
package cc.carm.lib.configuration.craft.builder.message;
|
||||
|
||||
import cc.carm.lib.configuration.core.builder.CommonConfigBuilder;
|
||||
import cc.carm.lib.configuration.craft.data.MessageText;
|
||||
import cc.carm.lib.configuration.craft.value.ConfiguredMessageList;
|
||||
import org.bukkit.command.CommandSender;
|
||||
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.Optional;
|
||||
import java.util.function.BiConsumer;
|
||||
import java.util.function.BiFunction;
|
||||
import java.util.function.Function;
|
||||
|
||||
public class MessageListBuilder<M>
|
||||
extends CommonConfigBuilder<List<MessageText>, MessageListBuilder<M>> {
|
||||
|
||||
protected @NotNull String[] params;
|
||||
protected @NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser;
|
||||
protected @NotNull BiConsumer<@NotNull CommandSender, @NotNull List<M>> sendFunction;
|
||||
|
||||
protected @NotNull Function<@NotNull String, @NotNull String> paramFormatter;
|
||||
|
||||
public MessageListBuilder(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> parser) {
|
||||
this.params = new String[0];
|
||||
this.messageParser = parser;
|
||||
this.paramFormatter = MessageValueBuilder.DEFAULT_PARAM_FORMATTER;
|
||||
this.sendFunction = (sender, M) -> {
|
||||
};
|
||||
}
|
||||
|
||||
public MessageListBuilder<M> defaults(@NotNull String... messages) {
|
||||
return defaults(Arrays.asList(messages));
|
||||
}
|
||||
|
||||
public MessageListBuilder<M> defaults(@NotNull List<String> messages) {
|
||||
return defaults(new ArrayList<>(MessageText.of(messages)));
|
||||
}
|
||||
|
||||
public MessageListBuilder<M> params(@NotNull String... params) {
|
||||
this.params = params;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MessageListBuilder<M> params(@NotNull List<String> params) {
|
||||
this.params = params.toArray(new String[0]);
|
||||
return this;
|
||||
}
|
||||
|
||||
public MessageListBuilder<M> formatParam(@NotNull Function<@NotNull String, @NotNull String> paramFormatter) {
|
||||
this.paramFormatter = paramFormatter;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MessageListBuilder<M> whenSend(@NotNull BiConsumer<@NotNull CommandSender, @NotNull List<M>> sendFunction) {
|
||||
this.sendFunction = sendFunction;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected @NotNull MessageListBuilder<M> getThis() {
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull ConfiguredMessageList<M> build() {
|
||||
return new ConfiguredMessageList<>(
|
||||
this.provider, this.path, buildComments(),
|
||||
Optional.ofNullable(this.defaultValue).orElse(new ArrayList<>()),
|
||||
buildParams(), this.messageParser, this.sendFunction
|
||||
);
|
||||
}
|
||||
|
||||
protected final String[] buildParams() {
|
||||
return Arrays.stream(params).map(param -> paramFormatter.apply(param)).toArray(String[]::new);
|
||||
}
|
||||
|
||||
}
|
||||
-79
@@ -1,79 +0,0 @@
|
||||
package cc.carm.lib.configuration.craft.builder.message;
|
||||
|
||||
import cc.carm.lib.configuration.core.builder.CommonConfigBuilder;
|
||||
import cc.carm.lib.configuration.craft.data.MessageText;
|
||||
import cc.carm.lib.configuration.craft.value.ConfiguredMessage;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.function.BiConsumer;
|
||||
import java.util.function.BiFunction;
|
||||
import java.util.function.Function;
|
||||
|
||||
public class MessageValueBuilder<M>
|
||||
extends CommonConfigBuilder<MessageText, MessageValueBuilder<M>> {
|
||||
|
||||
public static Function<@NotNull String, @NotNull String> DEFAULT_PARAM_FORMATTER = (s) -> "%(" + s + ")";
|
||||
|
||||
protected @NotNull String[] params;
|
||||
protected @NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser;
|
||||
protected @NotNull BiConsumer<@NotNull CommandSender, @NotNull M> sendHandler;
|
||||
|
||||
protected @NotNull Function<@NotNull String, @NotNull String> paramFormatter;
|
||||
|
||||
public MessageValueBuilder(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> parser) {
|
||||
this.params = new String[0];
|
||||
this.paramFormatter = DEFAULT_PARAM_FORMATTER;
|
||||
this.messageParser = parser;
|
||||
this.sendHandler = (sender, M) -> {
|
||||
};
|
||||
}
|
||||
|
||||
public MessageValueBuilder<M> defaults(@NotNull String message) {
|
||||
return defaults(MessageText.of(message));
|
||||
}
|
||||
|
||||
public MessageValueBuilder<M> params(@NotNull String... params) {
|
||||
this.params = params;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MessageValueBuilder<M> params(@NotNull List<String> params) {
|
||||
this.params = params.toArray(new String[0]);
|
||||
return this;
|
||||
}
|
||||
|
||||
public MessageValueBuilder<M> formatParam(@NotNull Function<@NotNull String, @NotNull String> paramFormatter) {
|
||||
this.paramFormatter = paramFormatter;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MessageValueBuilder<M> whenSend(@NotNull BiConsumer<@NotNull CommandSender, @NotNull M> sendFunction) {
|
||||
this.sendHandler = sendFunction;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected @NotNull MessageValueBuilder<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
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
protected final String[] buildParams() {
|
||||
return Arrays.stream(params).map(param -> paramFormatter.apply(param)).toArray(String[]::new);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,15 +1,21 @@
|
||||
package cc.carm.lib.configuration.craft.data;
|
||||
|
||||
import cc.carm.lib.configuration.common.data.AbstractText;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.jetbrains.annotations.Contract;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.function.BiFunction;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class MessageText {
|
||||
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) {
|
||||
@@ -26,49 +32,4 @@ public class MessageText {
|
||||
return of(Arrays.asList(messages));
|
||||
}
|
||||
|
||||
|
||||
protected @NotNull String message;
|
||||
|
||||
public MessageText(@NotNull String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public @NotNull String getMessage() {
|
||||
return this.message;
|
||||
}
|
||||
|
||||
public <M> @Nullable M parse(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @NotNull M> parser,
|
||||
@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
|
||||
return parse(parser, sender, buildParams(params, values));
|
||||
}
|
||||
|
||||
public <M> @Nullable M parse(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @NotNull M> parser,
|
||||
@Nullable CommandSender sender, @NotNull Map<String, Object> placeholders) {
|
||||
String message = getMessage();
|
||||
if (message.isEmpty()) return null; // No further processing
|
||||
else return parser.apply(sender, setPlaceholders(message, placeholders));
|
||||
}
|
||||
|
||||
public static Map<String, Object> buildParams(@Nullable String[] params, @Nullable Object[] values) {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
if (params == null || params.length == 0) return map;
|
||||
for (int i = 0; i < params.length; i++) {
|
||||
map.put(params[i], values.length > i ? values[i] : "?");
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
public static String setPlaceholders(@NotNull String messages, @NotNull Map<String, Object> placeholders) {
|
||||
if (messages.isEmpty()) return messages;
|
||||
|
||||
String parsed = messages;
|
||||
for (Map.Entry<String, Object> entry : placeholders.entrySet()) {
|
||||
Object value = entry.getValue();
|
||||
parsed = parsed.replace(entry.getKey(), value == null ? "" : value.toString());
|
||||
}
|
||||
|
||||
return parsed;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
package cc.carm.lib.configuration.craft.utils;
|
||||
|
||||
import me.clip.placeholderapi.PlaceholderAPI;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class PAPIHelper {
|
||||
|
||||
public static String parseMessages(Player player, String message) {
|
||||
return PlaceholderAPI.setPlaceholders(player, message);
|
||||
}
|
||||
|
||||
public static List<String> parseMessages(Player player, List<String> messages) {
|
||||
return PlaceholderAPI.setPlaceholders(player, messages);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+9
-47
@@ -1,11 +1,10 @@
|
||||
package cc.carm.lib.configuration.craft.value;
|
||||
|
||||
import cc.carm.lib.configuration.core.function.ConfigValueParser;
|
||||
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 cc.carm.lib.configuration.core.value.type.ConfiguredValue;
|
||||
import cc.carm.lib.configuration.craft.CraftConfigValue;
|
||||
import cc.carm.lib.configuration.craft.builder.message.MessageValueBuilder;
|
||||
import cc.carm.lib.configuration.craft.builder.message.CraftMessageValueBuilder;
|
||||
import cc.carm.lib.configuration.craft.data.MessageText;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
@@ -16,75 +15,38 @@ import java.util.Map;
|
||||
import java.util.function.BiConsumer;
|
||||
import java.util.function.BiFunction;
|
||||
|
||||
public class ConfiguredMessage<M> extends ConfiguredValue<MessageText> {
|
||||
public class ConfiguredMessage<M> extends ConfigMessage<M, MessageText, CommandSender> {
|
||||
|
||||
@NotNull
|
||||
public static <M> MessageValueBuilder<@Nullable M> create(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser) {
|
||||
public static <M> CraftMessageValueBuilder<@Nullable M> create(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser) {
|
||||
return CraftConfigValue.builder().createMessage().asValue(messageParser);
|
||||
}
|
||||
|
||||
public static MessageValueBuilder<String> fromString() {
|
||||
public static CraftMessageValueBuilder<String> asString() {
|
||||
return CraftConfigValue.builder().createMessage().asStringValue();
|
||||
}
|
||||
|
||||
public static ConfiguredMessage<String> ofString() {
|
||||
return CraftConfigValue.builder().createMessage().valueOfString();
|
||||
return asString().build();
|
||||
}
|
||||
|
||||
public static ConfiguredMessage<String> ofString(@NotNull String defaultMessage) {
|
||||
return CraftConfigValue.builder().createMessage().valueOfString(defaultMessage);
|
||||
return asString().defaults(defaultMessage).build();
|
||||
}
|
||||
|
||||
protected final @NotNull String[] params;
|
||||
protected final @NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser;
|
||||
protected final @NotNull BiConsumer<@NotNull CommandSender, @NotNull M> sendFunction;
|
||||
|
||||
public ConfiguredMessage(@Nullable ConfigurationProvider<?> provider,
|
||||
@Nullable String sectionPath, @Nullable ConfigCommentInfo comments,
|
||||
@NotNull MessageText message, @NotNull String[] params,
|
||||
@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, message,
|
||||
ConfigValueParser.castToString().andThen((s, d) -> MessageText.of(s)),
|
||||
MessageText::getMessage
|
||||
);
|
||||
this.params = params;
|
||||
this.messageParser = messageParser;
|
||||
this.sendFunction = sendFunction;
|
||||
super(provider, sectionPath, comments, MessageText.class, defaultMessage, params, messageParser, sendFunction, MessageText::of);
|
||||
}
|
||||
|
||||
public @Nullable M parse(@Nullable CommandSender sender, @Nullable Object... values) {
|
||||
return parse(sender, MessageText.buildParams(params, values));
|
||||
}
|
||||
|
||||
public @Nullable M parse(@Nullable CommandSender sender, @NotNull Map<String, Object> placeholders) {
|
||||
MessageText value = get();
|
||||
if (value == null || value.getMessage().isEmpty()) return null;
|
||||
else return value.parse(this.messageParser, sender, placeholders);
|
||||
}
|
||||
|
||||
public void send(@Nullable CommandSender receiver, @Nullable Object... values) {
|
||||
send(receiver, MessageText.buildParams(params, values));
|
||||
}
|
||||
|
||||
public void send(@Nullable CommandSender receiver, @NotNull Map<String, Object> placeholders) {
|
||||
if (receiver == null) return;
|
||||
M parsed = parse(receiver, placeholders);
|
||||
if (parsed == null) return;
|
||||
sendFunction.accept(receiver, parsed);
|
||||
}
|
||||
|
||||
public void broadcast(@Nullable Object... values) {
|
||||
broadcast(MessageText.buildParams(params, values));
|
||||
}
|
||||
|
||||
public void broadcast(@NotNull Map<String, Object> placeholders) {
|
||||
Bukkit.getOnlinePlayers().forEach(pl -> send(pl, placeholders));
|
||||
send(Bukkit.getConsoleSender(), placeholders);
|
||||
}
|
||||
|
||||
public void set(@Nullable String value) {
|
||||
this.set(value == null ? null : new MessageText(value));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+8
-69
@@ -1,11 +1,10 @@
|
||||
package cc.carm.lib.configuration.craft.value;
|
||||
|
||||
import cc.carm.lib.configuration.core.function.ConfigDataFunction;
|
||||
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 cc.carm.lib.configuration.core.value.type.ConfiguredList;
|
||||
import cc.carm.lib.configuration.craft.CraftConfigValue;
|
||||
import cc.carm.lib.configuration.craft.builder.message.MessageListBuilder;
|
||||
import cc.carm.lib.configuration.craft.builder.message.CraftMessageListBuilder;
|
||||
import cc.carm.lib.configuration.craft.data.MessageText;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
@@ -16,68 +15,28 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.BiConsumer;
|
||||
import java.util.function.BiFunction;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class ConfiguredMessageList<M> extends ConfiguredList<MessageText> {
|
||||
public class ConfiguredMessageList<M> extends ConfigMessageList<M, MessageText, CommandSender> {
|
||||
|
||||
@NotNull
|
||||
public static <M> MessageListBuilder<M> create(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser) {
|
||||
public static <M> CraftMessageListBuilder<M> create(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser) {
|
||||
return CraftConfigValue.builder().createMessage().asList(messageParser);
|
||||
}
|
||||
|
||||
public static MessageListBuilder<String> fromString() {
|
||||
public static CraftMessageListBuilder<String> asStrings() {
|
||||
return CraftConfigValue.builder().createMessage().asStringList();
|
||||
}
|
||||
|
||||
public static ConfiguredMessageList<String> ofString(@NotNull String... defaultMessages) {
|
||||
return CraftConfigValue.builder().createMessage().listOfString(defaultMessages);
|
||||
public static ConfiguredMessageList<String> ofStrings(@NotNull String... defaultMessages) {
|
||||
return asStrings().defaults(defaultMessages).build();
|
||||
}
|
||||
|
||||
protected final @NotNull String[] params;
|
||||
protected final @NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser;
|
||||
protected final @NotNull BiConsumer<@NotNull CommandSender, @NotNull List<M>> sendFunction;
|
||||
|
||||
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,
|
||||
ConfigDataFunction.castToString().andThen(MessageText::new), MessageText::getMessage
|
||||
);
|
||||
this.params = params;
|
||||
this.messageParser = messageParser;
|
||||
this.sendFunction = sendFunction;
|
||||
}
|
||||
|
||||
public @Nullable List<M> parse(@Nullable CommandSender sender, @Nullable Object... values) {
|
||||
return parse(sender, MessageText.buildParams(params, values));
|
||||
}
|
||||
|
||||
public @Nullable List<M> parse(@Nullable CommandSender sender, @NotNull Map<String, Object> placeholders) {
|
||||
List<MessageText> list = get();
|
||||
if (list.isEmpty()) return null;
|
||||
|
||||
List<String> messages = list.stream().map(MessageText::getMessage).collect(Collectors.toList());
|
||||
if (String.join("", messages).isEmpty()) return null;
|
||||
|
||||
return list.stream().map(value -> value.parse(this.messageParser, sender, placeholders))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public void send(@Nullable CommandSender receiver, @Nullable Object... values) {
|
||||
send(receiver, MessageText.buildParams(params, values));
|
||||
}
|
||||
|
||||
public void send(@Nullable CommandSender receiver, @NotNull Map<String, Object> placeholders) {
|
||||
if (receiver == null) return;
|
||||
List<M> parsed = parse(receiver, placeholders);
|
||||
if (parsed == null) return;
|
||||
sendFunction.accept(receiver, parsed);
|
||||
}
|
||||
|
||||
public void broadcast(@Nullable Object... values) {
|
||||
broadcast(MessageText.buildParams(params, values));
|
||||
super(provider, sectionPath, comments, MessageText.class, messages, params, messageParser, sendFunction, MessageText::of);
|
||||
}
|
||||
|
||||
public void broadcast(@NotNull Map<String, Object> placeholders) {
|
||||
@@ -85,24 +44,4 @@ public class ConfiguredMessageList<M> extends ConfiguredList<MessageText> {
|
||||
send(Bukkit.getConsoleSender(), placeholders);
|
||||
}
|
||||
|
||||
public void setNull() {
|
||||
set(null);
|
||||
}
|
||||
|
||||
public void setMessages(@NotNull String... values) {
|
||||
if (values.length == 0) {
|
||||
setNull();
|
||||
return;
|
||||
}
|
||||
set(MessageText.of(values));
|
||||
}
|
||||
|
||||
public void setMessages(@Nullable List<String> values) {
|
||||
if (values == null || values.isEmpty()) {
|
||||
setNull();
|
||||
return;
|
||||
}
|
||||
set(MessageText.of(values));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user