Compare commits

...
33 Commits
Author SHA1 Message Date
Ben12345rocks 4e44ce3ab8 Javadoc fix 2019-10-01 19:23:31 -04:00
Ben12345rocks 74c7fcb4da Update version number 2019-10-01 19:05:57 -04:00
Ben12345rocks ef64d52ad1 Extra safeguard 2019-10-01 17:39:34 -04:00
Ben12345rocks ab7bbec563 Add votes placeholder for top voter awards 2019-09-30 16:59:20 -04:00
Ben12345rocks 6afe4ab9d6 Use new message api 2019-09-29 12:58:59 -04:00
Ben12345rocks 12f43e3691 Add vote bossbar 2019-09-29 12:29:23 -04:00
Ben12345rocks 1e7cf2a1ba Add config option 2019-09-26 16:52:21 -04:00
Ben12345rocks 90636250cb Add ability to require allsites to be voted on for all urls button 2019-09-26 16:51:53 -04:00
Ben12345rocks 838451f956 Bug fix 2019-09-25 17:21:56 -04:00
Ben12345rocks cc85d999e1 New skull method for signs 2019-09-23 17:10:49 -04:00
Ben12345rocks 0013013cd2 Use new debug level 2019-09-21 21:07:05 -04:00
Ben12345rocks bfd04cf8a2 Update version number 2019-09-20 16:43:27 -04:00
Ben12345rocks beb1b70f50 Cleanup 2019-09-15 14:09:16 -04:00
Ben12345rocks f52edad583 Update version number 2019-09-15 13:54:58 -04:00
Ben12345rocks 0a1283de4b Small improvements 2019-09-14 20:59:07 -04:00
Ben12345rocks bed263aa87 Improvements 2019-09-14 07:54:46 -04:00
Ben12345rocks 55d8d20f88 Merge branch 'master' of https://github.com/Ben12345rocks/VotingPlugin 2019-09-13 17:39:10 -04:00
Ben12345rocks 3a59e2cdc2 Add new commands 2019-09-13 17:38:47 -04:00
Ben12345rocks 57fb754bc0 Add new option 2019-09-11 20:02:24 -04:00
Ben 052b48348b Merge pull request #617 from Shivelight/patch-1
Fix ToggleBroadcasts configuration path
2019-09-09 05:43:27 -04:00
Shivelight 5d15747c4e Fix ToggleBroadcasts configuration path
Match toggle broadcast message path with Config.java's path.
We are just fixing a typo here.
2019-09-09 16:04:12 +07:00
Ben12345rocks ce09359445 Improvement 2019-09-08 12:39:18 -04:00
Ben c22792bd9b Update README.md 2019-09-07 20:58:45 -04:00
Ben12345rocks 4ab36c355e Bug fix 2019-09-07 18:57:40 -04:00
Ben12345rocks 0b3829c1b4 Improvements 2019-09-07 18:56:05 -04:00
Ben12345rocks ae4883f099 Improvement 2019-09-07 18:13:29 -04:00
Ben12345rocks 2e3cf25e57 Add ability to set rewards with GUI 2019-08-25 13:07:51 -04:00
Ben12345rocks e65b831f35 Fix config typos 2019-08-18 12:38:54 -04:00
Ben12345rocks b6dc426eed Fix typo 2019-08-18 12:34:43 -04:00
Ben12345rocks a4f7619ca3 Update version number 2019-08-15 19:20:00 -04:00
Ben12345rocks 4e38dd0f1a Update version number 2019-08-11 13:23:08 -04:00
Ben12345rocks 2264db76cc Bug fixes 2019-08-11 13:22:17 -04:00
Ben12345rocks 28082abde5 Change option 2019-08-09 20:01:03 -04:00
27 changed files with 527 additions and 357 deletions

No files matched your search

+1 -3
View File
@@ -6,11 +6,9 @@ https://www.spigotmc.org/resources/votingplugin.15358/
![img2](http://badge.henrya.org/spigot/version?id=15358&color=red)
## License
### Creative Commons Arttribution 3.0 Unported
https://github.com/Ben12345rocks/VotingPlugin/blob/master/VotingPlugin/LICENSE.txt
https://github.com/Ben12345rocks/VotingPlugin/blob/master/VotingPlugin/Resources/LICENSE.txt
### Maven:
+35 -28
View File
@@ -32,6 +32,10 @@ MySQL:
# Recommend: False (Will prevent creating random user data)
AllowUnjoined: false
# Use server lookup for when allowunjoined is set to false
# Recommend leaving enabled unless you face issues
AllowUnJoinedCheckServer: true
# ------------------------------------------------
# VoteReminding
# ------------------------------------------------
@@ -237,7 +241,7 @@ Format:
# %Points% = player points
Points: '&a%Player% currently has &a&l%Points%&a Points!'
ToggleBroadcast:
ToggleBroadcasts:
Enabled: '&cYou will now see vote broadcasts'
Disabled: '&cYou will no longer see vote broadcasts'
@@ -381,6 +385,7 @@ GUI:
NextVote: '&cCan Vote In: %Info%'
ViewAllUrlsButtonEnabled: true
AllUrlsButton:
RequireAllSitesVoted: true
AlreadyVotedItem:
Material: 'REDSTONE_BLOCK'
Data: 0
@@ -817,8 +822,6 @@ DailyAwards:
# Set to 0 to give no points
PointsOnVote: 1
AlwaysCloseInventory: false
# Set this to false to disable the plugin adding totals
# Not really recommended
AddTotals: true
@@ -833,12 +836,15 @@ ClickSound:
# Limit monthly votes to number of days of a month multipled by the number of sites
LimitMonthlyVotes: false
######################
# Debug
Debug: false
######################
# Extra Debug
# Only needed in extreme cases
ExtraDebug: false
# Debug levels:
# NONE
# INFO
# EXTRA
DebugLevel: NONE
# Debug info ingame
# Players with permission "VotingPlugin.Debug"
@@ -846,19 +852,8 @@ ExtraDebug: false
DebugInGame: false
# Will log debug messages to VotingPlugin/Log/log.txt
# Requires Debug to be on
# Only needed for extra cases
# Only needed for extreme cases
#LogDebugToFile: false
# Options for request api
# Current methods
# ANVIL
# BOOK
# CHAT
# This is mainly used for admin gui's to type in values
RequestAPI:
DefaultMethod: 'Anvil'
DisabledMethods: []
# Whether or not to log every vote to a file
# Use this if you wanna track player votes
@@ -916,7 +911,7 @@ AutoDownload: false
# Whether or not to disable update checks
DisableUpdateChecking: false
# Allow transfer of vote points
# Allow transfer of vote points between players
AllowVotePointTransfers: false
# Disable this on a hub server for example
@@ -938,6 +933,14 @@ WaitUntilLoggedIn: true
# If false, skulls will be cached as they are used
PreloadSkulls: false
# Setting to false disables saving skulls in a cache to improve speeds
# Will reduce ram usage if disabled
LoadSkulls: true
# Use vault for permission checks
# May not work on some plugins
UseVaultPermissions: false
# ---------------------------------------------------------
# Mysql cache options
# Clearing cache forces the plugin to pull from database
@@ -954,12 +957,21 @@ ClearCacheOnJoin: false
# Would recommend for some bungee setups
ClearCacheOnVote: false
# Disable using vault for permission checks
DisableVaultPermissions: false
# ###############################################################
# Deprecated options, don't recommend using any of these
AlwaysCloseInventory: false
# Options for request api
# Current methods:
# ANVIL
# BOOK
# CHAT
# This is mainly used for admin gui's to type in values
RequestAPI:
DefaultMethod: 'Anvil'
DisabledMethods: []
# Whether or not to disable checking names on mojang, disable if you hit the rate limit
# Shouldn't make a noticeable impact if set to false
#CheckNameMojang: false
@@ -967,11 +979,6 @@ DisableVaultPermissions: false
# Shouldn't need to change this
#AutoKillInvs: true
# Used in special cases
# Much slower, but may work better
# Not recommended in newer versions
#AlternateUUIDLookup: false
# Disable checking on world change
# May improve performance
#DisableCheckOnWorldChange: false
+9
View File
@@ -61,6 +61,12 @@ commands:
votepoints:
description: A command
aliases: vpoints
votelist:
description: A command
aliases: vlist
voteall:
description: A command
aliases: vall
votechoices:
description: A command
alaises: vchoices
@@ -85,6 +91,9 @@ commands:
adminvotereload:
description: Command Alias
aliases: avreload
adminvotetestreward:
description: Command Alias
aliases: avtestreward
adminvoteversion:
description: Command Alias
aliases: avversion
+1 -1
View File
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.Ben12345rocks</groupId>
<artifactId>VotingPlugin</artifactId>
<version>5.19.2</version>
<version>5.20.2</version>
<packaging>jar</packaging>
<name>VotingPlugin</name>
<properties>
@@ -14,6 +14,7 @@ import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import com.Ben12345rocks.AdvancedCore.DebugLevel;
import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandle;
import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
@@ -23,9 +24,9 @@ import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory.ClickEvent;
import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
import com.Ben12345rocks.AdvancedCore.Util.Placeholder.PlaceHolder;
import com.Ben12345rocks.AdvancedCore.Util.Updater.Updater;
import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.ValueRequest;
@@ -317,7 +318,7 @@ public class CommandLoader {
User user = UserManager.getInstance().getVotingPluginUser(args[1]);
user.setPoints(Integer.parseInt(args[3]));
sender.sendMessage(
StringUtils.getInstance().colorize("&cSet " + args[1] + " points to " + args[3]));
StringParser.getInstance().colorize("&cSet " + args[1] + " points to " + args[3]));
}
});
@@ -346,7 +347,7 @@ public class CommandLoader {
synchronized (pointLock) {
user.addPoints(Integer.parseInt(args[3]));
}
sender.sendMessage(StringUtils.getInstance().colorize("&cGave " + args[1] + " " + args[3]
sender.sendMessage(StringParser.getInstance().colorize("&cGave " + args[1] + " " + args[3]
+ " points" + ", " + args[1] + " now has " + user.getPoints() + " points"));
}
});
@@ -359,7 +360,7 @@ public class CommandLoader {
public void execute(CommandSender sender, String[] args) {
User user = UserManager.getInstance().getVotingPluginUser(args[1]);
user.removePoints(Integer.parseInt(args[3]));
sender.sendMessage(StringUtils.getInstance().colorize("&cRemoved " + args[3] + " points from "
sender.sendMessage(StringParser.getInstance().colorize("&cRemoved " + args[3] + " points from "
+ args[1] + ", " + args[1] + " now has " + user.getPoints() + " points"));
}
});
@@ -576,7 +577,7 @@ public class CommandLoader {
public void execute(CommandSender sender, String[] args) {
if (sender instanceof Player) {
sender.sendMessage(
StringUtils.getInstance().colorize("&cThis command can not be done from ingame"));
StringParser.getInstance().colorize("&cThis command can not be done from ingame"));
return;
}
@@ -584,7 +585,7 @@ public class CommandLoader {
User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
user.clearTotals();
}
sender.sendMessage(StringUtils.getInstance().colorize("&cCleared totals for everyone"));
sender.sendMessage(StringParser.getInstance().colorize("&cCleared totals for everyone"));
}
});
@@ -595,7 +596,7 @@ public class CommandLoader {
public void execute(CommandSender sender, String[] args) {
if (sender instanceof Player) {
sender.sendMessage(
StringUtils.getInstance().colorize("&cThis command can not be done from ingame"));
StringParser.getInstance().colorize("&cThis command can not be done from ingame"));
return;
}
@@ -603,7 +604,7 @@ public class CommandLoader {
User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
user.clearOfflineRewards();
}
sender.sendMessage(StringUtils.getInstance().colorize("&cCleared totals for everyone"));
sender.sendMessage(StringParser.getInstance().colorize("&cCleared totals for everyone"));
}
});
@@ -615,7 +616,7 @@ public class CommandLoader {
@Override
public void execute(CommandSender sender, String[] args) {
if (sender instanceof Player) {
sender.sendMessage(StringUtils.getInstance().colorize("&cThis can not be done ingame"));
sender.sendMessage(StringParser.getInstance().colorize("&cThis can not be done ingame"));
return;
}
try {
@@ -639,7 +640,7 @@ public class CommandLoader {
public void execute(CommandSender sender, String[] args) {
UserManager.getInstance().getVotingPluginUser(args[1]).setTotal(top,
Integer.parseInt(args[4]));
sender.sendMessage(StringUtils.getInstance().colorize(
sender.sendMessage(StringParser.getInstance().colorize(
"&cSet " + top.toString() + " total for '" + args[1] + "' to " + args[4]));
}
});
@@ -653,7 +654,7 @@ public class CommandLoader {
public void execute(CommandSender sender, String[] args) {
User user = UserManager.getInstance().getVotingPluginUser(args[1]);
user.setTotal(top, user.getTotal(top) + Integer.parseInt(args[4]));
sender.sendMessage(StringUtils.getInstance()
sender.sendMessage(StringParser.getInstance()
.colorize("&cAdded " + top.toString() + " total for " + args[1]));
}
});
@@ -666,7 +667,7 @@ public class CommandLoader {
public void execute(CommandSender sender, String[] args) {
User user = UserManager.getInstance().getVotingPluginUser(args[1]);
user.clearTotals();
sender.sendMessage(StringUtils.getInstance().colorize("&cCleared totals for '" + args[1] + "'"));
sender.sendMessage(StringParser.getInstance().colorize("&cCleared totals for '" + args[1] + "'"));
}
});
@@ -679,7 +680,8 @@ public class CommandLoader {
User user = UserManager.getInstance().getVotingPluginUser(args[1]);
user.setMilestoneCount(user.getMilestoneCount() + Integer.parseInt(args[3]));
SpecialRewards.getInstance().checkMilestone(user);
sender.sendMessage(StringUtils.getInstance().colorize("&cAdded milestonecount for " + args[1]));
sender.sendMessage(
StringParser.getInstance().colorize("&cAdded milestonecount for " + args[1]));
}
});
@@ -692,7 +694,7 @@ public class CommandLoader {
User user = UserManager.getInstance().getVotingPluginUser(args[1]);
user.setMilestoneCount(Integer.parseInt(args[3]));
SpecialRewards.getInstance().checkMilestone(user);
sender.sendMessage(StringUtils.getInstance()
sender.sendMessage(StringParser.getInstance()
.colorize("&cSet milestonecount for " + args[1] + " to " + args[3]));
}
});
@@ -747,22 +749,33 @@ public class CommandLoader {
@Override
public void execute(CommandSender sender, String[] args) {
sender.sendMessage(StringUtils.getInstance().colorize("&cCreating VoteSite..." + args[1]));
sender.sendMessage(StringParser.getInstance().colorize("&cCreating VoteSite..." + args[1]));
ConfigVoteSites.getInstance().generateVoteSite(args[1]);
sender.sendMessage(StringUtils.getInstance().colorize("&cCreated VoteSite: &c&l" + args[1]));
sender.sendMessage(StringParser.getInstance().colorize("&cCreated VoteSite: &c&l" + args[1]));
}
});
plugin.getAdminVoteCommand()
.add(new CommandHandler(new String[] { "Config", "SetDebug", "(boolean)" },
.add(new CommandHandler(new String[] { "Config", "TempDebug" },
"VotingPlugin.Commands.AdminVote.Config.Edit|" + adminPerm,
"Set Debug on or off, effective until reload/restart") {
"Enable debug, effective until reload/restart") {
@Override
public void execute(CommandSender sender, String[] args) {
Main.plugin.getOptions().setDebug(true);
Main.plugin.getOptions().setDebug(DebugLevel.INFO);
}
});
plugin.getAdminVoteCommand()
.add(new CommandHandler(new String[] { "Config", "TempExtraDebug" },
"VotingPlugin.Commands.AdminVote.Config.Edit|" + adminPerm,
"Enable extra debug, effective until reload/restart") {
@Override
public void execute(CommandSender sender, String[] args) {
Main.plugin.getOptions().setDebug(DebugLevel.EXTRA);
}
});
@@ -775,7 +788,7 @@ public class CommandLoader {
String voteSite = plugin.getVoteSiteName(args[1]);
String serviceSite = args[3];
ConfigVoteSites.getInstance().setServiceSite(voteSite, serviceSite);
sender.sendMessage(StringUtils.getInstance()
sender.sendMessage(StringParser.getInstance()
.colorize("&cSet ServiceSite to &c&l" + serviceSite + "&c on &c&l" + voteSite));
}
});
@@ -789,7 +802,7 @@ public class CommandLoader {
String voteSite = plugin.getVoteSiteName(args[1]);
String url = args[3];
ConfigVoteSites.getInstance().setVoteURL(voteSite, url);
sender.sendMessage(StringUtils.getInstance()
sender.sendMessage(StringParser.getInstance()
.colorize("&cSet VoteURL to &c&l" + url + "&c on &c&l" + voteSite));
}
});
@@ -803,7 +816,7 @@ public class CommandLoader {
String voteSite = plugin.getVoteSiteName(args[1]);
int value = Integer.parseInt(args[3]);
ConfigVoteSites.getInstance().setPriority(voteSite, value);
sender.sendMessage(StringUtils.getInstance()
sender.sendMessage(StringParser.getInstance()
.colorize("&cSet priortiy to &c&l" + value + "&c on &c&l" + voteSite));
}
@@ -818,7 +831,7 @@ public class CommandLoader {
String voteSite = plugin.getVoteSiteName(args[1]);
int delay = Integer.parseInt(args[3]);
ConfigVoteSites.getInstance().setVoteDelay(voteSite, delay);
sender.sendMessage(StringUtils.getInstance()
sender.sendMessage(StringParser.getInstance()
.colorize("&cSet VoteDelay to &c&l" + delay + "&c on &c&l" + voteSite));
}
@@ -834,22 +847,22 @@ public class CommandLoader {
@Override
public void run() {
sender.sendMessage(StringUtils.getInstance().colorize("&cChecking for update..."));
sender.sendMessage(StringParser.getInstance().colorize("&cChecking for update..."));
plugin.setUpdater(new Updater(plugin, 15358, false));
final Updater.UpdateResult result = plugin.getUpdater().getResult();
switch (result) {
case FAIL_SPIGOT: {
sender.sendMessage(StringUtils.getInstance()
sender.sendMessage(StringParser.getInstance()
.colorize("&cFailed to check for update for &c&l" + plugin.getName() + "&c!"));
break;
}
case NO_UPDATE: {
sender.sendMessage(StringUtils.getInstance().colorize("&c&l" + plugin.getName()
sender.sendMessage(StringParser.getInstance().colorize("&c&l" + plugin.getName()
+ " &cis up to date! Version: &c&l" + plugin.getUpdater().getVersion()));
break;
}
case UPDATE_AVAILABLE: {
sender.sendMessage(StringUtils.getInstance()
sender.sendMessage(StringParser.getInstance()
.colorize("&c&l" + plugin.getName()
+ " &chas an update available! Your Version: &c&l"
+ plugin.getDescription().getVersion() + " &cNew Version: &c&l"
@@ -876,7 +889,7 @@ public class CommandLoader {
boolean value = Boolean.parseBoolean(args[3]);
ConfigVoteSites.getInstance().setEnabled(voteSite, value);
sender.sendMessage(StringUtils.getInstance()
sender.sendMessage(StringParser.getInstance()
.colorize("&cSet votesite " + voteSite + " enabled to " + value));
}
@@ -889,23 +902,23 @@ public class CommandLoader {
public void execute(CommandSender sender, String[] args) {
String siteName = args[1];
if (!ConfigVoteSites.getInstance().isServiceSiteGood(siteName)) {
sender.sendMessage(StringUtils.getInstance()
sender.sendMessage(StringParser.getInstance()
.colorize("&cServiceSite is invalid, votes may not work properly"));
} else {
String service = ConfigVoteSites.getInstance().getServiceSite(siteName);
if (ServerData.getInstance().getServiceSites().contains(service)) {
sender.sendMessage(StringUtils.getInstance().colorize("&aServiceSite is properly setup"));
sender.sendMessage(StringParser.getInstance().colorize("&aServiceSite is properly setup"));
} else {
sender.sendMessage(StringUtils.getInstance()
sender.sendMessage(StringParser.getInstance()
.colorize("&cService may not be valid, haven't recieved a vote from " + service
+ ", see /av servicesites"));
}
}
if (!ConfigVoteSites.getInstance().isVoteURLGood(siteName)) {
sender.sendMessage(StringUtils.getInstance().colorize("&cVoteURL is invalid"));
sender.sendMessage(StringParser.getInstance().colorize("&cVoteURL is invalid"));
} else {
sender.sendMessage(StringUtils.getInstance().colorize("&aVoteURL is properly setup"));
sender.sendMessage(StringParser.getInstance().colorize("&aVoteURL is properly setup"));
}
}
});
@@ -917,7 +930,7 @@ public class CommandLoader {
public void execute(CommandSender sender, String[] args) {
plugin.setUpdate(true);
plugin.update();
sender.sendMessage(StringUtils.getInstance().colorize("&cUpdating..."));
sender.sendMessage(StringParser.getInstance().colorize("&cUpdating..."));
}
});
@@ -940,7 +953,7 @@ public class CommandLoader {
User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
user.setOfflineVotes(new ArrayList<String>());
}
sender.sendMessage(StringUtils.getInstance().colorize("&cCleared"));
sender.sendMessage(StringParser.getInstance().colorize("&cCleared"));
}
});
@@ -1232,7 +1245,7 @@ public class CommandLoader {
String playerName = (String) event.getMeta(player, "Player");
BInventory inv = new BInventory("MileStones: " + playerName);
for (String mileStoneName : Config.getInstance().getMilestoneVotes()) {
if (StringUtils.getInstance().isInt(mileStoneName)) {
if (StringParser.getInstance().isInt(mileStoneName)) {
int mileStone = Integer.parseInt(mileStoneName);
inv.addButton(inv.getNextSlot(),
@@ -1244,7 +1257,7 @@ public class CommandLoader {
@Override
public void onClick(ClickEvent clickEvent) {
if (StringUtils.getInstance()
if (StringParser.getInstance()
.isInt(clickEvent.getClickedItem().getItemMeta()
.getDisplayName())) {
Player player = clickEvent.getPlayer();
@@ -1414,7 +1427,7 @@ public class CommandLoader {
UserManager.getInstance().getVotingPluginUser(args[1]));
}
} else {
sendMessage(sender, StringUtils.getInstance()
sendMessage(sender, StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
}
@@ -1480,7 +1493,7 @@ public class CommandLoader {
UserManager.getInstance().getVotingPluginUser(args[1]));
}
} else {
sendMessage(sender, StringUtils.getInstance()
sendMessage(sender, StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
}
}
@@ -1498,10 +1511,10 @@ public class CommandLoader {
if (sender instanceof Player) {
UserManager.getInstance().getVotingPluginUser((Player) sender).sendMessage(msg);
} else {
sender.sendMessage(StringUtils.getInstance().colorize(msg));
sender.sendMessage(StringParser.getInstance().colorize(msg));
}
} else {
sendMessage(sender, StringUtils.getInstance()
sendMessage(sender, StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
}
@@ -1561,7 +1574,7 @@ public class CommandLoader {
PlayerGUIs.getInstance().openVoteGUI(player,
UserManager.getInstance().getVotingPluginUser(args[1]));
} else {
sendMessage(sender, StringUtils.getInstance()
sendMessage(sender, StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
}
@@ -1912,7 +1925,7 @@ public class CommandLoader {
UserManager.getInstance().getVotingPluginUser(args[1]));
}
} else {
sendMessage(sender, StringUtils.getInstance()
sendMessage(sender, StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
}
@@ -1966,7 +1979,7 @@ public class CommandLoader {
UserManager.getInstance().getVotingPluginUser(args[1]));
}
} else {
sendMessage(sender, StringUtils.getInstance()
sendMessage(sender, StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
}
}
@@ -1999,7 +2012,7 @@ public class CommandLoader {
UserManager.getInstance().getVotingPluginUser(args[1]));
}
} else {
sendMessage(sender, StringUtils.getInstance()
sendMessage(sender, StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
}
}
@@ -2049,6 +2062,20 @@ public class CommandLoader {
}
});
plugin.getVoteCommand().add(new CommandHandler(new String[] { "List&All" },
"VotingPlugin.Commands.Vote.List|" + playerPerm, "See voting URLs") {
@Override
public void execute(CommandSender sender, String[] args) {
if (isPlayer(sender)) {
User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
user.sendMessage(Commands.getInstance().voteURLs(user));
} else {
sender.sendMessage(Commands.getInstance().voteURLs(null));
}
}
});
ArrayList<CommandHandler> avCommands = com.Ben12345rocks.AdvancedCore.Commands.CommandLoader.getInstance()
.getBasicCommands("VotingPlugin");
for (CommandHandler cmd : avCommands) {
@@ -20,9 +20,10 @@ import org.bukkit.permissions.Permission;
import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
import com.Ben12345rocks.AdvancedCore.TimeChecker.TimeChecker;
import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
import com.Ben12345rocks.AdvancedCore.Util.Messages.MessageBuilder;
import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
import com.Ben12345rocks.AdvancedCore.Util.Scoreboards.SimpleScoreboard;
import com.Ben12345rocks.VotingPlugin.Main;
import com.Ben12345rocks.VotingPlugin.Config.Config;
@@ -96,9 +97,9 @@ public class Commands {
maxPage++;
}
msg.add(StringUtils.getInstance().stringToComp("&3&lVotingPlugin Admin Help " + (page + 1) + "/" + maxPage));
msg.add(StringUtils.getInstance().stringToComp("&3&l() = Needed"));
msg.add(StringUtils.getInstance().stringToComp("&3&lAliases: adminvote, av"));
msg.add(StringParser.getInstance().stringToComp("&3&lVotingPlugin Admin Help " + (page + 1) + "/" + maxPage));
msg.add(StringParser.getInstance().stringToComp("&3&l() = Needed"));
msg.add(StringParser.getInstance().stringToComp("&3&lAliases: adminvote, av"));
for (int i = pagesize * page; (i < text.size()) && (i < ((page + 1) * pagesize)); i++) {
msg.add(text.get(i));
@@ -282,7 +283,7 @@ public class Commands {
}
sender.sendMessage(ArrayUtils.getInstance().convert(ArrayUtils.getInstance().colorize(text)));
} else {
sender.sendMessage(StringUtils.getInstance().colorize("&cPlayer not online: " + player));
sender.sendMessage(StringParser.getInstance().colorize("&cPlayer not online: " + player));
}
}
@@ -331,7 +332,7 @@ public class Commands {
pageSize++;
}
String title = StringUtils.getInstance().colorize(config.getFormatCommandVoteTopTitle()
String title = StringParser.getInstance().colorize(config.getFormatCommandVoteTopTitle()
.replace("%page%", "" + page).replace("%maxpages%", "" + pageSize).replace("%Top%", "All"));
SimpleScoreboard scoreboard = new SimpleScoreboard(title);
@@ -371,7 +372,7 @@ public class Commands {
pageSize++;
}
String title = StringUtils.getInstance().colorize(config.getFormatCommandVoteTopTitle()
String title = StringParser.getInstance().colorize(config.getFormatCommandVoteTopTitle()
.replace("%page%", "" + page).replace("%maxpages%", "" + pageSize).replace("%Top%", "Daily"));
SimpleScoreboard scoreboard = new SimpleScoreboard(title);
@@ -411,7 +412,7 @@ public class Commands {
pageSize++;
}
String title = StringUtils.getInstance().colorize(config.getFormatCommandVoteTopTitle()
String title = StringParser.getInstance().colorize(config.getFormatCommandVoteTopTitle()
.replace("%page%", "" + page).replace("%maxpages%", "" + pageSize).replace("%Top%", "Monthly"));
SimpleScoreboard scoreboard = new SimpleScoreboard(title);
@@ -451,7 +452,7 @@ public class Commands {
pageSize++;
}
String title = StringUtils.getInstance().colorize(config.getFormatCommandVoteTopTitle()
String title = StringParser.getInstance().colorize(config.getFormatCommandVoteTopTitle()
.replace("%page%", "" + page).replace("%maxpages%", "" + pageSize).replace("%Top%", "Weekly"));
SimpleScoreboard scoreboard = new SimpleScoreboard(title);
@@ -571,7 +572,7 @@ public class Commands {
String playerName = user.getPlayerName();
msg.add(StringUtils.getInstance().replaceIgnoreCase(config.getFormatCommandsVoteLastTitle(), "%player%",
msg.add(StringParser.getInstance().replaceIgnoreCase(config.getFormatCommandsVoteLastTitle(), "%player%",
playerName));
for (VoteSite voteSite : plugin.getVoteSites()) {
@@ -618,58 +619,58 @@ public class Commands {
String info = "";
if (diffDays == 1) {
info += StringUtils.getInstance()
.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
info += StringParser.getInstance()
.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
Config.getInstance().getFormatTimeFormatsDay()), "amount", "" + diffDays);
info += " ";
} else if (diffDays > 1) {
info += StringUtils.getInstance()
.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
info += StringParser.getInstance()
.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
Config.getInstance().getFormatTimeFormatsDays()), "amount", "" + diffDays);
info += " ";
}
if (diffHours == 1) {
info += StringUtils.getInstance()
.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
info += StringParser.getInstance()
.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
Config.getInstance().getFormatTimeFormatsHour()), "amount", "" + diffHours);
info += " ";
} else if (diffHours > 1) {
info += StringUtils.getInstance()
.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
info += StringParser.getInstance()
.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
Config.getInstance().getFormatTimeFormatsHours()), "amount", "" + diffHours);
info += " ";
}
if (diffMinutes == 1) {
info += StringUtils.getInstance()
.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
info += StringParser.getInstance()
.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
Config.getInstance().getFormatTimeFormatsMinute()), "amount", "" + diffMinutes);
info += " ";
} else if (diffMinutes > 1) {
info += StringUtils.getInstance().replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
info += StringParser.getInstance().replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
Config.getInstance().getFormatTimeFormatsMinutes()), "amount", "" + diffMinutes);
info += " ";
}
if (diffSeconds == 1) {
info += StringUtils.getInstance()
.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
info += StringParser.getInstance()
.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
Config.getInstance().getFormatTimeFormatsSecond()), "amount", "" + diffSeconds);
} else {
info += StringUtils.getInstance().replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
info += StringParser.getInstance().replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
Config.getInstance().getFormatTimeFormatsSeconds()), "amount", "" + diffSeconds);
}
info = StringUtils.getInstance()
info = StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getFormatCommandsVoteLastLastVoted(), "times", info);
return info;
@@ -686,7 +687,7 @@ public class Commands {
placeholders.put("SiteName", voteSite.getDisplayName());
placeholders.put("timesince", timeSince);
return StringUtils.getInstance().replacePlaceHolder(Config.getInstance().getFormatCommandsVoteLastLine(),
return StringParser.getInstance().replacePlaceHolder(Config.getInstance().getFormatCommandsVoteLastLine(),
placeholders);
}
@@ -702,18 +703,18 @@ public class Commands {
String playerName = user.getPlayerName();
msg.add(StringUtils.getInstance().colorize(StringUtils.getInstance()
msg.add(StringParser.getInstance().colorize(StringParser.getInstance()
.replaceIgnoreCase(config.getFormatCommandsVoteNextTitle(), "%player%", playerName)));
for (VoteSite voteSite : plugin.getVoteSites()) {
String msgLine = config.getFormatCommandsVoteNextLayout();
msgLine = StringUtils.getInstance().replaceIgnoreCase(msgLine, "%info%",
msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%info%",
voteCommandNextInfo(user, voteSite));
msgLine = StringUtils.getInstance().replaceIgnoreCase(msgLine, "%SiteName%", voteSite.getDisplayName());
msg.add(StringUtils.getInstance().colorize(msgLine));
msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%SiteName%", voteSite.getDisplayName());
msg.add(StringParser.getInstance().colorize(msgLine));
}
return ArrayUtils.getInstance().convert(msg);
@@ -754,8 +755,9 @@ public class Commands {
long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;
String timeMsg = config.getFormatCommandsVoteNextInfoTime();
timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Long.toString(diffHours));
timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%",
Long.toString(diffHours));
timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
Long.toString(diffMinutes));
info = timeMsg;
@@ -770,8 +772,9 @@ public class Commands {
long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;
String timeMsg = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%minutes%", Long.toString(diffMinutes));
timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
Long.toString(diffMinutes));
info = timeMsg;
} else {
@@ -798,11 +801,11 @@ public class Commands {
int all = user.getTotal(TopVoter.AllTime);
for (String s : config.getFormatCommandsVoteTotal()) {
String str = StringUtils.getInstance().replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
str = StringUtils.getInstance().replaceIgnoreCase(str, "%WeeklyTotal%", "" + weekly);
str = StringUtils.getInstance().replaceIgnoreCase(str, "%MonthlyTotal%", "" + month);
str = StringUtils.getInstance().replaceIgnoreCase(str, "%AllTimeTotal%", "" + all);
str = StringUtils.getInstance().replaceIgnoreCase(str, "%player%", user.getPlayerName());
String str = StringParser.getInstance().replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
str = StringParser.getInstance().replaceIgnoreCase(str, "%WeeklyTotal%", "" + weekly);
str = StringParser.getInstance().replaceIgnoreCase(str, "%MonthlyTotal%", "" + month);
str = StringParser.getInstance().replaceIgnoreCase(str, "%AllTimeTotal%", "" + all);
str = StringParser.getInstance().replaceIgnoreCase(str, "%player%", user.getPlayerName());
msg.add(str);
}
@@ -835,10 +838,10 @@ public class Commands {
}
for (String s : config.getFormatCommandsVoteTotalAll()) {
String str = StringUtils.getInstance().replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
str = StringUtils.getInstance().replaceIgnoreCase(str, "%WeeklyTotal%", "" + weekly);
str = StringUtils.getInstance().replaceIgnoreCase(str, "%MonthlyTotal%", "" + month);
str = StringUtils.getInstance().replaceIgnoreCase(str, "%AllTimeTotal%", "" + all);
String str = StringParser.getInstance().replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
str = StringParser.getInstance().replaceIgnoreCase(str, "%WeeklyTotal%", "" + weekly);
str = StringParser.getInstance().replaceIgnoreCase(str, "%MonthlyTotal%", "" + month);
str = StringParser.getInstance().replaceIgnoreCase(str, "%AllTimeTotal%", "" + all);
msg.add(str);
}
@@ -856,7 +859,7 @@ public class Commands {
public ArrayList<TextComponent> voteHelpText(CommandSender sender) {
ArrayList<TextComponent> texts = new ArrayList<TextComponent>();
HashMap<String, TextComponent> unsorted = new HashMap<String, TextComponent>();
texts.add(StringUtils.getInstance().stringToComp(config.getFormatCommandsVoteHelpTitle()));
texts.add(StringParser.getInstance().stringToComp(config.getFormatCommandsVoteHelpTitle()));
boolean requirePerms = config.getFormatCommandsVoteHelpRequirePermission();
@@ -893,7 +896,7 @@ public class Commands {
placeholders.put("player", user.getPlayerName());
placeholders.put("votesite", voteSite.getKey());
placeholders.put("time", timeString);
msg.add(StringUtils.getInstance()
msg.add(StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getFormatCommandsVoteTodayLine(), placeholders));
// msg.add("&6" + user.getPlayerName() + " : " + voteSite.getKey() + " : " +
// timeString);
@@ -915,15 +918,12 @@ public class Commands {
for (VoteSite voteSite : plugin.getVoteSites()) {
counter++;
String voteURL = voteSite.getVoteURL();
String msg = config.getFormatCommandsVoteURLS();
msg = StringUtils.getInstance().colorize(msg);
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());
msg = StringUtils.getInstance().replacePlaceHolder(msg, "Next",
"" + voteCommandNextInfo(user, voteSite));
sites.add(msg);
MessageBuilder message = new MessageBuilder(config.getFormatCommandsVoteURLS());
message.replacePlaceholder("num", Integer.toString(counter)).replacePlaceholder("url", voteURL)
.replacePlaceholder("SiteName", voteSite.getDisplayName())
.replacePlaceholder("player", user.getPlayerName())
.replacePlaceholder("Next", "" + voteCommandNextInfo(user, voteSite)).colorize();
sites.add(message.getText());
}
}
if (user != null) {
@@ -11,6 +11,7 @@ import org.bukkit.inventory.ItemStack;
import com.Ben12345rocks.AdvancedCore.Util.EditGUI.EditGUI;
import com.Ben12345rocks.AdvancedCore.Util.EditGUI.EditGUIButton;
import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueBoolean;
import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueList;
import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueNumber;
import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueString;
import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
@@ -250,6 +251,20 @@ public class AdminGUI {
}
}));
if (voteSite.getSiteData().isList("Rewards")) {
inv.addButton(
new EditGUIButton(new EditGUIValueList("Rewards", voteSite.getSiteData().getStringList("Rewards")) {
@Override
public void setValue(Player p, ArrayList<String> rewards) {
VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
ConfigVoteSites.getInstance().set(voteSite.getKey(), "Rewards", rewards);
plugin.reload();
}
}));
}
inv.openInventory(player);
}
}
@@ -3,6 +3,7 @@ package com.Ben12345rocks.VotingPlugin.Commands.GUI;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map.Entry;
import java.util.Set;
@@ -18,10 +19,10 @@ import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory.ClickEvent;
import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
import com.Ben12345rocks.VotingPlugin.Main;
import com.Ben12345rocks.VotingPlugin.Commands.Commands;
import com.Ben12345rocks.VotingPlugin.Config.Config;
@@ -83,7 +84,7 @@ public class PlayerGUIs {
public void openVoteBest(Player player, User user) {
setSelectedPlayer(player, user);
BInventory inv = new BInventory(StringUtils.getInstance()
BInventory inv = new BInventory(StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getGUIVoteBestName(), "player", user.getPlayerName()));
inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteBestDayBestItem())
@@ -126,11 +127,11 @@ public class PlayerGUIs {
&& !player.hasPermission("VotingPlugin.Mod"))
|| (!player.hasPermission("VotingPlugin.Commands.Vote.GUI")
&& !player.hasPermission("VotingPlugin.Player"))) {
player.sendMessage(StringUtils.getInstance().colorize(Main.plugin.getOptions().getFormatNoPerms()));
player.sendMessage(StringParser.getInstance().colorize(Main.plugin.getOptions().getFormatNoPerms()));
return;
}
setSelectedPlayer(player, user);
BInventory inv = new BInventory(StringUtils.getInstance()
BInventory inv = new BInventory(StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getGUIVoteGUIName(), "player", user.getPlayerName()));
if (!Config.getInstance().isAlwaysCloseInventory()) {
inv.dontClose();
@@ -230,7 +231,7 @@ public class PlayerGUIs {
public void openVoteLast(Player player, User user) {
setSelectedPlayer(player, user);
BInventory inv = new BInventory(StringUtils.getInstance()
BInventory inv = new BInventory(StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getGUIVoteLastName(), "player", user.getPlayerName()));
for (VoteSite site : plugin.getVoteSites()) {
inv.addButton(inv.getNextSlot(), new BInventoryButton(site.getItem().setName(site.getDisplayName())
@@ -252,7 +253,7 @@ public class PlayerGUIs {
public void openVoteNext(Player player, User user) {
setSelectedPlayer(player, user);
BInventory inv = new BInventory(StringUtils.getInstance()
BInventory inv = new BInventory(StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getGUIVoteNextName(), "player", user.getPlayerName()));
for (VoteSite site : plugin.getVoteSites()) {
inv.addButton(inv.getNextSlot(), new BInventoryButton(site.getItem().setName(site.getDisplayName())
@@ -273,7 +274,7 @@ public class PlayerGUIs {
public void openVoteShop(Player player) {
if (!Config.getInstance().getVoteShopEnabled()) {
player.sendMessage(StringUtils.getInstance().colorize("&cVote shop disabled"));
player.sendMessage(StringParser.getInstance().colorize("&cVote shop disabled"));
return;
}
@@ -335,14 +336,14 @@ public class PlayerGUIs {
Config.getInstance().getIdentifierRewardsPath(identifier),
new RewardOptions().setPlaceholders(placeholders));
user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
user.sendMessage(StringParser.getInstance().replacePlaceHolder(
Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
if (limit > 0) {
user.setVoteShopIdentifierLimit(identifier,
user.getVoteShopIdentifierLimit(identifier) + 1);
}
} else {
user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
user.sendMessage(StringParser.getInstance().replacePlaceHolder(
Config.getInstance().getFormatShopFailedMsg(), placeholders));
}
} else {
@@ -377,7 +378,7 @@ public class PlayerGUIs {
public void openVoteStreak(Player player, User user) {
setSelectedPlayer(player, user);
BInventory inv = new BInventory(StringUtils.getInstance()
BInventory inv = new BInventory(StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getGUIVoteStreakName(), "player", user.getPlayerName()));
inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteStreakCurrentDayStreakItem())
@@ -474,12 +475,83 @@ public class PlayerGUIs {
inv.openInventory(player);
}
public void openVoteTop(Player player, TopVoter top) {
try {
if (top == null) {
top = TopVoter.getDefault();
}
Set<Entry<User, Integer>> users = null;
String topVoter = top.getName();
@SuppressWarnings("unchecked")
LinkedHashMap<User, Integer> topVotes = (LinkedHashMap<User, Integer>) plugin.getTopVoter(top).clone();
users = topVotes.entrySet();
BInventory inv = new BInventory(StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getGUIVoteTopName(), "topvoter", topVoter));
if (!Config.getInstance().isAlwaysCloseInventory()) {
inv.dontClose();
}
int pos = 1;
for (Entry<User, Integer> entry : users) {
ItemBuilder playerItem;
if (Config.getInstance().isGuiVoteTopUseSkull()) {
playerItem = new ItemBuilder(entry.getKey().getPlayerHead());
} else {
playerItem = new ItemBuilder(
Material.valueOf(Config.getInstance().getGuiVoteTopPlayerItemMaterial()));
}
playerItem.setLore(new ArrayList<String>());
inv.addButton(new BInventoryButton(playerItem.setName(Config.getInstance().getGUIVoteTopItemName())
.addLoreLine(Config.getInstance().getGUIVoteTopItemLore()).addPlaceholder("position", "" + pos)
.addPlaceholder("player", entry.getKey().getPlayerName())
.addPlaceholder("votes", "" + entry.getValue())) {
@Override
public void onClick(ClickEvent clickEvent) {
User user = (User) getData("User");
openVoteGUI(player, user);
}
}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
pos++;
}
final TopVoter cur = top;
inv.getPageButtons().add(new BInventoryButton(
new ItemBuilder(Config.getInstance().getGUIVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
@Override
public void onClick(ClickEvent clickEvent) {
if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
openVoteTop(player, cur.next());
} else {
openVoteTop(player, cur.prev());
}
}
});
if (Config.getInstance().getGUIVoteTopBackButton()) {
inv.getPageButtons().add(getBackButton().setSlot(1));
}
inv.setPages(true);
inv.setMaxInvSize(Config.getInstance().getGUIVoteTopSize());
inv.openInventory(player);
} catch (Exception e) {
e.printStackTrace();
}
}
public void openVoteTopLastMonth(Player player) {
Set<Entry<User, Integer>> users = null;
users = plugin.getLastMonthTopVoter().entrySet();
BInventory inv = new BInventory(StringUtils.getInstance()
BInventory inv = new BInventory(StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getGUIVoteTopName(), "topvoter", "Last Month"));
if (!Config.getInstance().isAlwaysCloseInventory()) {
inv.dontClose();
@@ -521,74 +593,9 @@ public class PlayerGUIs {
}
public void openVoteTop(Player player, TopVoter top) {
if (top == null) {
top = TopVoter.getDefault();
}
Set<Entry<User, Integer>> users = null;
String topVoter = top.getName();
users = plugin.getTopVoter(top).entrySet();
BInventory inv = new BInventory(StringUtils.getInstance()
.replacePlaceHolder(Config.getInstance().getGUIVoteTopName(), "topvoter", topVoter));
if (!Config.getInstance().isAlwaysCloseInventory()) {
inv.dontClose();
}
int pos = 1;
for (Entry<User, Integer> entry : users) {
ItemBuilder playerItem;
if (Config.getInstance().isGuiVoteTopUseSkull()) {
playerItem = new ItemBuilder(entry.getKey().getPlayerHead());
} else {
playerItem = new ItemBuilder(Material.valueOf(Config.getInstance().getGuiVoteTopPlayerItemMaterial()));
}
playerItem.setLore(new ArrayList<String>());
inv.addButton(new BInventoryButton(playerItem.setName(Config.getInstance().getGUIVoteTopItemName())
.addLoreLine(Config.getInstance().getGUIVoteTopItemLore()).addPlaceholder("position", "" + pos)
.addPlaceholder("player", entry.getKey().getPlayerName())
.addPlaceholder("votes", "" + entry.getValue())) {
@Override
public void onClick(ClickEvent clickEvent) {
User user = (User) getData("User");
openVoteGUI(player, user);
}
}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
pos++;
}
final TopVoter cur = top;
inv.getPageButtons().add(new BInventoryButton(
new ItemBuilder(Config.getInstance().getGUIVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
@Override
public void onClick(ClickEvent clickEvent) {
if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
openVoteTop(player, cur.next());
} else {
openVoteTop(player, cur.prev());
}
}
});
if (Config.getInstance().getGUIVoteTopBackButton()) {
inv.getPageButtons().add(getBackButton().setSlot(1));
}
inv.setPages(true);
inv.setMaxInvSize(Config.getInstance().getGUIVoteTopSize());
inv.openInventory(player);
}
public void openVoteTotal(Player player, User user) {
setSelectedPlayer(player, user);
BInventory inv = new BInventory(StringUtils.getInstance()
BInventory inv = new BInventory(StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getGUIVoteTotalName(), "player", user.getPlayerName()));
for (TopVoter top : TopVoter.values()) {
@@ -624,8 +631,14 @@ public class PlayerGUIs {
if (Config.getInstance().getVoteURLViewAllUrlsButtonEnabled()) {
ItemBuilder builderAll = new ItemBuilder(
Config.getInstance().getVoteURLAlreadyVotedAllUrlsButtonItemSection());
if (user.canVoteAll()) {
builderAll = new ItemBuilder(Config.getInstance().getVoteURLCanVoteAllUrlsButtonItemSection());
if (Config.getInstance().isGuiVoteURLAllUrlsButtonrequireAllSitesVoted()) {
if (user.canVoteAny()) {
builderAll = new ItemBuilder(Config.getInstance().getVoteURLCanVoteAllUrlsButtonItemSection());
}
} else {
if (user.canVoteAll()) {
builderAll = new ItemBuilder(Config.getInstance().getVoteURLCanVoteAllUrlsButtonItemSection());
}
}
if (!builderAll.hasCustomDisplayName()) {
@@ -641,7 +654,6 @@ public class PlayerGUIs {
public void onClick(ClickEvent event) {
User user = UserManager.getInstance().getVotingPluginUser(event.getPlayer());
user.sendMessage(Commands.getInstance().voteURLs(user));
}
});
@@ -670,8 +682,8 @@ public class PlayerGUIs {
voteReward(player, voteSite.getKey());
} else {
User user = UserManager.getInstance().getVotingPluginUser(player);
user.sendMessage(StringUtils.getInstance().replacePlaceHolder(StringUtils.getInstance()
.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
user.sendMessage(StringParser.getInstance().replacePlaceHolder(StringParser.getInstance()
.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
Config.getInstance().getGUIVoteURLURLText(), "voteurl",
voteSite.getVoteURL()), "sitename", voteSite.getDisplayName()),
"player", player.getName()));
@@ -694,7 +706,7 @@ public class PlayerGUIs {
public void openVoteURL(Player player, String voteSite) {
User user = UserManager.getInstance().getVotingPluginUser(player);
VoteSite site = plugin.getVoteSite(voteSite);
BInventory inv = new BInventory(StringUtils.getInstance()
BInventory inv = new BInventory(StringParser.getInstance()
.replacePlaceHolder(Config.getInstance().getGUIVoteURLSiteName(), "site", site.getDisplayName()));
inv.setMeta(player, "VoteSite", site);
if (!Config.getInstance().isAlwaysCloseInventory()) {
@@ -11,7 +11,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter;
import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
import com.Ben12345rocks.VotingPlugin.Main;
/**
@@ -39,7 +39,7 @@ public class AdminVoteTabCompleter implements TabCompleter {
args.length - 1));
for (String str : cmds) {
if (StringUtils.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
if (StringParser.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
tab.add(str);
}
}
@@ -13,8 +13,8 @@ import org.bukkit.command.TabCompleter;
import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
import com.Ben12345rocks.VotingPlugin.Main;
/**
@@ -87,7 +87,7 @@ public class AliasesTabCompleter implements TabCompleter {
}
for (String str : cmds) {
if (StringUtils.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
if (StringParser.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
tab.add(str);
}
}
@@ -11,7 +11,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter;
import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
import com.Ben12345rocks.VotingPlugin.Main;
// TODO: Auto-generated Javadoc
@@ -40,7 +40,7 @@ public class VoteTabCompleter implements TabCompleter {
args.length - 1));
for (String str : cmds) {
if (StringUtils.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
if (StringParser.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
tab.add(str);
}
}
@@ -137,6 +137,10 @@ public class Config extends YMLFile {
@ConfigDataBoolean(path = "AutoCreateVoteSites")
@Getter
private boolean autoCreateVoteSites = true;
@ConfigDataBoolean(path = "GUI.VoteURL.AllUrlsButton.RequireAllSitesVoted")
@Getter
private boolean guiVoteURLAllUrlsButtonrequireAllSitesVoted = true;
@ConfigDataBoolean(path = "Format.BroadcastVote")
@Getter
@@ -287,6 +291,18 @@ public class Config extends YMLFile {
@Getter
private String formatCommandsVoteTodayLine = "&6%player% : %VoteSite% : %Time%";
@ConfigDataBoolean(path = "OverrideVersionDisable")
@Getter
private boolean overrideVersionDisable = false;
@ConfigDataBoolean(path = "LastMonthGUI")
@Getter
private boolean lastMonthGUI = false;
@ConfigDataBoolean(path = "AllowUnJoinedCheckServer")
@Getter
private boolean allowUnJoinedCheckServer = true;
/**
* Instantiates a new config.
*/
@@ -1263,18 +1279,14 @@ public class Config extends YMLFile {
return getData().getString("GUI.VoteShopName", "VoteShop");
}
public boolean getVoteShopNotBuyable(String shop) {
return getData().getBoolean("Shop." + shop + ".NotBuyable", false);
}
public String getVoteShopPermission(String ident) {
return getData().getString("Shop." + ident + ".Permission", "");
}
@ConfigDataBoolean(path = "OverrideVersionDisable")
@Getter
private boolean overrideVersionDisable = false;
@ConfigDataBoolean(path = "LastMonthGUI")
@Getter
private boolean lastMonthGUI = false;
/**
* Gets the vote site items.
*
@@ -1310,10 +1322,6 @@ public class Config extends YMLFile {
return getData().getInt("GUI.VoteReward." + siteName + ".Items." + item + ".Slot");
}
public boolean getVoteShopNotBuyable(String shop) {
return getData().getBoolean("Shop." + shop + ".NotBuyable", false);
}
/**
* Gets the votes required.
*
@@ -78,8 +78,8 @@ public class ServerData {
getData().set("Signs." + count + ".Data", data);
getData().set("Signs." + count + ".Position", position);
saveData();
plugin.getSigns().add(new SignHandler("" + count, getSignLocation("" + count), getSignData("" + count),
getSignPosition("" + count)));
plugin.getSigns().add(new SignHandler("" + count, getSignLocation("" + count), getSignSkullLocation("" + count),
getSignData("" + count), getSignPosition("" + count)));
}
/**
@@ -127,6 +127,22 @@ public class ServerData {
getData().getDouble("Signs." + sign + ".Z"));
}
/**
* Gets the sign location.
*
* @param sign
* the sign
* @return the sign location
*/
public Location getSignSkullLocation(String sign) {
if (getData().getString("Signs." + sign + ".Skull.World", "").isEmpty()) {
return null;
}
return new Location(Bukkit.getWorld(getData().getString("Signs." + sign + ".Skull.World")),
getData().getDouble("Signs." + sign + ".Skull.X"), getData().getDouble("Signs." + sign + ".Skull.Y"),
getData().getDouble("Signs." + sign + ".Skull.Z"));
}
/**
* Gets the sign position.
*
@@ -194,6 +210,10 @@ public class ServerData {
getData().set("Signs." + sign + ".Data", null);
getData().set("Signs." + sign + ".Position", null);
getData().set("Signs." + sign, null);
getData().set("Signs." + sign + ".Skull.World", null);
getData().set("Signs." + sign + ".Skull.X", null);
getData().set("Signs." + sign + ".Skull.Y", null);
getData().set("Signs." + sign + ".Skull.Z", null);
saveData();
}
@@ -209,31 +229,32 @@ public class ServerData {
saveData();
}
/**
* Sets the sign.
*
* @param count
* the count
* @param location
* the location
* @param data
* the data
* @param position
* the position
*/
public void setSign(String count, Location location, String data, int position) {
public void setSign(String count, Location location, Location skullLocation, String data, int position) {
getData().set("Signs." + count + ".World", location.getWorld().getName());
int x = (int) location.getX();
int z = (int) location.getZ();
getData().set("Signs." + count + ".X", x);
getData().set("Signs." + count + ".Y", location.getY());
getData().set("Signs." + count + ".Z", z);
getData().set("Signs." + count + ".X", (int) location.getX());
getData().set("Signs." + count + ".Y", (int) location.getY());
getData().set("Signs." + count + ".Z", (int) location.getZ());
getData().set("Signs." + count + ".Data", data);
getData().set("Signs." + count + ".Position", position);
if (skullLocation != null) {
getData().set("Signs." + count + ".Skull.World", skullLocation.getWorld().getName());
getData().set("Signs." + count + ".Skull.X", (int) skullLocation.getX());
getData().set("Signs." + count + ".Skull.Y", (int) skullLocation.getY());
getData().set("Signs." + count + ".Skull.Z", (int) skullLocation.getZ());
}
saveData();
}
public void setSkullLocation(String count, Location skullLocation) {
if (skullLocation != null) {
getData().set("Signs." + count + ".Skull.World", skullLocation.getWorld().getName());
getData().set("Signs." + count + ".Skull.X", (int) skullLocation.getX());
getData().set("Signs." + count + ".Skull.Y", (int) skullLocation.getY());
getData().set("Signs." + count + ".Skull.Z", (int) skullLocation.getZ());
}
}
/**
* Sets the version.
*/
@@ -1,6 +1,7 @@
package com.Ben12345rocks.VotingPlugin.Listeners;
import org.bukkit.block.Sign;
import org.bukkit.block.Skull;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
@@ -8,6 +9,7 @@ import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEvent;
import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
import com.Ben12345rocks.VotingPlugin.Main;
import com.Ben12345rocks.VotingPlugin.Signs.SignHandler;
import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
@@ -49,9 +51,33 @@ public class PlayerInteract implements Listener {
// plugin.debug(player.getName() +
// " right clicked a top voter sign, sending message");
UserManager.getInstance().getVotingPluginUser(player).sendMessage(sign.getRightClickMessage());
if (!sign.isSkullSet()) {
if (PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(),
"VotingPlugin.Sign.Create")
|| PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(),
"VotingPlugin.Admin")) {
player.sendMessage("Skull not set, click to set skull");
PlayerUtils.getInstance().setPlayerMeta(player, "skullset", sign.getSign());
}
}
}
}
} else if (event.getClickedBlock().getState() instanceof Skull) {
Object ob = PlayerUtils.getInstance().getPlayerMeta(player, "skullset");
if (ob != null) {
String sign1 = (String) ob;
for (SignHandler sign : plugin.getSigns()) {
if (sign.getSign().equals(sign1)) {
sign.setSkullLocation(event.getClickedBlock().getLocation());
sign.storeSign();
sign.checkSkulls();
player.sendMessage("Skull set");
}
}
PlayerUtils.getInstance().setPlayerMeta(player, "skullset", null);
}
}
}
}
@@ -47,7 +47,7 @@ public class PlayerJoinEvent implements Listener {
User user = UserManager.getInstance().getVotingPluginUser(player);
if (player.isOp() && plugin.isYmlError()) {
user.sendMessage("&cVotingPlugin: Detected yml error, please chceck console for details");
user.sendMessage("&cVotingPlugin: Detected yml error, please check console for details");
}
// run remind
@@ -54,7 +54,7 @@ public class PlayerVoteListener implements Listener {
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onplayerVote(PlayerVoteEvent event) {
String playerName = event.getPlayer();
if (!PlayerUtils.getInstance().isValidUser(playerName)) {
if (!PlayerUtils.getInstance().isValidUser(playerName, Config.getInstance().isAllowUnJoinedCheckServer())) {
if (!config.isAllowUnjoined()) {
plugin.getLogger().warning("Player " + playerName
+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
@@ -5,8 +5,8 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.SignChangeEvent;
import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
import com.Ben12345rocks.VotingPlugin.Main;
import com.Ben12345rocks.VotingPlugin.Config.Config;
import com.Ben12345rocks.VotingPlugin.Data.ServerData;
@@ -51,7 +51,7 @@ public class SignChange implements Listener {
try {
ServerData.getInstance().addSign(event.getBlock().getLocation(), event.getLine(2),
Integer.parseInt(event.getLine(1)));
event.getPlayer().sendMessage(StringUtils.getInstance().colorize("&aAdded sign!"));
event.getPlayer().sendMessage(StringParser.getInstance().colorize("&aAdded sign!"));
Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
@Override
@@ -60,12 +60,12 @@ public class SignChange implements Listener {
}
});
} catch (Exception ex) {
event.getPlayer().sendMessage(StringUtils.getInstance().colorize("&cError on sign creation!"));
event.getPlayer().sendMessage(StringParser.getInstance().colorize("&cError on sign creation!"));
ex.printStackTrace();
}
} else {
event.getPlayer()
.sendMessage(StringUtils.getInstance().colorize(Config.getInstance().getFormatNoPerms()));
.sendMessage(StringParser.getInstance().colorize(Config.getInstance().getFormatNoPerms()));
}
}
@@ -102,7 +102,6 @@ public class VotiferEvent implements Listener {
}
plugin.getLogger()
.info("Current known service sites: " + ArrayUtils.getInstance().makeStringList(services));
}
PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName), voteUsername,
@@ -32,6 +32,7 @@ import com.Ben12345rocks.AdvancedCore.Rewards.Reward;
import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
import com.Ben12345rocks.AdvancedCore.Rewards.RewardPlaceholderHandle;
import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInject;
import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInjectConfigurationSection;
import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInjectInt;
import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInjectValidator;
import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
@@ -41,9 +42,9 @@ import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueNumber
import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
import com.Ben12345rocks.AdvancedCore.Util.Javascript.JavascriptPlaceholderRequest;
import com.Ben12345rocks.AdvancedCore.Util.Logger.Logger;
import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
import com.Ben12345rocks.AdvancedCore.Util.Metrics.BStatsMetrics;
import com.Ben12345rocks.AdvancedCore.Util.Metrics.MCStatsMetrics;
import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
import com.Ben12345rocks.AdvancedCore.Util.Updater.Updater;
import com.Ben12345rocks.VotingPlugin.Commands.CommandLoader;
import com.Ben12345rocks.VotingPlugin.Commands.Commands;
@@ -133,6 +134,9 @@ public class Main extends AdvancedCorePlugin {
@Getter
private boolean updateStarted = false;
@Getter
private boolean ymlError = false;
/**
* Check votifier.
*/
@@ -157,6 +161,35 @@ public class Main extends AdvancedCorePlugin {
return true;
}
private void checkYMLError() {
if (config.isFailedToRead() || configVoteSites.isFailedToRead()) {
ymlError = true;
} else if (!config.isFailedToRead() && !configVoteSites.isFailedToRead()) {
ymlError = false;
}
if (config.isFailedToRead()) {
Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
@Override
public void run() {
plugin.getLogger().severe("Failed to load Config.yml");
}
}, 10);
}
if (configVoteSites.isFailedToRead()) {
Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
@Override
public void run() {
plugin.getLogger().severe("Failed to load VoteSites.yml");
}
}, 10);
}
}
public void convertDataStorage(UserStorage from, UserStorage to) {
if (from == null || to == null) {
throw new RuntimeException("Invalid Storage Method");
@@ -831,7 +864,25 @@ public class Main extends AdvancedCorePlugin {
}
}));
for (final TopVoter top : TopVoter.values())
RewardHandler.getInstance().addInjectedReward(new RewardInjectConfigurationSection("VoteBossBar") {
@Override
public String onRewardRequested(Reward arg0, com.Ben12345rocks.AdvancedCore.UserManager.User user,
ConfigurationSection section, HashMap<String, String> placeholders) {
if (section.getBoolean("Enabled")) {
user.sendBossBar(
StringParser.getInstance().replacePlaceHolder(section.getString("Message", ""),
placeholders),
section.getString("Color", "BLUE"), section.getString("Style", "SOLID"),
(double) UserManager.getInstance().getVotingPluginUser(user).getSitesVotedOn()
/ plugin.getVoteSites().size(),
section.getInt("Delay", 30));
}
return null;
}
});
for (final TopVoter top : TopVoter.values()) {
RewardHandler.getInstance().addPlaceholder(new RewardPlaceholderHandle("Total_" + top.toString()) {
@Override
@@ -840,6 +891,7 @@ public class Main extends AdvancedCorePlugin {
return "" + vUser.getTotal(top);
}
});
}
plugin.getLogger().info("Enabled VotingPlugin " + plugin.getDescription().getVersion());
@@ -990,35 +1042,6 @@ public class Main extends AdvancedCorePlugin {
}
private void checkYMLError() {
if (config.isFailedToRead() || configVoteSites.isFailedToRead()) {
ymlError = true;
} else if (!config.isFailedToRead() && !configVoteSites.isFailedToRead()) {
ymlError = false;
}
if (config.isFailedToRead()) {
Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
@Override
public void run() {
plugin.getLogger().severe("Failed to load Config.yml");
}
}, 10);
}
if (configVoteSites.isFailedToRead()) {
Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
@Override
public void run() {
plugin.getLogger().severe("Failed to load VoteSites.yml");
}
}, 10);
}
}
/**
* Reload.
*/
@@ -1046,9 +1069,6 @@ public class Main extends AdvancedCorePlugin {
});
}
@Getter
private boolean ymlError = false;
private void setupFiles() {
config = Config.getInstance();
config.setup();
@@ -1138,7 +1158,7 @@ public class Main extends AdvancedCorePlugin {
String value = values.getValue();
if (value != null && !value.equalsIgnoreCase("null")) {
if (checkInt) {
if (StringUtils.getInstance().isInt(value)) {
if (StringParser.getInstance().isInt(value)) {
entry.getKey().getData().setInt(values.getKey(), Integer.parseInt(value));
} else {
entry.getKey().getData().setString(values.getKey(), value);
@@ -19,8 +19,8 @@ import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
import com.Ben12345rocks.AdvancedCore.TimeChecker.TimeChecker;
import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
import com.Ben12345rocks.VotingPlugin.Main;
import com.Ben12345rocks.VotingPlugin.Config.Config;
import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
@@ -187,6 +187,26 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
return true;
}
public boolean canVoteAny() {
for (VoteSite voteSite : plugin.getVoteSites()) {
boolean canVote = canVoteSite(voteSite);
if (canVote) {
return true;
}
}
return false;
}
public int getSitesVotedOn() {
int amount = 0;
for (VoteSite site : plugin.getVoteSites()) {
if (!canVoteSite(site)) {
amount++;
}
}
return amount;
}
/**
* Can vote site.
*
@@ -511,17 +531,18 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
public void giveDailyTopVoterAward(int place, String path) {
new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getDailyAwardRewardsPath(path))
.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily").setOnline(isOnline())
.send(this);
.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily")
.withPlaceHolder("votes", "" + getTotal(TopVoter.Daily)).setOnline(isOnline()).send(this);
}
public void giveMonthlyTopVoterAward(int place, String path) {
new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMonthlyAwardRewardsPath(path))
.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly").setOnline(isOnline())
.send(this);
.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly")
.withPlaceHolder("votes", "" + getTotal(TopVoter.Monthly)).setOnline(isOnline()).send(this);
}
public void giveOfflineOtherRewards() {
// old reward api, will be removed in the future
ArrayList<String> offlineRewards = getOfflineOtherRewards();
for (String str : offlineRewards) {
if (str.equalsIgnoreCase("FirstVote")) {
@@ -532,7 +553,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
VoteParty.getInstance().giveReward(this, false);
} else if (str.contains("Cumulative")) {
String st = str.substring("Cumulative".length());
if (StringUtils.getInstance().isInt(st)) {
if (StringParser.getInstance().isInt(st)) {
int votesRequired = Integer.parseInt(st);
if (votesRequired != 0) {
if (Config.getInstance().getCumulativeRewardEnabled(votesRequired)) {
@@ -542,7 +563,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
}
} else if (str.contains("MileStone")) {
String st = str.substring("MileStone".length());
if (StringUtils.getInstance().isInt(st)) {
if (StringParser.getInstance().isInt(st)) {
int votesRequired = Integer.parseInt(st);
if (votesRequired > 0) {
if (Config.getInstance().getMilestoneRewardEnabled(votesRequired)) {
@@ -573,8 +594,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
public void giveWeeklyTopVoterAward(int place, String path) {
new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getWeeklyAwardRewardsPath(path))
.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly").setOnline(isOnline())
.send(this);
.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly")
.withPlaceHolder("votes", "" + getTotal(TopVoter.Weekly)).setOnline(isOnline()).send(this);
}
/**
@@ -653,6 +674,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
sendVoteEffects(true);
}
setOfflineVotes(new ArrayList<String>());
for (int i = 0; i < offlineVotes.size(); i++) {
if (plugin.hasVoteSite(offlineVotes.get(i))) {
plugin.debug("Giving offline site reward: " + offlineVotes.get(i));
@@ -662,8 +685,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
}
}
setOfflineVotes(new ArrayList<String>());
giveOfflineOtherRewards();
}
}
@@ -11,9 +11,9 @@ import org.bukkit.entity.Player;
import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
import com.Ben12345rocks.VotingPlugin.Main;
import com.Ben12345rocks.VotingPlugin.Config.Config;
import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
@@ -110,14 +110,14 @@ public class VoteSite {
public void broadcastVote(User user) {
if (!user.isVanished()) {
String playerName = user.getPlayerName();
String bc = StringUtils.getInstance().colorize(config.getFormatBroadCastMsg());
String bc = StringParser.getInstance().colorize(config.getFormatBroadCastMsg());
HashMap<String, String> placeholders = new HashMap<String, String>();
placeholders.put("player", playerName);
placeholders.put("nickname",
(user.getPlayer() != null) ? user.getPlayer().getDisplayName() : user.getPlayerName());
placeholders.put("sitename", getDisplayName());
placeholders.put("servicesite", getServiceSite());
bc = StringUtils.getInstance().replacePlaceHolder(bc, placeholders);
bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
ArrayList<Player> players = new ArrayList<Player>();
for (Player p : Bukkit.getOnlinePlayers()) {
if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
@@ -144,6 +144,10 @@ public class VoteSite {
}
}
public ConfigurationSection getSiteData() {
return configVoteSites.getData(key);
}
/**
* Give rewards.
*
@@ -36,6 +36,10 @@ public class SignHandler {
@Setter
private Location location;
@Getter
@Setter
private Location skullLocation;
@Getter
@Setter
private String data;
@@ -59,21 +63,10 @@ public class SignHandler {
@Setter
private boolean valid;
/**
* Instantiates a new sign handler.
*
* @param sign
* the sign
* @param location
* the location
* @param data
* the data
* @param position
* the position
*/
public SignHandler(String sign, Location location, String data, int position) {
public SignHandler(String sign, Location location, Location skullLocation, String data, int position) {
setSign(sign);
setLocation(location);
setSkullLocation(skullLocation);
setData(data);
this.position = position;
setValid(true);
@@ -93,6 +86,10 @@ public class SignHandler {
return false;
}
public boolean isSkullSet() {
return skullLocation != null;
}
/**
* Check skulls.
*/
@@ -100,6 +97,11 @@ public class SignHandler {
if (playerName.equalsIgnoreCase("No Player") || playerName.equals("")) {
return;
}
if (skullLocation != null) {
checkSkull(skullLocation.getBlock());
return;
}
Location loc = location;
Location loc1 = new Location(loc.getWorld(), loc.getBlockX() - 1, loc.getBlockY() - 1, loc.getBlockZ() - 1);
Location loc2 = new Location(loc.getWorld(), loc.getBlockX() + 1, loc.getBlockY() + 1, loc.getBlockZ() + 1);
@@ -160,7 +162,7 @@ public class SignHandler {
* Store sign.
*/
public void storeSign() {
ServerData.getInstance().setSign(sign, location, data, position);
ServerData.getInstance().setSign(sign, location, skullLocation, data, position);
}
/**
@@ -69,7 +69,8 @@ public class Signs {
for (String sign : ServerData.getInstance().getSigns()) {
// plugin.getLogger().info("Loading sign " + sign);
plugin.getSigns().add(new SignHandler(sign, ServerData.getInstance().getSignLocation(sign),
ServerData.getInstance().getSignData(sign), ServerData.getInstance().getSignPosition(sign)));
ServerData.getInstance().getSignSkullLocation(sign), ServerData.getInstance().getSignData(sign),
ServerData.getInstance().getSignPosition(sign)));
}
}
@@ -7,7 +7,7 @@ import org.bukkit.Bukkit;
import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
import com.Ben12345rocks.VotingPlugin.Main;
import com.Ben12345rocks.VotingPlugin.Config.Config;
import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
@@ -85,7 +85,7 @@ public class SpecialRewards {
boolean gotCumulative = false;
Set<String> votes = Config.getInstance().getCumulativeVotes();
for (String vote : votes) {
if (StringUtils.getInstance().isInt(vote)) {
if (StringParser.getInstance().isInt(vote)) {
int votesRequired = Integer.parseInt(vote);
if (votesRequired != 0) {
if (Config.getInstance().getCumulativeRewardEnabled(votesRequired)
@@ -147,7 +147,7 @@ public class SpecialRewards {
boolean gotMilestone = false;
Set<String> votes = Config.getInstance().getMilestoneVotes();
for (String vote : votes) {
if (StringUtils.getInstance().isInt(vote)) {
if (StringParser.getInstance().isInt(vote)) {
int votesRequired = Integer.parseInt(vote);
if (votesRequired != 0) {
if (Config.getInstance().getMilestoneRewardEnabled(votesRequired)
@@ -181,7 +181,7 @@ public class SpecialRewards {
// multiple
multiple = true;
}
if (StringUtils.getInstance().isInt(s)) {
if (StringParser.getInstance().isInt(s)) {
int streakRequired = Integer.parseInt(s);
if (streakRequired != 0) {
if (Config.getInstance().getVoteStreakRewardEnabled(type, streak)
@@ -22,8 +22,8 @@ import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.MonthChangeEvent;
import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.PreDateChangedEvent;
import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.WeekChangeEvent;
import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
import com.Ben12345rocks.AdvancedCore.YML.YMLFileHandler;
import com.Ben12345rocks.VotingPlugin.Main;
import com.Ben12345rocks.VotingPlugin.Config.Config;
@@ -96,6 +96,26 @@ public class TopVoterHandler implements Listener {
return place;
}
public void loadLastMonth() {
if (Config.getInstance().isLastMonthGUI()) {
plugin.getLastMonthTopVoter().clear();
LinkedHashMap<User, Integer> totals = new LinkedHashMap<User, Integer>();
for (String uuid : UserManager.getInstance().getAllUUIDs()) {
User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
int total = user.getLastMonthTotal();
if (total > 0) {
totals.put(user, total);
}
}
plugin.getLastMonthTopVoter().putAll(sortByValues(totals, false));
plugin.debug("Loaded last month top voters");
}
}
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onDateChanged(DateChangedEvent event) {
plugin.setUpdate(true);
@@ -359,7 +379,7 @@ public class TopVoterHandler implements Listener {
title = title.replace("%page%", "" + page);
title = title.replace("%maxpages%", "" + pageSize);
title = title.replace("%Top%", "All Time");
msg.add(StringUtils.getInstance().colorize(title));
msg.add(StringParser.getInstance().colorize(title));
for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
msg.add(topVoters.get(i));
@@ -399,7 +419,7 @@ public class TopVoterHandler implements Listener {
title = title.replace("%page%", "" + page);
title = title.replace("%maxpages%", "" + pageSize);
title = title.replace("%Top%", "Daily");
msg.add(StringUtils.getInstance().colorize(title));
msg.add(StringParser.getInstance().colorize(title));
for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
msg.add(topVoters.get(i));
@@ -439,7 +459,7 @@ public class TopVoterHandler implements Listener {
title = title.replace("%page%", "" + page);
title = title.replace("%maxpages%", "" + pageSize);
title = title.replace("%Top%", "Monthly");
msg.add(StringUtils.getInstance().colorize(title));
msg.add(StringParser.getInstance().colorize(title));
for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
msg.add(topVoters.get(i));
@@ -560,7 +580,7 @@ public class TopVoterHandler implements Listener {
title = title.replace("%page%", "" + page);
title = title.replace("%maxpages%", "" + pageSize);
title = title.replace("%Top%", "Weekly");
msg.add(StringUtils.getInstance().colorize(title));
msg.add(StringParser.getInstance().colorize(title));
for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
msg.add(topVoters.get(i));
@@ -570,26 +590,6 @@ public class TopVoterHandler implements Listener {
return ArrayUtils.getInstance().convert(msg);
}
public void loadLastMonth() {
if (Config.getInstance().isLastMonthGUI()) {
plugin.getLastMonthTopVoter().clear();
LinkedHashMap<User, Integer> totals = new LinkedHashMap<User, Integer>();
for (String uuid : UserManager.getInstance().getAllUUIDs()) {
User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
int total = user.getLastMonthTotal();
if (total > 0) {
totals.put(user, total);
}
}
plugin.getLastMonthTopVoter().putAll(sortByValues(totals, false));
plugin.debug("Loaded last month top voters");
}
}
public synchronized void updateTopVoters(ArrayList<User> users1) {
ArrayList<User> users = new ArrayList<User>();
ArrayList<String> blackList = getTopVoterBlackList();
@@ -6,7 +6,7 @@ import java.util.Map.Entry;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
import com.Ben12345rocks.AdvancedCore.Util.Placeholder.PlaceHolder;
import com.Ben12345rocks.VotingPlugin.Main;
import com.Ben12345rocks.VotingPlugin.Commands.Commands;
@@ -63,7 +63,7 @@ public class PlaceHolders {
}
public String getPlaceHolder(OfflinePlayer p, String identifier) {
identifier = StringUtils.getInstance().replaceJavascript(p, identifier);
identifier = StringParser.getInstance().replaceJavascript(p, identifier);
for (PlaceHolder<User> placeholder : nonPlayerPlaceholders) {
if (placeholder.matches(identifier)) {
@@ -83,7 +83,7 @@ public class PlaceHolders {
}
public String getPlaceHolder(Player p, String identifier) {
identifier = StringUtils.getInstance().replaceJavascript(p, identifier);
identifier = StringParser.getInstance().replaceJavascript(p, identifier);
return getPlaceHolder((OfflinePlayer) p, identifier);
}
@@ -13,9 +13,9 @@ import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DayChangeEvent;
import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.MonthChangeEvent;
import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
import com.Ben12345rocks.VotingPlugin.Main;
import com.Ben12345rocks.VotingPlugin.Config.Config;
import com.Ben12345rocks.VotingPlugin.Data.ServerData;
@@ -125,7 +125,7 @@ public class VoteParty implements Listener {
msg = ArrayUtils.getInstance().colorize(ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders));
sender.sendMessage(ArrayUtils.getInstance().convert(msg));
} else {
sender.sendMessage(StringUtils.getInstance().colorize("&cVoteParty not enabled"));
sender.sendMessage(StringParser.getInstance().colorize("&cVoteParty not enabled"));
}
}