carm/EasyConfiguration
1
Fork 0
mirror of https://github.com/CarmJos/EasyConfiguration.git synced 2026-06-04 10:38:19 +08:00
Code Issues Releases Activity

feat(parser): Supported more insert functions

Browse Source
This commit is contained in:
Carm Jos
2025-02-17 03:13:35 +08:00
parent 05f504a347
commit 616314c7f0
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/text/src/main/java/cc/carm/lib/configuration/value/text/PreparedText.java
+6
View File
@@ -10,6 +10,12 @@ public class PreparedText<MSG, RECEIVER> extends TextDispatcher<MSG, RECEIVER, P
super(texts, params);
}
public PreparedText<MSG, RECEIVER> insert(@NotNull String key,
@NotNull ConfiguredText<MSG, RECEIVER> message,
@NotNull Object... values) {
return insert(key, receiver -> message.parse(receiver, values));
}
@Override
public PreparedText<MSG, RECEIVER> self() {
return this;
features/text/src/main/java/cc/carm/lib/configuration/value/text/function/TextParser.java
+21 -8
View File
@@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.UnaryOperator;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -45,7 +46,7 @@ public abstract class TextParser<RECEIVER, SELF extends TextParser<RECEIVER, SEL
/**
* Used to store the insertion of the message
*/
protected @NotNull Map<String, List<String>> insertion = new HashMap<>();
protected @NotNull Map<String, Function<RECEIVER, List<String>>> insertion = new HashMap<>();
protected boolean disableInsertion = false;
protected TextParser(@NotNull TextContents texts, @NotNull String... params) {
@@ -148,14 +149,25 @@ public abstract class TextParser<RECEIVER, SELF extends TextParser<RECEIVER, SEL
* Insert the specific contents by the id.
*
* @param id the id of the insertion text
* @param lines the lines to insert
* @param linesSupplier to supply the lines to insert
* @return the current {@link TextParser} instance
*/
public SELF insert(@NotNull String id, @NotNull String... lines) {
this.insertion.put(id, Arrays.asList(lines));
public SELF insert(@NotNull String id, @NotNull Function<RECEIVER, List<String>> linesSupplier) {
this.insertion.put(id, linesSupplier);
return self();
}
/**
* Insert the specific contents by the id.
*
* @param id the id of the insertion text
* @param lines the lines to insert
* @return the current {@link TextParser} instance
*/
public SELF insert(@NotNull String id, @NotNull String... lines) {
return insert(id, Arrays.asList(lines));
}
/**
* Insert the specific contents by the id.
*
@@ -164,8 +176,7 @@ public abstract class TextParser<RECEIVER, SELF extends TextParser<RECEIVER, SEL
* @return the current {@link TextParser} instance
*/
public SELF insert(@NotNull String id, @NotNull List<String> lines) {
this.insertion.put(id, lines);
return self();
return insert(id, receiver -> lines);
}
/**
@@ -273,8 +284,10 @@ public abstract class TextParser<RECEIVER, SELF extends TextParser<RECEIVER, SEL
}
String id = matcher.group("id");
List<String> values = this.insertion.get(id);
if (values == null) continue;
List<String> values = Optional.ofNullable(this.insertion.get(id))
.map(f -> f.apply(receiver))
.orElse(null);
if (values == null || values.isEmpty()) continue;
String prefix = matcher.group("prefix");
String type = matcher.group("type");