default value display and display null value as function

Author: HSGamer

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

@@ -25,12 +25,6 @@ public abstract class NumberDisplay<K, V extends Number> implements SimpleQueryD
     private static final String FORMAT_QUERY_SHORTEN = "shorten";
     private static final Map<String, Function<Number, String>> displayByQueryCache = new ConcurrentHashMap<>();
 
-    private final String displayNullValue;
-
-    protected NumberDisplay(String displayNullValue) {
-        this.displayNullValue = displayNullValue;
-    }
-
     private static Map<String, String> getSettings(String query) {
         if (query.isEmpty()) {
             return Collections.emptyMap();
@@ -211,10 +205,12 @@ private static Function<Number, String> createDisplayFunction(String formatQuery
         }
     }
 
+    public abstract @NotNull String getDisplayNullValue();
+
     @Override
     public @NotNull String getDisplayValue(@Nullable V value, @NotNull String formatQuery) {
         if (value == null) {
-            return displayNullValue;
+            return getDisplayNullValue();
         }
 
         if (formatQuery.isEmpty()) {

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

@@ -38,7 +38,7 @@ public NumberTopHolder(TopPlayerNumberTemplate template, String name, Settings s
 
         List<Agent> agents = new ArrayList<>();
         List<DataEntryAgent<UUID, Double>> entryAgents = new ArrayList<>();
-        this.valueDisplay = new NumberDisplay<UUID, Double>(settings.displayNullValue()) {
+        this.valueDisplay = new NumberDisplay<UUID, Double>() {
             @Override
             public @NotNull String getDisplayName(@Nullable UUID uuid) {
                 return Optional.ofNullable(uuid).map(template.getNameProviderManager()::getName).orElse(settings.displayNullName());
@@ -48,6 +48,19 @@ public NumberTopHolder(TopPlayerNumberTemplate template, String name, Settings s
             public @NotNull String getDisplayKey(@Nullable UUID uuid) {
                 return uuid != null ? uuid.toString() : settings.displayNullUuid();
             }
+
+            @Override
+            public @NotNull String getDisplayNullValue() {
+                return settings.displayNullValue();
+            }
+
+            @Override
+            public @NotNull String getDisplayValue(@Nullable Double value, @NotNull String formatQuery) {
+                if (formatQuery.isEmpty()) {
+                    formatQuery = settings.defaultValueDisplay();
+                }
+                return super.getDisplayValue(value, formatQuery);
+            }
         };
 
         this.storageAgent = new StorageAgent<>(template.getTopManager().buildStorage(name));
@@ -164,6 +177,10 @@ public interface Settings {
 
         String displayNullValue();
 
+        default String defaultValueDisplay() {
+            return "";
+        }
+
         boolean showErrors();
 
         boolean resetOnError();