Add the Jail Vote feature back in, with lots of unit testing. Closes #8
This commit is contained in:
parent
b23bdaa89b
commit
d205a35d0a
@ -40,6 +40,7 @@ public class JailMain extends JavaPlugin {
|
|||||||
private JailPayManager jpm;
|
private JailPayManager jpm;
|
||||||
private JailStickManager jsm;
|
private JailStickManager jsm;
|
||||||
private JailTimer jt;
|
private JailTimer jt;
|
||||||
|
private JailVoteManager jvm;
|
||||||
private PrisonerManager pm;
|
private PrisonerManager pm;
|
||||||
private ScoreBoardManager sbm;
|
private ScoreBoardManager sbm;
|
||||||
private MoveProtectionListener mpl;
|
private MoveProtectionListener mpl;
|
||||||
@ -84,6 +85,13 @@ public class JailMain extends JavaPlugin {
|
|||||||
cmdHand = new CommandHandler(this);
|
cmdHand = new CommandHandler(this);
|
||||||
jh = new JailHandler(this);
|
jh = new JailHandler(this);
|
||||||
pm = new PrisonerManager(this);
|
pm = new PrisonerManager(this);
|
||||||
|
|
||||||
|
try {
|
||||||
|
jvm = new JailVoteManager(this);
|
||||||
|
}catch(Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
getLogger().severe("Failed to load the Jail Vote system, please see the stacktrace above (you probably misconfigured the time).");
|
||||||
|
}
|
||||||
|
|
||||||
PluginManager plm = this.getServer().getPluginManager();
|
PluginManager plm = this.getServer().getPluginManager();
|
||||||
plm.registerEvents(new CacheListener(this), this);
|
plm.registerEvents(new CacheListener(this), this);
|
||||||
@ -132,6 +140,7 @@ public class JailMain extends JavaPlugin {
|
|||||||
getServer().getScheduler().cancelTasks(this);
|
getServer().getScheduler().cancelTasks(this);
|
||||||
|
|
||||||
update = null;
|
update = null;
|
||||||
|
jvm = null;
|
||||||
jt = null;
|
jt = null;
|
||||||
sbm = null;
|
sbm = null;
|
||||||
jpm = null;
|
jpm = null;
|
||||||
@ -213,11 +222,7 @@ public class JailMain extends JavaPlugin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** Reloads the {@link JailPayManager}. */
|
||||||
* Reloads the {@link JailPayManager}.
|
|
||||||
*
|
|
||||||
* @throws Exception If we couldn't successfully create a new Jail Pay Manager instance.
|
|
||||||
*/
|
|
||||||
public void reloadJailPayManager() {
|
public void reloadJailPayManager() {
|
||||||
this.jpm = null;
|
this.jpm = null;
|
||||||
|
|
||||||
@ -230,6 +235,21 @@ public class JailMain extends JavaPlugin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Reloads the {@link JailVoteManager}. */
|
||||||
|
public void reloadJailVoteManager() throws Exception {
|
||||||
|
if(this.jvm != null) {
|
||||||
|
for(Integer i : this.jvm.getRunningTasks().values()) {
|
||||||
|
this.getServer().getScheduler().cancelTask(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.jvm.getRunningTasks().clear();
|
||||||
|
this.jvm.getVotes().clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
this.jvm = null;
|
||||||
|
this.jvm = new JailVoteManager(this);
|
||||||
|
}
|
||||||
|
|
||||||
/** Reloads the update checker, in case they changed a setting about it. */
|
/** Reloads the update checker, in case they changed a setting about it. */
|
||||||
public void reloadUpdateCheck() {
|
public void reloadUpdateCheck() {
|
||||||
@ -283,6 +303,11 @@ public class JailMain extends JavaPlugin {
|
|||||||
public ScoreBoardManager getScoreBoardManager() {
|
public ScoreBoardManager getScoreBoardManager() {
|
||||||
return this.sbm;
|
return this.sbm;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Gets the {@link JailVoteManager} instance. */
|
||||||
|
public JailVoteManager getJailVoteManager() {
|
||||||
|
return this.jvm;
|
||||||
|
}
|
||||||
|
|
||||||
/** Gets the {@link Update} instance. */
|
/** Gets the {@link Update} instance. */
|
||||||
public Update getUpdate() {
|
public Update getUpdate() {
|
||||||
|
@ -111,6 +111,8 @@ public class JailManager {
|
|||||||
* @return The nearest {@link Jail} to the sender if it is a player or else the first jail defined.
|
* @return The nearest {@link Jail} to the sender if it is a player or else the first jail defined.
|
||||||
*/
|
*/
|
||||||
public Jail getNearestJail(CommandSender sender) {
|
public Jail getNearestJail(CommandSender sender) {
|
||||||
|
if(jails.isEmpty()) return null;
|
||||||
|
|
||||||
if(sender instanceof Player) {
|
if(sender instanceof Player) {
|
||||||
Location loc = ((Player) sender).getLocation();
|
Location loc = ((Player) sender).getLocation();
|
||||||
|
|
||||||
|
217
src/main/java/com/graywolf336/jail/JailVoteManager.java
Normal file
217
src/main/java/com/graywolf336/jail/JailVoteManager.java
Normal file
@ -0,0 +1,217 @@
|
|||||||
|
package com.graywolf336.jail;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
import com.graywolf336.jail.beans.Jail;
|
||||||
|
import com.graywolf336.jail.beans.JailVote;
|
||||||
|
import com.graywolf336.jail.beans.Prisoner;
|
||||||
|
import com.graywolf336.jail.enums.JailVoteResult;
|
||||||
|
import com.graywolf336.jail.enums.Lang;
|
||||||
|
import com.graywolf336.jail.enums.Settings;
|
||||||
|
import com.graywolf336.jail.events.PrePrisonerJailedEvent;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Manages all the votes to jail players.
|
||||||
|
*
|
||||||
|
* @author graywolf336
|
||||||
|
* @since 3.0.0
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
public class JailVoteManager {
|
||||||
|
private JailMain pl;
|
||||||
|
private HashMap<String, JailVote> votes;
|
||||||
|
private HashMap<String, Integer> tasks;
|
||||||
|
private String timerDesc, reason;
|
||||||
|
private long timerTicks, jailTime;
|
||||||
|
private int minYes;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new instance of this Jail Vote manager.
|
||||||
|
*
|
||||||
|
* @throws Exception When it can't load the time correctly
|
||||||
|
*/
|
||||||
|
public JailVoteManager(JailMain plugin) throws Exception {
|
||||||
|
this.pl = plugin;
|
||||||
|
this.votes = new HashMap<String, JailVote>();
|
||||||
|
this.tasks = new HashMap<String, Integer>();
|
||||||
|
this.reason = plugin.getConfig().getString(Settings.JAILVOTEREASON.getPath());
|
||||||
|
|
||||||
|
String timer = plugin.getConfig().getString(Settings.JAILVOTETIMER.getPath());
|
||||||
|
this.timerDesc = Util.getDurationBreakdown(Util.getTime(timer));
|
||||||
|
this.timerTicks = Util.getTime(timer, TimeUnit.SECONDS) * 20;
|
||||||
|
this.jailTime = Util.getTime(plugin.getConfig().getString(Settings.JAILVOTETIME.getPath()));
|
||||||
|
this.minYes = plugin.getConfig().getInt(Settings.JAILMINYESVOTES.getPath());
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Gets all the votes to jail someone. */
|
||||||
|
public HashMap<String, JailVote> getVotes() {
|
||||||
|
return this.votes;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the jail vote for the given player name, returning null if it doesn't exist.
|
||||||
|
*
|
||||||
|
* @param name of the player to get the jail vote for
|
||||||
|
* @return {@link JailVote} for the player
|
||||||
|
*/
|
||||||
|
public JailVote getVoteForPlayer(String name) {
|
||||||
|
return this.votes.get(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds a vote to jail someone.
|
||||||
|
*
|
||||||
|
* @param v the {@link JailVote} to add.
|
||||||
|
* @return true if the vote was added, false if a vote already exists for that player name.
|
||||||
|
*/
|
||||||
|
public boolean addVote(JailVote v) {
|
||||||
|
if(this.votes.containsKey(v.getPlayerName())) {
|
||||||
|
return false;
|
||||||
|
}else {
|
||||||
|
this.votes.put(v.getPlayerName(), v);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds a vote for the given player's name.
|
||||||
|
*
|
||||||
|
* @param name the name of the player the vote is for.
|
||||||
|
* @param id the uuid of the player voting.
|
||||||
|
* @param which whether they are voting yes or no, true if yes false if no.
|
||||||
|
* @return True if the vote was successful, false if it was unsuccessful.
|
||||||
|
*/
|
||||||
|
public boolean addVote(String name, UUID id, boolean which) {
|
||||||
|
if(this.votes.containsKey(name)) {
|
||||||
|
pl.debug(id.toString() + " voted " + (which ? "yes" : "no") + " to jail " + name);
|
||||||
|
if(which) {
|
||||||
|
return this.votes.get(name).voteYes(id);
|
||||||
|
}else {
|
||||||
|
return this.votes.get(name).voteNo(id);
|
||||||
|
}
|
||||||
|
}else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean hasVotedAlready(String name, UUID id) {
|
||||||
|
if(this.votes.containsKey(name)) {
|
||||||
|
return this.votes.get(name).hasVoted(id);
|
||||||
|
}else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if a player is voted for or not.
|
||||||
|
*
|
||||||
|
* @param name of the player to check for.
|
||||||
|
* @return true if they were voted for, false if not.
|
||||||
|
*/
|
||||||
|
public boolean isVotedFor(String name) {
|
||||||
|
return this.votes.containsKey(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Returns the nice formatted time of how long a vote is open. */
|
||||||
|
public String getTimerLengthDescription() {
|
||||||
|
return this.timerDesc;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Returns the minimum amount of yes votes required to jail someone. */
|
||||||
|
public int getMinimumYesVotes() {
|
||||||
|
return this.minYes;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Gets the current running tasks ids. */
|
||||||
|
public HashMap<String, Integer> getRunningTasks() {
|
||||||
|
return this.tasks;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedules the calculation of whether a jail vote should jail or not jail.
|
||||||
|
*
|
||||||
|
* @param name the name of the person who is being voted to be jailed
|
||||||
|
*/
|
||||||
|
public void scheduleCalculating(final String name) {
|
||||||
|
int taskId = pl.getServer().getScheduler().runTaskLater(pl, new Runnable() {
|
||||||
|
public void run() {
|
||||||
|
doTheVoteCalculation(votes.get(name));
|
||||||
|
tasks.remove(name);
|
||||||
|
}
|
||||||
|
}, timerTicks).getTaskId();
|
||||||
|
|
||||||
|
this.tasks.put(name, taskId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculates the votes, determining whether there are enough votes to jail the person or not.
|
||||||
|
*
|
||||||
|
* @param v the {@link JailVote} to do the calculation of.
|
||||||
|
*/
|
||||||
|
public JailVoteResult doTheVoteCalculation(JailVote v) {
|
||||||
|
JailVoteResult result;
|
||||||
|
|
||||||
|
if(v.getPlayer() == null) {
|
||||||
|
pl.getServer().broadcastMessage(Lang.VOTEPLAYERNOLONGERONLINE.get(v.getPlayerName()));
|
||||||
|
result = JailVoteResult.NOTONLINE;
|
||||||
|
}else {
|
||||||
|
if(v.getYesVotes() > v.getNoVotes()) {
|
||||||
|
if(v.getYesVotes() >= getMinimumYesVotes()) {
|
||||||
|
Prisoner p = new Prisoner(v.getPlayer().getUniqueId().toString(), v.getPlayerName(), pl.getConfig().getBoolean(Settings.AUTOMATICMUTE.getPath()), jailTime, "[JailVote]", reason);
|
||||||
|
|
||||||
|
//Get the jail name, check for the nearest one
|
||||||
|
String jailName = pl.getConfig().getString(Settings.DEFAULTJAIL.getPath());
|
||||||
|
if(jailName.equalsIgnoreCase("nearest")) {
|
||||||
|
Jail j = pl.getJailManager().getNearestJail(v.getPlayer());
|
||||||
|
if(j != null) {
|
||||||
|
jailName = j.getName();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Get the jail instance from the name of jail in the params.
|
||||||
|
Jail j = pl.getJailManager().getJail(jailName);
|
||||||
|
if(j == null) {
|
||||||
|
pl.getLogger().warning("Jail Vote Failed: no jail was found?");
|
||||||
|
result = JailVoteResult.NOJAIL;
|
||||||
|
}else if(!j.isEnabled()) {
|
||||||
|
pl.getLogger().warning("Jail Vote Failed: " + Lang.WORLDUNLOADED.get(j.getName()));
|
||||||
|
result = JailVoteResult.JAILNOTENABLED;
|
||||||
|
}else {
|
||||||
|
//call the event
|
||||||
|
PrePrisonerJailedEvent event = new PrePrisonerJailedEvent(j, null, p, v.getPlayer(), v.getPlayer() == null, p.getJailer());
|
||||||
|
pl.getServer().getPluginManager().callEvent(event);
|
||||||
|
|
||||||
|
//check if the event is cancelled
|
||||||
|
if(event.isCancelled()) {
|
||||||
|
pl.getLogger().warning("Jail Vote Failed: The PrePrisonerJailedEvent was cancelled for some reason.");
|
||||||
|
result = JailVoteResult.EVENTCANCELLED;
|
||||||
|
}else {
|
||||||
|
try {
|
||||||
|
pl.getPrisonerManager().prepareJail(j, null, v.getPlayer(), p);
|
||||||
|
result = JailVoteResult.YES;
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
pl.getLogger().warning("Jail Vote Failed: The preparing the jail failed.");
|
||||||
|
result = JailVoteResult.JAILEDEXCEPTION;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else {
|
||||||
|
pl.getServer().broadcastMessage(Lang.VOTESNOTENOUGHYES.get(new String[] { v.getPlayerName(), String.valueOf(v.getYesVotes()), String.valueOf(minYes) }));
|
||||||
|
result = JailVoteResult.NOTENOUGHYESVOTES;
|
||||||
|
}
|
||||||
|
}else if(v.getYesVotes() == v.getNoVotes()) {
|
||||||
|
pl.getServer().broadcastMessage(Lang.VOTESTIED.get(v.getPlayerName()));
|
||||||
|
result = JailVoteResult.TIED;
|
||||||
|
}else {
|
||||||
|
pl.getServer().broadcastMessage(Lang.VOTESSAIDNO.get(v.getPlayerName()));
|
||||||
|
result = JailVoteResult.NO;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
votes.remove(v.getPlayerName());
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
@ -48,4 +48,14 @@ public class JailsAPI {
|
|||||||
public static HandCuffManager getHandCuffManager() {
|
public static HandCuffManager getHandCuffManager() {
|
||||||
return pl.getHandCuffManager();
|
return pl.getHandCuffManager();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The instance of the {@link JailVoteManager} which handles all the voting to jail players.
|
||||||
|
*
|
||||||
|
* @return instance of the {@link JailVoteManager}
|
||||||
|
* @see JailVoteManager
|
||||||
|
*/
|
||||||
|
public static JailVoteManager getJailVoteManager() {
|
||||||
|
return pl.getJailVoteManager();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
94
src/main/java/com/graywolf336/jail/beans/JailVote.java
Normal file
94
src/main/java/com/graywolf336/jail/beans/JailVote.java
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
package com.graywolf336.jail.beans;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents a vote to jail someone.
|
||||||
|
*
|
||||||
|
* @author graywolf336
|
||||||
|
* @since 3.0.0
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
public class JailVote {
|
||||||
|
private String name;
|
||||||
|
private ArrayList<UUID> voters;
|
||||||
|
private int yes, no;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initiates a vote to jail someone, with the vote being for the given player.
|
||||||
|
*
|
||||||
|
* @param player the name of the player the vote is for
|
||||||
|
*/
|
||||||
|
public JailVote(String player) {
|
||||||
|
this.name = player;
|
||||||
|
this.voters = new ArrayList<UUID>();
|
||||||
|
this.yes = 0;
|
||||||
|
this.no = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The name of the player the vote is for. */
|
||||||
|
public String getPlayerName() {
|
||||||
|
return this.name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the player who the vote is for, from the player name.
|
||||||
|
*
|
||||||
|
* @return the player who the vote is for to jail
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
public Player getPlayer() {
|
||||||
|
return Bukkit.getPlayer(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Checks if the player with the given id has voted already. */
|
||||||
|
public boolean hasVoted(UUID id) {
|
||||||
|
return this.voters.contains(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Method to vote yes, providing the uuid of the person doing the voting.
|
||||||
|
*
|
||||||
|
* @param id the uuid of the voter
|
||||||
|
* @return true if it was success, false if they already voted
|
||||||
|
*/
|
||||||
|
public boolean voteYes(UUID id) {
|
||||||
|
if(this.voters.contains(id)) {
|
||||||
|
return false;
|
||||||
|
}else {
|
||||||
|
this.voters.add(id);
|
||||||
|
this.yes++;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Method to vote no, providing the uuid of the person doing the voting.
|
||||||
|
*
|
||||||
|
* @param id the uuid of the voter
|
||||||
|
* @return true if it was success, false if they already voted
|
||||||
|
*/
|
||||||
|
public boolean voteNo(UUID id) {
|
||||||
|
if(this.voters.contains(id)) {
|
||||||
|
return false;
|
||||||
|
}else {
|
||||||
|
this.voters.add(id);
|
||||||
|
this.no++;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Get the amount of yes votes. */
|
||||||
|
public int getYesVotes() {
|
||||||
|
return this.yes;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Get the amount of no votes. */
|
||||||
|
public int getNoVotes() {
|
||||||
|
return this.no;
|
||||||
|
}
|
||||||
|
}
|
@ -35,6 +35,7 @@ import com.graywolf336.jail.command.subcommands.JailTimeCommand;
|
|||||||
import com.graywolf336.jail.command.subcommands.JailTransferAllCommand;
|
import com.graywolf336.jail.command.subcommands.JailTransferAllCommand;
|
||||||
import com.graywolf336.jail.command.subcommands.JailTransferCommand;
|
import com.graywolf336.jail.command.subcommands.JailTransferCommand;
|
||||||
import com.graywolf336.jail.command.subcommands.JailVersionCommand;
|
import com.graywolf336.jail.command.subcommands.JailVersionCommand;
|
||||||
|
import com.graywolf336.jail.command.subcommands.JailVoteCommand;
|
||||||
import com.graywolf336.jail.enums.Lang;
|
import com.graywolf336.jail.enums.Lang;
|
||||||
|
|
||||||
public class JailHandler {
|
public class JailHandler {
|
||||||
@ -199,6 +200,7 @@ public class JailHandler {
|
|||||||
load(JailTransferAllCommand.class);
|
load(JailTransferAllCommand.class);
|
||||||
load(JailTransferCommand.class);
|
load(JailTransferCommand.class);
|
||||||
load(JailVersionCommand.class);
|
load(JailVersionCommand.class);
|
||||||
|
load(JailVoteCommand.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void load(Class<? extends Command> c) {
|
private void load(Class<? extends Command> c) {
|
||||||
|
@ -25,11 +25,13 @@ public class JailReloadCommand implements Command {
|
|||||||
jm.getPlugin().reloadScoreBoardManager();
|
jm.getPlugin().reloadScoreBoardManager();
|
||||||
jm.getPlugin().reloadJailSticks();
|
jm.getPlugin().reloadJailSticks();
|
||||||
jm.getPlugin().reloadJailPayManager();
|
jm.getPlugin().reloadJailPayManager();
|
||||||
|
jm.getPlugin().reloadJailVoteManager();
|
||||||
jm.getPlugin().reloadUpdateCheck();
|
jm.getPlugin().reloadUpdateCheck();
|
||||||
|
|
||||||
sender.sendMessage(Lang.PLUGINRELOADED.get());
|
sender.sendMessage(Lang.PLUGINRELOADED.get());
|
||||||
}catch (Exception e) {
|
}catch (Exception e) {
|
||||||
sender.sendMessage(ChatColor.RED + "Failed to reload due to: " + e.getMessage());
|
e.printStackTrace();
|
||||||
|
sender.sendMessage(ChatColor.RED + "Failed to reload due to (see the console): " + e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -10,11 +10,11 @@ import com.graywolf336.jail.command.CommandInfo;
|
|||||||
maxArgs = 0,
|
maxArgs = 0,
|
||||||
minimumArgs = 0,
|
minimumArgs = 0,
|
||||||
needsPlayer = false,
|
needsPlayer = false,
|
||||||
pattern = "version|ver|v",
|
pattern = "version|ver",
|
||||||
permission = "jail.command.jailversion",
|
permission = "jail.command.jailversion",
|
||||||
usage = "/jail version"
|
usage = "/jail version"
|
||||||
)
|
)
|
||||||
public class JailVersionCommand implements Command{
|
public class JailVersionCommand implements Command {
|
||||||
|
|
||||||
public boolean execute(JailManager jm, CommandSender sender, String... args) {
|
public boolean execute(JailManager jm, CommandSender sender, String... args) {
|
||||||
// Sends the version number to the sender
|
// Sends the version number to the sender
|
||||||
|
@ -0,0 +1,91 @@
|
|||||||
|
package com.graywolf336.jail.command.subcommands;
|
||||||
|
|
||||||
|
import org.bukkit.command.CommandSender;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
import com.graywolf336.jail.JailManager;
|
||||||
|
import com.graywolf336.jail.JailVoteManager;
|
||||||
|
import com.graywolf336.jail.beans.JailVote;
|
||||||
|
import com.graywolf336.jail.command.Command;
|
||||||
|
import com.graywolf336.jail.command.CommandInfo;
|
||||||
|
import com.graywolf336.jail.enums.Lang;
|
||||||
|
import com.graywolf336.jail.enums.Settings;
|
||||||
|
|
||||||
|
@CommandInfo(
|
||||||
|
maxArgs = 2,
|
||||||
|
minimumArgs = 1,
|
||||||
|
needsPlayer = true,
|
||||||
|
pattern = "vote|v",
|
||||||
|
permission = "jail.usercmd.jailvote",
|
||||||
|
usage = "/jail vote [player] (yes|no)"
|
||||||
|
)
|
||||||
|
public class JailVoteCommand implements Command {
|
||||||
|
public boolean execute(JailManager jm, CommandSender sender, String... args) {
|
||||||
|
if(jm.getPlugin().getConfig().getBoolean(Settings.JAILVOTEENABLED.getPath()) && jm.getPlugin().getJailVoteManager() != null && !jm.getJails().isEmpty()) {
|
||||||
|
Player p = (Player) sender;
|
||||||
|
JailVoteManager jvm = jm.getPlugin().getJailVoteManager();
|
||||||
|
|
||||||
|
switch(args.length) {
|
||||||
|
case 2:
|
||||||
|
if(jvm.isVotedFor(args[1])) {
|
||||||
|
if(jvm.hasVotedAlready(args[1], p.getUniqueId())) {
|
||||||
|
sender.sendMessage(Lang.VOTEALREADYVOTEDFOR.get(args[1]));
|
||||||
|
}else {
|
||||||
|
if(jvm.addVote(args[1], p.getUniqueId(), true)) {
|
||||||
|
sender.sendMessage(Lang.VOTEYESSUCCESS.get(args[1]));
|
||||||
|
}else {
|
||||||
|
sender.sendMessage(Lang.VOTEUNSUCCESSFUL.get());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else if(sender.hasPermission("jail.vote.start")) {
|
||||||
|
jvm.addVote(new JailVote(args[1]));
|
||||||
|
jvm.addVote(args[1], p.getUniqueId(), true);
|
||||||
|
|
||||||
|
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTHEADER.get());
|
||||||
|
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE1.get(new String[] { sender.getName(), args[1] }));
|
||||||
|
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE2.get(args[1]));
|
||||||
|
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE3.get(args[1]));
|
||||||
|
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE4.get(jvm.getTimerLengthDescription()));
|
||||||
|
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTFOOTER.get());
|
||||||
|
|
||||||
|
jvm.scheduleCalculating(args[1]);
|
||||||
|
}else {
|
||||||
|
jm.getPlugin().debug(sender.getName() + " tried to start a vote to jail someone but didn't have permission, jail.vote.start");
|
||||||
|
sender.sendMessage(Lang.VOTENOPERMISSIONTOSTART.get(args[1]));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
String name = args[1];
|
||||||
|
|
||||||
|
if(jvm.isVotedFor(name)) {
|
||||||
|
if(jvm.hasVotedAlready(args[1], p.getUniqueId())) {
|
||||||
|
sender.sendMessage(Lang.VOTEALREADYVOTEDFOR.get(args[1]));
|
||||||
|
}else {
|
||||||
|
if(args[2].equalsIgnoreCase("yes")) {
|
||||||
|
jvm.addVote(args[1], p.getUniqueId(), true);
|
||||||
|
sender.sendMessage(Lang.VOTEYESSUCCESS.get(args[1]));
|
||||||
|
}else {
|
||||||
|
jvm.addVote(args[1], p.getUniqueId(), false);
|
||||||
|
sender.sendMessage(Lang.VOTENOSUCCESS.get(args[1]));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else {
|
||||||
|
sender.sendMessage(Lang.VOTENOVOTEFORTHATPLAYER.get(name));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}else {
|
||||||
|
sender.sendMessage(Lang.VOTENOTENABLED.get());
|
||||||
|
|
||||||
|
if(jm.getPlugin().getJailVoteManager() == null) {
|
||||||
|
jm.getPlugin().getLogger().severe("Jail Vote Manager didn't load correctly, it is null.");
|
||||||
|
}else if(jm.getJails().isEmpty()) {
|
||||||
|
jm.getPlugin().getLogger().severe("There are no jails, Jail Vote needs a Jail to work.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
22
src/main/java/com/graywolf336/jail/enums/JailVoteResult.java
Normal file
22
src/main/java/com/graywolf336/jail/enums/JailVoteResult.java
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
package com.graywolf336.jail.enums;
|
||||||
|
|
||||||
|
public enum JailVoteResult {
|
||||||
|
/** The result when the PrePrisonerJailedEvent is cancelled. */
|
||||||
|
EVENTCANCELLED,
|
||||||
|
/** The result when the jailing results in an exception for some reason. */
|
||||||
|
JAILEDEXCEPTION,
|
||||||
|
/** The result when the jail which is picked is not enabled. */
|
||||||
|
JAILNOTENABLED,
|
||||||
|
/** The result when the player who the vote is for is no longer online. */
|
||||||
|
NOTONLINE,
|
||||||
|
/** The result when there aren't enough yes votes as configured. */
|
||||||
|
NOTENOUGHYESVOTES,
|
||||||
|
/** The result when there are no jails. */
|
||||||
|
NOJAIL,
|
||||||
|
/** The result when there are more no votes than yes votes. */
|
||||||
|
NO,
|
||||||
|
/** The result when the votes are tied, resulting in no jailing. */
|
||||||
|
TIED,
|
||||||
|
/** The result when there are enough yes votes over no votes for the vote to be successful. */
|
||||||
|
YES
|
||||||
|
}
|
@ -201,6 +201,42 @@ public enum Lang {
|
|||||||
PAYPAIDLOWEREDTIME("jailpay", "paidloweredtime"),
|
PAYPAIDLOWEREDTIME("jailpay", "paidloweredtime"),
|
||||||
/** The message sent when they pay and lower someone else's time. */
|
/** The message sent when they pay and lower someone else's time. */
|
||||||
PAYPAIDLOWEREDTIMEELSE("jailpay", "paidloweredtimeelse"),
|
PAYPAIDLOWEREDTIMEELSE("jailpay", "paidloweredtimeelse"),
|
||||||
|
|
||||||
|
// Jail vote
|
||||||
|
/** The header sent when broadcasting a new jail vote. */
|
||||||
|
VOTEBROADCASTHEADER("jailvote.broadcast", "header"),
|
||||||
|
/** The footer sent when broadcasting a new jail vote. */
|
||||||
|
VOTEBROADCASTFOOTER("jailvote.broadcast", "footer"),
|
||||||
|
/** Line1 of the broadcast message sent when a new jail vote is happening. */
|
||||||
|
VOTEBROADCASTLINE1("jailvote.broadcast", "line1"),
|
||||||
|
/** Line2 of the broadcast message sent when a new jail vote is happening. */
|
||||||
|
VOTEBROADCASTLINE2("jailvote.broadcast", "line2"),
|
||||||
|
/** Line3 of the broadcast message sent when a new jail vote is happening. */
|
||||||
|
VOTEBROADCASTLINE3("jailvote.broadcast", "line3"),
|
||||||
|
/** Line4 of the broadcast message sent when a new jail vote is happening. */
|
||||||
|
VOTEBROADCASTLINE4("jailvote.broadcast", "line4"),
|
||||||
|
/** The message sent when someone tries to vote for a player when a vote isn't running. */
|
||||||
|
VOTENOVOTEFORTHATPLAYER("jailvote", "novotegoingforthatplayer"),
|
||||||
|
/** The message sent to a player who tries to start a vote to jail someone and doesn't have permission. */
|
||||||
|
VOTENOPERMISSIONTOSTART("jailvote", "nopermissiontostartvote"),
|
||||||
|
/** The message sent when jail vote is not enabled. */
|
||||||
|
VOTENOTENABLED("jailvote", "notenabled"),
|
||||||
|
/** The message sent whenever someone's vote is not successful. */
|
||||||
|
VOTEUNSUCCESSFUL("jailvote", "voteunsuccessful"),
|
||||||
|
/** The message sent whenever a player successfully votes no. */
|
||||||
|
VOTENOSUCCESS("jailvote", "votenosuccessful"),
|
||||||
|
/** The message sent whenever a player successfully votes yes. */
|
||||||
|
VOTEYESSUCCESS("jailvote", "voteyessuccessful"),
|
||||||
|
/** The message broadcasted whenever a vote is tied. */
|
||||||
|
VOTESTIED("jailvote", "votestied"),
|
||||||
|
/** The message broadcasted whenever there are more no votes. */
|
||||||
|
VOTESSAIDNO("jailvote", "morenovotes"),
|
||||||
|
/** The message broadcasted whenever there aren't the minimum yes votes. */
|
||||||
|
VOTESNOTENOUGHYES("jailvote", "notenoughyes"),
|
||||||
|
/** The message broadcasted whenever the player the vote is for is no longer online. */
|
||||||
|
VOTEPLAYERNOLONGERONLINE("jailvote", "playernolongeronline"),
|
||||||
|
/** The message sent when a player tries to vote again for someone. */
|
||||||
|
VOTEALREADYVOTEDFOR("jailvote", "alreadyvotedfor"),
|
||||||
|
|
||||||
// Confirming action messages.
|
// Confirming action messages.
|
||||||
/** The message sent when the sender is already confirming something. */
|
/** The message sent when the sender is already confirming something. */
|
||||||
|
@ -43,6 +43,11 @@ public enum Settings {
|
|||||||
JAILPAYITEM("jailpay.item"),
|
JAILPAYITEM("jailpay.item"),
|
||||||
JAILPAYPRICEPERMINUTE ("jailpay.pricePerMinute"),
|
JAILPAYPRICEPERMINUTE ("jailpay.pricePerMinute"),
|
||||||
JAILPAYPRICEINFINITE ("jailpay.priceInfinite"),
|
JAILPAYPRICEINFINITE ("jailpay.priceInfinite"),
|
||||||
|
JAILVOTEENABLED ("jailvote.enabled"),
|
||||||
|
JAILVOTETIMER ("jailvote.voteTimer"),
|
||||||
|
JAILMINYESVOTES ("jailvote.minimumYes"),
|
||||||
|
JAILVOTEREASON ("jailvote.reason"),
|
||||||
|
JAILVOTETIME ("jailvote.time"),
|
||||||
LANGUAGE("system.language"),
|
LANGUAGE("system.language"),
|
||||||
LOGJAILINGTOCONSOLE("jailing.jail.log.console"),
|
LOGJAILINGTOCONSOLE("jailing.jail.log.console"),
|
||||||
LOGJAILINGTOPROFILE("jailing.jail.log.profile"),
|
LOGJAILINGTOPROFILE("jailing.jail.log.profile"),
|
||||||
|
@ -89,4 +89,10 @@ jailpay:
|
|||||||
priceInfinite: 10000
|
priceInfinite: 10000
|
||||||
jailstick:
|
jailstick:
|
||||||
enabled: true
|
enabled: true
|
||||||
sticks: ["stick,30m,,Running away,-1", "blaze_rod,15m,,Having too much fun,6"]
|
sticks: ["stick,30m,,Running away,-1", "blaze_rod,15m,,Having too much fun,6"]
|
||||||
|
jailvote:
|
||||||
|
enabled: true #whether the jail vote is enabled
|
||||||
|
voteTimer: 60s #the length the timer has for a vote to last
|
||||||
|
minimumYes: 5 #the minimum amount of yes votes before a vote takes place (5 yes, 0 no; 5 yes, 1 no; etc)
|
||||||
|
reason: "Jailed by players via Jail Vote" #the reason why players get jailed
|
||||||
|
time: 5m #time the player gets jailed for
|
||||||
|
@ -95,6 +95,25 @@ language:
|
|||||||
paidreleasedelse: "&2You have just payed %0% and released %1% from jail!"
|
paidreleasedelse: "&2You have just payed %0% and released %1% from jail!"
|
||||||
paidloweredtime: "&2You have just payed %0% and lowered your sentence to %1% minutes!"
|
paidloweredtime: "&2You have just payed %0% and lowered your sentence to %1% minutes!"
|
||||||
paidloweredtimeelse: "&2You have just payed %0% and lowered %1%'s sentence to %2% minutes!"
|
paidloweredtimeelse: "&2You have just payed %0% and lowered %1%'s sentence to %2% minutes!"
|
||||||
|
jailvote:
|
||||||
|
broadcast:
|
||||||
|
header: "&3------------ Jail -----------"
|
||||||
|
line1: "&a%0% &bhas voted that &c%1% &bshould be jailed."
|
||||||
|
line2: "&6Type &a/jail vote %0% yes &6if you agree"
|
||||||
|
line3: "&6or type &a/jail vote %0% no &6if you disagree."
|
||||||
|
line4: "&bThis vote will be open for %0%!"
|
||||||
|
footer: "&3-----------------------------"
|
||||||
|
novotegoingforthatplayer: "&cThere is currently no vote running to jail %0%."
|
||||||
|
nopermissiontostartvote: "&cYou don't have permission to start a vote to jail %0%."
|
||||||
|
notenabled: "&cJail vote is disabled by the administrator."
|
||||||
|
voteunsuccessful: "&cYour vote to jail someone was unsuccessful, you already voted."
|
||||||
|
votenosuccessful: "&aYou successfully voted for %0% to &cnot&a be jailed!"
|
||||||
|
voteyessuccessful: "&aYou successfully voted for %0% to be jailed!"
|
||||||
|
votestied: "&cThe votes were tied, %0% was not jailed."
|
||||||
|
morenovotes: "&cThere were more votes for no, %0% was not jailed."
|
||||||
|
notenoughyes: "&cThe voting to jail %0% was not successful, %1% out of a minimum %2% yes votes were received."
|
||||||
|
playernolongeronline: "&cThe player %0% is no longer online, player not jailed."
|
||||||
|
alreadyvotedfor: "&cYou have already voted for %0%, you can't vote again."
|
||||||
handcuffing:
|
handcuffing:
|
||||||
cantbehandcuffed: '&9%0% &ccan not be handcuffed.'
|
cantbehandcuffed: '&9%0% &ccan not be handcuffed.'
|
||||||
currentlyjailed: '&9%0% &cis currently jailed, you can not handcuff a prisoner.'
|
currentlyjailed: '&9%0% &cis currently jailed, you can not handcuff a prisoner.'
|
||||||
|
@ -29,6 +29,7 @@ permissions:
|
|||||||
jail.canbestickjailed: true
|
jail.canbestickjailed: true
|
||||||
jail.openchest: true
|
jail.openchest: true
|
||||||
jail.cantbejailed: true
|
jail.cantbejailed: true
|
||||||
|
jail.vote.start: true
|
||||||
jail.command.*:
|
jail.command.*:
|
||||||
description: access to all admin commands
|
description: access to all admin commands
|
||||||
children:
|
children:
|
||||||
@ -58,12 +59,14 @@ permissions:
|
|||||||
jail.command.toggledebug: true
|
jail.command.toggledebug: true
|
||||||
jail.command.unjail: true
|
jail.command.unjail: true
|
||||||
jail.command.unjailforce: true
|
jail.command.unjailforce: true
|
||||||
|
jail.vote.start: true
|
||||||
jail.usercmd.*:
|
jail.usercmd.*:
|
||||||
description: access to all user commands
|
description: access to all user commands
|
||||||
children:
|
children:
|
||||||
jail.usercmd.jailpay: true
|
jail.usercmd.jailpay: true
|
||||||
jail.usercmd.jailstatus: true
|
jail.usercmd.jailstatus: true
|
||||||
jail.usercmd.jailstick: true
|
jail.usercmd.jailstick: true
|
||||||
|
jail.usercmd.jailvote: true
|
||||||
jail.command.jail:
|
jail.command.jail:
|
||||||
default: op
|
default: op
|
||||||
jail.command.jailcreate:
|
jail.command.jailcreate:
|
||||||
@ -142,4 +145,8 @@ permissions:
|
|||||||
jail.command.jailtime:
|
jail.command.jailtime:
|
||||||
default: op
|
default: op
|
||||||
jail.command.jailversion:
|
jail.command.jailversion:
|
||||||
|
default: op
|
||||||
|
jail.usercmd.jailvote:
|
||||||
|
default: op
|
||||||
|
jail.vote.start:
|
||||||
default: op
|
default: op
|
@ -28,7 +28,6 @@ import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
|
|||||||
import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
|
import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
|
||||||
import com.graywolf336.jail.JailMain;
|
import com.graywolf336.jail.JailMain;
|
||||||
import com.graywolf336.jail.beans.CachePrisoner;
|
import com.graywolf336.jail.beans.CachePrisoner;
|
||||||
import com.graywolf336.jail.beans.Jail;
|
|
||||||
import com.graywolf336.jail.beans.Prisoner;
|
import com.graywolf336.jail.beans.Prisoner;
|
||||||
|
|
||||||
@RunWith(PowerMockRunner.class)
|
@RunWith(PowerMockRunner.class)
|
||||||
@ -46,15 +45,7 @@ public class BenchmarkTest extends AbstractBenchmark {
|
|||||||
assertTrue(creator.setup());
|
assertTrue(creator.setup());
|
||||||
main = creator.getMain();
|
main = creator.getMain();
|
||||||
assertNotNull("The JailMain class is null.", main);
|
assertNotNull("The JailMain class is null.", main);
|
||||||
|
assertTrue("The adding of a jail failed.", creator.addJail());
|
||||||
Jail j = new Jail(main, "testingJail");
|
|
||||||
j.setWorld("world");
|
|
||||||
j.setMaxPoint(new int[] { 9, 63, -238 });
|
|
||||||
j.setMinPoint(new int[] { 23, 70, -242 });
|
|
||||||
j.setTeleportIn(new Location(main.getServer().getWorld("world"), 11.469868464778077, 65.0, -239.27944647045672, Float.valueOf("38.499817"), Float.valueOf("2.0000453")));
|
|
||||||
j.setTeleportFree(new Location(main.getServer().getWorld("world"), 27.947015843504765, 65.0, -218.8108042076112, Float.valueOf("90.54981"), Float.valueOf("12.500043")));
|
|
||||||
main.getJailManager().addJail(j, false);
|
|
||||||
|
|
||||||
assertFalse("There are no jails.", main.getJailManager().getJails().isEmpty());
|
assertFalse("There are no jails.", main.getJailManager().getJails().isEmpty());
|
||||||
|
|
||||||
for(int i = 0; i < 1000; i++) {
|
for(int i = 0; i < 1000; i++) {
|
||||||
|
@ -49,6 +49,7 @@ public class TestJailAPI {
|
|||||||
assertNotNull(main.getHandCuffManager());
|
assertNotNull(main.getHandCuffManager());
|
||||||
assertNotNull(main.getJailManager());
|
assertNotNull(main.getJailManager());
|
||||||
assertNotNull(main.getPrisonerManager());
|
assertNotNull(main.getPrisonerManager());
|
||||||
|
assertNotNull(main.getJailVoteManager());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@ -56,6 +57,7 @@ public class TestJailAPI {
|
|||||||
assertThat("The HandCuff Manager references are different.", JailsAPI.getHandCuffManager(), is(main.getHandCuffManager()));
|
assertThat("The HandCuff Manager references are different.", JailsAPI.getHandCuffManager(), is(main.getHandCuffManager()));
|
||||||
assertThat("The Jail Manager references are different.", JailsAPI.getJailManager(), is(main.getJailManager()));
|
assertThat("The Jail Manager references are different.", JailsAPI.getJailManager(), is(main.getJailManager()));
|
||||||
assertThat("The Prisoner Manager references are different.", JailsAPI.getPrisonerManager(), is(main.getPrisonerManager()));
|
assertThat("The Prisoner Manager references are different.", JailsAPI.getPrisonerManager(), is(main.getPrisonerManager()));
|
||||||
|
assertThat("The Jail Vote Manager references are different.", JailsAPI.getJailVoteManager(), is(main.getJailVoteManager()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
213
src/test/java/test/java/com/graywolf336/jail/TestJailVote.java
Normal file
213
src/test/java/test/java/com/graywolf336/jail/TestJailVote.java
Normal file
@ -0,0 +1,213 @@
|
|||||||
|
package test.java.com.graywolf336.jail;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertFalse;
|
||||||
|
import static org.junit.Assert.assertTrue;
|
||||||
|
import static org.junit.Assert.assertNotNull;
|
||||||
|
import static org.junit.Assert.assertNull;
|
||||||
|
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
import org.bukkit.plugin.PluginDescriptionFile;
|
||||||
|
import org.junit.AfterClass;
|
||||||
|
import org.junit.BeforeClass;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||||
|
import org.powermock.modules.junit4.PowerMockRunner;
|
||||||
|
|
||||||
|
import test.java.com.graywolf336.jail.util.TestInstanceCreator;
|
||||||
|
|
||||||
|
import com.graywolf336.jail.JailMain;
|
||||||
|
import com.graywolf336.jail.JailVoteManager;
|
||||||
|
import com.graywolf336.jail.beans.JailVote;
|
||||||
|
import com.graywolf336.jail.enums.JailVoteResult;
|
||||||
|
|
||||||
|
@RunWith(PowerMockRunner.class)
|
||||||
|
@PrepareForTest({ JailMain.class, PluginDescriptionFile.class })
|
||||||
|
public class TestJailVote {
|
||||||
|
private UUID[] ids = new UUID[] { UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID() };
|
||||||
|
private static TestInstanceCreator creator;
|
||||||
|
private static JailMain main;
|
||||||
|
|
||||||
|
@BeforeClass
|
||||||
|
public static void setUp() throws Exception {
|
||||||
|
creator = new TestInstanceCreator();
|
||||||
|
assertNotNull("The instance creator is null.", creator);
|
||||||
|
assertTrue(creator.setup());
|
||||||
|
main = creator.getMain();
|
||||||
|
assertNotNull("The JailMain class is null.", main);
|
||||||
|
assertTrue("The adding of a jail failed.", creator.addJail());
|
||||||
|
}
|
||||||
|
|
||||||
|
@AfterClass
|
||||||
|
public static void tearDown() throws Exception {
|
||||||
|
creator.tearDown();
|
||||||
|
main = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void verifyJailVote() {
|
||||||
|
assertNotNull("The JailVoteManager is null.", main.getJailVoteManager());
|
||||||
|
assertNotNull("The Jail Votes collection is null.", main.getJailVoteManager().getVotes());
|
||||||
|
assertNotNull("The task ids list is null.", main.getJailVoteManager().getRunningTasks());
|
||||||
|
assertEquals("There are items in the task list.", 0, main.getJailVoteManager().getRunningTasks().size());
|
||||||
|
assertNull("There is a jail vote for graywolf336.", main.getJailVoteManager().getVoteForPlayer("graywolf336"));
|
||||||
|
assertFalse("Someone has been voted for to be jailed?", main.getJailVoteManager().isVotedFor("graywolf336"));
|
||||||
|
assertEquals("The broadcast duration isn't correct.", "1m0s", main.getJailVoteManager().getTimerLengthDescription());
|
||||||
|
assertEquals("The default minimum amount of yes votes is not 5.", 5, main.getJailVoteManager().getMinimumYesVotes());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testYesVote() {
|
||||||
|
JailVoteManager jvm = main.getJailVoteManager();
|
||||||
|
String name = "yesVote";
|
||||||
|
UUID id = UUID.randomUUID();
|
||||||
|
creator.addMockPlayer(name, id);
|
||||||
|
|
||||||
|
//adding a new vote
|
||||||
|
assertTrue("There is already a vote for yesVote.", jvm.addVote(new JailVote(name)));
|
||||||
|
assertNotNull("The JailVote for yesVote is null.", jvm.getVoteForPlayer(name));
|
||||||
|
assertTrue("There is no vote to jail yesVote.", jvm.isVotedFor(name));
|
||||||
|
|
||||||
|
//0-6 yes
|
||||||
|
for(int i = 0; i < 6; i++) {
|
||||||
|
jvm.addVote(name, ids[i], true);
|
||||||
|
assertTrue(ids[i].toString() + " has already voted for yesVote.", jvm.hasVotedAlready(name, ids[i]));
|
||||||
|
}
|
||||||
|
assertEquals("There aren't six yes votes to jail yesVote.", 6, jvm.getVoteForPlayer(name).getYesVotes());
|
||||||
|
|
||||||
|
for(int i = 6; i < ids.length; i++) {
|
||||||
|
jvm.addVote(name, ids[i], false);
|
||||||
|
assertTrue(ids[i].toString() + " has already voted for yesVote.", jvm.hasVotedAlready(name, ids[i]));
|
||||||
|
}
|
||||||
|
assertEquals("There aren't four no votes to jail yesVote.", 4, jvm.getVoteForPlayer(name).getNoVotes());
|
||||||
|
|
||||||
|
assertEquals("The vote result was not successful.", JailVoteResult.YES, jvm.doTheVoteCalculation(jvm.getVoteForPlayer(name)));
|
||||||
|
assertNull("The vote for yesVote is still active", jvm.getVoteForPlayer(name));
|
||||||
|
assertFalse("The vote for yesVote is still active.", jvm.isVotedFor(name));
|
||||||
|
assertTrue("yesVote is not jailed.", main.getJailManager().isPlayerJailedByLastKnownUsername(name));
|
||||||
|
assertEquals("The jail sentence from the jail vote against yesVote isn't the default.", 300000, main.getJailManager().getPrisoner(id).getRemainingTime());
|
||||||
|
assertEquals("The reason from jail vote isn't the default.", "Jailed by players via Jail Vote", main.getJailManager().getPrisoner(id).getReason());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testNoVote() {
|
||||||
|
JailVoteManager jvm = main.getJailVoteManager();
|
||||||
|
String name = "noVote";
|
||||||
|
UUID id = UUID.randomUUID();
|
||||||
|
creator.addMockPlayer(name, id);
|
||||||
|
|
||||||
|
//adding a new vote
|
||||||
|
assertTrue("There is already a vote for noVote.", jvm.addVote(new JailVote(name)));
|
||||||
|
assertNotNull("The JailVote for noVote is null.", jvm.getVoteForPlayer(name));
|
||||||
|
assertTrue("There is no vote to jail noVote.", jvm.isVotedFor(name));
|
||||||
|
|
||||||
|
//0-6 no
|
||||||
|
for(int i = 0; i < 6; i++) {
|
||||||
|
jvm.addVote(name, ids[i], false);
|
||||||
|
assertTrue(ids[i].toString() + " has already voted for noVote.", jvm.hasVotedAlready(name, ids[i]));
|
||||||
|
}
|
||||||
|
assertEquals("There aren't six no votes to jail noVote.", 6, jvm.getVoteForPlayer(name).getNoVotes());
|
||||||
|
|
||||||
|
for(int i = 6; i < ids.length; i++) {
|
||||||
|
jvm.addVote(name, ids[i], true);
|
||||||
|
assertTrue(ids[i].toString() + " has already voted for noVote.", jvm.hasVotedAlready(name, ids[i]));
|
||||||
|
}
|
||||||
|
assertEquals("There aren't four yes votes to jail noVote.", 4, jvm.getVoteForPlayer(name).getYesVotes());
|
||||||
|
|
||||||
|
assertEquals("The vote result was not NO.", JailVoteResult.NO, jvm.doTheVoteCalculation(jvm.getVoteForPlayer(name)));
|
||||||
|
assertNull("The vote for noVote is still active", jvm.getVoteForPlayer(name));
|
||||||
|
assertFalse("The vote for noVote is still active.", jvm.isVotedFor(name));
|
||||||
|
assertFalse("noVote is jailed.", main.getJailManager().isPlayerJailed(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testTiedVote() {
|
||||||
|
JailVoteManager jvm = main.getJailVoteManager();
|
||||||
|
String name = "tiedVote";
|
||||||
|
UUID id = UUID.randomUUID();
|
||||||
|
creator.addMockPlayer(name, id);
|
||||||
|
|
||||||
|
//adding a new vote
|
||||||
|
assertTrue("There is already a vote for tiedVote.", jvm.addVote(new JailVote(name)));
|
||||||
|
assertNotNull("The JailVote for tiedVote is null.", jvm.getVoteForPlayer(name));
|
||||||
|
assertTrue("There is no vote to jail tiedVote.", jvm.isVotedFor(name));
|
||||||
|
|
||||||
|
//0-6 no
|
||||||
|
for(int i = 0; i < 5; i++) {
|
||||||
|
jvm.addVote(name, ids[i], false);
|
||||||
|
assertTrue(ids[i].toString() + " has already voted for tiedVote.", jvm.hasVotedAlready(name, ids[i]));
|
||||||
|
}
|
||||||
|
assertEquals("There aren't five no votes to jail tiedVote.", 5, jvm.getVoteForPlayer(name).getNoVotes());
|
||||||
|
|
||||||
|
for(int i = 5; i < ids.length; i++) {
|
||||||
|
jvm.addVote(name, ids[i], true);
|
||||||
|
assertTrue(ids[i].toString() + " has already voted for tiedVote.", jvm.hasVotedAlready(name, ids[i]));
|
||||||
|
}
|
||||||
|
assertEquals("There aren't five yes votes to jail tiedVote.", 5, jvm.getVoteForPlayer(name).getYesVotes());
|
||||||
|
|
||||||
|
assertEquals("The vote result was not TIED.", JailVoteResult.TIED, jvm.doTheVoteCalculation(jvm.getVoteForPlayer(name)));
|
||||||
|
assertNull("The vote for tiedVote is still active", jvm.getVoteForPlayer(name));
|
||||||
|
assertFalse("The vote for tiedVote is still active.", jvm.isVotedFor(name));
|
||||||
|
assertFalse("tiedVote is jailed.", main.getJailManager().isPlayerJailed(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testTiedButNotOnlineVote() {
|
||||||
|
JailVoteManager jvm = main.getJailVoteManager();
|
||||||
|
String name = "notOnline";
|
||||||
|
|
||||||
|
//adding a new vote
|
||||||
|
assertTrue("There is already a vote for notOnline.", jvm.addVote(new JailVote(name)));
|
||||||
|
assertNotNull("The JailVote for notOnline is null.", jvm.getVoteForPlayer(name));
|
||||||
|
assertTrue("There is no vote to jail notOnline.", jvm.isVotedFor(name));
|
||||||
|
|
||||||
|
//0-6 no
|
||||||
|
for(int i = 0; i < 5; i++) {
|
||||||
|
jvm.addVote(name, ids[i], false);
|
||||||
|
assertTrue(ids[i].toString() + " has already voted for notOnline.", jvm.hasVotedAlready(name, ids[i]));
|
||||||
|
}
|
||||||
|
assertEquals("There aren't five no votes to jail notOnline.", 5, jvm.getVoteForPlayer(name).getNoVotes());
|
||||||
|
|
||||||
|
for(int i = 5; i < ids.length; i++) {
|
||||||
|
jvm.addVote(name, ids[i], true);
|
||||||
|
assertTrue(ids[i].toString() + " has already voted for notOnline.", jvm.hasVotedAlready(name, ids[i]));
|
||||||
|
}
|
||||||
|
assertEquals("There aren't five yes votes to jail notOnline.", 5, jvm.getVoteForPlayer(name).getYesVotes());
|
||||||
|
|
||||||
|
assertEquals("The notOnline player was treated as online, thus the result is tied.", JailVoteResult.NOTONLINE, jvm.doTheVoteCalculation(jvm.getVoteForPlayer(name)));
|
||||||
|
assertNull("The vote for tiedVote is still active", jvm.getVoteForPlayer(name));
|
||||||
|
assertFalse("The vote for tiedVote is still active.", jvm.isVotedFor(name));
|
||||||
|
assertFalse("tiedVote is jailed.", main.getJailManager().isPlayerJailedByLastKnownUsername(name));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testNotEnoughYesVotesVote() {
|
||||||
|
JailVoteManager jvm = main.getJailVoteManager();
|
||||||
|
String name = "notEnoughYes";
|
||||||
|
UUID id = UUID.randomUUID();
|
||||||
|
creator.addMockPlayer(name, id);
|
||||||
|
|
||||||
|
assertTrue("There is already a vote for notEnoughYes.", jvm.addVote(new JailVote(name)));
|
||||||
|
assertNotNull("The JailVote for notEnoughYes is null.", jvm.getVoteForPlayer(name));
|
||||||
|
assertTrue("There is no vote to jail notEnoughYes.", jvm.isVotedFor(name));
|
||||||
|
|
||||||
|
for(int i = 0; i < 4; i++) {
|
||||||
|
jvm.addVote(name, ids[i], true);
|
||||||
|
assertTrue(ids[i].toString() + " has already voted for notEnoughYes.", jvm.hasVotedAlready(name, ids[i]));
|
||||||
|
}
|
||||||
|
assertEquals("There aren't four yes votes to jail notEnoughYes.", 4, jvm.getVoteForPlayer(name).getYesVotes());
|
||||||
|
|
||||||
|
for(int i = 8; i < ids.length; i++) {
|
||||||
|
jvm.addVote(name, ids[i], false);
|
||||||
|
assertTrue(ids[i].toString() + " has already voted for notEnoughYes.", jvm.hasVotedAlready(name, ids[i]));
|
||||||
|
}
|
||||||
|
assertEquals("There aren't two no votes to jail notEnoughYes.", 2, jvm.getVoteForPlayer(name).getNoVotes());
|
||||||
|
|
||||||
|
assertEquals("The vote result was not Not Enough Yes Votes.", JailVoteResult.NOTENOUGHYESVOTES, jvm.doTheVoteCalculation(jvm.getVoteForPlayer(name)));
|
||||||
|
assertNull("The vote for notEnoughYes is still active", jvm.getVoteForPlayer(name));
|
||||||
|
assertFalse("The vote for notEnoughYes is still active.", jvm.isVotedFor(name));
|
||||||
|
assertFalse("notEnoughYes is jailed.", main.getJailManager().isPlayerJailed(id));
|
||||||
|
}
|
||||||
|
}
|
@ -21,6 +21,7 @@ import java.util.logging.Logger;
|
|||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Server;
|
import org.bukkit.Server;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.World.Environment;
|
import org.bukkit.World.Environment;
|
||||||
@ -46,19 +47,23 @@ import org.powermock.core.MockGateway;
|
|||||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||||
|
|
||||||
import com.graywolf336.jail.JailMain;
|
import com.graywolf336.jail.JailMain;
|
||||||
|
import com.graywolf336.jail.beans.Jail;
|
||||||
|
|
||||||
@PrepareForTest({ CraftItemFactory.class })
|
@PrepareForTest({ CraftItemFactory.class })
|
||||||
public class TestInstanceCreator {
|
public class TestInstanceCreator {
|
||||||
private JailMain main;
|
private JailMain main;
|
||||||
private Server mockServer;
|
private Server mockServer;
|
||||||
private Player mockPlayer;
|
private Player mockPlayer;
|
||||||
|
private World mockWorld;
|
||||||
private CommandSender mockSender, mockPlayerSender;
|
private CommandSender mockSender, mockPlayerSender;
|
||||||
private ConsoleCommandSender consoleSender;
|
private ConsoleCommandSender consoleSender;
|
||||||
|
private ArrayList<UUID> players = new ArrayList<UUID>();
|
||||||
|
|
||||||
public static final File serverDirectory = new File("bin" + File.separator + "test" + File.separator + "server");
|
public static final File serverDirectory = new File("bin" + File.separator + "test" + File.separator + "server");
|
||||||
public static final File worldsDirectory = new File("bin" + File.separator + "test" + File.separator + "server");
|
public static final File worldsDirectory = new File("bin" + File.separator + "test" + File.separator + "server");
|
||||||
public static final File pluginDirectory = new File(serverDirectory + File.separator + "plugins" + File.separator + "JailTest");
|
public static final File pluginDirectory = new File(serverDirectory + File.separator + "plugins" + File.separator + "JailTest");
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
public boolean setup() {
|
public boolean setup() {
|
||||||
try {
|
try {
|
||||||
pluginDirectory.mkdirs();
|
pluginDirectory.mkdirs();
|
||||||
@ -76,7 +81,7 @@ public class TestInstanceCreator {
|
|||||||
when(mockServer.getWorldContainer()).thenReturn(worldsDirectory);
|
when(mockServer.getWorldContainer()).thenReturn(worldsDirectory);
|
||||||
when(mockServer.getItemFactory()).thenReturn(CraftItemFactory.instance());
|
when(mockServer.getItemFactory()).thenReturn(CraftItemFactory.instance());
|
||||||
|
|
||||||
MockWorldFactory.makeNewMockWorld("world", Environment.NORMAL, WorldType.NORMAL);
|
mockWorld = MockWorldFactory.makeNewMockWorld("world", Environment.NORMAL, WorldType.NORMAL);
|
||||||
|
|
||||||
suppress(constructor(JailMain.class));
|
suppress(constructor(JailMain.class));
|
||||||
main = PowerMockito.spy(new JailMain());
|
main = PowerMockito.spy(new JailMain());
|
||||||
@ -253,7 +258,8 @@ public class TestInstanceCreator {
|
|||||||
|
|
||||||
// Init our player, who is op and who has all permissions (with name of graywolf336)
|
// Init our player, who is op and who has all permissions (with name of graywolf336)
|
||||||
mockPlayer = mock(Player.class);
|
mockPlayer = mock(Player.class);
|
||||||
when(mockPlayer.getUniqueId()).thenReturn(UUID.fromString("062c14ba-4c47-4757-911b-bbf9a60dab7b"));
|
UUID playerId = UUID.fromString("062c14ba-4c47-4757-911b-bbf9a60dab7b");
|
||||||
|
when(mockPlayer.getUniqueId()).thenReturn(playerId);
|
||||||
when(mockPlayer.getName()).thenReturn("graywolf336");
|
when(mockPlayer.getName()).thenReturn("graywolf336");
|
||||||
when(mockPlayer.getDisplayName()).thenReturn("TheGrayWolf");
|
when(mockPlayer.getDisplayName()).thenReturn("TheGrayWolf");
|
||||||
when(mockPlayer.isPermissionSet(anyString())).thenReturn(true);
|
when(mockPlayer.isPermissionSet(anyString())).thenReturn(true);
|
||||||
@ -262,6 +268,10 @@ public class TestInstanceCreator {
|
|||||||
when(mockPlayer.hasPermission(Matchers.isA(Permission.class))).thenReturn(true);
|
when(mockPlayer.hasPermission(Matchers.isA(Permission.class))).thenReturn(true);
|
||||||
when(mockPlayer.isOp()).thenReturn(true);
|
when(mockPlayer.isOp()).thenReturn(true);
|
||||||
when(mockPlayer.getInventory()).thenReturn(new MockPlayerInventory());
|
when(mockPlayer.getInventory()).thenReturn(new MockPlayerInventory());
|
||||||
|
when(mockPlayer.getLocation()).thenReturn(new Location(mockWorld, 23, 70, -242));
|
||||||
|
when(mockServer.getPlayer("graywolf336")).thenReturn(mockPlayer);
|
||||||
|
when(mockServer.getPlayer(playerId)).thenReturn(mockPlayer);
|
||||||
|
players.add(playerId);
|
||||||
|
|
||||||
// Init our second command sender, but this time is an instance of a player
|
// Init our second command sender, but this time is an instance of a player
|
||||||
mockPlayerSender = mockPlayer;
|
mockPlayerSender = mockPlayer;
|
||||||
@ -312,6 +322,44 @@ public class TestInstanceCreator {
|
|||||||
deleteFolder(serverDirectory);
|
deleteFolder(serverDirectory);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
public boolean addMockPlayer(String name, UUID id) {
|
||||||
|
if(players.contains(id)) {
|
||||||
|
return false;
|
||||||
|
}else {
|
||||||
|
Player anotherPlayer = mock(Player.class);
|
||||||
|
when(anotherPlayer.getUniqueId()).thenReturn(id);
|
||||||
|
when(anotherPlayer.getName()).thenReturn(name);
|
||||||
|
when(anotherPlayer.getDisplayName()).thenReturn(name);
|
||||||
|
when(anotherPlayer.isPermissionSet(anyString())).thenReturn(true);
|
||||||
|
when(anotherPlayer.isPermissionSet(Matchers.isA(Permission.class))).thenReturn(true);
|
||||||
|
when(anotherPlayer.hasPermission(anyString())).thenReturn(true);
|
||||||
|
when(anotherPlayer.hasPermission(Matchers.isA(Permission.class))).thenReturn(true);
|
||||||
|
when(anotherPlayer.isOp()).thenReturn(true);
|
||||||
|
when(anotherPlayer.getInventory()).thenReturn(new MockPlayerInventory());
|
||||||
|
when(anotherPlayer.getLocation()).thenReturn(new Location(mockWorld, 56, 85, -2420));
|
||||||
|
when(mockServer.getPlayer(name)).thenReturn(anotherPlayer);
|
||||||
|
when(mockServer.getPlayer(id)).thenReturn(anotherPlayer);
|
||||||
|
players.add(id);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean addJail() {
|
||||||
|
if(main.getJailManager().getJails().isEmpty()) {
|
||||||
|
Jail j = new Jail(main, "testingJail");
|
||||||
|
j.setWorld("world");
|
||||||
|
j.setMaxPoint(new int[] { 9, 63, -238 });
|
||||||
|
j.setMinPoint(new int[] { 23, 70, -242 });
|
||||||
|
j.setTeleportIn(new Location(main.getServer().getWorld("world"), 11.469868464778077, 65.0, -239.27944647045672, Float.valueOf("38.499817"), Float.valueOf("2.0000453")));
|
||||||
|
j.setTeleportFree(new Location(main.getServer().getWorld("world"), 27.947015843504765, 65.0, -218.8108042076112, Float.valueOf("90.54981"), Float.valueOf("12.500043")));
|
||||||
|
main.getJailManager().addJail(j, false);
|
||||||
|
return true;
|
||||||
|
}else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public JailMain getMain() {
|
public JailMain getMain() {
|
||||||
return this.main;
|
return this.main;
|
||||||
|
Loading…
Reference in New Issue
Block a user