Compare commits

...
19 Commits
Author SHA1 Message Date
Ben12345rocks 6833247a8c Update build path 2017-08-11 20:49:57 -04:00
Ben 46087ccad5 Merge pull request #244 from Ben12345rocks/5.9.6
5.9.6
2017-08-11 20:49:16 -04:00
Ben12345rocks 4634d6bdc2 More improvements 2017-08-11 20:38:38 -04:00
Ben12345rocks 3f451c888a Improvements to service sites 2017-08-11 20:36:49 -04:00
Ben12345rocks ea448e3920 Bug fix 2017-08-11 20:25:33 -04:00
Ben12345rocks 169aaf026e Update version number 2017-08-11 14:11:01 -04:00
Ben12345rocks 0af3f7f2bc Update build path 2017-08-08 10:38:50 -04:00
Ben b3baa33c39 Merge pull request #240 from Ben12345rocks/5.9.5
5.9.5
2017-08-08 10:34:31 -04:00
Ben12345rocks e7f8aac88d Bug fix 2017-08-08 10:30:12 -04:00
Ben12345rocks 6ce4040bae Update build path 2017-08-07 17:37:44 -04:00
Ben12345rocks f5e38b2b1b Update version number 2017-08-07 17:22:19 -04:00
Ben12345rocks 9fdb9b4efb Minor change to user api 2017-08-06 12:44:57 -04:00
Ben12345rocks 29f020bdc0 Bug fix 2017-08-03 18:22:34 -04:00
Ben12345rocks cce5bb0672 Bug fix, closes #238 2017-08-03 17:47:43 -04:00
Ben12345rocks 8a0cd0426c Fix offline top voter messaging 2017-08-02 21:02:38 -04:00
Ben12345rocks 397c4392a0 Update perms list 2017-08-02 19:33:27 -04:00
Ben12345rocks 4784b372c9 Make site names non case sensitive, closes #235 2017-07-31 20:09:35 -04:00
Ben12345rocks 1521d0787c Add vanish support for broadcasting, closes #232 2017-07-31 20:05:30 -04:00
Ben12345rocks 9cbcb74822 Improve last vote time showing when never voted, closes #237 2017-07-31 19:57:07 -04:00
12 changed files with 94 additions and 97 deletions

No files matched your search

@@ -2,8 +2,11 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -64,12 +67,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -81,7 +86,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=info
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
@@ -92,6 +97,9 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
@@ -99,6 +107,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+5 -1
View File
@@ -678,7 +678,7 @@ EnableMonthlyAwards: true
MonthlyAwards:
# Position. 1 is first in top voter, 2 is second, etc...
1:
Rewards:
Rewards:
Messages:
Player: '&aYou came in first place in %TopVoter%!'
2:
@@ -765,3 +765,7 @@ DelayBetweenUpdates: 3
# Set to true to disable no service site message on voting
# You should never have to touch this if everything is setup properly
DisableNoServiceSiteMessage: false
# Used in special cases
# Much slower, but may work better
AlternateUUIDLookup: false
+2 -2
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.Ben12345rocks</groupId>
<artifactId>VotingPlugin</artifactId>
<version>5.9.4</version>
<version>5.9.6</version>
<packaging>jar</packaging>
<name>VotingPlugin</name>
<properties>
@@ -161,7 +161,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.12-R0.1-SNAPSHOT</version>
<version>1.12.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -226,7 +226,20 @@ public class CommandLoader {
public void execute(CommandSender sender, String[] args) {
User user = UserManager.getInstance().getVotingPluginUser(args[1]);
user.addPoints(Integer.parseInt(args[2]));
sender.sendMessage(StringUtils.getInstance().colorize("&cGave " + args[1] + " " + args[2] + " points"));
sender.sendMessage(StringUtils.getInstance().colorize("&cGave " + args[1] + " " + args[2] + " points"
+ ", " + args[1] + " now has " + user.getPoints() + " points"));
}
});
plugin.adminVoteCommand.add(new CommandHandler(new String[] { "RemovePoints", "(player)", "(number)" },
"VotingPlugin.Commands.AdminVote.RemovePoints|" + adminPerm, "Remove voting points") {
@Override
public void execute(CommandSender sender, String[] args) {
User user = UserManager.getInstance().getVotingPluginUser(args[1]);
user.removePoints(Integer.parseInt(args[2]));
sender.sendMessage(StringUtils.getInstance().colorize("&cRemoved " + args[2] + " points from " + args[1]
+ ", " + args[1] + " now has " + user.getPoints() + " points"));
}
});
@@ -468,7 +481,8 @@ public class CommandLoader {
@Override
public void execute(CommandSender sender, String[] args) {
CommandAdminVote.getInstance().setVoteSiteServiceSite(sender, args[1], args[3]);
CommandAdminVote.getInstance().setVoteSiteServiceSite(sender, plugin.getVoteSiteName(args[1]),
args[3]);
}
});
@@ -478,7 +492,8 @@ public class CommandLoader {
@Override
public void execute(CommandSender sender, String[] args) {
CommandAdminVote.getInstance().setVoteSiteVoteURL(sender, args[1], args[3]);
CommandAdminVote.getInstance().setVoteSiteVoteURL(sender, plugin.getVoteSiteName(args[1]),
args[3]);
}
});
@@ -489,7 +504,8 @@ public class CommandLoader {
@Override
public void execute(CommandSender sender, String[] args) {
CommandAdminVote.getInstance().setVoteSitePriority(sender, args[1], Integer.parseInt(args[3]));
CommandAdminVote.getInstance().setVoteSitePriority(sender, plugin.getVoteSiteName(args[1]),
Integer.parseInt(args[3]));
}
});
@@ -501,7 +517,8 @@ public class CommandLoader {
@Override
public void execute(CommandSender sender, String[] args) {
CommandAdminVote.getInstance().setVoteSiteVoteDelay(sender, args[1], Integer.parseInt(args[3]));
CommandAdminVote.getInstance().setVoteSiteVoteDelay(sender, plugin.getVoteSiteName(args[1]),
Integer.parseInt(args[3]));
}
});
@@ -531,7 +548,7 @@ public class CommandLoader {
@Override
public void execute(CommandSender sender, String[] args) {
CommandAdminVote.getInstance().setVoteSiteEnabled(sender, args[1],
CommandAdminVote.getInstance().setVoteSiteEnabled(sender, plugin.getVoteSiteName(args[1]),
Boolean.parseBoolean(args[3]));
}
@@ -543,7 +560,7 @@ public class CommandLoader {
@Override
public void execute(CommandSender sender, String[] args) {
CommandAdminVote.getInstance().checkVoteSite(sender, args[1]);
CommandAdminVote.getInstance().checkVoteSite(sender, plugin.getVoteSiteName(args[1]));
}
});
@@ -197,7 +197,7 @@ public class Commands {
ArrayList<String> msg = new ArrayList<String>();
for (CommandHandler handle : plugin.voteCommand) {
msg.add(handle.getHelpLineCommand("/v") + " : " + handle.getPerm());
msg.add(handle.getHelpLineCommand("/vote") + " : " + handle.getPerm());
}
for (CommandHandler handle : plugin.adminVoteCommand) {
@@ -527,9 +527,13 @@ public class Commands {
* @return the string
*/
public String voteCommandLastDate(User user, VoteSite voteSite) {
Date date = new Date(user.getTime(voteSite));
String timeString = new SimpleDateFormat(config.getFormatTimeFormat()).format(date);
return timeString;
long time = user.getTime(voteSite);
if (time > 0) {
Date date = new Date(time);
String timeString = new SimpleDateFormat(config.getFormatTimeFormat()).format(date);
return timeString;
}
return "";
}
public String voteCommandLastLine(User user, VoteSite voteSite) {
@@ -859,6 +859,10 @@ public class Config extends YMLFile {
public String getMonthlyAwardRewardsPath(int pos) {
return "MonthlyAwards." + pos + ".Rewards";
}
public boolean getAlternateUUIDLookup() {
return getData().getBoolean("AlternateUUIDLookup");
}
/**
* Gets the monthly awards enabled.
@@ -7,6 +7,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
import com.Ben12345rocks.VotingPlugin.Main;
import com.Ben12345rocks.VotingPlugin.Config.Config;
import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
@@ -57,6 +58,15 @@ public class VotiferEvent implements Listener {
if (voteSite == null) {
if (!Config.getInstance().getDisableNoServiceSiteMessage()) {
plugin.getLogger().warning("No voting site with the service site: '" + voteSiteURL + "'");
plugin.getLogger().warning(
"Please read here on how to fix it: https://github.com/Ben12345rocks/VotingPlugin/wiki/Common-Problems");
ArrayList<String> services = new ArrayList<String>();
for (VoteSite site : plugin.getVoteSites()) {
services.add(site.getServiceSite());
}
plugin.getLogger().warning(
"Current service sites: " + ArrayUtils.getInstance().makeStringList(services));
}
return;
}
@@ -228,11 +228,16 @@ public class Main extends JavaPlugin {
for (String siteName : sites) {
String URL = ConfigVoteSites.getInstance().getServiceSite(siteName);
if (URL != null) {
if (URL.equals(url)) {
if (URL.equalsIgnoreCase(url)) {
return siteName;
}
}
}
for (String siteName : sites) {
if (siteName.equalsIgnoreCase(url)) {
return siteName;
}
}
}
return url;
@@ -842,6 +847,7 @@ public class Main extends JavaPlugin {
AdvancedCoreHook.getInstance().setHelpLine(Config.getInstance().getFormatHelpLine());
AdvancedCoreHook.getInstance().setLogDebugToFile(Config.getInstance().getLogDebugToFile());
AdvancedCoreHook.getInstance().setSendScoreboards(Config.getInstance().getSendScoreboards());
AdvancedCoreHook.getInstance().setAlternateUUIDLookUp(Config.getInstance().getAlternateUUIDLookup());
}
}
@@ -11,13 +11,12 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
import com.Ben12345rocks.AdvancedCore.Objects.UUID;
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.Config.Config;
@@ -133,6 +132,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
public void addTotal() {
addMonthTotal();
addAllTimeTotal();
setMilestoneCount(getMilestoneCount()+1);
}
/**
@@ -253,21 +253,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
setWeeklyTotal(0);
}
/**
* Daily top voter award.
*
* @param place
* the place
*/
public void dailyTopVoterAward(int place) {
if (PlayerUtils.getInstance().isPlayerOnline(getPlayerName())) {
// online
giveDailyTopVoterAward(place);
} else {
addOfflineOtherReward("DailyTopVoter" + place);
}
}
public int getAllTimeTotal() {
return getUserData().getInt("AllTimeTotal");
}
@@ -419,13 +404,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
* the place
*/
public void giveDailyTopVoterAward(int place) {
RewardHandler.getInstance().giveReward(this, Config.getInstance().getData(),
Config.getInstance().getDailyAwardRewardsPath(place));
Player player = Bukkit.getPlayer(java.util.UUID.fromString(getUUID()));
if (player != null) {
player.sendMessage(StringUtils.getInstance()
.colorize(Config.getInstance().getFormatTopVoterRewardMsg().replace("%place%", "" + place)));
}
new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getDailyAwardRewardsPath(place))
.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily").send(this);
}
/**
@@ -435,13 +415,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
* the place
*/
public void giveMonthlyTopVoterAward(int place) {
RewardHandler.getInstance().giveReward(this, Config.getInstance().getData(),
Config.getInstance().getMonthlyAwardRewardsPath(place));
Player player = Bukkit.getPlayer(java.util.UUID.fromString(getUUID()));
if (player != null) {
player.sendMessage(StringUtils.getInstance()
.colorize(Config.getInstance().getFormatTopVoterRewardMsg().replace("%place%", "" + place)));
}
new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMonthlyAwardRewardsPath(place))
.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly").send(this);
}
public void giveOfflineOtherRewards() {
@@ -531,13 +506,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
* the place
*/
public void giveWeeklyTopVoterAward(int place) {
RewardHandler.getInstance().giveReward(this, Config.getInstance().getData(),
Config.getInstance().getWeeklyAwardRewardsPath(place));
Player player = Bukkit.getPlayer(java.util.UUID.fromString(getUUID()));
if (player != null) {
player.sendMessage(StringUtils.getInstance()
.colorize(Config.getInstance().getFormatTopVoterRewardMsg().replace("%place%", "" + place)));
}
new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getWeeklyAwardRewardsPath(place))
.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly").send(this);
}
/**
@@ -581,21 +551,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
}
}
/**
* Monthly top voter award.
*
* @param place
* the place
*/
public void monthlyTopVoterAward(int place) {
if (PlayerUtils.getInstance().isPlayerOnline(getPlayerName())) {
// online
giveMonthlyTopVoterAward(place);
} else {
addOfflineOtherReward("MonthlyTopVoter" + place);
}
}
/**
* Off vote.
*/
@@ -804,19 +759,4 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
}
}
/**
* Weekly top voter award.
*
* @param place
* the place
*/
public void weeklyTopVoterAward(int place) {
if (PlayerUtils.getInstance().isPlayerOnline(getPlayerName())) {
// online
giveWeeklyTopVoterAward(place);
} else {
addOfflineOtherReward("WeeklyTopVoter" + place);
}
}
}
@@ -78,10 +78,12 @@ public class VoteSite {
* the user
*/
public void broadcastVote(User user) {
String playerName = user.getPlayerName();
String bc = StringUtils.getInstance().colorize(config.getFormatBroadCastMsg());
bc = bc.replace("%player%", playerName).replace("%SiteName%", getDisplayName());
MiscUtils.getInstance().broadcast(bc);
if (!user.isVanished()) {
String playerName = user.getPlayerName();
String bc = StringUtils.getInstance().colorize(config.getFormatBroadCastMsg());
bc = bc.replace("%player%", playerName).replace("%SiteName%", getDisplayName());
MiscUtils.getInstance().broadcast(bc);
}
}
/**
@@ -13,6 +13,7 @@ import java.util.Map.Entry;
import java.util.Set;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
@@ -75,7 +76,7 @@ public class TopVoterHandler implements Listener {
return ArrayUtils.getInstance().convert(msg);
}
@EventHandler
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onDateChanged(DateChangedEvent event) {
ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
ArrayList<User> users = new ArrayList<User>();
@@ -86,7 +87,7 @@ public class TopVoterHandler implements Listener {
updateTopVoters(users);
}
@EventHandler
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onDayChange(DayChangeEvent event) {
for (String uuid : UserManager.getInstance().getAllUUIDs()) {
@@ -115,7 +116,7 @@ public class TopVoterHandler implements Listener {
if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
i++;
if (places.contains(Integer.toString(i))) {
user.dailyTopVoterAward(i);
user.giveDailyTopVoterAward(i);
}
}
}
@@ -124,7 +125,7 @@ public class TopVoterHandler implements Listener {
}
@EventHandler
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onMonthChange(MonthChangeEvent event) {
for (String uuid : UserManager.getInstance().getAllUUIDs()) {
User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
@@ -152,7 +153,7 @@ public class TopVoterHandler implements Listener {
if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
i++;
if (places.contains(Integer.toString(i))) {
user.monthlyTopVoterAward(i);
user.giveMonthlyTopVoterAward(i);
}
}
}
@@ -170,7 +171,7 @@ public class TopVoterHandler implements Listener {
}
@EventHandler
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onWeekChange(WeekChangeEvent event) {
for (String uuid : UserManager.getInstance().getAllUUIDs()) {
User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
@@ -198,7 +199,7 @@ public class TopVoterHandler implements Listener {
if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
i++;
if (places.contains(Integer.toString(i))) {
user.weeklyTopVoterAward(i);
user.giveWeeklyTopVoterAward(i);
}
}
}
@@ -33,11 +33,11 @@ public class UserManager {
}
public User getVotingPluginUser(OfflinePlayer player) {
return getVotingPluginUser(player.getName());
return getVotingPluginUser(new UUID(player.getUniqueId().toString()));
}
public User getVotingPluginUser(Player player) {
return getVotingPluginUser(player.getName());
return getVotingPluginUser(new UUID(player.getUniqueId().toString()));
}
@SuppressWarnings("deprecation")