Add NumberCommand reward type

Author: BenCodez

AdvancedCore/src/main/java/com/bencodez/advancedcore/api/rewards/RewardHandler.java

@@ -1204,6 +1204,28 @@ public void onValidate(Reward reward, RewardInject inject, ConfigurationSection
 			}
 		}));
 
+		injectedRewards.add(new RewardInjectConfigurationSection("NumberCommand") {
+
+			@Override
+			public String onRewardRequested(Reward reward, AdvancedCoreUser user, ConfigurationSection section,
+					HashMap<String, String> placeholders) {
+				int min = section.getInt("Min", 0);
+				int max = section.getInt("Max", 100);
+				int number = ThreadLocalRandom.current().nextInt(min, max + 1);
+				String command = section.getString("Command", "").replace("%number%", String.valueOf(number));
+				MiscUtils.getInstance().executeConsoleCommands(user.getPlayerName(), command, placeholders);
+				return String.valueOf(number);
+			}
+		}.asPlaceholder("Number").priority(100).validator(new RewardInjectValidator() {
+
+			@Override
+			public void onValidate(Reward reward, RewardInject inject, ConfigurationSection data) {
+				if (!data.isInt("Min") || !data.isInt("Max") || !data.isString("Command")) {
+					warning(reward, inject, "NumberCommand requires Min, Max, and Command to be set");
+				}
+			}
+		}));
+
 		injectedRewards.add(new RewardInjectInt("EXP", 0) {
 
 			@Override
@@ -1442,7 +1464,7 @@ public void onValidate(Reward reward, RewardInject inject, ConfigurationSection
 			@Override
 			public String onRewardRequest(Reward reward, AdvancedCoreUser user, String value,
 					HashMap<String, String> placeholders) {
-				MiscUtils.getInstance().executeConsoleCommands(user.getPlayer(), value, placeholders);
+				MiscUtils.getInstance().executeConsoleCommands(user.getPlayerName(), value, placeholders);
 				return null;
 			}
 		}.addEditButton(new EditGUIButton(new ItemBuilder("COMMAND_BLOCK"), new EditGUIValueString("Command", null) {
@@ -1833,7 +1855,7 @@ public void openInventory(ClickEvent clickEvent) {
 			public String onRewardRequest(Reward r, AdvancedCoreUser user, ArrayList<String> list,
 					HashMap<String, String> placeholders) {
 				if (list.size() > 0) {
-					MiscUtils.getInstance().executeConsoleCommands(user.getPlayer(),
+					MiscUtils.getInstance().executeConsoleCommands(user.getPlayerName(),
 							list.get(ThreadLocalRandom.current().nextInt(list.size())), placeholders);
 				}
 				return null;

AdvancedCore/src/main/resources/Rewards/ExampleAdvanced.yml

@@ -66,6 +66,12 @@ RandomCommand: []
 # Will give one reward from the list of rewards
 RandomReward: []
 
+# Picks a random number and uses that within the command
+NumberCommand:
+  Min: 1
+  Max: 10
+  Command: "say The random number is %number%"
+
 # Works similar to RandomReward above, just avoids reward files
 # Similar style to AdvancedPriority
 AdvancedRandomReward: