Make every reward a number reward

Author: ErikSzabo

build.gradle.kts

@@ -23,7 +23,7 @@ plugins {
 }
 
 group = "gg.auroramc"
-version = "2.4.4"
+version = "2.5.0"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

src/main/java/gg/auroramc/aurora/api/reward/CommandReward.java

@@ -1,6 +1,7 @@
 package gg.auroramc.aurora.api.reward;
 
 import gg.auroramc.aurora.Aurora;
+import gg.auroramc.aurora.api.AuroraAPI;
 import gg.auroramc.aurora.api.command.CommandDispatcher;
 import gg.auroramc.aurora.api.expression.BooleanExpression;
 import gg.auroramc.aurora.api.message.Placeholder;
@@ -10,25 +11,34 @@
 
 import java.util.List;
 
-public class CommandReward extends AbstractReward {
+public class CommandReward extends NumberReward {
     @Getter
     private List<String> commands;
     private String correctionExpression;
 
     @Override
-    public void execute(Player player, long level, List<Placeholder<?>> formulaPlaceholders) {
+    public void execute(Player player, long level, List<Placeholder<?>> placeholders) {
         if (commands == null) return;
+        var value = getValue(placeholders);
+
         for (String command : commands) {
-            CommandDispatcher.dispatch(player, command, formulaPlaceholders);
+            CommandDispatcher.dispatch(
+                    player,
+                    Placeholder.execute(command,
+                            Placeholder.of("{value}", value),
+                            Placeholder.of("{value_int}", value.longValue()),
+                            Placeholder.of("{value_formatted}", AuroraAPI.formatNumber(value))),
+                    placeholders
+            );
         }
     }
 
     @Override
     public void init(ConfigurationSection args) {
         super.init(args);
-        if(args.isString("command") && args.getString("command") != null) {
+        if (args.isString("command") && args.getString("command") != null) {
             commands = List.of(args.getString("command"));
-        } else if(args.isList("command")) {
+        } else if (args.isList("command")) {
             commands = args.getStringList("command");
         } else {
             commands = List.of();

src/main/java/gg/auroramc/aurora/api/reward/ItemReward.java

@@ -17,7 +17,7 @@
 import java.util.Locale;
 import java.util.concurrent.CompletableFuture;
 
-public class ItemReward extends AbstractReward {
+public class ItemReward extends NumberReward {
     enum StashHandle {
         NONE,
         OVERFLOW,
@@ -88,7 +88,10 @@ public ThreadSafety getThreadSafety() {
     }
 
     private ItemStack[] getItems(Player player, List<Placeholder<?>> placeholders) {
-        var amount = itemConfig.getAmount();
+        var amount = getValue(placeholders).intValue();
+        if (amount <= 0) {
+            amount = itemConfig.getAmount();
+        }
         var item = ItemBuilder.of(itemConfig).placeholder(placeholders).amount(1).toItemStack(player);
 
         if (item == null || item.getType() == Material.AIR) {

src/main/java/gg/auroramc/aurora/api/reward/PermissionReward.java

@@ -1,6 +1,8 @@
 package gg.auroramc.aurora.api.reward;
 
+import com.google.common.collect.Lists;
 import gg.auroramc.aurora.Aurora;
+import gg.auroramc.aurora.api.AuroraAPI;
 import gg.auroramc.aurora.api.message.Placeholder;
 import gg.auroramc.aurora.api.message.Text;
 import gg.auroramc.aurora.api.util.ThreadSafety;
@@ -15,7 +17,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class PermissionReward extends AbstractReward {
+public class PermissionReward extends NumberReward {
     @Getter
     private List<String> permissions;
     private boolean value;
@@ -60,14 +62,23 @@ public void init(ConfigurationSection args) {
     }
 
     public List<Node> buildNodes(Player player, List<Placeholder<?>> placeholders) {
+        var numberValue = getValue(placeholders);
+        List<Placeholder<?>> numberPlaceholders = Lists.newArrayList(
+                Placeholder.of("{value}", numberValue),
+                Placeholder.of("{value_int}", numberValue.longValue()),
+                Placeholder.of("{value_formatted}", AuroraAPI.formatNumber(numberValue))
+        );
+
+        numberPlaceholders.addAll(placeholders);
+
         return permissions.stream().map(permission -> {
-            var builder = Node.builder(Text.fillPlaceholders(player, permission, placeholders)).value(value);
+            var builder = Node.builder(Text.fillPlaceholders(player, permission, numberPlaceholders)).value(value);
 
             if (!contexts.isEmpty()) {
                 var contextSet = MutableContextSet.create();
 
                 for (var entry : contexts.entrySet())
-                    contextSet.add(entry.getKey(), Text.fillPlaceholders(player, entry.getValue(), placeholders));
+                    contextSet.add(entry.getKey(), Text.fillPlaceholders(player, entry.getValue(), numberPlaceholders));
 
                 builder.withContext(contextSet);
             }