Merge pull request #322 from Ben12345rocks/5.12

5.12

Author: BenCodez

VotingPlugin/Resources/Config.yml

@@ -343,15 +343,6 @@ GUI:
         Amount: 1
         Name: '&4Vote Shop'
       Slot: 6
-    # /vote Reward gui item
-    # Uncomment to use, most likely will be unused
-    #Rewards:
-    #  Item:
-    #    Material: 'DIAMOND'
-    #    Data: 0
-    #    Amount: 1
-    #    Name: '&4Voting Rewards'
-    #  Slot: 7
 
   # GUI for /vote url
   # And /vote if enabled in Config.yml
@@ -609,12 +600,16 @@ VoteParty:
   GiveAllPlayers: false
   # If true, the vote count will reset each day
   ResetEachDay: false
+  # Reset at the end of the month
+  ResetMonthly: false
   # Count votes from /av vote?
   CountFakeVotes: true
   # Number of user votes that apply to vote party total the user needs to get rewards
   UserVotesRequired: 0
   # Broadcast when vote party reached
   Broadcast: '&cReached the vote party amount!'
+  # List of commands to execute, these only execute once.
+  Commands: []
   # Reward files to give
   Rewards: []
 
@@ -671,6 +666,7 @@ VoteStreak:
 # IT WILL ONLY RUN ONE TIME FOR ANY NUMBER OF OFFLINE VOTES
 # Any reward files listed here are ran on vote of any site
 # It is recommended to add rewards to each site instead of here
+# Using forceoffline won't work here
 AnySiteRewards: []
 
 
@@ -754,9 +750,13 @@ DailyAwards:
 # Set to 0 to give no points
 PointsOnVote: 1
 
-# Wether or not to check on world change
-# Should only be used if you do per world rewards
-CheckOnWorldChange: false
+# Set this to false to disable the plugin adding totals
+# Not really recommended
+AddTotals: true
+
+# Disable checking on world change
+# May improve performance
+DisableCheckOnWorldChange: false
 
 # Debug
 Debug: false

VotingPlugin/Resources/VoteSites.yml

@@ -31,18 +31,26 @@ VoteSites:
     # Reset vote delay each day (for certain sites that do this)
     VoteDelayDaily: false
 
-    # If true, rewards can be executed offline (required ForceOffline to be true in the reward)
-    GiveOffline: false
+    # If true, rewards can be executed offline (requires ForceOffline to be true in the reward)
+    # Setting this to true will execute the reward offline, NOT WHEN THE PLAYER IS OFFLINE
+    # This basiclly disables offline voting if set to true, don't misinterpret this option
+    ForceOffline: false
 
     # VoteSite Material for GUI's
+    # Removing this may result in an error, required on each site
     Item:
       Material: 'DIAMOND'
       Amount: 1
 
-    # List of reward files to give to voter
+    # Rewards to give
+    # https://github.com/Ben12345rocks/AdvancedCore/wiki/Rewards
     Rewards:
-    - 'ExampleReward'
+      Commands:
+      - 'say hello'
+      Messages:
+        Player: 'You voted'
 
 # Reward for any site
 # Similar to AnySiteReward
+# This requires the site to be configured in order to get the reward.
 EverySiteReward: []

VotingPlugin/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.11</version>
+	<version>5.12</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -154,7 +154,7 @@
 		<dependency>
 			<groupId>com.github.Ben12345rocks</groupId>
 			<artifactId>AdvancedCore</artifactId>
-			<version>master-SNAPSHOT</version>
+			<version>2.12-SNAPSHOT</version>
 		</dependency>
 		<!-- <dependency> <groupId>com.Ben12345rocks</groupId> <artifactId>AdvancedCore</artifactId> 
 			<version>LATEST</version> <scope>compile</scope> </dependency> -->

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Commands/CommandLoader.java

@@ -466,6 +466,25 @@ public void execute(CommandSender sender, String[] args) {
 			}
 		});
 
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "ClearOfflineRewards" },
+				"VotingPlugin.Commands.AdminVote.ClearOfflineRewards|" + adminPerm, "Reset offline votes/rewards") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				if (sender instanceof Player) {
+					sender.sendMessage(
+							StringUtils.getInstance().colorize("&cThis command can not be done from ingame"));
+					return;
+				}
+
+				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+					User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+					user.clearOfflineRewards();
+				}
+				sender.sendMessage(StringUtils.getInstance().colorize("&cCleared totals for everyone"));
+			}
+		});
+
 		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "ConvertFromData", "(userstorage)" },
 				"VotingPlugin.Commands.AdminVote.ConvertFromData",
 				"Convert from selected user storage to current user storage") {

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Commands/Commands.java

@@ -679,7 +679,7 @@ public String voteCommandNextInfo(User user, VoteSite voteSite) {
 					timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
 							Long.toString(diffMinutes));
 					info = timeMsg;
-					
+
 				}
 			}
 		} else {
@@ -834,6 +834,7 @@ public String[] voteURLs(User user) {
 				msg = StringUtils.getInstance().replaceIgnoreCase(msg, "%num%", Integer.toString(counter));
 				msg = StringUtils.getInstance().replaceIgnoreCase(msg, "%url%", voteURL);
 				msg = StringUtils.getInstance().replaceIgnoreCase(msg, "%SiteName%", voteSite.getDisplayName());
+				msg = StringUtils.getInstance().replaceIgnoreCase(msg, "%player%", user.getPlayerName());
 				sites.add(msg);
 			}
 		}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Commands/GUI/PlayerGUIs.java

@@ -535,10 +535,12 @@ public void onClick(ClickEvent event) {
 					if (player != null) {
 						player.closeInventory();
 						User user = UserManager.getInstance().getVotingPluginUser(player);
-						user.sendMessage(StringUtils.getInstance()
-								.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
-										Config.getInstance().getGUIVoteURLURLText(), "voteurl", voteSite.getVoteURL()),
-										"sitename", voteSite.getDisplayName()));
+						user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
+								StringUtils.getInstance()
+										.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+												Config.getInstance().getGUIVoteURLURLText(), "voteurl",
+												voteSite.getVoteURL()), "sitename", voteSite.getDisplayName()),
+								"player", player.getName()));
 
 					}
 

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Config/Config.java

@@ -110,8 +110,8 @@ public boolean getBroadCastVotesEnabled() {
 		return getData().getBoolean("BroadcastVote", true);
 	}
 
-	public boolean getCheckOnWorldChange() {
-		return getData().getBoolean("CheckOnWorldChange");
+	public boolean getDisableCheckOnWorldChange() {
+		return getData().getBoolean("DisableCheckOnWorldChange");
 	}
 
 	public boolean getClearCacheOnUpdate() {
@@ -1112,6 +1112,14 @@ public boolean getVotePartyResetEachDay() {
 		return getData().getBoolean("VoteParty.ResetEachDay");
 	}
 
+	public boolean getAddTotals() {
+		return getData().getBoolean("AddTotals", true);
+	}
+
+	public boolean getVotePartyResetMontly() {
+		return getData().getBoolean("VoteParty.ResetMonthly");
+	}
+
 	/**
 	 * Gets the vote party rewards.
 	 *
@@ -1121,6 +1129,11 @@ public String getVotePartyRewardsPath() {
 		return "VoteParty.Rewards";
 	}
 
+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getVotePartyCommands() {
+		return (ArrayList<String>) getData().getList("VoteParty.Commands", new ArrayList<String>());
+	}
+
 	/**
 	 * Gets the vote party votes required.
 	 *

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Config/ConfigVoteSites.java

@@ -60,6 +60,8 @@ public void generateVoteSite(String siteName) {
 			setServiceSite(siteName, org);
 			setVoteURL(siteName, "VoteURL");
 			setVoteDelay(siteName, 24);
+			set(siteName, "Item.Material", "GRASS");
+			set(siteName, "Item.Amount", 1);
 			set(siteName, "Rewards.Messages.Player", "&aThanks for voting on %ServiceSite%!");
 
 			plugin.loadVoteSites();
@@ -167,7 +169,7 @@ public File getVoteSiteFile(String siteName) {
 	}
 
 	public boolean getVoteSiteGiveOffline(String site) {
-		return getData(site).getBoolean("GiveOffline");
+		return getData(site).getBoolean("ForceOffline", getData(site).getBoolean("GiveOffline"));
 	}
 
 	public boolean getVoteSiteResetVoteDelayDaily(String siteName) {

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Events/PlayerJoinEvent.java

@@ -53,14 +53,18 @@ public void run() {
 
 				if (player != null) {
 					User user = UserManager.getInstance().getVotingPluginUser(player);
+
+					// run remind
+					user.loginMessage();
+
 					if (UserManager.getInstance().getAllUUIDs().contains(player.getUniqueId().toString())) {
 						// give offline vote (if they voted
 						// offline)
+
 						user.offVote();
+
 					}
 
-					// run remind
-					user.loginMessage();
 				}
 
 			}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Events/PlayerVoteAllSitesEvent.java

@@ -0,0 +1,80 @@
+package com.Ben12345rocks.VotingPlugin.Events;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PlayerVoteEvent.
+ */
+public class PlayerVoteAllSitesEvent extends Event {
+
+	/** The Constant handlers. */
+	private static final HandlerList handlers = new HandlerList();
+
+	/**
+	 * Gets the handler list.
+	 *
+	 * @return the handler list
+	 */
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+
+	private User user;
+
+	/** The cancelled. */
+	private boolean cancelled;
+
+	public PlayerVoteAllSitesEvent(User user) {
+		super();
+		setUser(user);
+	}
+
+	/**
+	 * @return the user
+	 */
+	public User getUser() {
+		return user;
+	}
+
+	/**
+	 * @param user
+	 *            the user to set
+	 */
+	public void setUser(User user) {
+		this.user = user;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.bukkit.event.Event#getHandlers()
+	 */
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+	/**
+	 * Checks if is cancelled.
+	 *
+	 * @return true, if is cancelled
+	 */
+	public boolean isCancelled() {
+		return cancelled;
+	}
+
+	/**
+	 * Sets the cancelled.
+	 *
+	 * @param bln
+	 *            the new cancelled
+	 */
+	public void setCancelled(boolean bln) {
+		cancelled = bln;
+	}
+
+}