carm/EasyPlugin
carm/EasyPlugin
1
Fork 0
mirror of https://github.com/CarmJos/EasyPlugin.git synced 2024-09-19 19:25:45 +00:00
Code Issues Releases Activity

[v1.3.6] 消息配置文件相关更新

Browse Source 
- [A] 添加MessageBuilder，更方便构建参数
- [U] 采用 `Object...` 的形式传入参数
This commit is contained in:
Carm Jos 2022-02-25 22:12:00 +08:00
parent c575805c72
commit acea995996
16 changed files with 277 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
easyplugin-all/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.5</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
easyplugin-bom/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.5</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
easyplugin-command/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.5</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
easyplugin-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.5</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
easyplugin-configuration/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.5</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -69,7 +69,7 @@
<optional>true</optional>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

161
easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/EasyMessage.java
View File

@ -1,6 +1,7 @@
package cc.carm.lib.easyplugin.configuration.language;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import cc.carm.lib.easyplugin.configuration.language.builder.EasyMessageBuilder;
import cc.carm.lib.easyplugin.configuration.values.ConfigValue;
import cc.carm.lib.easyplugin.utils.ColorParser;
import cc.carm.lib.easyplugin.utils.MessageUtils;
@ -14,106 +15,110 @@ import org.jetbrains.annotations.Nullable;
public class EasyMessage {
@Nullable ConfigValue<String> configValue;
@Nullable ConfigValue<String> configValue;
@Nullable String defaultValue;
@Nullable String[] messageParams;
@Nullable String defaultValue;
@Nullable String[] messageParams;
public EasyMessage() {
this(null);
}
public static EasyMessageBuilder builder() {
return new EasyMessageBuilder();
}
public EasyMessage(@Nullable String defaultValue) {
this(defaultValue, null);
}
public EasyMessage() {
this(null);
}
public EasyMessage(@Nullable String defaultValue, @Nullable String[] messageParams) {
this.defaultValue = defaultValue;
this.messageParams = messageParams;
}
public EasyMessage(@Nullable String defaultValue) {
this(defaultValue, null);
}
public void initialize(@NotNull FileConfig source, @NotNull String sectionName) {
this.configValue = new ConfigValue<>(() -> source, sectionName, String.class, getDefaultValue());
}
public EasyMessage(@Nullable String defaultValue, @Nullable String[] messageParams) {
this.defaultValue = defaultValue;
this.messageParams = messageParams;
}
private @Nullable String getDefaultValue() {
return defaultValue;
}
public void initialize(@NotNull FileConfig source, @NotNull String sectionName) {
this.configValue = new ConfigValue<>(() -> source, sectionName, String.class, getDefaultValue());
}
private @Nullable String[] getMessageParams() {
return messageParams;
}
private @Nullable String getDefaultValue() {
return defaultValue;
}
private @NotNull String getDefaultMessages() {
if (getDefaultValue() == null) return "";
else return getDefaultValue();
}
private @Nullable String[] getMessageParams() {
return messageParams;
}
private @NotNull String getMessages() {
if (configValue == null) {
return getDefaultMessages();
} else {
return configValue.get();
}
}
private @NotNull String getDefaultMessages() {
if (getDefaultValue() == null) return "";
else return getDefaultValue();
}
public @NotNull String get(@Nullable CommandSender sender) {
return get(sender, null);
}
private @NotNull String getMessages() {
if (configValue == null) {
return getDefaultMessages();
} else {
return configValue.get();
}
}
public @NotNull String get(@Nullable CommandSender sender, @Nullable Object[] values) {
return get(sender, getMessageParams(), values);
}
public @NotNull String get(@Nullable CommandSender sender) {
return get(sender, (Object[]) null);
}
public @NotNull String get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
String messages = getMessages();
if (sender == null || messages.length() < 1) return messages;
params = params == null ? new String[0] : params;
values = values == null ? new Object[0] : values;
return ColorParser.parse(MessageUtils.setPlaceholders(sender, messages, params, values));
}
public @NotNull String get(@Nullable CommandSender sender, @Nullable Object... values) {
return get(sender, getMessageParams(), values);
}
public void send(@Nullable CommandSender sender) {
send(sender, null);
}
public @NotNull String get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
String messages = getMessages();
if (sender == null || messages.length() < 1) return messages;
params = params == null ? new String[0] : params;
values = values == null ? new Object[0] : values;
return ColorParser.parse(MessageUtils.setPlaceholders(sender, messages, params, values));
}
public void send(@Nullable CommandSender sender, @Nullable Object[] values) {
send(sender, getMessageParams(), values);
}
public void send(@Nullable CommandSender sender) {
send(sender, (Object[]) null);
}
public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
String message = get(sender, params, values);
if (message.length() < 1) return;
MessageUtils.send(sender, message);
}
public void send(@Nullable CommandSender sender, @Nullable Object... values) {
send(sender, getMessageParams(), values);
}
public void sendBar(@Nullable Player player) {
sendBar(player, null);
}
public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
String message = get(sender, params, values);
if (message.length() < 1) return;
MessageUtils.send(sender, message);
}
public void sendBar(@Nullable Player player, @Nullable Object[] values) {
sendBar(player, getMessageParams(), values);
}
public void sendBar(@Nullable Player player) {
sendBar(player, (Object[]) null);
}
public void sendBar(@Nullable Player player, @Nullable String[] params, @Nullable Object[] values) {
if (player == null) return;
String message = get(player, params, values);
public void sendBar(@Nullable Player player, @Nullable Object... values) {
sendBar(player, getMessageParams(), values);
}
if (message.length() < 1) return;
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(get(player, params, values)));
}
public void sendBar(@Nullable Player player, @Nullable String[] params, @Nullable Object[] values) {
if (player == null) return;
String message = get(player, params, values);
public void sendToAll() {
sendToAll(null);
}
if (message.length() < 1) return;
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(get(player, params, values)));
}
public void sendToAll(@Nullable Object[] values) {
sendToAll(messageParams, values);
}
public void sendToAll() {
sendToAll((Object[]) null);
}
public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
}
public void sendToAll(@Nullable Object... values) {
sendToAll(messageParams, values);
}
public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
}
}

141
easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/EasyMessageList.java
View File

@ -1,6 +1,7 @@
package cc.carm.lib.easyplugin.configuration.language;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import cc.carm.lib.easyplugin.configuration.language.builder.EasyMessageListBuilder;
import cc.carm.lib.easyplugin.configuration.values.ConfigValueList;
import cc.carm.lib.easyplugin.utils.ColorParser;
import cc.carm.lib.easyplugin.utils.MessageUtils;
@ -16,93 +17,97 @@ import java.util.List;
public class EasyMessageList {
@Nullable ConfigValueList<String> configValue;
@Nullable ConfigValueList<String> configValue;
@Nullable String[] defaultValue;
@Nullable String[] messageParams;
@Nullable String[] defaultValue;
@Nullable String[] messageParams;
public EasyMessageList() {
this((String[]) null);
}
public static EasyMessageListBuilder builder() {
return new EasyMessageListBuilder();
}
public EasyMessageList(@Nullable String... defaultValue) {
this(defaultValue, null);
}
public EasyMessageList() {
this((String[]) null);
}
public EasyMessageList(@Nullable String[] defaultValue,
@Nullable String[] messageParams) {
this.defaultValue = defaultValue;
this.messageParams = messageParams;
}
public EasyMessageList(@Nullable String... defaultValue) {
this(defaultValue, null);
}
public void initialize(FileConfig sourceConfig, String sectionName) {
configValue = new ConfigValueList<>(() -> sourceConfig, sectionName, String.class, getDefaultValue());
}
public EasyMessageList(@Nullable String[] defaultValue,
@Nullable String[] messageParams) {
this.defaultValue = defaultValue;
this.messageParams = messageParams;
}
private @Nullable String[] getDefaultValue() {
return defaultValue;
}
public void initialize(FileConfig sourceConfig, String sectionName) {
configValue = new ConfigValueList<>(() -> sourceConfig, sectionName, String.class, getDefaultValue());
}
@Unmodifiable
private @NotNull List<String> getDefaultMessages() {
if (getDefaultValue() == null) return new ArrayList<>();
else return Arrays.asList(getDefaultValue());
}
private @Nullable String[] getDefaultValue() {
return defaultValue;
}
private @Nullable String[] getMessageParams() {
return messageParams;
}
@Unmodifiable
private @NotNull List<String> getDefaultMessages() {
if (getDefaultValue() == null) return new ArrayList<>();
else return Arrays.asList(getDefaultValue());
}
private @NotNull List<String> getMessages() {
if (configValue == null) {
return getDefaultMessages();
} else {
return configValue.get();
}
}
private @Nullable String[] getMessageParams() {
return messageParams;
}
public @NotNull List<String> get(@Nullable CommandSender sender) {
return get(sender, null);
}
private @NotNull List<String> getMessages() {
if (configValue == null) {
return getDefaultMessages();
} else {
return configValue.get();
}
}
public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable Object[] values) {
return get(sender, getMessageParams(), values);
}
public @NotNull List<String> get(@Nullable CommandSender sender) {
return get(sender, (Object[]) null);
}
public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
if (sender == null) return getMessages();
params = params == null ? new String[0] : params;
values = values == null ? new Object[0] : values;
public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable Object... values) {
return get(sender, getMessageParams(), values);
}
return ColorParser.parse(MessageUtils.setPlaceholders(sender, getMessages(), params, values));
}
public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
if (sender == null) return getMessages();
params = params == null ? new String[0] : params;
values = values == null ? new Object[0] : values;
public void send(@Nullable CommandSender sender) {
send(sender, null);
}
return ColorParser.parse(MessageUtils.setPlaceholders(sender, getMessages(), params, values));
}
public void send(@Nullable CommandSender sender, @Nullable Object[] values) {
send(sender, getMessageParams(), values);
}
public void send(@Nullable CommandSender sender) {
send(sender, (Object[]) null);
}
public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
List<String> messages = get(sender, params, values);
if (messages.isEmpty()) return;
if (messages.size() == 1 && messages.get(0).length() == 0) return; //空消息不再发送
MessageUtils.send(sender, messages);
}
public void send(@Nullable CommandSender sender, @Nullable Object... values) {
send(sender, getMessageParams(), values);
}
public void sendToAll() {
sendToAll(null);
}
public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
List<String> messages = get(sender, params, values);
if (messages.isEmpty()) return;
if (messages.size() == 1 && messages.get(0).length() == 0) return; //空消息不再发送
MessageUtils.send(sender, messages);
}
public void sendToAll(@Nullable Object[] values) {
sendToAll(messageParams, values);
}
public void sendToAll() {
sendToAll((Object[]) null);
}
public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
}
public void sendToAll(@Nullable Object... values) {
sendToAll(messageParams, values);
}
public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
}
}

51
easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/builder/EasyMessageBuilder.java Normal file
View File

@ -0,0 +1,51 @@
package cc.carm.lib.easyplugin.configuration.language.builder;
import cc.carm.lib.easyplugin.configuration.language.EasyMessage;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
import java.util.Optional;
public class EasyMessageBuilder {
String content;
String[] params;
@Nullable String paramPrefix = "%(";
@Nullable String paramSuffix = ")";
public EasyMessageBuilder() {
}
EasyMessageBuilder contents(String content) {
this.content = content;
return this;
}
EasyMessageBuilder params(String... placeholders) {
this.params = placeholders;
return this;
}
public EasyMessageBuilder setParamPrefix(@Nullable String paramPrefix) {
this.paramPrefix = paramPrefix;
return this;
}
public EasyMessageBuilder setParamSuffix(@Nullable String paramSuffix) {
this.paramSuffix = paramSuffix;
return this;
}
public EasyMessageBuilder setParamFormat(@Nullable String paramPrefix, @Nullable String paramSuffix) {
this.paramPrefix = paramPrefix;
this.paramSuffix = paramSuffix;
return this;
}
public EasyMessage build() {
return new EasyMessage(this.content, Optional.ofNullable(this.params).map(params -> Arrays.stream(this.params).map(param -> paramPrefix + param + paramSuffix).toArray(String[]::new)).orElse(null));
}
}

51
easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/builder/EasyMessageListBuilder.java Normal file
View File

@ -0,0 +1,51 @@
package cc.carm.lib.easyplugin.configuration.language.builder;
import cc.carm.lib.easyplugin.configuration.language.EasyMessageList;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
import java.util.Optional;
public class EasyMessageListBuilder {
String[] contents;
String[] params;
@Nullable String paramPrefix = "%(";
@Nullable String paramSuffix = ")";
public EasyMessageListBuilder() {
}
EasyMessageListBuilder contents(String... contents) {
this.contents = contents;
return this;
}
EasyMessageListBuilder params(String... placeholders) {
this.params = placeholders;
return this;
}
public EasyMessageListBuilder setParamPrefix(@Nullable String paramPrefix) {
this.paramPrefix = paramPrefix;
return this;
}
public EasyMessageListBuilder setParamSuffix(@Nullable String paramSuffix) {
this.paramSuffix = paramSuffix;
return this;
}
public EasyMessageListBuilder setParamFormat(@Nullable String paramPrefix, @Nullable String paramSuffix) {
this.paramPrefix = paramPrefix;
this.paramSuffix = paramSuffix;
return this;
}
public EasyMessageList build() {
return new EasyMessageList(this.contents, Optional.ofNullable(this.params).map(params -> Arrays.stream(this.params).map(param -> paramPrefix + param + paramSuffix).toArray(String[]::new)).orElse(null));
}
}

4
easyplugin-database/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.5</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -54,7 +54,7 @@
<dependency>
<groupId>cc.carm.lib</groupId>
<artifactId>easysql-beecp</artifactId>
<version>0.2.7</version>
<version>0.3.8</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>

2
easyplugin-gui/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.5</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
easyplugin-lp/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.5</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
easyplugin-main/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.5</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
easyplugin-placeholderapi/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.5</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
easyplugin-vault/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.5</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>

7
pom.xml
View File

@ -14,7 +14,7 @@
<groupId>cc.carm.lib</groupId>
<artifactId>easyplugin-parent</artifactId>
<packaging>pom</packaging>
<version>1.3.5</version>
<version>1.3.6</version>
<modules>
<module>easyplugin-main</module>
@ -86,6 +86,11 @@
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>minebench-repo</id>
<url>https://repo.minebench.de/</url>
</repository>
<repository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/groups/public</url>