Merge pull request #1520 from semisolar/feature/votestreak-shared-progress-only

Add shared VoteStreaks progress groups

Author: BenCodez

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/CommandLoader.java

@@ -938,9 +938,9 @@ public void execute(CommandSender sender, String[] args) {
 						}
 
 						if (plugin.getVoteStreakHandler().resetVoteStreak(user, target)) {
-							sendMessage(sender, "&cReset VoteStreak '" + target + "' for '" + args[1] + "'");
+							sendMessage(sender, "&cReset VoteStreak state '" + target + "' for '" + args[1] + "'");
 						} else {
-							sendMessage(sender, "&cVoteStreak not found: &e" + target);
+							sendMessage(sender, "&cVoteStreak or progress group not found: &e" + target);
 						}
 					}
 				});
@@ -2826,6 +2826,7 @@ public void updateReplacements() {
 		for (VoteStreakDefinition def : plugin.getVoteStreakHandler().getDefinitions()) {
 			voteStreaks.add(def.getId());
 		}
+		voteStreaks.addAll(plugin.getVoteStreakHandler().getProgressGroups());
 
 		TabCompleteHandler.getInstance().addTabCompleteOption(new TabCompleteHandle("(votestreak)", voteStreaks) {
 
@@ -2835,6 +2836,7 @@ public void reload() {
 				for (VoteStreakDefinition def : plugin.getVoteStreakHandler().getDefinitions()) {
 					voteStreaks.add(def.getId());
 				}
+				voteStreaks.addAll(plugin.getVoteStreakHandler().getProgressGroups());
 				setReplace(voteStreaks);
 			}
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/specialrewards/votestreak/VoteStreakDefinition.java

@@ -23,9 +23,25 @@ public final class VoteStreakDefinition {
 
 	@Getter
 	private final boolean recurring;
+	@Getter
+	private final String progressGroup;
+	@Getter
+	private final String rewardPath;
 
 	public VoteStreakDefinition(String id, VoteStreakType type, boolean enabled, int requiredAmount, int votesRequired,
 			int allowMissedAmount, int allowMissedPeriod, boolean recurring) {
+		this(id, type, enabled, requiredAmount, votesRequired, allowMissedAmount, allowMissedPeriod, recurring, "",
+				"VoteStreaks." + id + ".Rewards");
+	}
+
+	public VoteStreakDefinition(String id, VoteStreakType type, boolean enabled, int requiredAmount, int votesRequired,
+			int allowMissedAmount, int allowMissedPeriod, boolean recurring, String progressGroup) {
+		this(id, type, enabled, requiredAmount, votesRequired, allowMissedAmount, allowMissedPeriod, recurring,
+				progressGroup, "VoteStreaks." + id + ".Rewards");
+	}
+
+	public VoteStreakDefinition(String id, VoteStreakType type, boolean enabled, int requiredAmount, int votesRequired,
+			int allowMissedAmount, int allowMissedPeriod, boolean recurring, String progressGroup, String rewardPath) {
 		this.id = id;
 		this.type = type;
 		this.enabled = enabled;
@@ -34,6 +50,9 @@ public VoteStreakDefinition(String id, VoteStreakType type, boolean enabled, int
 		this.allowMissedPeriod = Math.max(0, allowMissedPeriod);
 		this.votesRequired = Math.max(1, votesRequired);
 		this.recurring = recurring;
+		this.progressGroup = progressGroup == null ? "" : progressGroup.trim();
+		this.rewardPath = rewardPath == null || rewardPath.trim().isEmpty() ? "VoteStreaks." + id + ".Rewards"
+				: rewardPath.trim();
 	}
 
 }