move getDisplayLine to ValueDisplay template

Author: HSGamer

query/display-number/src/main/java/me/hsgamer/topper/query/display/number/NumberDisplay.java

@@ -16,22 +16,18 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 public abstract class NumberDisplay<K, V extends Number> implements SimpleQueryDisplay<K, V> {
-    private static final Pattern VALUE_PLACEHOLDER_PATTERN = Pattern.compile("\\{value(?:_(.*))?}");
     private static final String FORMAT_QUERY_DECIMAL = "decimal";
     private static final String FORMAT_QUERY_TIME = "time";
     private static final String FORMAT_QUERY_SHORTEN = "shorten";
     private static final Map<String, Function<Number, String>> displayByQueryCache = new ConcurrentHashMap<>();
 
-    private final String line;
     private final String displayNullValue;
 
-    protected NumberDisplay(String line, String displayNullValue) {
-        this.line = line;
+    protected NumberDisplay(String displayNullValue) {
         this.displayNullValue = displayNullValue;
     }
 
@@ -232,20 +228,4 @@ private static Function<Number, String> createDisplayFunction(String formatQuery
 
         return displayByQueryCache.computeIfAbsent(formatQuery, NumberDisplay::createDisplayFunction).apply(value);
     }
-
-    public String getDisplayLine(int index /* 1-based */, @Nullable Map.Entry<K, V> entry) {
-        String line = this.line
-                .replace("{index}", String.valueOf(index))
-                .replace("{uuid}", getDisplayKey(entry == null ? null : entry.getKey()))
-                .replace("{name}", getDisplayName(entry == null ? null : entry.getKey()));
-
-        V value = entry == null ? null : entry.getValue();
-        Matcher matcher = VALUE_PLACEHOLDER_PATTERN.matcher(line);
-        while (matcher.find()) {
-            String formatType = matcher.group(1);
-            line = line.replace(matcher.group(), getDisplayValue(value, formatType));
-        }
-
-        return line;
-    }
 }

template/top-player-number/src/main/java/me/hsgamer/topper/template/topplayernumber/holder/display/ValueDisplay.java

@@ -5,18 +5,25 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class ValueDisplay extends NumberDisplay<UUID, Double> {
+    private static final Pattern VALUE_PLACEHOLDER_PATTERN = Pattern.compile("\\{value(?:_(.*))?}");
+
+    public final String defaultLine;
     public final String displayNullName;
     public final String displayNullUuid;
     private final Function<UUID, String> nameFunction;
 
     public ValueDisplay(Function<UUID, String> nameFunction, Settings settings) {
-        super(settings.defaultLine(), settings.displayNullValue());
+        super(settings.displayNullValue());
         this.nameFunction = nameFunction;
+        this.defaultLine = settings.defaultLine();
         this.displayNullName = settings.displayNullName();
         this.displayNullUuid = settings.displayNullUuid();
     }
@@ -29,6 +36,22 @@ public ValueDisplay(Function<UUID, String> nameFunction, Settings settings) {
         return Optional.ofNullable(uuid).map(nameFunction).orElse(displayNullName);
     }
 
+    public String getDisplayLine(int index /* 1-based */, @Nullable Map.Entry<UUID, Double> entry) {
+        String line = this.defaultLine
+                .replace("{index}", String.valueOf(index))
+                .replace("{uuid}", getDisplayKey(entry == null ? null : entry.getKey()))
+                .replace("{name}", getDisplayName(entry == null ? null : entry.getKey()));
+
+        Double value = entry == null ? null : entry.getValue();
+        Matcher matcher = VALUE_PLACEHOLDER_PATTERN.matcher(line);
+        while (matcher.find()) {
+            String formatType = matcher.group(1);
+            line = line.replace(matcher.group(), getDisplayValue(value, formatType));
+        }
+
+        return line;
+    }
+
     public String getDisplayLine(int index /* 1-based */, NumberTopHolder holder) {
         return getDisplayLine(index, holder.getSnapshotAgent().getSnapshotByIndex(index - 1).orElse(null));
     }