add ValueState to indicate a value being handled

Author: HSGamer

spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/holder/provider/NumberStringValueProvider.java

@@ -4,6 +4,7 @@
 import io.github.projectunified.minelib.scheduler.global.GlobalScheduler;
 import me.hsgamer.hscore.common.MapUtils;
 import me.hsgamer.topper.spigot.plugin.TopperPlugin;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;
 import java.util.Map;
@@ -45,13 +46,18 @@ public NumberStringValueProvider(TopperPlugin plugin, Map<String, Object> map) {
 
     protected abstract String getDisplayName();
 
-    protected abstract Optional<String> getString(UUID uuid);
+    protected abstract ValueState getString(UUID uuid);
 
     @Override
     public CompletableFuture<Optional<Double>> getValue(UUID uuid) {
         return CompletableFuture.supplyAsync(() -> {
             try {
-                Optional<String> value = getString(uuid)
+                ValueState valueState = getString(uuid);
+                if (!valueState.handled) {
+                    return Optional.empty();
+                }
+
+                Optional<String> value = Optional.ofNullable(valueState.value)
                         .filter(s -> !s.isEmpty())
                         .map(s -> isFormatted ? formattedSettings.clearFormat(s) : s);
                 if (!value.isPresent()) {
@@ -60,6 +66,7 @@ public CompletableFuture<Optional<Double>> getValue(UUID uuid) {
                     }
                     return Optional.empty();
                 }
+
                 return Optional.of(Double.parseDouble(value.get()));
             } catch (Exception e) {
                 if (showErrors) {
@@ -95,4 +102,22 @@ String clearFormat(String string) {
             return builder.toString();
         }
     }
+
+    public static class ValueState {
+        public final boolean handled;
+        public final @Nullable String value;
+
+        private ValueState(boolean handled, @Nullable String value) {
+            this.handled = handled;
+            this.value = value;
+        }
+
+        public static ValueState handled(@Nullable String value) {
+            return new ValueState(true, value);
+        }
+
+        public static ValueState unhandled() {
+            return new ValueState(false, null);
+        }
+    }
 }

spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/hook/placeholderapi/PlaceholderValueProvider.java

@@ -29,21 +29,18 @@ protected String getDisplayName() {
     }
 
     @Override
-    protected Optional<String> getString(UUID uuid) {
+    protected ValueState getString(UUID uuid) {
         OfflinePlayer player;
         if (isOnlineOnly) {
             player = plugin.getServer().getPlayer(uuid);
             if (player == null) {
-                return Optional.empty();
+                return ValueState.unhandled();
             }
         } else {
             player = plugin.getServer().getOfflinePlayer(uuid);
         }
 
         String parsed = PlaceholderAPI.setPlaceholders(player, placeholder).trim();
-        if (parsed.isEmpty()) {
-            return Optional.empty();
-        }
-        return Optional.of(parsed);
+        return ValueState.handled(parsed.isEmpty() ? null : parsed);
     }
 }