EpicKnarvik97/Jail
EpicKnarvik97/Jail
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Improves formatting, removes broken comments and updates version to 1.17

Browse Source
This commit is contained in:
Kristian Knarvik 2021-10-21 15:13:55 +02:00
parent 820842932a
commit d5296c4314
110 changed files with 4038 additions and 5562 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
pom.xml
View File

@ -10,22 +10,6 @@
<description>Ban too harsh? Mute too weak? Kicking not enough? Jail them!</description> <description>Ban too harsh? Mute too weak? Kicking not enough? Jail them!</description>
<url>http://dev.bukkit.org/bukkit-plugins/jail/</url> <url>http://dev.bukkit.org/bukkit-plugins/jail/</url>
<ciManagement>
<url>https://ci.craftyn.com/job/Jail/</url>
<system>jenkins</system>
</ciManagement>
<issueManagement>
<url>https://github.com/graywolf336/Jail/issues</url>
<system>GitHub</system>
</issueManagement>
<scm>
<url>https://github.com/graywolf336/Jail</url>
<connection>scm:git:git://github.com/graywolf336/Jail.git</connection>
<developerConnection>scm:git:git:@github.com/graywolf336/Jail.git</developerConnection>
</scm>
<properties> <properties>
<project.build.number>0</project.build.number> <project.build.number>0</project.build.number>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -48,40 +32,31 @@
</repository> </repository>
<repository> <repository>
<id>gray-snapshot</id> <id>jitpack.io</id>
<url>https://repo.craftyn.com/repository/graywolf336-snapshots/</url> <url>https://jitpack.io</url>
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.spigotmc</groupId>
<artifactId>bukkit</artifactId> <artifactId>spigot-api</artifactId>
<version>1.13.2-R0.1-SNAPSHOT</version> <version>1.17.1-R0.1-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>1.13.2-R0.1-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sk89q.worldedit</groupId> <groupId>com.sk89q.worldedit</groupId>
<artifactId>worldedit-bukkit</artifactId> <artifactId>worldedit-bukkit</artifactId>
<version>7.0.0-SNAPSHOT</version> <version>7.2.6</version>
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.milkbowl.vault</groupId> <groupId>com.github.MilkBowl</groupId>
<artifactId>Vault</artifactId> <artifactId>VaultAPI</artifactId>
<version>1.5.6</version> <version>1.7</version>
<type>jar</type>
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
@ -96,31 +71,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.13.1</version> <version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.5.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-easymock</artifactId>
<version>1.5.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.5.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.2</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.carrotsearch</groupId> <groupId>com.carrotsearch</groupId>
@ -128,6 +79,12 @@
<version>0.7.2</version> <version>0.7.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.17.1-R0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- End of Test Dependencies --> <!-- End of Test Dependencies -->
</dependencies> </dependencies>
@ -143,26 +100,6 @@
<project.build.number>${env.BUILD_NUMBER}</project.build.number> <project.build.number>${env.BUILD_NUMBER}</project.build.number>
</properties> </properties>
</profile> </profile>
<profile>
<id>doclint-java8-disable</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles> </profiles>
<build> <build>
@ -201,10 +138,10 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version> <version>3.8.1</version>
<configuration> <configuration>
<source>1.8</source> <source>16</source>
<target>1.8</target> <target>16</target>
</configuration> </configuration>
</plugin> </plugin>
@ -236,7 +173,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version> <version>3.2.0</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries /> <manifestEntries />
@ -247,7 +184,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>2.2</version> <version>3.2.4</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@ -294,42 +231,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.11</version>
<configuration>
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>${surefireArgLine}</argLine>
<parallel>methods</parallel>
<threadCount>10</threadCount>
<excludes>
<exclude>**/TestCommandSender.java</exclude>
<exclude>**/TestInstanceCreator.java</exclude>
</excludes>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
<version>2.11</version>
</dependency>
</dependencies>
</plugin>
</plugins> </plugins>
</build> </build>
<distributionManagement>
<repository>
<id>repo-release</id>
<name>Jail Releases</name>
<url>https://repo.craftyn.com/repository/internal/</url>
</repository>
<snapshotRepository>
<id>repo-snapshot</id>
<name>Jail Snapshots</name>
<url>https://repo.craftyn.com/repository/snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project> </project>

20
src/main/java/com/graywolf336/jail/HandCuffManager.java
View File

@ -1,15 +1,15 @@
package com.graywolf336.jail; package com.graywolf336.jail;
import org.bukkit.Location;
import java.util.HashMap; import java.util.HashMap;
import java.util.UUID; import java.util.UUID;
import org.bukkit.Location;
/** /**
* Manages the handcuffing of players. * Manages the handcuffing of players.
* *
* <p>&nbsp;</p> * <p>&nbsp;</p>
* * <p>
* Provides easy to use methods for adding, * Provides easy to use methods for adding,
* removing, and checking if someone has * removing, and checking if someone has
* handcuffs. * handcuffs.
@ -22,17 +22,19 @@ import org.bukkit.Location;
* </ul> * </ul>
* *
* @author graywolf336 * @author graywolf336
* @since 2.6.3
* @version 1.0.2 * @version 1.0.2
* @since 2.6.3
*/ */
public class HandCuffManager { public class HandCuffManager {
private HashMap<UUID, Long> handcuffed; private final HashMap<UUID, Long> handcuffed;
private HashMap<UUID, Location> locs; private final HashMap<UUID, Location> locs;
/** Constructs a new HandCuff Manager, for handling all the handcuffing. */ /**
* Constructs a new HandCuff Manager, for handling all the handcuffing.
*/
protected HandCuffManager() { protected HandCuffManager() {
this.handcuffed = new HashMap<UUID, Long>(); this.handcuffed = new HashMap<>();
this.locs = new HashMap<UUID, Location>(); this.locs = new HashMap<>();
} }
/** /**

277
src/main/java/com/graywolf336/jail/JailIO.java
View File

@ -1,8 +1,18 @@
package com.graywolf336.jail; package com.graywolf336.jail;
import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.beans.SimpleLocation;
import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.enums.Settings;
import org.bukkit.Location;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import java.io.File; import java.io.File;
import java.io.InputStreamReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader;
import java.sql.Connection; import java.sql.Connection;
import java.sql.DriverManager; import java.sql.DriverManager;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -15,27 +25,15 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import org.bukkit.Location;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.beans.SimpleLocation;
import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.enums.Settings;
/** /**
* Handles all the saving and loading of the plugin's data. * Handles all the saving and loading of the plugin's data.
* *
* @author graywolf336 * @author graywolf336
* @since 2.x.x
* @version 3.0.0 * @version 3.0.0
* * @since 2.x.x
*/ */
public class JailIO { public class JailIO {
private JailMain pl; private final JailMain pl;
private FileConfiguration flat, records; private FileConfiguration flat, records;
private Connection con; private Connection con;
private int storage = -1; //0 = flatfile, 1 = sqlite, 2 = mysql private int storage = -1; //0 = flatfile, 1 = sqlite, 2 = mysql
@ -46,24 +44,26 @@ public class JailIO {
this.pl = plugin; this.pl = plugin;
} }
/** Loads the language file from disk, if there is none then we save the default one. */ /**
* Loads the language file from disk, if there is none then we save the default one.
*/
protected void loadLanguage() { protected void loadLanguage() {
String language = pl.getConfig().getString(Settings.LANGUAGE.getPath()); String language = pl.getConfig().getString(Settings.LANGUAGE.getPath());
boolean save = false; boolean save = false;
File langFile = new File(pl.getDataFolder() + File.separator + "locales", language + ".yml"); File langFile = new File(pl.getDataFolder() + File.separator + "locales", language + ".yml");
//File or folder already exists, let's check //File or folder already exists, let's check
if(langFile.exists()) { if (langFile.exists()) {
if(langFile.isFile()) { if (langFile.isFile()) {
Lang.setFile(YamlConfiguration.loadConfiguration(langFile)); Lang.setFile(YamlConfiguration.loadConfiguration(langFile));
pl.getLogger().info("Loaded the language: " + language); pl.getLogger().info("Loaded the language: " + language);
}else { } else {
pl.getLogger().severe("The language file can not be a folder."); pl.getLogger().severe("The language file can not be a folder.");
pl.getLogger().severe("As a result, we are reverting back to English as the language."); pl.getLogger().severe("As a result, we are reverting back to English as the language.");
Lang.setFile(YamlConfiguration.loadConfiguration(new InputStreamReader(pl.getResource("locales/en.yml")))); Lang.setFile(YamlConfiguration.loadConfiguration(new InputStreamReader(pl.getResource("locales/en.yml"))));
save = true; save = true;
} }
}else { } else {
pl.getLogger().warning("Loading the default language of: en"); pl.getLogger().warning("Loading the default language of: en");
pl.getLogger().warning("If you wish to change this, please rename 'en.yml' to whatever you wish and set the config value to the name of the file."); pl.getLogger().warning("If you wish to change this, please rename 'en.yml' to whatever you wish and set the config value to the name of the file.");
Lang.setFile(YamlConfiguration.loadConfiguration(new InputStreamReader(pl.getResource("locales/en.yml")))); Lang.setFile(YamlConfiguration.loadConfiguration(new InputStreamReader(pl.getResource("locales/en.yml"))));
@ -71,10 +71,11 @@ public class JailIO {
} }
//Make sure we have all the new language settings loaded //Make sure we have all the new language settings loaded
if(!save) save = Lang.writeNewLanguage(YamlConfiguration.loadConfiguration(new InputStreamReader(pl.getResource("locales/en.yml")))); if (!save)
save = Lang.writeNewLanguage(YamlConfiguration.loadConfiguration(new InputStreamReader(pl.getResource("locales/en.yml"))));
//If we have flagged to save the language file, let's save it as en.yml as this flag usually means they didn't have it loaded. //If we have flagged to save the language file, let's save it as en.yml as this flag usually means they didn't have it loaded.
if(save) { if (save) {
try { try {
Lang.getFile().save(new File(pl.getDataFolder() + File.separator + "locales", "en.yml")); Lang.getFile().save(new File(pl.getDataFolder() + File.separator + "locales", "en.yml"));
} catch (IOException e) { } catch (IOException e) {
@ -93,28 +94,28 @@ public class JailIO {
int inital = storage == -1 ? -1 : storage; int inital = storage == -1 ? -1 : storage;
String st = pl.getConfig().getString("storage.type", "flatfile"); String st = pl.getConfig().getString("storage.type", "flatfile");
if(st.equalsIgnoreCase("sqlite")) { if (st.equalsIgnoreCase("sqlite")) {
storage = 1; storage = 1;
prefix = pl.getConfig().getString("storage.mysql.prefix"); prefix = pl.getConfig().getString("storage.mysql.prefix");
}else if(st.equalsIgnoreCase("mysql")) { } else if (st.equalsIgnoreCase("mysql")) {
storage = 2; storage = 2;
prefix = pl.getConfig().getString("storage.mysql.prefix"); prefix = pl.getConfig().getString("storage.mysql.prefix");
}else { } else {
storage = 0; storage = 0;
} }
//Determine if we changed storage types midstream //Determine if we changed storage types midstream
//this way we can know whether to save EVERYTHING //this way we can know whether to save EVERYTHING
//or not afterwards //or not afterwards
if(inital != -1 && inital != storage) { if (inital != -1 && inital != storage) {
pl.debug("We changed storage types! We used to be " + inital + " and changed to " + storage + "."); pl.debug("We changed storage types! We used to be " + inital + " and changed to " + storage + ".");
changed = true; changed = true;
} }
pl.debug("The storage type " + st + " with the type being " + storage + "."); pl.debug("The storage type " + st + " with the type being " + storage + ".");
if(!pl.inDebug()) pl.getLogger().info("Storage type selected: " + st); if (!pl.inDebug()) pl.getLogger().info("Storage type selected: " + st);
switch(storage) { switch (storage) {
case 1: case 1:
try { try {
Class.forName("org.sqlite.JDBC"); Class.forName("org.sqlite.JDBC");
@ -124,7 +125,7 @@ public class JailIO {
this.con = sqliteConnection; this.con = sqliteConnection;
pl.debug("Connection created for sqlite."); pl.debug("Connection created for sqlite.");
if(doInitialCreations) createTables(); if (doInitialCreations) createTables();
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
pl.getLogger().severe("---------- Jail Error!!! ----------"); pl.getLogger().severe("---------- Jail Error!!! ----------");
@ -149,8 +150,8 @@ public class JailIO {
this.con = mysqlConnection; this.con = mysqlConnection;
pl.debug("Connection created for MySQL."); pl.debug("Connection created for MySQL.");
if(doInitialCreations) createTables(); if (doInitialCreations) createTables();
} catch(ClassNotFoundException e) { } catch (ClassNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
pl.getLogger().severe("---------- Jail Error!!! ----------"); pl.getLogger().severe("---------- Jail Error!!! ----------");
pl.getLogger().severe("MySQL driver not found, disabling the plugin."); pl.getLogger().severe("MySQL driver not found, disabling the plugin.");
@ -169,7 +170,7 @@ public class JailIO {
break; break;
} }
if(changed) { if (changed) {
changed = false; changed = false;
this.saveEverything(); this.saveEverything();
} }
@ -183,11 +184,11 @@ public class JailIO {
* @return The connection for the sql database. * @return The connection for the sql database.
*/ */
private Connection getConnection() { private Connection getConnection() {
switch(storage) { switch (storage) {
case 1: case 1:
if(con == null) this.prepareStorage(false); if (con == null) this.prepareStorage(false);
try { try {
if(con.isClosed()) this.prepareStorage(false); if (con.isClosed()) this.prepareStorage(false);
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
pl.getLogger().severe("---------- Jail Error!!! ----------"); pl.getLogger().severe("---------- Jail Error!!! ----------");
@ -196,9 +197,9 @@ public class JailIO {
} }
return con; return con;
case 2: case 2:
if(con == null) this.prepareStorage(false); if (con == null) this.prepareStorage(false);
try { try {
if(con.isClosed() || !con.isValid(10)) this.prepareStorage(false); if (con.isClosed() || !con.isValid(10)) this.prepareStorage(false);
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
pl.getLogger().severe("---------- Jail Error!!! ----------"); pl.getLogger().severe("---------- Jail Error!!! ----------");
@ -211,13 +212,15 @@ public class JailIO {
} }
} }
/** Closes the sql connection. */ /**
* Closes the sql connection.
*/
protected void closeConnection() { protected void closeConnection() {
switch(storage) { switch (storage) {
case 1: case 1:
case 2: case 2:
try { try {
if(con != null) { if (con != null) {
con.close(); con.close();
con = null; con = null;
@ -236,14 +239,14 @@ public class JailIO {
} }
private void createTables() { private void createTables() {
if(getConnection() == null) { if (getConnection() == null) {
pl.debug("The connection was null when we tried to create a table."); pl.debug("The connection was null when we tried to create a table.");
return; return;
} }
try { try {
Statement st = getConnection().createStatement(); Statement st = getConnection().createStatement();
switch(storage){ switch (storage) {
case 1: case 1:
String sqlJailCreateCmd = "CREATE TABLE IF NOT EXISTS `" + prefix + "jails` (" String sqlJailCreateCmd = "CREATE TABLE IF NOT EXISTS `" + prefix + "jails` ("
+ "`name` VARCHAR PRIMARY KEY NOT NULL," + "`name` VARCHAR PRIMARY KEY NOT NULL,"
@ -418,7 +421,7 @@ public class JailIO {
* Loads the jails, this should <strong>only</strong> be called after {@link #prepareStorage(boolean)}. * Loads the jails, this should <strong>only</strong> be called after {@link #prepareStorage(boolean)}.
*/ */
protected void loadJails() { protected void loadJails() {
switch(storage) { switch (storage) {
case 1: case 1:
case 2: case 2:
//load the jails from mysql and sqlite //load the jails from mysql and sqlite
@ -428,12 +431,12 @@ public class JailIO {
PreparedStatement ps = getConnection().prepareStatement("SELECT * FROM " + prefix + "jails"); PreparedStatement ps = getConnection().prepareStatement("SELECT * FROM " + prefix + "jails");
ResultSet set = ps.executeQuery(); ResultSet set = ps.executeQuery();
while(set.next()) { while (set.next()) {
Jail j = new Jail(pl, set.getString("name")); Jail j = new Jail(pl, set.getString("name"));
j.setWorld(set.getString("world")); j.setWorld(set.getString("world"));
j.setMaxPoint(new int[] { set.getInt("top.x"), set.getInt("top.y"), set.getInt("top.z") }); j.setMaxPoint(new int[]{set.getInt("top.x"), set.getInt("top.y"), set.getInt("top.z")});
j.setMinPoint(new int[] { set.getInt("bottom.x"), set.getInt("bottom.y"), set.getInt("bottom.z") }); j.setMinPoint(new int[]{set.getInt("bottom.x"), set.getInt("bottom.y"), set.getInt("bottom.z")});
j.setTeleportIn(new Location(pl.getServer().getWorld(j.getWorldName()), set.getDouble("tps.in.x"), j.setTeleportIn(new Location(pl.getServer().getWorld(j.getWorldName()), set.getDouble("tps.in.x"),
set.getDouble("tps.in.y"), set.getDouble("tps.in.z"), set.getDouble("tps.in.y"), set.getDouble("tps.in.z"),
set.getFloat("tps.in.yaw"), set.getFloat("tps.in.pitch"))); set.getFloat("tps.in.yaw"), set.getFloat("tps.in.pitch")));
@ -455,17 +458,17 @@ public class JailIO {
//This list contains an integer which refers to the cellid column in sql //This list contains an integer which refers to the cellid column in sql
//this list only gets populated if there are cells which reference a jail //this list only gets populated if there are cells which reference a jail
//that doesn't exist anymore //that doesn't exist anymore
List<Integer> cellsToRemove = new LinkedList<Integer>(); List<Integer> cellsToRemove = new LinkedList<>();
try { try {
PreparedStatement ps = getConnection().prepareStatement("SELECT * FROM " + prefix + "cells"); PreparedStatement ps = getConnection().prepareStatement("SELECT * FROM " + prefix + "cells");
ResultSet set = ps.executeQuery(); ResultSet set = ps.executeQuery();
while(set.next()) { while (set.next()) {
Jail j = pl.getJailManager().getJail(set.getString("jail")); Jail j = pl.getJailManager().getJail(set.getString("jail"));
if(j != null) { if (j != null) {
if(j.getWorld() != null) { if (j.getWorld() != null) {
Cell c = new Cell(set.getInt("cellid"), set.getString("name")); Cell c = new Cell(set.getInt("cellid"), set.getString("name"));
c.setTeleport(new SimpleLocation(j.getWorldName(), set.getDouble("tp.x"), set.getDouble("tp.y"), set.getDouble("tp.z"), c.setTeleport(new SimpleLocation(j.getWorldName(), set.getDouble("tp.x"), set.getDouble("tp.y"), set.getDouble("tp.z"),
set.getFloat("tp.yaw"), set.getFloat("tp.pitch"))); set.getFloat("tp.yaw"), set.getFloat("tp.pitch")));
@ -473,9 +476,9 @@ public class JailIO {
c.setChestLocation(new SimpleLocation(j.getWorldName(), set.getInt("chest.x"), set.getInt("chest.y"), set.getInt("chest.z"))); c.setChestLocation(new SimpleLocation(j.getWorldName(), set.getInt("chest.x"), set.getInt("chest.y"), set.getInt("chest.z")));
String cSigns = set.getString("signs"); String cSigns = set.getString("signs");
if(!cSigns.isEmpty()) { if (!cSigns.isEmpty()) {
String[] signs = cSigns.split(";"); String[] signs = cSigns.split(";");
for(String s : signs) { for (String s : signs) {
String[] co = s.split(","); String[] co = s.split(",");
c.addSign(new SimpleLocation(co[0], co[1], co[2], co[3])); c.addSign(new SimpleLocation(co[0], co[1], co[2], co[3]));
} }
@ -488,15 +491,15 @@ public class JailIO {
//if this method returns false then //if this method returns false then
//the cell already exists and needs //the cell already exists and needs
//to be removed from the database //to be removed from the database
if(!j.addCell(c, false)) { if (!j.addCell(c, false)) {
int id = set.getInt("cellid"); int id = set.getInt("cellid");
cellsToRemove.add(id); cellsToRemove.add(id);
pl.debug("The cell, " + c.getName() + " (" + id + "), is already in jail " + j.getName() + " so we're removing it."); pl.debug("The cell, " + c.getName() + " (" + id + "), is already in jail " + j.getName() + " so we're removing it.");
} }
}else { } else {
pl.getLogger().warning("The cell, " + set.getString("name") + ", in " + j.getName() + " is located in a world that is not loaded."); pl.getLogger().warning("The cell, " + set.getString("name") + ", in " + j.getName() + " is located in a world that is not loaded.");
} }
}else { } else {
cellsToRemove.add(set.getInt("cellid")); cellsToRemove.add(set.getInt("cellid"));
} }
} }
@ -512,17 +515,17 @@ public class JailIO {
} }
//Remove the invalid prisoners //Remove the invalid prisoners
if(!cellsToRemove.isEmpty()) { if (!cellsToRemove.isEmpty()) {
StringBuilder ids = new StringBuilder(); StringBuilder ids = new StringBuilder();
for(int c : cellsToRemove) { for (int c : cellsToRemove) {
if(ids.length() == 0) ids.append("'" + c + "'"); if (ids.length() == 0) ids.append("'").append(c).append("'");
else ids.append("," + "'" + c + "'"); else ids.append("," + "'").append(c).append("'");
} }
try { try {
PreparedStatement cds = getConnection().prepareStatement("delete from " + prefix + "cells where cellid in (" + ids.toString() + ");"); PreparedStatement cds = getConnection().prepareStatement("delete from " + prefix + "cells where cellid in (" + ids + ");");
pl.debug("Deleting old cells: `delete from " + prefix + "cells where cellid in (" + ids.toString() + ");`"); pl.debug("Deleting old cells: `delete from " + prefix + "cells where cellid in (" + ids + ");`");
int count = cds.executeUpdate(); int count = cds.executeUpdate();
pl.getLogger().info("Deleted " + count + " cells which were invalid, they either referenced a jail which are no longer valid or were duplicates."); pl.getLogger().info("Deleted " + count + " cells which were invalid, they either referenced a jail which are no longer valid or were duplicates.");
@ -537,16 +540,16 @@ public class JailIO {
//This list contains a string which refers to the name of the prisoner in sql //This list contains a string which refers to the name of the prisoner in sql
//this list only gets populated if there are prisoners which reference a jail //this list only gets populated if there are prisoners which reference a jail
//that doesn't exist anymore //that doesn't exist anymore
List<String> prisonersToRemove = new LinkedList<String>(); List<String> prisonersToRemove = new LinkedList<>();
try { try {
PreparedStatement ps = getConnection().prepareStatement("SELECT * FROM " + prefix + "prisoners"); PreparedStatement ps = getConnection().prepareStatement("SELECT * FROM " + prefix + "prisoners");
ResultSet set = ps.executeQuery(); ResultSet set = ps.executeQuery();
while(set.next()) { while (set.next()) {
Jail j = pl.getJailManager().getJail(set.getString("jail")); Jail j = pl.getJailManager().getJail(set.getString("jail"));
if(j != null) { if (j != null) {
String cellname = set.getString("cell"); String cellname = set.getString("cell");
Cell c = j.getCell(cellname); Cell c = j.getCell(cellname);
@ -559,12 +562,12 @@ public class JailIO {
p.setPreviousGameMode(set.getString("previousGameMode")); p.setPreviousGameMode(set.getString("previousGameMode"));
p.setChanged(false);//Since we just loaded the prisoner, we really don't need to save them. p.setChanged(false);//Since we just loaded the prisoner, we really don't need to save them.
if(cellname == null || cellname.isEmpty()) { if (cellname == null || cellname.isEmpty()) {
j.addPrisoner(p); j.addPrisoner(p);
}else if(c != null) { } else if (c != null) {
c.setPrisoner(p); c.setPrisoner(p);
c.setChanged(false); c.setChanged(false);
}else { } else {
//the prisoner is assigned to a cell which doesn't exist, so just put them into the jail //the prisoner is assigned to a cell which doesn't exist, so just put them into the jail
j.addPrisoner(p); j.addPrisoner(p);
} }
@ -585,11 +588,11 @@ public class JailIO {
} }
//Remove the invalid prisoners //Remove the invalid prisoners
if(!prisonersToRemove.isEmpty()) { if (!prisonersToRemove.isEmpty()) {
String names = ""; StringBuilder names = new StringBuilder();
for(String s : prisonersToRemove) { for (String s : prisonersToRemove) {
if(names.isEmpty()) names = "'" + s + "'"; if (names.length() == 0) names = new StringBuilder("'" + s + "'");
else names += "," + "'" + s + "'"; else names.append("," + "'").append(s).append("'");
} }
try { try {
@ -611,10 +614,10 @@ public class JailIO {
break; break;
default: default:
//load the jails from flatfile //load the jails from flatfile
if(flat.isConfigurationSection("jails")) { if (flat.isConfigurationSection("jails")) {
Set<String> jails = flat.getConfigurationSection("jails").getKeys(false); Set<String> jails = flat.getConfigurationSection("jails").getKeys(false);
if(!jails.isEmpty()) { if (!jails.isEmpty()) {
for(String name : jails) { for (String name : jails) {
loadJailFromFlatFile(name); loadJailFromFlatFile(name);
} }
} }
@ -638,14 +641,14 @@ public class JailIO {
pl.debug("Loading the jail " + name + "; " + node + "; " + cNode); pl.debug("Loading the jail " + name + "; " + node + "; " + cNode);
Jail j = new Jail(pl, name); Jail j = new Jail(pl, name);
if(flat.getString(node + "world") == null || flat.getString(node + "world").isEmpty()) { if (flat.getString(node + "world") == null || flat.getString(node + "world").isEmpty()) {
pl.getLogger().severe("Failed to load the jail, " + name + ", because the world is not set."); pl.getLogger().severe("Failed to load the jail, " + name + ", because the world is not set.");
return; return;
} }
j.setWorld(flat.getString(node + "world")); j.setWorld(flat.getString(node + "world"));
j.setMaxPoint(new int[] {flat.getInt(node + "top.x"), flat.getInt(node + "top.y"), flat.getInt(node + "top.z")}); j.setMaxPoint(new int[]{flat.getInt(node + "top.x"), flat.getInt(node + "top.y"), flat.getInt(node + "top.z")});
j.setMinPoint(new int[] {flat.getInt(node + "bottom.x"), flat.getInt(node + "bottom.y"), flat.getInt(node + "bottom.z")}); j.setMinPoint(new int[]{flat.getInt(node + "bottom.x"), flat.getInt(node + "bottom.y"), flat.getInt(node + "bottom.z")});
j.setTeleportIn(new Location( j.setTeleportIn(new Location(
pl.getServer().getWorld(j.getWorldName()), pl.getServer().getWorld(j.getWorldName()),
@ -662,10 +665,10 @@ public class JailIO {
(float) flat.getDouble(node + "tps.free.yaw"), (float) flat.getDouble(node + "tps.free.yaw"),
(float) flat.getDouble(node + "tps.free.pitch"))); (float) flat.getDouble(node + "tps.free.pitch")));
if(flat.isConfigurationSection(node + "cells")) { if (flat.isConfigurationSection(node + "cells")) {
Set<String> cells = flat.getConfigurationSection(node + "cells").getKeys(false); Set<String> cells = flat.getConfigurationSection(node + "cells").getKeys(false);
if(!cells.isEmpty()) { if (!cells.isEmpty()) {
for(String cell : cells) { for (String cell : cells) {
Cell c = new Cell(cell); Cell c = new Cell(cell);
String cellNode = cNode + cell + "."; String cellNode = cNode + cell + ".";
@ -680,17 +683,17 @@ public class JailIO {
flat.getInt(cellNode + "chest.y"), flat.getInt(cellNode + "chest.y"),
flat.getInt(cellNode + "chest.z"))); flat.getInt(cellNode + "chest.z")));
for(String sign : flat.getStringList(cellNode + "signs")) { for (String sign : flat.getStringList(cellNode + "signs")) {
String[] arr = sign.split(","); String[] arr = sign.split(",");
c.addSign(new SimpleLocation(arr[0], c.addSign(new SimpleLocation(arr[0],
Double.valueOf(arr[1]), Double.parseDouble(arr[1]),
Double.valueOf(arr[2]), Double.parseDouble(arr[2]),
Double.valueOf(arr[3]), Double.parseDouble(arr[3]),
Float.valueOf(arr[4]), Float.parseFloat(arr[4]),
Float.valueOf(arr[5]))); Float.parseFloat(arr[5])));
} }
if(flat.contains(cellNode + "prisoner")) { if (flat.contains(cellNode + "prisoner")) {
Prisoner p = new Prisoner(flat.getString(cellNode + "prisoner.uuid"), Prisoner p = new Prisoner(flat.getString(cellNode + "prisoner.uuid"),
flat.getString(cellNode + "prisoner.name"), flat.getString(cellNode + "prisoner.name"),
flat.getBoolean(cellNode + "prisoner.muted"), flat.getBoolean(cellNode + "prisoner.muted"),
@ -713,10 +716,10 @@ public class JailIO {
} }
} }
if(flat.isConfigurationSection(node + "prisoners")) { if (flat.isConfigurationSection(node + "prisoners")) {
Set<String> prisoners = flat.getConfigurationSection(node + "prisoners").getKeys(false); Set<String> prisoners = flat.getConfigurationSection(node + "prisoners").getKeys(false);
if(!prisoners.isEmpty()) { if (!prisoners.isEmpty()) {
for(String uuid : prisoners) { for (String uuid : prisoners) {
String pNode = node + "prisoners." + uuid + "."; String pNode = node + "prisoners." + uuid + ".";
Prisoner pris = new Prisoner(uuid, Prisoner pris = new Prisoner(uuid,
flat.getString(pNode + "name"), flat.getString(pNode + "name"),
@ -741,17 +744,19 @@ public class JailIO {
pl.getLogger().info("Loaded jail " + j.getName() + " with " + j.getAllPrisoners().size() + " prisoners and " + j.getCellCount() + " cells" + (j.isEnabled() ? "." : " but the jail is disabled as the world doesn't exist or isn't loaded.")); pl.getLogger().info("Loaded jail " + j.getName() + " with " + j.getAllPrisoners().size() + " prisoners and " + j.getCellCount() + " cells" + (j.isEnabled() ? "." : " but the jail is disabled as the world doesn't exist or isn't loaded."));
} }
/** Saves everything about a jail, don't usually call this. */ /**
* Saves everything about a jail, don't usually call this.
*/
protected void saveEverything() { protected void saveEverything() {
long st = System.currentTimeMillis(); long st = System.currentTimeMillis();
for(Jail j : pl.getJailManager().getJails()) { for (Jail j : pl.getJailManager().getJails()) {
saveJail(j); saveJail(j);
//Only save the cells individually //Only save the cells individually
//when we are not using the flatfile storage //when we are not using the flatfile storage
if(storage != 0) { if (storage != 0) {
for(Cell c : j.getCells()) { for (Cell c : j.getCells()) {
saveCell(j, c, true); saveCell(j, c, true);
} }
} }
@ -766,8 +771,8 @@ public class JailIO {
* @param j The jail to save. * @param j The jail to save.
*/ */
protected void saveJail(Jail j) { protected void saveJail(Jail j) {
if(j.isEnabled()) { if (j.isEnabled()) {
switch(storage) { switch (storage) {
case 1: case 1:
case 2: case 2:
long st = System.currentTimeMillis(); long st = System.currentTimeMillis();
@ -808,11 +813,11 @@ public class JailIO {
} }
try { try {
for(Cell c : j.getCells()) { for (Cell c : j.getCells()) {
if(c.getDatabaseID() != -1) if (c.getDatabaseID() != -1)
saveCell(j, c, false); saveCell(j, c, false);
if(c.hasPrisoner() && c.getPrisoner().wasChanged()) { if (c.hasPrisoner() && c.getPrisoner().wasChanged()) {
Prisoner p = c.getPrisoner(); Prisoner p = c.getPrisoner();
PreparedStatement pPS = getConnection().prepareStatement("REPLACE INTO `" + prefix + "prisoners` (`uuid`, `name`, `jail`, `cell`, `muted`, `time`," PreparedStatement pPS = getConnection().prepareStatement("REPLACE INTO `" + prefix + "prisoners` (`uuid`, `name`, `jail`, `cell`, `muted`, `time`,"
+ "`offlinePending`, `toBeTransferred`, `jailer`, `reason`, `inventory`, `armor`, `previousLocation`, `previousGameMode`)" + "`offlinePending`, `toBeTransferred`, `jailer`, `reason`, `inventory`, `armor`, `previousLocation`, `previousGameMode`)"
@ -845,8 +850,8 @@ public class JailIO {
} }
try { try {
for(Prisoner p : j.getPrisonersNotInCells().values()) { for (Prisoner p : j.getPrisonersNotInCells().values()) {
if(p.wasChanged()) { if (p.wasChanged()) {
PreparedStatement pPS = getConnection().prepareStatement("REPLACE INTO `" + prefix + "prisoners` (`uuid`, `name`, `jail`, `cell`, `muted`, `time`," PreparedStatement pPS = getConnection().prepareStatement("REPLACE INTO `" + prefix + "prisoners` (`uuid`, `name`, `jail`, `cell`, `muted`, `time`,"
+ "`offlinePending`, `toBeTransferred`, `jailer`, `reason`, `inventory`, `armor`, `previousLocation`, `previousGameMode`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); + "`offlinePending`, `toBeTransferred`, `jailer`, `reason`, `inventory`, `armor`, `previousLocation`, `previousGameMode`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
pPS.setString(1, p.getUUID().toString()); pPS.setString(1, p.getUUID().toString());
@ -878,7 +883,7 @@ public class JailIO {
pl.debug("Took " + (System.currentTimeMillis() - st) + " millis to save the jail " + j.getName() + "."); pl.debug("Took " + (System.currentTimeMillis() - st) + " millis to save the jail " + j.getName() + ".");
break; break;
default: default:
if(flat != null) { if (flat != null) {
String node = "jails." + j.getName() + "."; String node = "jails." + j.getName() + ".";
//Corners //Corners
@ -907,10 +912,10 @@ public class JailIO {
//Set all the cells to nothing, then we save each of them so no cells are left behind //Set all the cells to nothing, then we save each of them so no cells are left behind
flat.set(node + "cells", null); flat.set(node + "cells", null);
for(Cell c : j.getCells()) { for (Cell c : j.getCells()) {
String cNode = node + "cells." + c.getName() + "."; String cNode = node + "cells." + c.getName() + ".";
if(c.getTeleport() != null) { if (c.getTeleport() != null) {
flat.set(cNode + "tp.x", c.getTeleport().getX()); flat.set(cNode + "tp.x", c.getTeleport().getX());
flat.set(cNode + "tp.y", c.getTeleport().getY()); flat.set(cNode + "tp.y", c.getTeleport().getY());
flat.set(cNode + "tp.z", c.getTeleport().getZ()); flat.set(cNode + "tp.z", c.getTeleport().getZ());
@ -918,7 +923,7 @@ public class JailIO {
flat.set(cNode + "tp.pitch", c.getTeleport().getPitch()); flat.set(cNode + "tp.pitch", c.getTeleport().getPitch());
} }
if(c.getChestLocation() != null) { if (c.getChestLocation() != null) {
flat.set(cNode + "chest.x", c.getChestLocation().getBlockX()); flat.set(cNode + "chest.x", c.getChestLocation().getBlockX());
flat.set(cNode + "chest.y", c.getChestLocation().getBlockY()); flat.set(cNode + "chest.y", c.getChestLocation().getBlockY());
flat.set(cNode + "chest.z", c.getChestLocation().getBlockZ()); flat.set(cNode + "chest.z", c.getChestLocation().getBlockZ());
@ -926,14 +931,14 @@ public class JailIO {
String[] signs = new String[c.getSigns().size()]; String[] signs = new String[c.getSigns().size()];
int count = 0; int count = 0;
for(SimpleLocation loc : c.getSigns()) { for (SimpleLocation loc : c.getSigns()) {
signs[count] = loc.toString(); signs[count] = loc.toString();
count++; count++;
} }
flat.set(cNode + "signs", signs); flat.set(cNode + "signs", signs);
if(c.getPrisoner() != null) { if (c.getPrisoner() != null) {
Prisoner p = c.getPrisoner(); Prisoner p = c.getPrisoner();
flat.set(cNode + "prisoner.uuid", p.getUUID().toString()); flat.set(cNode + "prisoner.uuid", p.getUUID().toString());
flat.set(cNode + "prisoner.name", p.getLastKnownName()); flat.set(cNode + "prisoner.name", p.getLastKnownName());
@ -945,9 +950,9 @@ public class JailIO {
flat.set(cNode + "prisoner.reason", p.getReason()); flat.set(cNode + "prisoner.reason", p.getReason());
flat.set(cNode + "prisoner.inventory", p.getInventory()); flat.set(cNode + "prisoner.inventory", p.getInventory());
flat.set(cNode + "prisoner.armor", p.getArmor()); flat.set(cNode + "prisoner.armor", p.getArmor());
if(p.getPreviousLocationString() != null) if (p.getPreviousLocationString() != null)
flat.set(cNode + "prisoner.previousLocation", p.getPreviousLocationString()); flat.set(cNode + "prisoner.previousLocation", p.getPreviousLocationString());
if(p.getPreviousGameMode() != null) if (p.getPreviousGameMode() != null)
flat.set(cNode + "prisoner.previousGameMode", p.getPreviousGameMode().toString()); flat.set(cNode + "prisoner.previousGameMode", p.getPreviousGameMode().toString());
} }
@ -956,7 +961,7 @@ public class JailIO {
//Null all the prisoners out before we save them again, this way no prisoners are left behind //Null all the prisoners out before we save them again, this way no prisoners are left behind
flat.set(node + "prisoners", null); flat.set(node + "prisoners", null);
for(Prisoner p : j.getPrisonersNotInCells().values()) { for (Prisoner p : j.getPrisonersNotInCells().values()) {
String pNode = node + "prisoners." + p.getUUID().toString() + "."; String pNode = node + "prisoners." + p.getUUID().toString() + ".";
flat.set(pNode + "name", p.getLastKnownName()); flat.set(pNode + "name", p.getLastKnownName());
flat.set(pNode + "muted", p.isMuted()); flat.set(pNode + "muted", p.isMuted());
@ -967,9 +972,9 @@ public class JailIO {
flat.set(pNode + "reason", p.getReason()); flat.set(pNode + "reason", p.getReason());
flat.set(pNode + "inventory", p.getInventory()); flat.set(pNode + "inventory", p.getInventory());
flat.set(pNode + "armor", p.getArmor()); flat.set(pNode + "armor", p.getArmor());
if(p.getPreviousLocationString() != null) if (p.getPreviousLocationString() != null)
flat.set(pNode + "previousLocation", p.getPreviousLocationString()); flat.set(pNode + "previousLocation", p.getPreviousLocationString());
if(p.getPreviousGameMode() != null) if (p.getPreviousGameMode() != null)
flat.set(pNode + "previousGameMode", p.getPreviousGameMode().toString()); flat.set(pNode + "previousGameMode", p.getPreviousGameMode().toString());
} }
@ -978,7 +983,7 @@ public class JailIO {
} catch (IOException e) { } catch (IOException e) {
pl.getLogger().severe("Unable to save the Jail data: " + e.getMessage()); pl.getLogger().severe("Unable to save the Jail data: " + e.getMessage());
} }
}else { } else {
pl.getLogger().severe("Storage not enabled, could not save the jail " + j.getName()); pl.getLogger().severe("Storage not enabled, could not save the jail " + j.getName());
} }
break; break;
@ -989,9 +994,9 @@ public class JailIO {
public void saveCell(Jail j, Cell c, boolean force) { public void saveCell(Jail j, Cell c, boolean force) {
//if the cell hasn't changed, no need to save it again //if the cell hasn't changed, no need to save it again
//unless they're forcing the save //unless they're forcing the save
if(!c.hasChanged() && !force) return; if (!c.hasChanged() && !force) return;
switch(storage) { switch (storage) {
case 1: case 1:
case 2: case 2:
try { try {
@ -1017,11 +1022,11 @@ public class JailIO {
cPS.setDouble(6, c.getTeleport().getYaw()); cPS.setDouble(6, c.getTeleport().getYaw());
cPS.setDouble(7, c.getTeleport().getPitch()); cPS.setDouble(7, c.getTeleport().getPitch());
if(c.useChest()) { if (c.useChest()) {
cPS.setInt(8, c.getChestLocation().getBlockX()); cPS.setInt(8, c.getChestLocation().getBlockX());
cPS.setInt(9, c.getChestLocation().getBlockY()); cPS.setInt(9, c.getChestLocation().getBlockY());
cPS.setInt(10, c.getChestLocation().getBlockZ()); cPS.setInt(10, c.getChestLocation().getBlockZ());
}else { } else {
cPS.setNull(8, java.sql.Types.INTEGER); cPS.setNull(8, java.sql.Types.INTEGER);
cPS.setNull(9, java.sql.Types.INTEGER); cPS.setNull(9, java.sql.Types.INTEGER);
cPS.setNull(10, java.sql.Types.INTEGER); cPS.setNull(10, java.sql.Types.INTEGER);
@ -1032,7 +1037,7 @@ public class JailIO {
cPS.executeUpdate(); cPS.executeUpdate();
cPS.close(); cPS.close();
if(c.hasPrisoner()) { if (c.hasPrisoner()) {
Prisoner p = c.getPrisoner(); Prisoner p = c.getPrisoner();
PreparedStatement pPS = con.prepareStatement("REPLACE INTO `" + prefix + "prisoners` (`uuid`, `name`, `jail`, `cell`, `muted`, `time`," PreparedStatement pPS = con.prepareStatement("REPLACE INTO `" + prefix + "prisoners` (`uuid`, `name`, `jail`, `cell`, `muted`, `time`,"
+ "`offlinePending`, `toBeTransferred`, `jailer`, `reason`, `inventory`, `armor`, `previousLocation`, `previousGameMode`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); + "`offlinePending`, `toBeTransferred`, `jailer`, `reason`, `inventory`, `armor`, `previousLocation`, `previousGameMode`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
@ -1087,7 +1092,7 @@ public class JailIO {
* @param p the prisoner data * @param p the prisoner data
*/ */
protected void removePrisoner(Jail j, Cell c, Prisoner p) { protected void removePrisoner(Jail j, Cell c, Prisoner p) {
switch(storage) { switch (storage) {
case 1: case 1:
case 2: case 2:
try { try {
@ -1110,7 +1115,7 @@ public class JailIO {
} }
break; break;
default: default:
if(c == null) if (c == null)
flat.set("jails." + j.getName() + ".prisoners." + p.getUUID().toString(), null); flat.set("jails." + j.getName() + ".prisoners." + p.getUUID().toString(), null);
else else
flat.set("jails." + j.getName() + ".cells." + c.getName() + ".prisoner", null); flat.set("jails." + j.getName() + ".cells." + c.getName() + ".prisoner", null);
@ -1132,15 +1137,15 @@ public class JailIO {
*/ */
public void removeCell(Jail j, Cell c) { public void removeCell(Jail j, Cell c) {
//Clear the inventory before we delete it //Clear the inventory before we delete it
if(c.hasChest()) c.getChest().getInventory().clear(); if (c.hasChest()) c.getChest().getInventory().clear();
//transfer the prisoner if it has one //transfer the prisoner if it has one
if(c.hasPrisoner()) { if (c.hasPrisoner()) {
pl.getLogger().warning("Removing of cell '" + c.getName() + "' from the jail '" + j.getName() + "' failed as it has a prisoner."); pl.getLogger().warning("Removing of cell '" + c.getName() + "' from the jail '" + j.getName() + "' failed as it has a prisoner.");
return; return;
} }
switch(storage) { switch (storage) {
case 1: case 1:
try { try {
Connection con = getConnection(); Connection con = getConnection();
@ -1180,7 +1185,7 @@ public class JailIO {
} }
break; break;
default: default:
if(flat != null) { if (flat != null) {
flat.set("jails." + j.getName() + ".cells." + c.getName(), null); flat.set("jails." + j.getName() + ".cells." + c.getName(), null);
try { try {
@ -1203,10 +1208,10 @@ public class JailIO {
protected void removeJail(Jail j) { protected void removeJail(Jail j) {
String name = j.getName(); String name = j.getName();
switch(storage) { switch (storage) {
case 1: case 1:
case 2: case 2:
for(Cell c : j.getCells()) { for (Cell c : j.getCells()) {
removeCell(j, c); removeCell(j, c);
} }
@ -1252,7 +1257,7 @@ public class JailIO {
* @param reason the player is jailed * @param reason the player is jailed
*/ */
public void addRecordEntry(String uuid, String username, String jailer, String date, long time, String reason) { public void addRecordEntry(String uuid, String username, String jailer, String date, long time, String reason) {
switch(storage) { switch (storage) {
case 1: case 1:
break; break;
case 2: case 2:
@ -1279,10 +1284,11 @@ public class JailIO {
} }
break; break;
default: default:
if(records == null) records = YamlConfiguration.loadConfiguration(new File(pl.getDataFolder(), "records.yml")); if (records == null)
records = YamlConfiguration.loadConfiguration(new File(pl.getDataFolder(), "records.yml"));
List<String> previous = records.getStringList(uuid); List<String> previous = records.getStringList(uuid);
previous.add(Lang.RECORDENTRY.get(new String[] { date, username, jailer, String.valueOf(time), reason, uuid })); previous.add(Lang.RECORDENTRY.get(date, username, jailer, String.valueOf(time), reason, uuid));
records.set(uuid, previous); records.set(uuid, previous);
@ -1306,9 +1312,9 @@ public class JailIO {
*/ */
public List<String> getRecordEntries(String username) { public List<String> getRecordEntries(String username) {
UUID uuid = pl.getServer().getOfflinePlayer(username).getUniqueId(); UUID uuid = pl.getServer().getOfflinePlayer(username).getUniqueId();
List<String> entries = new ArrayList<String>(); List<String> entries = new ArrayList<>();
switch(storage) { switch (storage) {
case 1: case 1:
break; break;
case 2: case 2:
@ -1322,8 +1328,8 @@ public class JailIO {
ps.setString(1, uuid.toString()); ps.setString(1, uuid.toString());
ResultSet set = ps.executeQuery(); ResultSet set = ps.executeQuery();
while(set.next()) { while (set.next()) {
entries.add(Lang.RECORDENTRY.get(new String[] { set.getString("date"), set.getString("username"), set.getString("jailer"), String.valueOf(set.getLong("time")), set.getString("reason"), set.getString("uuid") })); entries.add(Lang.RECORDENTRY.get(set.getString("date"), set.getString("username"), set.getString("jailer"), String.valueOf(set.getLong("time")), set.getString("reason"), set.getString("uuid")));
} }
set.close(); set.close();
@ -1335,7 +1341,8 @@ public class JailIO {
} }
break; break;
default: default:
if(records == null) records = YamlConfiguration.loadConfiguration(new File(pl.getDataFolder(), "records.yml")); if (records == null)
records = YamlConfiguration.loadConfiguration(new File(pl.getDataFolder(), "records.yml"));
entries = records.getStringList(uuid.toString()); entries = records.getStringList(uuid.toString());
break; break;

117
src/main/java/com/graywolf336/jail/JailMain.java
View File

@ -1,15 +1,5 @@
package com.graywolf336.jail; package com.graywolf336.jail;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.event.HandlerList;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.command.CommandHandler; import com.graywolf336.jail.command.CommandHandler;
@ -28,13 +18,22 @@ import com.graywolf336.jail.listeners.MoveProtectionListener;
import com.graywolf336.jail.listeners.PlayerListener; import com.graywolf336.jail.listeners.PlayerListener;
import com.graywolf336.jail.listeners.ProtectionListener; import com.graywolf336.jail.listeners.ProtectionListener;
import com.graywolf336.jail.listeners.WorldListener; import com.graywolf336.jail.listeners.WorldListener;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.event.HandlerList;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
/** /**
* The main class for this Jail plugin, holds instances of vital classes. * The main class for this Jail plugin, holds instances of vital classes.
* *
* @author graywolf336 * @author graywolf336
* @since 1.x.x
* @version 3.0.0 * @version 3.0.0
* @since 1.x.x
*/ */
public class JailMain extends JavaPlugin { public class JailMain extends JavaPlugin {
private CommandHandler cmdHand; private CommandHandler cmdHand;
@ -58,7 +57,7 @@ public class JailMain extends JavaPlugin {
loadConfig(); loadConfig();
debug = getConfig().getBoolean(Settings.DEBUG.getPath()); debug = getConfig().getBoolean(Settings.DEBUG.getPath());
if(debug) getLogger().info("Debugging enabled."); if (debug) getLogger().info("Debugging enabled.");
hcm = new HandCuffManager(); hcm = new HandCuffManager();
jm = new JailManager(this); jm = new JailManager(this);
@ -66,7 +65,7 @@ public class JailMain extends JavaPlugin {
io.loadLanguage(); io.loadLanguage();
//If the prepareStorage returns false, we need to disable the plugin //If the prepareStorage returns false, we need to disable the plugin
if(!io.prepareStorage(true)) { if (!io.prepareStorage(true)) {
this.getLogger().severe("An error occured while preparing the connection to the storage, please see the error above for more information."); this.getLogger().severe("An error occured while preparing the connection to the storage, please see the error above for more information.");
this.getServer().getPluginManager().disablePlugin(this); this.getServer().getPluginManager().disablePlugin(this);
return; return;
@ -80,7 +79,7 @@ public class JailMain extends JavaPlugin {
try { try {
jvm = new JailVoteManager(this); jvm = new JailVoteManager(this);
}catch(Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
getLogger().severe("Failed to load the Jail Vote system, please see the stacktrace above (you probably misconfigured the time)."); getLogger().severe("Failed to load the Jail Vote system, please see the stacktrace above (you probably misconfigured the time).");
} }
@ -115,15 +114,15 @@ public class JailMain extends JavaPlugin {
} }
public void onDisable() { public void onDisable() {
if(jm != null) if (jm != null)
for(Jail j : jm.getJails()) for (Jail j : jm.getJails())
io.saveJail(j); io.saveJail(j);
if(jt != null) if (jt != null)
if(jt.getTimer() != null) if (jt.getTimer() != null)
jt.getTimer().stop(); jt.getTimer().stop();
if(io != null) if (io != null)
io.closeConnection(); io.closeConnection();
getServer().getScheduler().cancelTasks(this); getServer().getScheduler().cancelTasks(this);
@ -168,13 +167,13 @@ public class JailMain extends JavaPlugin {
* Send the command off to the CommandHandler class, that way this main class doesn't get clogged up. * Send the command off to the CommandHandler class, that way this main class doesn't get clogged up.
*/ */
public boolean onCommand(CommandSender sender, Command command, String commandLabel, String[] args) { public boolean onCommand(CommandSender sender, Command command, String commandLabel, String[] args) {
if(jh == null || cmdHand == null) { if (jh == null || cmdHand == null) {
sender.sendMessage(Lang.PLUGINNOTLOADED.get()); sender.sendMessage(Lang.PLUGINNOTLOADED.get());
getServer().getConsoleSender().sendMessage(Lang.PLUGINNOTLOADED.get()); getServer().getConsoleSender().sendMessage(Lang.PLUGINNOTLOADED.get());
}else { } else {
if(commandLabel.equalsIgnoreCase("jail") || commandLabel.equalsIgnoreCase("j")) { if (commandLabel.equalsIgnoreCase("jail") || commandLabel.equalsIgnoreCase("j")) {
jh.parseCommand(jm, sender, args); jh.parseCommand(jm, sender, args);
}else { } else {
cmdHand.handleCommand(jm, sender, command.getName().toLowerCase(), args); cmdHand.handleCommand(jm, sender, command.getName().toLowerCase(), args);
} }
} }
@ -183,19 +182,19 @@ public class JailMain extends JavaPlugin {
} }
public List<String> onTabComplete(CommandSender sender, Command command, String commandLabel, String[] args) { public List<String> onTabComplete(CommandSender sender, Command command, String commandLabel, String[] args) {
if(jh == null || cmdHand == null) { if (jh == null || cmdHand == null) {
sender.sendMessage(Lang.PLUGINNOTLOADED.get()); sender.sendMessage(Lang.PLUGINNOTLOADED.get());
getServer().getConsoleSender().sendMessage(Lang.PLUGINNOTLOADED.get()); getServer().getConsoleSender().sendMessage(Lang.PLUGINNOTLOADED.get());
}else { } else {
debug("Tab Complete Args (" + args.length + ") for '" + commandLabel + "': " + Util.getStringFromArray(", ", args)); debug("Tab Complete Args (" + args.length + ") for '" + commandLabel + "': " + Util.getStringFromArray(", ", args));
try { try {
if(commandLabel.equalsIgnoreCase("jail") || commandLabel.equalsIgnoreCase("j")) { if (commandLabel.equalsIgnoreCase("jail") || commandLabel.equalsIgnoreCase("j")) {
return jh.parseTabComplete(jm, sender, args); return jh.parseTabComplete(jm, sender, args);
}else { } else {
return cmdHand.parseTabComplete(jm, sender, command.getName().toLowerCase(), args); return cmdHand.parseTabComplete(jm, sender, command.getName().toLowerCase(), args);
} }
}catch(Exception e) { } catch (Exception e) {
if(this.debug) if (this.debug)
e.printStackTrace(); e.printStackTrace();
debug(e.getClass().getSimpleName() + " occured while providing tab complete: " + e.getMessage()); debug(e.getClass().getSimpleName() + " occured while providing tab complete: " + e.getMessage());
@ -231,36 +230,40 @@ public class JailMain extends JavaPlugin {
getServer().getPluginManager().callEvent(new JailPluginReloadedEvent(this)); getServer().getPluginManager().callEvent(new JailPluginReloadedEvent(this));
} }
/** Reloads/Loads the move protection listener based upon it's previous status and the config. */ /**
* Reloads/Loads the move protection listener based upon it's previous status and the config.
*/
private void reloadMoveProtection() { private void reloadMoveProtection() {
boolean moveProtection = getConfig().getBoolean(Settings.MOVEPROTECTION.getPath()); boolean moveProtection = getConfig().getBoolean(Settings.MOVEPROTECTION.getPath());
//If move protection is not enabled and it used to be, //If move protection is not enabled and it used to be,
//unregister it. //unregister it.
if(!moveProtection && this.mpl != null) { if (!moveProtection && this.mpl != null) {
HandlerList.unregisterAll(this.mpl); HandlerList.unregisterAll(this.mpl);
this.mpl = null; this.mpl = null;
this.debug("The move protection listener is now disabled."); this.debug("The move protection listener is now disabled.");
} }
//If it is enabled and it used to not be, then enable it. //If it is enabled and it used to not be, then enable it.
if(moveProtection && this.mpl == null) { if (moveProtection && this.mpl == null) {
this.mpl = new MoveProtectionListener(this); this.mpl = new MoveProtectionListener(this);
getServer().getPluginManager().registerEvents(mpl, this); getServer().getPluginManager().registerEvents(mpl, this);
this.debug("The move protection listener is now enabled."); this.debug("The move protection listener is now enabled.");
} }
} }
/** Reloads the scoreboard manager class, useful when something is changed in the config about it. */ /**
* Reloads the scoreboard manager class, useful when something is changed in the config about it.
*/
private void reloadScoreBoardManager() { private void reloadScoreBoardManager() {
this.sbm.removeAllScoreboards(); this.sbm.removeAllScoreboards();
this.sbm = null; this.sbm = null;
this.sbm = new ScoreBoardManager(this); this.sbm = new ScoreBoardManager(this);
if(getConfig().getBoolean(Settings.SCOREBOARDENABLED.getPath())) { if (getConfig().getBoolean(Settings.SCOREBOARDENABLED.getPath())) {
for(Jail j : jm.getJails()) { for (Jail j : jm.getJails()) {
for(Prisoner p : j.getAllPrisoners().values()) { for (Prisoner p : j.getAllPrisoners().values()) {
if(getServer().getPlayer(p.getUUID()) != null) { if (getServer().getPlayer(p.getUUID()) != null) {
this.sbm.addScoreBoard(getServer().getPlayer(p.getUUID()), p); this.sbm.addScoreBoard(getServer().getPlayer(p.getUUID()), p);
} }
} }
@ -268,10 +271,12 @@ public class JailMain extends JavaPlugin {
} }
} }
/** Reloads the Jail Sticks, so the new ones can be loaded from the config. */ /**
* Reloads the Jail Sticks, so the new ones can be loaded from the config.
*/
private void reloadJailSticks() { private void reloadJailSticks() {
if(getConfig().getBoolean(Settings.JAILSTICKENABLED.getPath())) { if (getConfig().getBoolean(Settings.JAILSTICKENABLED.getPath())) {
if(this.jsm != null) { if (this.jsm != null) {
this.jsm.removeAllStickUsers(); this.jsm.removeAllStickUsers();
this.jsm = null; this.jsm = null;
} }
@ -280,24 +285,28 @@ public class JailMain extends JavaPlugin {
} }
} }
/** Reloads the {@link JailPayManager}. */ /**
* Reloads the {@link JailPayManager}.
*/
private void reloadJailPayManager() { private void reloadJailPayManager() {
this.jpm = null; this.jpm = null;
if(getConfig().getBoolean(Settings.JAILPAYENABLED.getPath())) { if (getConfig().getBoolean(Settings.JAILPAYENABLED.getPath())) {
if(getServer().getPluginManager().isPluginEnabled("Vault")) { if (getServer().getPluginManager().isPluginEnabled("Vault")) {
this.jpm = new JailPayManager(this); this.jpm = new JailPayManager(this);
}else { } else {
getConfig().set(Settings.JAILPAYENABLED.getPath(), false); getConfig().set(Settings.JAILPAYENABLED.getPath(), false);
getLogger().severe("Jail Pay couldn't find an economy, disabling Jail Pay."); getLogger().severe("Jail Pay couldn't find an economy, disabling Jail Pay.");
} }
} }
} }
/** Reloads the {@link JailVoteManager}. */ /**
* Reloads the {@link JailVoteManager}.
*/
private void reloadJailVoteManager() throws Exception { private void reloadJailVoteManager() throws Exception {
if(this.jvm != null) { if (this.jvm != null) {
for(Integer i : this.jvm.getRunningTasks().values()) { for (Integer i : this.jvm.getRunningTasks().values()) {
this.getServer().getScheduler().cancelTask(i); this.getServer().getScheduler().cancelTask(i);
} }
@ -309,17 +318,15 @@ public class JailMain extends JavaPlugin {
this.jvm = new JailVoteManager(this); 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.
*/
private void reloadUpdateCheck() { private void reloadUpdateCheck() {
getServer().getScheduler().cancelTask(updateCheckTask); getServer().getScheduler().cancelTask(updateCheckTask);
update = new Update(this); update = new Update(this);
if(getConfig().getBoolean(Settings.UPDATENOTIFICATIONS.getPath())) { if (getConfig().getBoolean(Settings.UPDATENOTIFICATIONS.getPath())) {
try { try {
updateCheckTask = getServer().getScheduler().runTaskTimerAsynchronously(this, new Runnable() { updateCheckTask = getServer().getScheduler().runTaskTimerAsynchronously(this, () -> update.query(), 80L, Util.getTime(getConfig().getString(Settings.UPDATETIME.getPath()), TimeUnit.SECONDS) * 20).getTaskId();
public void run() {
update.query();
}
}, 80L, Util.getTime(getConfig().getString(Settings.UPDATETIME.getPath()), TimeUnit.SECONDS) * 20).getTaskId();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
getLogger().severe("Was unable to schedule the update checking, please check your time format is correct."); getLogger().severe("Was unable to schedule the update checking, please check your time format is correct.");
@ -439,7 +446,7 @@ public class JailMain extends JavaPlugin {
* @param message the item to log as debugging * @param message the item to log as debugging
*/ */
public void debug(String message) { public void debug(String message) {
if(inDebug()) getLogger().info("[Debug]: " + message); if (inDebug()) getLogger().info("[Debug]: " + message);
} }
/** /**

217
src/main/java/com/graywolf336/jail/JailManager.java
View File

@ -1,18 +1,5 @@
package com.graywolf336.jail; package com.graywolf336.jail;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.UUID;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.beans.CachePrisoner; import com.graywolf336.jail.beans.CachePrisoner;
import com.graywolf336.jail.beans.Cell; import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.ConfirmPlayer; import com.graywolf336.jail.beans.ConfirmPlayer;
@ -23,12 +10,24 @@ import com.graywolf336.jail.enums.Confirmation;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.steps.CellCreationSteps; import com.graywolf336.jail.steps.CellCreationSteps;
import com.graywolf336.jail.steps.JailCreationSteps; import com.graywolf336.jail.steps.JailCreationSteps;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.UUID;
/** /**
* Handles all things related to jails. * Handles all things related to jails.
* *
* <p> * <p>
* * <p>
* Stores the following: * Stores the following:
* <ul> * <ul>
* <li>The {@link Jail jails}, which contains the prisoners and cells.</li> * <li>The {@link Jail jails}, which contains the prisoners and cells.</li>
@ -38,26 +37,26 @@ import com.graywolf336.jail.steps.JailCreationSteps;
* </ul> * </ul>
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.1.0 * @version 1.1.0
* @since 3.0.0
*/ */
public class JailManager { public class JailManager {
private JailMain plugin; private final JailMain plugin;
private HashMap<String, Jail> jails; private final HashMap<String, Jail> jails;
private HashMap<String, CreationPlayer> jailCreators; private final HashMap<String, CreationPlayer> jailCreators;
private HashMap<String, CreationPlayer> cellCreators; private final HashMap<String, CreationPlayer> cellCreators;
private HashMap<String, ConfirmPlayer> confirms; private final HashMap<String, ConfirmPlayer> confirms;
private HashMap<UUID, CachePrisoner> cache; private final HashMap<UUID, CachePrisoner> cache;
private JailCreationSteps jcs; private final JailCreationSteps jcs;
private CellCreationSteps ccs; private final CellCreationSteps ccs;
protected JailManager(JailMain plugin) { protected JailManager(JailMain plugin) {
this.plugin = plugin; this.plugin = plugin;
this.jails = new HashMap<String, Jail>(); this.jails = new HashMap<>();
this.jailCreators = new HashMap<String, CreationPlayer>(); this.jailCreators = new HashMap<>();
this.cellCreators = new HashMap<String, CreationPlayer>(); this.cellCreators = new HashMap<>();
this.confirms = new HashMap<String, ConfirmPlayer>(); this.confirms = new HashMap<>();
this.cache = new HashMap<UUID, CachePrisoner>(); this.cache = new HashMap<>();
this.jcs = new JailCreationSteps(); this.jcs = new JailCreationSteps();
this.ccs = new CellCreationSteps(); this.ccs = new CellCreationSteps();
} }
@ -77,7 +76,7 @@ public class JailManager {
* @return HashSet of all the jail instances. * @return HashSet of all the jail instances.
*/ */
public HashSet<Jail> getJails() { public HashSet<Jail> getJails() {
return new HashSet<Jail>(jails.values()); return new HashSet<>(jails.values());
} }
/** /**
@ -89,7 +88,7 @@ public class JailManager {
String[] toReturn = new String[jails.size()]; String[] toReturn = new String[jails.size()];
int count = 0; int count = 0;
for(Jail j : this.jails.values()) { for (Jail j : this.jails.values()) {
toReturn[count] = j.getName(); toReturn[count] = j.getName();
count++; count++;
} }
@ -101,17 +100,17 @@ public class JailManager {
* Gets a list of Jail names that start with the provided prefix. * Gets a list of Jail names that start with the provided prefix.
* *
* <p> * <p>
* * <p>
* If the provided prefix is empty, then we add all of the jails. * If the provided prefix is empty, then we add all of the jails.
* *
* @param prefix The start of the jails to get * @param prefix The start of the jails to get
* @return List of jails that matched the prefix * @return List of jails that matched the prefix
*/ */
public List<String> getJailsByPrefix(String prefix) { public List<String> getJailsByPrefix(String prefix) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
for(Jail j : this.jails.values()) for (Jail j : this.jails.values())
if(prefix.isEmpty() || StringUtil.startsWithIgnoreCase(j.getName(), prefix)) if (prefix.isEmpty() || StringUtil.startsWithIgnoreCase(j.getName(), prefix))
results.add(j.getName()); results.add(j.getName());
Collections.sort(results); Collections.sort(results);
@ -127,7 +126,7 @@ public class JailManager {
*/ */
public void addJail(Jail jail, boolean n) { public void addJail(Jail jail, boolean n) {
this.jails.put(jail.getName().toLowerCase(), jail); this.jails.put(jail.getName().toLowerCase(), jail);
if(n) plugin.getJailIO().saveJail(jail); if (n) plugin.getJailIO().saveJail(jail);
} }
/** /**
@ -147,7 +146,7 @@ public class JailManager {
* @return The {@link Jail} with the given name, if no jail found this <strong>will</strong> return null. * @return The {@link Jail} with the given name, if no jail found this <strong>will</strong> return null.
*/ */
public Jail getJail(String name) { public Jail getJail(String name) {
if(name.isEmpty() && jails.isEmpty()) if (name.isEmpty() && jails.isEmpty())
return null; return null;
else else
return name.isEmpty() ? this.jails.values().iterator().next() : this.jails.get(name.toLowerCase()); return name.isEmpty() ? this.jails.values().iterator().next() : this.jails.get(name.toLowerCase());
@ -160,15 +159,15 @@ 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 (jails.isEmpty()) return null;
if(sender instanceof Player) { if (sender instanceof Player) {
Location loc = ((Player) sender).getLocation(); Location loc = ((Player) sender).getLocation();
Jail j = null; Jail j = null;
double len = -1; double len = -1;
for(Jail jail : jails.values()) { for (Jail jail : jails.values()) {
double clen = jail.getDistance(loc); double clen = jail.getDistance(loc);
if (clen < len || len == -1) { if (clen < len || len == -1) {
@ -178,7 +177,7 @@ public class JailManager {
} }
return (j == null ? jails.values().iterator().next() : j); return (j == null ? jails.values().iterator().next() : j);
}else { } else {
return jails.values().iterator().next(); return jails.values().iterator().next();
} }
} }
@ -190,8 +189,8 @@ public class JailManager {
* @return The jail this block is in, null if no jail found. * @return The jail this block is in, null if no jail found.
*/ */
public Jail getJailFromLocation(Location loc) { public Jail getJailFromLocation(Location loc) {
for(Jail j : jails.values()) { for (Jail j : jails.values()) {
if(Util.isInsideAB(loc.toVector(), j.getMinPoint().toVector(), j.getMaxPoint().toVector())) { if (Util.isInsideAB(loc.toVector(), j.getMinPoint().toVector(), j.getMaxPoint().toVector())) {
return j; return j;
} }
} }
@ -206,8 +205,8 @@ public class JailManager {
* @return whether it is inside a jail or not * @return whether it is inside a jail or not
*/ */
public boolean isLocationAJail(Location l) { public boolean isLocationAJail(Location l) {
for(Jail j : jails.values()) { for (Jail j : jails.values()) {
if(Util.isInsideAB(l.toVector(), j.getMinPoint().toVector(), j.getMaxPoint().toVector())) { if (Util.isInsideAB(l.toVector(), j.getMinPoint().toVector(), j.getMaxPoint().toVector())) {
return true; return true;
} }
} }
@ -231,9 +230,9 @@ public class JailManager {
* @return HashSet of all the Cells. * @return HashSet of all the Cells.
*/ */
public HashSet<Cell> getAllCells() { public HashSet<Cell> getAllCells() {
HashSet<Cell> cells = new HashSet<Cell>(); HashSet<Cell> cells = new HashSet<>();
for(Jail j : jails.values()) for (Jail j : jails.values())
cells.addAll(j.getCells()); cells.addAll(j.getCells());
return cells; return cells;
@ -287,9 +286,9 @@ public class JailManager {
* @return HashSet of Prisoners. * @return HashSet of Prisoners.
*/ */
public HashMap<UUID, Prisoner> getAllPrisoners() { public HashMap<UUID, Prisoner> getAllPrisoners() {
HashMap<UUID, Prisoner> prisoners = new HashMap<UUID, Prisoner>(); HashMap<UUID, Prisoner> prisoners = new HashMap<>();
for(Jail j : jails.values()) for (Jail j : jails.values())
prisoners.putAll(j.getAllPrisoners()); prisoners.putAll(j.getAllPrisoners());
return prisoners; return prisoners;
@ -302,7 +301,7 @@ public class JailManager {
* @return The jail the player is in, <strong>CAN BE NULL</strong>. * @return The jail the player is in, <strong>CAN BE NULL</strong>.
*/ */
public Jail getJailPrisonerIsIn(Prisoner prisoner) { public Jail getJailPrisonerIsIn(Prisoner prisoner) {
if(prisoner == null) return null; if (prisoner == null) return null;
else return getJailPlayerIsIn(prisoner.getUUID()); else return getJailPlayerIsIn(prisoner.getUUID());
} }
@ -310,20 +309,20 @@ public class JailManager {
* Gets the {@link Jail jail} the given player is in. * Gets the {@link Jail jail} the given player is in.
* *
* <p> * <p>
* * <p>
* Checks the cache first. * Checks the cache first.
* *
* @param uuid The uuid of the player who's jail we are getting. * @param uuid The uuid of the player who's jail we are getting.
* @return The jail the player is in, <strong>CAN BE NULL</strong>. * @return The jail the player is in, <strong>CAN BE NULL</strong>.
*/ */
public Jail getJailPlayerIsIn(UUID uuid) { public Jail getJailPlayerIsIn(UUID uuid) {
if(this.cache.containsKey(uuid)) { if (this.cache.containsKey(uuid)) {
plugin.debug(uuid.toString() + " is in the cache (getJailPlayerIsIn)."); plugin.debug(uuid.toString() + " is in the cache (getJailPlayerIsIn).");
return this.cache.get(uuid).getJail(); return this.cache.get(uuid).getJail();
} }
for(Jail j : jails.values()) for (Jail j : jails.values())
if(j.isPlayerJailed(uuid)) if (j.isPlayerJailed(uuid))
return j; return j;
return null; return null;
@ -358,9 +357,9 @@ public class JailManager {
* @return {@link Jail jail} player is in * @return {@link Jail jail} player is in
*/ */
public Jail getJailPlayerIsInByLastKnownName(String username) { public Jail getJailPlayerIsInByLastKnownName(String username) {
for(Jail j : jails.values()) for (Jail j : jails.values())
for(Prisoner p : j.getAllPrisoners().values()) for (Prisoner p : j.getAllPrisoners().values())
if(p.getLastKnownName().equalsIgnoreCase(username)) if (p.getLastKnownName().equalsIgnoreCase(username))
return j; return j;
return null; return null;
@ -373,8 +372,8 @@ public class JailManager {
* @return {@link Prisoner prisoner} data * @return {@link Prisoner prisoner} data
*/ */
public Prisoner getPrisonerByLastKnownName(String username) { public Prisoner getPrisonerByLastKnownName(String username) {
for(Prisoner p : this.getAllPrisoners().values()) for (Prisoner p : this.getAllPrisoners().values())
if(p.getLastKnownName().equalsIgnoreCase(username)) if (p.getLastKnownName().equalsIgnoreCase(username))
return p; return p;
return null; return null;
@ -398,19 +397,19 @@ public class JailManager {
*/ */
public String clearJailOfPrisoners(String jail) { public String clearJailOfPrisoners(String jail) {
//If they don't pass in a jail name, clear all the jails //If they don't pass in a jail name, clear all the jails
if(jail != null) { if (jail != null) {
Jail j = getJail(jail); Jail j = getJail(jail);
if(j != null) { if (j != null) {
for(Prisoner p : j.getAllPrisoners().values()) { for (Prisoner p : j.getAllPrisoners().values()) {
getPlugin().getPrisonerManager().schedulePrisonerRelease(p); getPlugin().getPrisonerManager().schedulePrisonerRelease(p);
} }
return Lang.PRISONERSCLEARED.get(j.getName()); return Lang.PRISONERSCLEARED.get(j.getName());
}else { } else {
return Lang.NOJAIL.get(jail); return Lang.NOJAIL.get(jail);
} }
}else { } else {
return clearAllJailsOfAllPrisoners(); return clearAllJailsOfAllPrisoners();
} }
} }
@ -422,11 +421,11 @@ public class JailManager {
*/ */
public String clearAllJailsOfAllPrisoners() { public String clearAllJailsOfAllPrisoners() {
//No name of a jail has been passed, so release all of the prisoners in all the jails //No name of a jail has been passed, so release all of the prisoners in all the jails
if(getJails().size() == 0) { if (getJails().size() == 0) {
return Lang.NOJAILS.get(); return Lang.NOJAILS.get();
}else { } else {
for(Jail j : getJails()) { for (Jail j : getJails()) {
for(Prisoner p : j.getAllPrisoners().values()) { for (Prisoner p : j.getAllPrisoners().values()) {
getPlugin().getPrisonerManager().schedulePrisonerRelease(p); getPlugin().getPrisonerManager().schedulePrisonerRelease(p);
} }
} }
@ -439,30 +438,30 @@ public class JailManager {
* Forcefully clears all the jails if name provided is null. * Forcefully clears all the jails if name provided is null.
* *
* <p> * <p>
* * <p>
* This method just clears them from the storage, doesn't release them. * This method just clears them from the storage, doesn't release them.
* *
* @param name of the jail to clear, null if all of them. * @param name of the jail to clear, null if all of them.
* @return The resulting message to be sent to the caller of this method. * @return The resulting message to be sent to the caller of this method.
*/ */
public String forcefullyClearJailOrJails(String name) { public String forcefullyClearJailOrJails(String name) {
if(name == null) { if (name == null) {
if(getJails().size() == 0) { if (getJails().size() == 0) {
return Lang.NOJAILS.get(); return Lang.NOJAILS.get();
}else { } else {
for(Jail j : getJails()) { for (Jail j : getJails()) {
j.clearPrisoners(); j.clearPrisoners();
} }
return Lang.PRISONERSCLEARED.get(Lang.ALLJAILS); return Lang.PRISONERSCLEARED.get(Lang.ALLJAILS);
} }
}else { } else {
Jail j = getJail(name); Jail j = getJail(name);
if(j != null) { if (j != null) {
j.clearPrisoners(); j.clearPrisoners();
return Lang.PRISONERSCLEARED.get(j.getName()); return Lang.PRISONERSCLEARED.get(j.getName());
}else { } else {
return Lang.NOJAIL.get(name); return Lang.NOJAIL.get(name);
} }
} }
@ -477,24 +476,24 @@ public class JailManager {
*/ */
public String deleteJailCell(String jail, String cell) { public String deleteJailCell(String jail, String cell) {
//Check if the jail name provided is a valid jail //Check if the jail name provided is a valid jail
if(isValidJail(jail)) { if (isValidJail(jail)) {
Jail j = getJail(jail); Jail j = getJail(jail);
//check if the cell is a valid cell //check if the cell is a valid cell
if(j.isValidCell(cell)) { if (j.isValidCell(cell)) {
if(j.getCell(cell).hasPrisoner()) { if (j.getCell(cell).hasPrisoner()) {
//The cell has a prisoner, so tell them to first transfer the prisoner //The cell has a prisoner, so tell them to first transfer the prisoner
//or release the prisoner //or release the prisoner
return Lang.CELLREMOVALUNSUCCESSFUL.get(new String[] { cell, jail }); return Lang.CELLREMOVALUNSUCCESSFUL.get(cell, jail);
}else { } else {
j.removeCell(cell); j.removeCell(cell);
return Lang.CELLREMOVED.get(new String[] { cell, jail }); return Lang.CELLREMOVED.get(cell, jail);
} }
}else { } else {
//No cell found by the provided name in the stated jail //No cell found by the provided name in the stated jail
return Lang.NOCELL.get(new String[] { cell, jail }); return Lang.NOCELL.get(cell, jail);
} }
}else { } else {
//No jail found by the provided name //No jail found by the provided name
return Lang.NOJAIL.get(jail); return Lang.NOJAIL.get(jail);
} }
@ -507,36 +506,36 @@ public class JailManager {
* @return An array of strings of messages to send. * @return An array of strings of messages to send.
*/ */
public String[] deleteAllJailCells(String jail) { public String[] deleteAllJailCells(String jail) {
LinkedList<String> msgs = new LinkedList<String>(); LinkedList<String> msgs = new LinkedList<>();
//Check if the jail name provided is a valid jail //Check if the jail name provided is a valid jail
if(isValidJail(jail)) { if (isValidJail(jail)) {
Jail j = getJail(jail); Jail j = getJail(jail);
if(j.getCellCount() == 0) { if (j.getCellCount() == 0) {
//There are no cells in this jail, thus we can't delete them. //There are no cells in this jail, thus we can't delete them.
msgs.add(Lang.NOCELLS.get(j.getName())); msgs.add(Lang.NOCELLS.get(j.getName()));
}else { } else {
//Keep a local copy of the hashset so that we don't get any CMEs. //Keep a local copy of the hashset so that we don't get any CMEs.
HashSet<Cell> cells = new HashSet<Cell>(j.getCells()); HashSet<Cell> cells = new HashSet<>(j.getCells());
for(Cell c : cells) { for (Cell c : cells) {
if(c.hasPrisoner()) { if (c.hasPrisoner()) {
//The cell has a prisoner, so tell them to first transfer the prisoner //The cell has a prisoner, so tell them to first transfer the prisoner
//or release the prisoner //or release the prisoner
msgs.add(Lang.CELLREMOVALUNSUCCESSFUL.get(new String[] { c.getName(), j.getName() })); msgs.add(Lang.CELLREMOVALUNSUCCESSFUL.get(c.getName(), j.getName()));
}else { } else {
j.removeCell(c.getName()); j.removeCell(c.getName());
msgs.add(Lang.CELLREMOVED.get(new String[] { c.getName(), j.getName() })); msgs.add(Lang.CELLREMOVED.get(c.getName(), j.getName()));
} }
} }
} }
}else { } else {
//No jail found by the provided name //No jail found by the provided name
msgs.add(Lang.NOJAIL.get(jail)); msgs.add(Lang.NOJAIL.get(jail));
} }
return msgs.toArray(new String[msgs.size()]); return msgs.toArray(new String[0]);
} }
/** /**
@ -547,17 +546,17 @@ public class JailManager {
*/ */
public String deleteJail(String jail) { public String deleteJail(String jail) {
//Check if the jail name provided is a valid jail //Check if the jail name provided is a valid jail
if(isValidJail(jail)) { if (isValidJail(jail)) {
//check if the jail doesn't contain prisoners //check if the jail doesn't contain prisoners
if(getJail(jail).getAllPrisoners().size() == 0) { if (getJail(jail).getAllPrisoners().size() == 0) {
//There are no prisoners, so we can delete it //There are no prisoners, so we can delete it
removeJail(jail); removeJail(jail);
return Lang.JAILREMOVED.get(jail); return Lang.JAILREMOVED.get(jail);
}else { } else {
//The jail has prisoners, they need to release them first //The jail has prisoners, they need to release them first
return Lang.JAILREMOVALUNSUCCESSFUL.get(jail); return Lang.JAILREMOVALUNSUCCESSFUL.get(jail);
} }
}else { } else {
//No jail found by the provided name //No jail found by the provided name
return Lang.NOJAIL.get(jail); return Lang.NOJAIL.get(jail);
} }
@ -567,7 +566,7 @@ public class JailManager {
* Returns whether or not the player is creating a jail or a cell. * Returns whether or not the player is creating a jail or a cell.
* *
* <p> * <p>
* * <p>
* If you want to check to see if they're just creating a jail then use {@link #isCreatingAJail(String) isCreatingAJail} or if you want to see if they're creating a cell then use {@link #isCreatingACell(String) isCreatingACell}. * If you want to check to see if they're just creating a jail then use {@link #isCreatingAJail(String) isCreatingAJail} or if you want to see if they're creating a cell then use {@link #isCreatingACell(String) isCreatingACell}.
* *
* @param name The name of the player, in any case as we convert it to lowercase. * @param name The name of the player, in any case as we convert it to lowercase.
@ -586,11 +585,11 @@ public class JailManager {
public String getStepMessage(String player) { public String getStepMessage(String player) {
String message = ""; String message = "";
if(isCreatingACell(player)) {//Check whether it is a jail cell if (isCreatingACell(player)) {//Check whether it is a jail cell
CreationPlayer cp = this.getCellCreationPlayer(player); CreationPlayer cp = this.getCellCreationPlayer(player);
message = "You're already creating a Cell with the name '" + cp.getCellName() + "' and you still need to "; message = "You're already creating a Cell with the name '" + cp.getCellName() + "' and you still need to ";
switch(cp.getStep()) { switch (cp.getStep()) {
case 1: case 1:
message += "set the teleport in location."; message += "set the teleport in location.";
break; break;
@ -602,11 +601,11 @@ public class JailManager {
break; break;
} }
}else if(isCreatingAJail(player)) {//If not a cell, then check if a jail. } else if (isCreatingAJail(player)) {//If not a cell, then check if a jail.
CreationPlayer cp = this.getJailCreationPlayer(player); CreationPlayer cp = this.getJailCreationPlayer(player);
message = "You're already creating a Jail with the name '" + cp.getJailName() + "' and you still need to "; message = "You're already creating a Jail with the name '" + cp.getJailName() + "' and you still need to ";
switch(cp.getStep()) { switch (cp.getStep()) {
case 1: case 1:
message += "select the first point."; message += "select the first point.";
break; break;
@ -643,9 +642,9 @@ public class JailManager {
* @return True if they were added successfully, false if they are already creating a Jail. * @return True if they were added successfully, false if they are already creating a Jail.
*/ */
public boolean addCreatingJail(String player, String jailName) { public boolean addCreatingJail(String player, String jailName) {
if(isCreatingAJail(player)) { if (isCreatingAJail(player)) {
return false; return false;
}else { } else {
this.jailCreators.put(player.toLowerCase(), new CreationPlayer(jailName)); this.jailCreators.put(player.toLowerCase(), new CreationPlayer(jailName));
return true; return true;
} }
@ -689,9 +688,9 @@ public class JailManager {
* @return True if they were added successfully, false if they are already creating a Jail. * @return True if they were added successfully, false if they are already creating a Jail.
*/ */
public boolean addCreatingCell(String player, String jailName, String cellName) { public boolean addCreatingCell(String player, String jailName, String cellName) {
if(isCreatingACell(player)) { if (isCreatingACell(player)) {
return false; return false;
}else { } else {
this.cellCreators.put(player.toLowerCase(), new CreationPlayer(jailName, cellName)); this.cellCreators.put(player.toLowerCase(), new CreationPlayer(jailName, cellName));
return true; return true;
} }

54
src/main/java/com/graywolf336/jail/JailPayManager.java
View File

@ -1,34 +1,34 @@
package com.graywolf336.jail; package com.graywolf336.jail;
import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.enums.Settings;
import com.graywolf336.jail.interfaces.IJailPayManager;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.RegisteredServiceProvider;
import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.enums.Settings;
import com.graywolf336.jail.interfaces.IJailPayManager;
public class JailPayManager implements IJailPayManager { public class JailPayManager implements IJailPayManager {
private Economy economy = null; private Economy economy = null;
private double minteCost, infiniteCost; private final double minteCost;
private double infiniteCost;
private Material item; private Material item;
private boolean infinite, timed; private final boolean infinite;
private final boolean timed;
protected JailPayManager(JailMain plugin) { protected JailPayManager(JailMain plugin) {
this.item = Material.getMaterial(plugin.getConfig().getString(Settings.JAILPAYITEM.getPath()).toUpperCase()); this.item = Material.getMaterial(plugin.getConfig().getString(Settings.JAILPAYITEM.getPath()).toUpperCase());
if(this.item == null) { if (this.item == null) {
plugin.getLogger().warning("Pay item is null, setting to air"); plugin.getLogger().warning("Pay item is null, setting to air");
this.item = Material.AIR; this.item = Material.AIR;
} }
this.minteCost = plugin.getConfig().getDouble(Settings.JAILPAYPRICEPERMINUTE.getPath()); this.minteCost = plugin.getConfig().getDouble(Settings.JAILPAYPRICEPERMINUTE.getPath());
if(!this.usingItemsForPayment()) { if (!this.usingItemsForPayment()) {
if(!this.setupEconomy(plugin)) { if (!this.setupEconomy(plugin)) {
plugin.getConfig().set(Settings.JAILPAYENABLED.getPath(), false); plugin.getConfig().set(Settings.JAILPAYENABLED.getPath(), false);
} }
} }
@ -66,22 +66,22 @@ public class JailPayManager implements IJailPayManager {
} }
public boolean hasEnoughToPay(Player p, double amt) { public boolean hasEnoughToPay(Player p, double amt) {
if(this.usingItemsForPayment()) { if (this.usingItemsForPayment()) {
return p.getInventory().contains(this.item, (int) Math.ceil(amt)); return p.getInventory().contains(this.item, (int) Math.ceil(amt));
}else { } else {
return this.economy.has(p, amt); return this.economy.has(p, amt);
} }
} }
public void pay(Player p, double amt) { public void pay(Player p, double amt) {
if(this.usingItemsForPayment()) { if (this.usingItemsForPayment()) {
int amtNeeded = (int) Math.ceil(amt); int amtNeeded = (int) Math.ceil(amt);
for (int i = 0; i < p.getInventory().getSize(); i++) { for (int i = 0; i < p.getInventory().getSize(); i++) {
ItemStack it = p.getInventory().getItem(i); ItemStack it = p.getInventory().getItem(i);
//The item is either air or we doesn't match out needs //The item is either air or we doesn't match out needs
if(it == null || it.getType() != this.item) continue; if (it == null || it.getType() != this.item) continue;
//If the itemstack has more than or equal to the amount //If the itemstack has more than or equal to the amount
//that we need, remove it and subject from the amt needed //that we need, remove it and subject from the amt needed
@ -97,33 +97,33 @@ public class JailPayManager implements IJailPayManager {
if (amtNeeded == 0) break; if (amtNeeded == 0) break;
} }
}else { } else {
this.economy.withdrawPlayer(p, amt); this.economy.withdrawPlayer(p, amt);
} }
} }
public String getCurrencyName() { public String getCurrencyName() {
if(this.usingItemsForPayment()) { if (this.usingItemsForPayment()) {
String name = item.toString().replaceAll("_", " "); StringBuilder name = new StringBuilder(item.toString().replaceAll("_", " "));
if(name.contains(" ")){ if (name.toString().contains(" ")) {
String[] split = name.split(" "); String[] split = name.toString().split(" ");
for(int i=0; i < split.length; i++){ for (int i = 0; i < split.length; i++) {
split[i] = split[i].substring(0, 1).toUpperCase() + split[i].substring(1).toLowerCase(); split[i] = split[i].substring(0, 1).toUpperCase() + split[i].substring(1).toLowerCase();
} }
name = ""; name = new StringBuilder();
for(String s : split){ for (String s : split) {
name += " " + s; name.append(" ").append(s);
} }
name = name.substring(1); name = new StringBuilder(name.substring(1));
} else { } else {
name = name.substring(0, 1).toUpperCase() + name.substring(1).toLowerCase(); name = new StringBuilder(name.substring(0, 1).toUpperCase() + name.substring(1).toLowerCase());
} }
return name; return name.toString();
}else { } else {
return this.economy.currencyNamePlural(); return this.economy.currencyNamePlural();
} }
} }

47
src/main/java/com/graywolf336/jail/JailStickManager.java
View File

@ -1,14 +1,13 @@
package com.graywolf336.jail; package com.graywolf336.jail;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.UUID;
import org.bukkit.Material;
import com.graywolf336.jail.beans.Stick; import com.graywolf336.jail.beans.Stick;
import com.graywolf336.jail.enums.Settings; import com.graywolf336.jail.enums.Settings;
import com.graywolf336.jail.interfaces.IJailStickManager; import com.graywolf336.jail.interfaces.IJailStickManager;
import org.bukkit.Material;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.UUID;
/** /**
* Manages the jail stick users. * Manages the jail stick users.
@ -16,34 +15,33 @@ import com.graywolf336.jail.interfaces.IJailStickManager;
* @author graywolf336 * @author graywolf336
* @version 1.0.2 * @version 1.0.2
* @since 3.0.0 * @since 3.0.0
*
*/ */
public class JailStickManager implements IJailStickManager { public class JailStickManager implements IJailStickManager {
private ArrayList<UUID> stickers; private final ArrayList<UUID> stickers;
private HashMap<Material, Stick> sticks; private final HashMap<Material, Stick> sticks;
protected JailStickManager(JailMain plugin) { protected JailStickManager(JailMain plugin) {
this.stickers = new ArrayList<UUID>(); this.stickers = new ArrayList<>();
this.sticks = new HashMap<Material, Stick>(); this.sticks = new HashMap<>();
this.loadJailSticks(plugin); this.loadJailSticks(plugin);
} }
private void loadJailSticks(JailMain pl) { private void loadJailSticks(JailMain pl) {
//item name,time,jail name,reason //item name,time,jail name,reason
if(pl.getJailManager().getJails().size() == 0) { if (pl.getJailManager().getJails().size() == 0) {
pl.getLogger().warning("Can't have jail sticks without any jails."); pl.getLogger().warning("Can't have jail sticks without any jails.");
}else { } else {
for(String s : pl.getConfig().getStringList(Settings.JAILSTICKSTICKS.getPath())) { for (String s : pl.getConfig().getStringList(Settings.JAILSTICKSTICKS.getPath())) {
pl.debug(s); pl.debug(s);
String[] a = s.split(","); String[] a = s.split(",");
String jail = a[2]; String jail = a[2];
//Check if the jail given, if any, exists //Check if the jail given, if any, exists
if(jail.isEmpty()) { if (jail.isEmpty()) {
jail = pl.getJailManager().getJail("").getName(); jail = pl.getJailManager().getJail("").getName();
}else { } else {
if(!pl.getJailManager().isValidJail(jail)) { if (!pl.getJailManager().isValidJail(jail)) {
pl.getLogger().severe(s); pl.getLogger().severe(s);
pl.getLogger().severe("The above jail stick configuration is invalid and references a jail that doesn't exist."); pl.getLogger().severe("The above jail stick configuration is invalid and references a jail that doesn't exist.");
continue; continue;
@ -51,13 +49,13 @@ public class JailStickManager implements IJailStickManager {
} }
Material m = Material.getMaterial(a[0].toUpperCase()); Material m = Material.getMaterial(a[0].toUpperCase());
if(this.sticks.containsKey(m)) { if (this.sticks.containsKey(m)) {
pl.getLogger().severe(s); pl.getLogger().severe(s);
pl.getLogger().severe("You can not use the same item for two different Jail Sticks. This already exists as a Jail Stick: " + a[0]); pl.getLogger().severe("You can not use the same item for two different Jail Sticks. This already exists as a Jail Stick: " + a[0]);
continue; continue;
} }
long time = 5; long time;
try { try {
time = Util.getTime(a[1]); time = Util.getTime(a[1]);
} catch (Exception e) { } catch (Exception e) {
@ -67,12 +65,11 @@ public class JailStickManager implements IJailStickManager {
} }
try { try {
this.sticks.put(m, new Stick(jail, a[3], time, a.length >= 5 ? Double.valueOf(a[4]) : -1)); this.sticks.put(m, new Stick(jail, a[3], time, a.length >= 5 ? Double.parseDouble(a[4]) : -1));
}catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
pl.getLogger().severe(s); pl.getLogger().severe(s);
pl.getLogger().severe("Unable to create a new stick for " + a[0] + ", see the exception above for details."); pl.getLogger().severe("Unable to create a new stick for " + a[0] + ", see the exception above for details.");
continue;
} }
} }
} }
@ -102,17 +99,17 @@ public class JailStickManager implements IJailStickManager {
} }
public boolean toggleUsingStick(UUID id) { public boolean toggleUsingStick(UUID id) {
if(this.stickers.contains(id)) { if (this.stickers.contains(id)) {
this.stickers.remove(id); this.stickers.remove(id);
return false; return false;
}else { } else {
this.stickers.add(id); this.stickers.add(id);
return true; return true;
} }
} }
public void removeAllStickUsers() { public void removeAllStickUsers() {
for(UUID id : stickers) { for (UUID id : stickers) {
this.removeUsingStick(id); this.removeUsingStick(id);
} }
} }

60
src/main/java/com/graywolf336/jail/JailTimer.java
View File

@ -1,27 +1,23 @@
package com.graywolf336.jail; package com.graywolf336.jail;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.Timer;
import org.bukkit.entity.Player;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.enums.Settings; import com.graywolf336.jail.enums.Settings;
import com.graywolf336.jail.events.PrisonerTimeChangeEvent; import com.graywolf336.jail.events.PrisonerTimeChangeEvent;
import org.bukkit.entity.Player;
import javax.swing.*;
/** /**
* Contains all the logic for counting down the time of the prisoners time. * Contains all the logic for counting down the time of the prisoners time.
* *
* @author graywolf336 * @author graywolf336
* @since 2.x.x
* @version 3.0.0 * @version 3.0.0
* @since 2.x.x
*/ */
public class JailTimer { public class JailTimer {
private JailMain pl; private final JailMain pl;
private Timer timer; private Timer timer;
private Long lastTime; private Long lastTime;
private Long afkTime = 0L; private Long afkTime = 0L;
@ -35,27 +31,21 @@ public class JailTimer {
} }
this.lastTime = System.currentTimeMillis(); this.lastTime = System.currentTimeMillis();
if(pl.getConfig().getBoolean(Settings.USEBUKKITTIMER.getPath())) { if (pl.getConfig().getBoolean(Settings.USEBUKKITTIMER.getPath())) {
pl.getLogger().info("Using the Bukkit Scheduler."); pl.getLogger().info("Using the Bukkit Scheduler.");
pl.getServer().getScheduler().runTaskTimerAsynchronously(pl, new TimeEvent(), 200, 200); pl.getServer().getScheduler().runTaskTimerAsynchronously(pl, new TimeEvent(), 200, 200);
}else { } else {
pl.getLogger().info("Using the Java Timer."); pl.getLogger().info("Using the Java Timer.");
timer = new Timer(10000, new ActionListener () { timer = new Timer(10000, event -> pl.getServer().getScheduler().scheduleSyncDelayedTask(pl, new TimeEvent()));
public void actionPerformed (ActionEvent event) {
pl.getServer().getScheduler().scheduleSyncDelayedTask(pl, new TimeEvent());
};
});
timer.start(); timer.start();
} }
//Save all the jail information every minute, not every 10 seconds //Save all the jail information every minute, not every 10 seconds
pl.getServer().getScheduler().runTaskTimerAsynchronously(pl, new Runnable() { pl.getServer().getScheduler().runTaskTimerAsynchronously(pl, () -> {
public void run() { for (Jail j : pl.getJailManager().getJails()) {
for(Jail j : pl.getJailManager().getJails()) {
pl.getJailIO().saveJail(j); pl.getJailIO().saveJail(j);
} }
}
}, 1200L, 1200L); }, 1200L, 1200L);
} }
@ -73,18 +63,18 @@ public class JailTimer {
long timePassed = System.currentTimeMillis() - lastTime; long timePassed = System.currentTimeMillis() - lastTime;
lastTime = System.currentTimeMillis(); lastTime = System.currentTimeMillis();
for(Jail j : pl.getJailManager().getJails()) { for (Jail j : pl.getJailManager().getJails()) {
for(Prisoner p : j.getAllPrisoners().values()) { for (Prisoner p : j.getAllPrisoners().values()) {
//only execute this code if the prisoner's time is more than 0 milliseconds //only execute this code if the prisoner's time is more than 0 milliseconds
//and they don't have any offline pending things //and they don't have any offline pending things
if(p.getRemainingTime() > 0 && !p.isOfflinePending()) { if (p.getRemainingTime() > 0 && !p.isOfflinePending()) {
final Player player = pl.getServer().getPlayer(p.getUUID()); final Player player = pl.getServer().getPlayer(p.getUUID());
//Check if the player is offline //Check if the player is offline
if(player == null) { if (player == null) {
//if they are offline AND the config has counting down the time //if they are offline AND the config has counting down the time
//while the prisoner is offline, then let's do it //while the prisoner is offline, then let's do it
if(pl.getConfig().getBoolean(Settings.COUNTDOWNTIMEOFFLINE.getPath())) { if (pl.getConfig().getBoolean(Settings.COUNTDOWNTIMEOFFLINE.getPath())) {
//Set their remaining time but if it is less than zero, set it to zero //Set their remaining time but if it is less than zero, set it to zero
long before = p.getRemainingTime(); long before = p.getRemainingTime();
long after = Math.max(0, p.getRemainingTime() - timePassed); long after = Math.max(0, p.getRemainingTime() - timePassed);
@ -92,25 +82,21 @@ public class JailTimer {
PrisonerTimeChangeEvent event = new PrisonerTimeChangeEvent(j, j.getCellPrisonerIsIn(p.getUUID()), p, player, before, after); PrisonerTimeChangeEvent event = new PrisonerTimeChangeEvent(j, j.getCellPrisonerIsIn(p.getUUID()), p, player, before, after);
pl.getServer().getPluginManager().callEvent(event); pl.getServer().getPluginManager().callEvent(event);
if(!event.isCancelled()) { if (!event.isCancelled()) {
after = event.getTimeAfterChange(); after = event.getTimeAfterChange();
p.setRemainingTime(after); p.setRemainingTime(after);
if(p.getRemainingTime() == 0) pl.getPrisonerManager().schedulePrisonerRelease(p); if (p.getRemainingTime() == 0) pl.getPrisonerManager().schedulePrisonerRelease(p);
} }
} }
}else { } else {
if(afkTime > 0) { if (afkTime > 0) {
p.setAFKTime(p.getAFKTime() + timePassed); p.setAFKTime(p.getAFKTime() + timePassed);
if(p.getAFKTime() > afkTime) { if (p.getAFKTime() > afkTime) {
p.setAFKTime(0); p.setAFKTime(0);
//This is so we kick players on the main thread //This is so we kick players on the main thread
//instead of on the async thread(s), as spigot //instead of on the async thread(s), as spigot
//has a protection against this enabled. //has a protection against this enabled.
pl.getServer().getScheduler().scheduleSyncDelayedTask(pl, new Runnable() { pl.getServer().getScheduler().scheduleSyncDelayedTask(pl, () -> player.kickPlayer(Lang.AFKKICKMESSAGE.get()));
public void run() {
player.kickPlayer(Lang.AFKKICKMESSAGE.get());
}
});
} }
} }
@ -122,10 +108,10 @@ public class JailTimer {
PrisonerTimeChangeEvent event = new PrisonerTimeChangeEvent(j, j.getCellPrisonerIsIn(p.getUUID()), p, player, before, after); PrisonerTimeChangeEvent event = new PrisonerTimeChangeEvent(j, j.getCellPrisonerIsIn(p.getUUID()), p, player, before, after);
pl.getServer().getPluginManager().callEvent(event); pl.getServer().getPluginManager().callEvent(event);
if(!event.isCancelled()) { if (!event.isCancelled()) {
after = event.getTimeAfterChange(); after = event.getTimeAfterChange();
p.setRemainingTime(after); p.setRemainingTime(after);
if(p.getRemainingTime() == 0) pl.getPrisonerManager().schedulePrisonerRelease(p); if (p.getRemainingTime() == 0) pl.getPrisonerManager().schedulePrisonerRelease(p);
} }
} }
} }

78
src/main/java/com/graywolf336/jail/JailVoteManager.java
View File

@ -1,9 +1,5 @@
package com.graywolf336.jail; 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.Jail;
import com.graywolf336.jail.beans.JailVote; import com.graywolf336.jail.beans.JailVote;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
@ -12,20 +8,26 @@ import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.enums.Settings; import com.graywolf336.jail.enums.Settings;
import com.graywolf336.jail.events.PrePrisonerJailedEvent; import com.graywolf336.jail.events.PrePrisonerJailedEvent;
import java.util.HashMap;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
/** /**
* Manages all the votes to jail players. * Manages all the votes to jail players.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class JailVoteManager { public class JailVoteManager {
private JailMain pl; private final JailMain pl;
private HashMap<String, JailVote> votes; private final HashMap<String, JailVote> votes;
private HashMap<String, Integer> tasks; private final HashMap<String, Integer> tasks;
private String timerDesc, reason; private final String timerDesc;
private long timerTicks, jailTime; private final String reason;
private int minYes; private final long timerTicks;
private final long jailTime;
private final int minYes;
/** /**
* Creates a new instance of this Jail Vote manager. * Creates a new instance of this Jail Vote manager.
@ -35,8 +37,8 @@ public class JailVoteManager {
*/ */
protected JailVoteManager(JailMain plugin) throws Exception { protected JailVoteManager(JailMain plugin) throws Exception {
this.pl = plugin; this.pl = plugin;
this.votes = new HashMap<String, JailVote>(); this.votes = new HashMap<>();
this.tasks = new HashMap<String, Integer>(); this.tasks = new HashMap<>();
this.reason = plugin.getConfig().getString(Settings.JAILVOTEREASON.getPath()); this.reason = plugin.getConfig().getString(Settings.JAILVOTEREASON.getPath());
String timer = plugin.getConfig().getString(Settings.JAILVOTETIMER.getPath()); String timer = plugin.getConfig().getString(Settings.JAILVOTETIMER.getPath());
@ -72,9 +74,9 @@ public class JailVoteManager {
* @return true if the vote was added, false if a vote already exists for that player name. * @return true if the vote was added, false if a vote already exists for that player name.
*/ */
public boolean addVote(JailVote v) { public boolean addVote(JailVote v) {
if(this.votes.containsKey(v.getPlayerName())) { if (this.votes.containsKey(v.getPlayerName())) {
return false; return false;
}else { } else {
this.votes.put(v.getPlayerName(), v); this.votes.put(v.getPlayerName(), v);
return true; return true;
} }
@ -89,14 +91,14 @@ public class JailVoteManager {
* @return True if the vote was successful, false if it was unsuccessful. * @return True if the vote was successful, false if it was unsuccessful.
*/ */
public boolean addVote(String name, UUID id, boolean which) { public boolean addVote(String name, UUID id, boolean which) {
if(this.votes.containsKey(name)) { if (this.votes.containsKey(name)) {
pl.debug(id.toString() + " voted " + (which ? "yes" : "no") + " to jail " + name); pl.debug(id.toString() + " voted " + (which ? "yes" : "no") + " to jail " + name);
if(which) { if (which) {
return this.votes.get(name).voteYes(id); return this.votes.get(name).voteYes(id);
}else { } else {
return this.votes.get(name).voteNo(id); return this.votes.get(name).voteNo(id);
} }
}else { } else {
return false; return false;
} }
} }
@ -109,9 +111,9 @@ public class JailVoteManager {
* @return whether the player has voted for the username provided. * @return whether the player has voted for the username provided.
*/ */
public boolean hasVotedAlready(String name, UUID id) { public boolean hasVotedAlready(String name, UUID id) {
if(this.votes.containsKey(name)) { if (this.votes.containsKey(name)) {
return this.votes.get(name).hasVoted(id); return this.votes.get(name).hasVoted(id);
}else { } else {
return false; return false;
} }
} }
@ -159,11 +161,9 @@ public class JailVoteManager {
* @param name the name of the person who is being voted to be jailed * @param name the name of the person who is being voted to be jailed
*/ */
public void scheduleCalculating(final String name) { public void scheduleCalculating(final String name) {
int taskId = pl.getServer().getScheduler().runTaskLater(pl, new Runnable() { int taskId = pl.getServer().getScheduler().runTaskLater(pl, () -> {
public void run() {
doTheVoteCalculation(votes.get(name)); doTheVoteCalculation(votes.get(name));
tasks.remove(name); tasks.remove(name);
}
}, timerTicks).getTaskId(); }, timerTicks).getTaskId();
this.tasks.put(name, taskId); this.tasks.put(name, taskId);
@ -178,41 +178,41 @@ public class JailVoteManager {
public JailVoteResult doTheVoteCalculation(JailVote v) { public JailVoteResult doTheVoteCalculation(JailVote v) {
JailVoteResult result; JailVoteResult result;
if(v.getPlayer() == null) { if (v.getPlayer() == null) {
pl.getServer().broadcastMessage(Lang.VOTEPLAYERNOLONGERONLINE.get(v.getPlayerName())); pl.getServer().broadcastMessage(Lang.VOTEPLAYERNOLONGERONLINE.get(v.getPlayerName()));
result = JailVoteResult.NOTONLINE; result = JailVoteResult.NOTONLINE;
}else { } else {
if(v.getYesVotes() > v.getNoVotes()) { if (v.getYesVotes() > v.getNoVotes()) {
if(v.getYesVotes() >= getMinimumYesVotes()) { if (v.getYesVotes() >= getMinimumYesVotes()) {
Prisoner p = new Prisoner(v.getPlayer().getUniqueId().toString(), v.getPlayerName(), pl.getConfig().getBoolean(Settings.AUTOMATICMUTE.getPath()), jailTime, "[JailVote]", reason); 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 //Get the jail name, check for the nearest one
String jailName = pl.getConfig().getString(Settings.DEFAULTJAIL.getPath()); String jailName = pl.getConfig().getString(Settings.DEFAULTJAIL.getPath());
if(jailName.equalsIgnoreCase("nearest")) { if (jailName.equalsIgnoreCase("nearest")) {
Jail j = pl.getJailManager().getNearestJail(v.getPlayer()); Jail j = pl.getJailManager().getNearestJail(v.getPlayer());
if(j != null) { if (j != null) {
jailName = j.getName(); jailName = j.getName();
} }
} }
//Get the jail instance from the name of jail in the params. //Get the jail instance from the name of jail in the params.
Jail j = pl.getJailManager().getJail(jailName); Jail j = pl.getJailManager().getJail(jailName);
if(j == null) { if (j == null) {
pl.getLogger().warning("Jail Vote Failed: no jail was found?"); pl.getLogger().warning("Jail Vote Failed: no jail was found?");
result = JailVoteResult.NOJAIL; result = JailVoteResult.NOJAIL;
}else if(!j.isEnabled()) { } else if (!j.isEnabled()) {
pl.getLogger().warning("Jail Vote Failed: " + Lang.WORLDUNLOADED.get(j.getName())); pl.getLogger().warning("Jail Vote Failed: " + Lang.WORLDUNLOADED.get(j.getName()));
result = JailVoteResult.JAILNOTENABLED; result = JailVoteResult.JAILNOTENABLED;
}else { } else {
//call the event //call the event
PrePrisonerJailedEvent event = new PrePrisonerJailedEvent(j, null, p, v.getPlayer(), v.getPlayer() == null, p.getJailer()); PrePrisonerJailedEvent event = new PrePrisonerJailedEvent(j, null, p, v.getPlayer(), v.getPlayer() == null, p.getJailer());
pl.getServer().getPluginManager().callEvent(event); pl.getServer().getPluginManager().callEvent(event);
//check if the event is cancelled //check if the event is cancelled
if(event.isCancelled()) { if (event.isCancelled()) {
pl.getLogger().warning("Jail Vote Failed: The PrePrisonerJailedEvent was cancelled for some reason."); pl.getLogger().warning("Jail Vote Failed: The PrePrisonerJailedEvent was cancelled for some reason.");
result = JailVoteResult.EVENTCANCELLED; result = JailVoteResult.EVENTCANCELLED;
}else { } else {
try { try {
pl.getPrisonerManager().prepareJail(j, null, v.getPlayer(), p); pl.getPrisonerManager().prepareJail(j, null, v.getPlayer(), p);
result = JailVoteResult.YES; result = JailVoteResult.YES;
@ -223,14 +223,14 @@ public class JailVoteManager {
} }
} }
} }
}else { } else {
pl.getServer().broadcastMessage(Lang.VOTESNOTENOUGHYES.get(new String[] { v.getPlayerName(), String.valueOf(v.getYesVotes()), String.valueOf(minYes) })); pl.getServer().broadcastMessage(Lang.VOTESNOTENOUGHYES.get(v.getPlayerName(), String.valueOf(v.getYesVotes()), String.valueOf(minYes)));
result = JailVoteResult.NOTENOUGHYESVOTES; result = JailVoteResult.NOTENOUGHYESVOTES;
} }
}else if(v.getYesVotes() == v.getNoVotes()) { } else if (v.getYesVotes() == v.getNoVotes()) {
pl.getServer().broadcastMessage(Lang.VOTESTIED.get(v.getPlayerName())); pl.getServer().broadcastMessage(Lang.VOTESTIED.get(v.getPlayerName()));
result = JailVoteResult.TIED; result = JailVoteResult.TIED;
}else { } else {
pl.getServer().broadcastMessage(Lang.VOTESSAIDNO.get(v.getPlayerName())); pl.getServer().broadcastMessage(Lang.VOTESSAIDNO.get(v.getPlayerName()));
result = JailVoteResult.NO; result = JailVoteResult.NO;
} }

4
src/main/java/com/graywolf336/jail/JailsAPI.java
View File

@ -6,7 +6,7 @@ import com.graywolf336.jail.interfaces.IJailStickManager;
* The static api interface for Jail plugin. * The static api interface for Jail plugin.
* *
* <p> * <p>
* * <p>
* If you're looking for non-static methods, please see the * If you're looking for non-static methods, please see the
* {@link JailMain} interface. * {@link JailMain} interface.
* *
@ -32,7 +32,7 @@ public class JailsAPI {
try { try {
return Integer.parseInt(split[split.length - 1].replace("b", "")); return Integer.parseInt(split[split.length - 1].replace("b", ""));
}catch(NumberFormatException e) { } catch (NumberFormatException e) {
return -1; return -1;
} }
} }

294
src/main/java/com/graywolf336/jail/PrisonerManager.java
View File

@ -1,16 +1,5 @@
package com.graywolf336.jail; package com.graywolf336.jail;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import com.graywolf336.jail.beans.AnyCell; import com.graywolf336.jail.beans.AnyCell;
import com.graywolf336.jail.beans.Cell; import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
@ -28,6 +17,16 @@ import com.graywolf336.jail.exceptions.JailRequiredException;
import com.graywolf336.jail.exceptions.PrisonerAlreadyJailedException; import com.graywolf336.jail.exceptions.PrisonerAlreadyJailedException;
import com.graywolf336.jail.exceptions.PrisonerRequiredException; import com.graywolf336.jail.exceptions.PrisonerRequiredException;
import com.graywolf336.jail.interfaces.ICell; import com.graywolf336.jail.interfaces.ICell;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/** /**
* Provides methods, non-statically, that do the preparing of jails, jailing, etc. * Provides methods, non-statically, that do the preparing of jails, jailing, etc.
@ -44,30 +43,26 @@ import com.graywolf336.jail.interfaces.ICell;
* </ul> * </ul>
* *
* @author graywolf336 * @author graywolf336
* @since 2.x.x
* @version 3.0.0 * @version 3.0.0
* @since 2.x.x
*/ */
public class PrisonerManager { public class PrisonerManager {
private JailMain pl; private final JailMain pl;
private ArrayList<Prisoner> releases; private final ArrayList<Prisoner> releases;
protected PrisonerManager(JailMain plugin) { protected PrisonerManager(JailMain plugin) {
this.pl = plugin; this.pl = plugin;
this.releases = new ArrayList<Prisoner>(); this.releases = new ArrayList<>();
// Schedule the releasing of prisoners // Schedule the releasing of prisoners
plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() { plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, this::releaseScheduledPrisoners, 100L, 20L);
public void run() {
releaseScheduledPrisoners();
}
}, 100L, 20L);
} }
/** /**
* Does everything preparing for the jailing of the provided prisoner, if they are online it forwards it to {@link #jailPrisoner(Jail, ICell, Player, Prisoner)}. * Does everything preparing for the jailing of the provided prisoner, if they are online it forwards it to {@link #jailPrisoner(Jail, ICell, Player, Prisoner)}.
* *
* <p> * <p>
* * <p>
* In this we do the following: * In this we do the following:
* <ol> * <ol>
* <li>Checks if the jail is null, if so it throws an Exception</li> * <li>Checks if the jail is null, if so it throws an Exception</li>
@ -91,65 +86,61 @@ public class PrisonerManager {
*/ */
public void prepareJail(final Jail jail, ICell cell, final Player player, final Prisoner prisoner) throws JailRequiredException, PrisonerAlreadyJailedException, PrisonerRequiredException { public void prepareJail(final Jail jail, ICell cell, final Player player, final Prisoner prisoner) throws JailRequiredException, PrisonerAlreadyJailedException, PrisonerRequiredException {
//Do some checks of whether the passed params are null. //Do some checks of whether the passed params are null.
if(jail == null) if (jail == null)
throw new JailRequiredException("jailing a prisoner"); throw new JailRequiredException("jailing a prisoner");
if(cell == null) if (cell == null)
cell = new NoCell(); cell = new NoCell();
if(prisoner == null) if (prisoner == null)
throw new PrisonerRequiredException("jailing a prisoner"); throw new PrisonerRequiredException("jailing a prisoner");
if(this.pl.getJailManager().isPlayerJailed(prisoner.getUUID())) if (this.pl.getJailManager().isPlayerJailed(prisoner.getUUID()))
throw new PrisonerAlreadyJailedException(prisoner.getLastKnownName(), prisoner.getUUID().toString()); throw new PrisonerAlreadyJailedException(prisoner.getLastKnownName(), prisoner.getUUID().toString());
//Set whether the prisoner is offline or not. //Set whether the prisoner is offline or not.
prisoner.setOfflinePending(player == null); prisoner.setOfflinePending(player == null);
//Now that we've got those checks out of the way, let's start preparing. //Now that we've got those checks out of the way, let's start preparing.
if(cell instanceof NoCell) { if (cell instanceof NoCell) {
jail.addPrisoner(prisoner); jail.addPrisoner(prisoner);
cell = null; cell = null;
}else if(cell instanceof AnyCell) { } else if (cell instanceof AnyCell) {
cell = jail.getFirstEmptyCell(); cell = jail.getFirstEmptyCell();
if(cell == null) if (cell == null)
jail.addPrisoner(prisoner); jail.addPrisoner(prisoner);
else else
cell.setPrisoner(prisoner); cell.setPrisoner(prisoner);
}else { } else {
cell.setPrisoner(prisoner); cell.setPrisoner(prisoner);
} }
//If they are are offline then throw the event otherwise jail them //If they are are offline then throw the event otherwise jail them
if(prisoner.isOfflinePending()) { if (prisoner.isOfflinePending()) {
pl.getServer().getPluginManager().callEvent(new OfflinePrisonerJailedEvent(jail, cell, prisoner)); pl.getServer().getPluginManager().callEvent(new OfflinePrisonerJailedEvent(jail, cell, prisoner));
}else { } else {
final ICell c = cell; final ICell c = cell;
pl.getServer().getScheduler().runTask(pl, new Runnable() { pl.getServer().getScheduler().runTask(pl, () -> jailPrisoner(jail, c, player, prisoner));
public void run() {
jailPrisoner(jail, c, player, prisoner);
}
});
} }
//Get a message ready for broadcasting or logging. //Get a message ready for broadcasting or logging.
String msg = ""; String msg;
if(prisoner.getRemainingTime() < 0L) if (prisoner.getRemainingTime() < 0L)
msg = Lang.BROADCASTMESSAGEFOREVER.get(new String[] { prisoner.getLastKnownName(), prisoner.getReason(), jail.getName(), cell == null ? "" : cell.getName() }); msg = Lang.BROADCASTMESSAGEFOREVER.get(prisoner.getLastKnownName(), prisoner.getReason(), jail.getName(), cell == null ? "" : cell.getName());
else else
msg = Lang.BROADCASTMESSAGEFORMINUTES.get(new String[] { prisoner.getLastKnownName(), String.valueOf(prisoner.getRemainingTimeInMinutes()), prisoner.getReason(), jail.getName(), cell == null ? "" : cell.getName() }); msg = Lang.BROADCASTMESSAGEFORMINUTES.get(prisoner.getLastKnownName(), String.valueOf(prisoner.getRemainingTimeInMinutes()), prisoner.getReason(), jail.getName(), cell == null ? "" : cell.getName());
boolean broadcasted = false; boolean broadcasted = false;
//Broadcast the message, if it is enabled //Broadcast the message, if it is enabled
if(pl.getConfig().getBoolean(Settings.BROADCASTJAILING.getPath(), false)) { if (pl.getConfig().getBoolean(Settings.BROADCASTJAILING.getPath(), false)) {
pl.getServer().broadcast(msg, "jail.see.broadcast"); pl.getServer().broadcast(msg, "jail.see.broadcast");
broadcasted = true; broadcasted = true;
} }
//Log the message, if it is enabled //Log the message, if it is enabled
if(pl.getConfig().getBoolean(Settings.LOGJAILINGTOCONSOLE.getPath(), true) && !broadcasted) { if (pl.getConfig().getBoolean(Settings.LOGJAILINGTOCONSOLE.getPath(), true) && !broadcasted) {
pl.getServer().getConsoleSender().sendMessage(msg); pl.getServer().getConsoleSender().sendMessage(msg);
} }
} }
@ -173,14 +164,14 @@ public class PrisonerManager {
* @param prisoner data containing everything pertaining to them * @param prisoner data containing everything pertaining to them
*/ */
protected void jailPrisoner(final Jail jail, ICell cell, final Player player, final Prisoner prisoner) { protected void jailPrisoner(final Jail jail, ICell cell, final Player player, final Prisoner prisoner) {
if(cell instanceof NoCell) if (cell instanceof NoCell)
cell = null; cell = null;
else if(cell instanceof AnyCell) else if (cell instanceof AnyCell)
cell = null; cell = null;
//If they have handcuffs on them, then let's remove them before we continue //If they have handcuffs on them, then let's remove them before we continue
//this way the handcuff listeners and this aren't battleing each other //this way the handcuff listeners and this aren't battleing each other
if(pl.getHandCuffManager().isHandCuffed(player.getUniqueId())) { if (pl.getHandCuffManager().isHandCuffed(player.getUniqueId())) {
pl.getHandCuffManager().removeHandCuffs(player.getUniqueId()); pl.getHandCuffManager().removeHandCuffs(player.getUniqueId());
} }
@ -192,21 +183,21 @@ public class PrisonerManager {
prisoner.setTeleporting(true); prisoner.setTeleporting(true);
//If their reason is empty send proper message, else send other proper message //If their reason is empty send proper message, else send other proper message
if(prisoner.getReason().isEmpty()) { if (prisoner.getReason().isEmpty()) {
player.sendMessage(Lang.JAILED.get()); player.sendMessage(Lang.JAILED.get());
}else { } else {
player.sendMessage(Lang.JAILEDWITHREASON.get(prisoner.getReason())); player.sendMessage(Lang.JAILEDWITHREASON.get(prisoner.getReason()));
} }
//If the config has releasing them back to their previous position, //If the config has releasing them back to their previous position,
//then let's set it in the prisoner data. //then let's set it in the prisoner data.
if(pl.getConfig().getBoolean(Settings.RELEASETOPREVIOUSPOSITION.getPath(), false)) { if (pl.getConfig().getBoolean(Settings.RELEASETOPREVIOUSPOSITION.getPath(), false)) {
prisoner.setPreviousPosition(player.getLocation()); prisoner.setPreviousPosition(player.getLocation());
} }
//If the config has restoring their previous gamemode enabled, //If the config has restoring their previous gamemode enabled,
//then let's set it in their prisoner data. //then let's set it in their prisoner data.
if(pl.getConfig().getBoolean(Settings.RESTOREPREVIOUSGAMEMODE.getPath(), false)) { if (pl.getConfig().getBoolean(Settings.RESTOREPREVIOUSGAMEMODE.getPath(), false)) {
prisoner.setPreviousGameMode(player.getGameMode()); prisoner.setPreviousGameMode(player.getGameMode());
} }
@ -214,10 +205,10 @@ public class PrisonerManager {
//from the parsing then we set theirs to adventure //from the parsing then we set theirs to adventure
try { try {
player.setGameMode(GameMode.valueOf(pl.getConfig().getString(Settings.JAILEDGAMEMODE.getPath(), "ADVENTURE").toUpperCase())); player.setGameMode(GameMode.valueOf(pl.getConfig().getString(Settings.JAILEDGAMEMODE.getPath(), "ADVENTURE").toUpperCase()));
}catch(Exception e) { } catch (Exception e) {
StringBuilder gamemodes = new StringBuilder(); StringBuilder gamemodes = new StringBuilder();
for(GameMode m : GameMode.values()) { for (GameMode m : GameMode.values()) {
if(gamemodes.length() != 0) if (gamemodes.length() != 0)
gamemodes.append(", "); gamemodes.append(", ");
gamemodes.append(m.toString().toLowerCase()); gamemodes.append(m.toString().toLowerCase());
@ -225,19 +216,19 @@ public class PrisonerManager {
pl.getLogger().warning("Your jailed gamemode setting is problematic. It is currently '" pl.getLogger().warning("Your jailed gamemode setting is problematic. It is currently '"
+ pl.getConfig().getString(Settings.JAILEDGAMEMODE.getPath()) + pl.getConfig().getString(Settings.JAILEDGAMEMODE.getPath())
+ "' and should be one of the following: " + gamemodes.toString()); + "' and should be one of the following: " + gamemodes);
player.setGameMode(GameMode.ADVENTURE); player.setGameMode(GameMode.ADVENTURE);
} }
//only eject them if they're inside a vehicle and also eject anyone else on top of them //only eject them if they're inside a vehicle and also eject anyone else on top of them
if(player.isInsideVehicle()) { if (player.isInsideVehicle()) {
player.getVehicle().eject(); player.getVehicle().eject();
player.eject(); player.eject();
} }
//If we are ignoring the sleeping state of prisoners, //If we are ignoring the sleeping state of prisoners,
//then let's set that //then let's set that
if(pl.getConfig().getBoolean(Settings.IGNORESLEEPINGSTATE.getPath(), true)) { if (pl.getConfig().getBoolean(Settings.IGNORESLEEPINGSTATE.getPath(), true)) {
player.setSleepingIgnored(true); player.setSleepingIgnored(true);
} }
@ -254,20 +245,19 @@ public class PrisonerManager {
} }
//If the cell doesn't equal null, then let's put them in the jail //If the cell doesn't equal null, then let's put them in the jail
if(cell != null) { if (cell != null) {
//Teleport them to the cell's teleport location //Teleport them to the cell's teleport location
//they will now be placed in jail. //they will now be placed in jail.
pl.debug("Teleporting " + player.getName() + " to " + jail.getName() + " in the cell " + cell.getName() + "'s in: " + jail.getTeleportIn().toString()); pl.debug("Teleporting " + player.getName() + " to " + jail.getName() + " in the cell " + cell.getName() + "'s in: " + jail.getTeleportIn().toString());
player.teleport(cell.getTeleport()); player.teleport(cell.getTeleport());
//check if we store the inventory //check if we store the inventory
if(pl.getConfig().getBoolean(Settings.JAILEDSTOREINVENTORY.getPath(), true)) { if (pl.getConfig().getBoolean(Settings.JAILEDSTOREINVENTORY.getPath(), true)) {
final ICell theCell = cell; final ICell theCell = cell;
pl.getServer().getScheduler().runTaskLater(pl, new Runnable() { pl.getServer().getScheduler().runTaskLater(pl, () -> {
public void run() {
List<String> blacklist = pl.getConfig().getStringList(Settings.JAILEDINVENTORYBLACKLIST.getPath()); List<String> blacklist = pl.getConfig().getStringList(Settings.JAILEDINVENTORYBLACKLIST.getPath());
//Check if there is a chest to store our items to and if it is a double chest, if not we will then serialize it //Check if there is a chest to store our items to and if it is a double chest, if not we will then serialize it
if(theCell.hasChest()) { if (theCell.hasChest()) {
//Get the chest's inventory and then clear it //Get the chest's inventory and then clear it
Inventory chest = theCell.getChest().getInventory(); Inventory chest = theCell.getChest().getInventory();
chest.clear(); chest.clear();
@ -275,11 +265,11 @@ public class PrisonerManager {
//Get the separate inventory, so we can iterate of them //Get the separate inventory, so we can iterate of them
ItemStack[] inventory = player.getInventory().getContents(); ItemStack[] inventory = player.getInventory().getContents();
for(ItemStack item : inventory) { for (ItemStack item : inventory) {
if(item != null) { if (item != null) {
if(!Util.isStringInsideList(item.getType().toString(), blacklist)) { if (!Util.isStringInsideList(item.getType().toString(), blacklist)) {
int i = chest.firstEmpty(); int i = chest.firstEmpty();
if(i != -1) {//Check that we have got a free spot, should never happen but just in case if (i != -1) {//Check that we have got a free spot, should never happen but just in case
chest.setItem(i, item); chest.setItem(i, item);
} }
} }
@ -287,15 +277,15 @@ public class PrisonerManager {
} }
player.getInventory().clear(); player.getInventory().clear();
}else { } else {
for(ItemStack item : player.getInventory().getContents()) for (ItemStack item : player.getInventory().getContents())
if(item != null) if (item != null)
if(Util.isStringInsideList(item.getType().toString(), blacklist)) if (Util.isStringInsideList(item.getType().toString(), blacklist))
player.getInventory().remove(item); player.getInventory().remove(item);
for(ItemStack item : player.getInventory().getArmorContents()) for (ItemStack item : player.getInventory().getArmorContents())
if(item != null) if (item != null)
if(Util.isStringInsideList(item.getType().toString(), blacklist)) if (Util.isStringInsideList(item.getType().toString(), blacklist))
player.getInventory().remove(item); player.getInventory().remove(item);
prisoner.setInventory(Util.toBase64(player.getInventory())); prisoner.setInventory(Util.toBase64(player.getInventory()));
@ -303,36 +293,33 @@ public class PrisonerManager {
player.getInventory().setArmorContents(null); player.getInventory().setArmorContents(null);
player.getInventory().clear(); player.getInventory().clear();
} }
};
}, 10); }, 10);
} }
}else { } else {
//Teleport them to the jail's teleport in location //Teleport them to the jail's teleport in location
//They will now be placed in jail. //They will now be placed in jail.
pl.debug("Teleporting " + player.getName() + " to " + jail.getName() + "'s in: " + jail.getTeleportIn().toString()); pl.debug("Teleporting " + player.getName() + " to " + jail.getName() + "'s in: " + jail.getTeleportIn().toString());
player.teleport(jail.getTeleportIn()); player.teleport(jail.getTeleportIn());
//There is no cell we're jailing them to, so stick them in the jail //There is no cell we're jailing them to, so stick them in the jail
if(pl.getConfig().getBoolean(Settings.JAILEDSTOREINVENTORY.getPath(), true)) { if (pl.getConfig().getBoolean(Settings.JAILEDSTOREINVENTORY.getPath(), true)) {
pl.getServer().getScheduler().runTaskLater(pl, new Runnable() { pl.getServer().getScheduler().runTaskLater(pl, () -> {
public void run() {
List<String> blacklist = pl.getConfig().getStringList(Settings.JAILEDINVENTORYBLACKLIST.getPath()); List<String> blacklist = pl.getConfig().getStringList(Settings.JAILEDINVENTORYBLACKLIST.getPath());
for(ItemStack item : player.getInventory().getContents()) for (ItemStack item : player.getInventory().getContents())
if(item != null) if (item != null)
if(Util.isStringInsideList(item.getType().toString(), blacklist)) if (Util.isStringInsideList(item.getType().toString(), blacklist))
player.getInventory().remove(item); player.getInventory().remove(item);
for(ItemStack item : player.getInventory().getArmorContents()) for (ItemStack item : player.getInventory().getArmorContents())
if(item != null) if (item != null)
if(Util.isStringInsideList(item.getType().toString(), blacklist)) if (Util.isStringInsideList(item.getType().toString(), blacklist))
player.getInventory().remove(item); player.getInventory().remove(item);
prisoner.setInventory(Util.toBase64(player.getInventory())); prisoner.setInventory(Util.toBase64(player.getInventory()));
player.getInventory().setArmorContents(null); player.getInventory().setArmorContents(null);
player.getInventory().clear(); player.getInventory().clear();
};
}, 10); }, 10);
} }
} }
@ -343,7 +330,7 @@ public class PrisonerManager {
//Get the commands to execute after they are jailed //Get the commands to execute after they are jailed
//replace all of the %p% so that the commands can have a player name in them //replace all of the %p% so that the commands can have a player name in them
for(String command : pl.getConfig().getStringList(Settings.COMMANDSONJAIL.getPath())) { for (String command : pl.getConfig().getStringList(Settings.COMMANDSONJAIL.getPath())) {
command = command.replaceAll("%p%", player.getName()); command = command.replaceAll("%p%", player.getName());
command = command.replaceAll("%player%", player.getName()); command = command.replaceAll("%player%", player.getName());
command = command.replaceAll("%uuid%", player.getUniqueId().toString()); command = command.replaceAll("%uuid%", player.getUniqueId().toString());
@ -352,7 +339,7 @@ public class PrisonerManager {
} }
//Add the scoreboard to them if it is enabled //Add the scoreboard to them if it is enabled
if(pl.getConfig().getBoolean(Settings.SCOREBOARDENABLED.getPath())) { if (pl.getConfig().getBoolean(Settings.SCOREBOARDENABLED.getPath())) {
pl.getScoreBoardManager().addScoreBoard(player, prisoner); pl.getScoreBoardManager().addScoreBoard(player, prisoner);
} }
@ -360,7 +347,7 @@ public class PrisonerManager {
pl.getJailIO().saveJail(jail); pl.getJailIO().saveJail(jail);
//Call our custom event for when a prisoner is actually jailed. //Call our custom event for when a prisoner is actually jailed.
PrisonerJailedEvent event = new PrisonerJailedEvent(jail, cell == null ? null : (Cell)cell, prisoner, player); PrisonerJailedEvent event = new PrisonerJailedEvent(jail, cell == null ? null : (Cell) cell, prisoner, player);
pl.getServer().getPluginManager().callEvent(event); pl.getServer().getPluginManager().callEvent(event);
} }
@ -368,7 +355,7 @@ public class PrisonerManager {
* Schedules a prisoner to be released, this method is to be used <strong>async</strong>. * Schedules a prisoner to be released, this method is to be used <strong>async</strong>.
* *
* <p> * <p>
* * <p>
* If you're wanting to unjail a prisoner, see the {@link #unJail(Jail, ICell, Player, Prisoner, CommandSender)} method. * If you're wanting to unjail a prisoner, see the {@link #unJail(Jail, ICell, Player, Prisoner, CommandSender)} method.
* *
* @param prisoner to be released. * @param prisoner to be released.
@ -378,8 +365,8 @@ public class PrisonerManager {
} }
private void releaseScheduledPrisoners() { private void releaseScheduledPrisoners() {
ArrayList<Prisoner> lettingGo = new ArrayList<Prisoner>(releases); ArrayList<Prisoner> lettingGo = new ArrayList<>(releases);
for(Prisoner p : lettingGo) { for (Prisoner p : lettingGo) {
releases.remove(p); releases.remove(p);
releasePrisoner(pl.getServer().getPlayer(p.getUUID()), p); releasePrisoner(pl.getServer().getPlayer(p.getUUID()), p);
} }
@ -392,16 +379,16 @@ public class PrisonerManager {
* @param prisoner data to handle. * @param prisoner data to handle.
*/ */
private void releasePrisoner(Player player, Prisoner prisoner) { private void releasePrisoner(Player player, Prisoner prisoner) {
if(player == null) { if (player == null) {
prisoner.setOfflinePending(true); prisoner.setOfflinePending(true);
prisoner.setRemainingTime(0); prisoner.setRemainingTime(0);
}else { } else {
Jail j = pl.getJailManager().getJailPlayerIsIn(player.getUniqueId()); Jail j = pl.getJailManager().getJailPlayerIsIn(player.getUniqueId());
try { try {
unJail(j, j.getCellPrisonerIsIn(player.getUniqueId()), player, prisoner, null); unJail(j, j.getCellPrisonerIsIn(player.getUniqueId()), player, prisoner, null);
}catch(Exception e) { } catch (Exception e) {
if(pl.inDebug()) { if (pl.inDebug()) {
e.printStackTrace(); e.printStackTrace();
} }
@ -415,7 +402,7 @@ public class PrisonerManager {
* Unjails a prisoner, <strong>sync</strong>, from jail, removing all their data. * Unjails a prisoner, <strong>sync</strong>, from jail, removing all their data.
* *
* <p> * <p>
* * <p>
* Throws an exception if either the jail is null or the prisoner is null. * Throws an exception if either the jail is null or the prisoner is null.
* *
* @param jail where the prisoner is located at * @param jail where the prisoner is located at
@ -426,21 +413,20 @@ public class PrisonerManager {
* @throws AsyncUnJailingNotSupportedException when this method is called via a thread that is <strong>not</strong> the primary thread. * @throws AsyncUnJailingNotSupportedException when this method is called via a thread that is <strong>not</strong> the primary thread.
* @throws JailRequiredException when the jail provided is null. * @throws JailRequiredException when the jail provided is null.
* @throws PrisonerRequiredException when the provided prisoner data is null. * @throws PrisonerRequiredException when the provided prisoner data is null.
*
*/ */
public void unJail(final Jail jail, ICell cell, final Player player, final Prisoner prisoner, final CommandSender sender) throws AsyncUnJailingNotSupportedException, JailRequiredException, PrisonerRequiredException { public void unJail(final Jail jail, ICell cell, final Player player, final Prisoner prisoner, final CommandSender sender) throws AsyncUnJailingNotSupportedException, JailRequiredException, PrisonerRequiredException {
if(!pl.getServer().isPrimaryThread()) throw new AsyncUnJailingNotSupportedException(); if (!pl.getServer().isPrimaryThread()) throw new AsyncUnJailingNotSupportedException();
//Do some checks of whether the passed params are null. //Do some checks of whether the passed params are null.
if(jail == null) if (jail == null)
throw new JailRequiredException("unjailing a prisoner"); throw new JailRequiredException("unjailing a prisoner");
if(cell instanceof NoCell) if (cell instanceof NoCell)
cell = null; cell = null;
else if(cell instanceof AnyCell) else if (cell instanceof AnyCell)
cell = null; cell = null;
if(prisoner == null) if (prisoner == null)
throw new PrisonerRequiredException("unjailing a prisoner"); throw new PrisonerRequiredException("unjailing a prisoner");
//Throw the custom event which is called before we start releasing them //Throw the custom event which is called before we start releasing them
@ -453,7 +439,7 @@ public class PrisonerManager {
//In case they have somehow got in a vehicle, let's unmount //In case they have somehow got in a vehicle, let's unmount
//them so we can possibly teleport them //them so we can possibly teleport them
if(player.isInsideVehicle()) { if (player.isInsideVehicle()) {
player.getVehicle().eject(); player.getVehicle().eject();
player.eject(); player.eject();
} }
@ -461,7 +447,7 @@ public class PrisonerManager {
//Now, let's restore their inventory if we can store it but //Now, let's restore their inventory if we can store it but
//first up is clearing their inventory...if we can store it //first up is clearing their inventory...if we can store it
boolean store = pl.getConfig().getBoolean(Settings.JAILEDSTOREINVENTORY.getPath(), true); boolean store = pl.getConfig().getBoolean(Settings.JAILEDSTOREINVENTORY.getPath(), true);
if(store) { if (store) {
player.closeInventory(); player.closeInventory();
player.getInventory().setArmorContents(null); player.getInventory().setArmorContents(null);
player.getInventory().clear(); player.getInventory().clear();
@ -469,21 +455,21 @@ public class PrisonerManager {
//if the cell isn't null, let's check if the cell has a chest and if so then try out best to restore //if the cell isn't null, let's check if the cell has a chest and if so then try out best to restore
//the prisoner's inventory from that //the prisoner's inventory from that
if(cell != null) { if (cell != null) {
if(store) { if (store) {
if(cell.hasChest()) { if (cell.hasChest()) {
Inventory chest = cell.getChest().getInventory(); Inventory chest = cell.getChest().getInventory();
for (ItemStack item : chest.getContents()) { for (ItemStack item : chest.getContents()) {
if (item == null || item.getType() == Material.AIR) continue; if (item == null || item.getType() == Material.AIR) continue;
if(item.getType().toString().toLowerCase().contains("helmet") && (player.getInventory().getHelmet() == null || player.getInventory().getHelmet().getType() == Material.AIR)) { if (item.getType().toString().toLowerCase().contains("helmet") && (player.getInventory().getHelmet() == null || player.getInventory().getHelmet().getType() == Material.AIR)) {
player.getInventory().setHelmet(item); player.getInventory().setHelmet(item);
} else if(item.getType().toString().toLowerCase().contains("chestplate") && (player.getInventory().getChestplate() == null || player.getInventory().getChestplate().getType() == Material.AIR)) { } else if (item.getType().toString().toLowerCase().contains("chestplate") && (player.getInventory().getChestplate() == null || player.getInventory().getChestplate().getType() == Material.AIR)) {
player.getInventory().setChestplate(item); player.getInventory().setChestplate(item);
} else if(item.getType().toString().toLowerCase().contains("leg") && (player.getInventory().getLeggings() == null || player.getInventory().getLeggings().getType() == Material.AIR)) { } else if (item.getType().toString().toLowerCase().contains("leg") && (player.getInventory().getLeggings() == null || player.getInventory().getLeggings().getType() == Material.AIR)) {
player.getInventory().setLeggings(item); player.getInventory().setLeggings(item);
} else if(item.getType().toString().toLowerCase().contains("boots") && (player.getInventory().getBoots() == null || player.getInventory().getBoots().getType() == Material.AIR)) { } else if (item.getType().toString().toLowerCase().contains("boots") && (player.getInventory().getBoots() == null || player.getInventory().getBoots().getType() == Material.AIR)) {
player.getInventory().setBoots(item); player.getInventory().setBoots(item);
} else if (player.getInventory().firstEmpty() == -1) { } else if (player.getInventory().firstEmpty() == -1) {
player.getWorld().dropItem(player.getLocation(), item); player.getWorld().dropItem(player.getLocation(), item);
@ -493,19 +479,19 @@ public class PrisonerManager {
} }
chest.clear(); chest.clear();
}else { } else {
Util.restoreInventory(player, prisoner); Util.restoreInventory(player, prisoner);
} }
}else { } else {
//Clear out the cell's chest just in case //Clear out the cell's chest just in case
//they decided to store something there //they decided to store something there
if(cell.hasChest()) cell.getChest().getInventory().clear(); if (cell.hasChest()) cell.getChest().getInventory().clear();
} }
pl.getJailIO().removePrisoner(jail, (Cell)cell, prisoner); pl.getJailIO().removePrisoner(jail, (Cell) cell, prisoner);
cell.removePrisoner(); cell.removePrisoner();
}else { } else {
if(store) Util.restoreInventory(player, prisoner); if (store) Util.restoreInventory(player, prisoner);
pl.getJailIO().removePrisoner(jail, prisoner); pl.getJailIO().removePrisoner(jail, prisoner);
jail.removePrisoner(prisoner); jail.removePrisoner(prisoner);
@ -515,33 +501,31 @@ public class PrisonerManager {
//let's enable their sleeping state taking place again //let's enable their sleeping state taking place again
player.setSleepingIgnored(false); player.setSleepingIgnored(false);
pl.getServer().getScheduler().runTaskLater(pl, new Runnable() { pl.getServer().getScheduler().runTaskLater(pl, () -> {
public void run() {
//If the config has us teleporting them back to their //If the config has us teleporting them back to their
//previous position then let's do that //previous position then let's do that
boolean tpd = false; boolean tpd = false;
if(pl.getConfig().getBoolean(Settings.RELEASETOPREVIOUSPOSITION.getPath(), false)) { if (pl.getConfig().getBoolean(Settings.RELEASETOPREVIOUSPOSITION.getPath(), false)) {
if(prisoner.getPreviousLocation() != null) if (prisoner.getPreviousLocation() != null)
tpd = player.teleport(prisoner.getPreviousLocation()); tpd = player.teleport(prisoner.getPreviousLocation());
} }
//If they haven't already been teleported and the config has us to teleport on release, //If they haven't already been teleported and the config has us to teleport on release,
//then we teleport players to the jail's free spot //then we teleport players to the jail's free spot
if(!tpd && pl.getConfig().getBoolean(Settings.TELEPORTONRELEASE.getPath(), true)) { if (!tpd && pl.getConfig().getBoolean(Settings.TELEPORTONRELEASE.getPath(), true)) {
player.teleport(jail.getTeleportFree()); player.teleport(jail.getTeleportFree());
} }
//If we are to restore their previous gamemode and we have it stored, //If we are to restore their previous gamemode and we have it stored,
//then by all means let's restore it //then by all means let's restore it
if(pl.getConfig().getBoolean(Settings.RESTOREPREVIOUSGAMEMODE.getPath(), false)) { if (pl.getConfig().getBoolean(Settings.RESTOREPREVIOUSGAMEMODE.getPath(), false)) {
player.setGameMode(prisoner.getPreviousGameMode()); player.setGameMode(prisoner.getPreviousGameMode());
} }
};
}, 5); }, 5);
//Get the commands to execute prisoners are unjailed //Get the commands to execute prisoners are unjailed
//replace all of the %p% so that the commands can have a player name in them //replace all of the %p% so that the commands can have a player name in them
for(String command : pl.getConfig().getStringList(Settings.COMMANDSONRELEASE.getPath())) { for (String command : pl.getConfig().getStringList(Settings.COMMANDSONRELEASE.getPath())) {
command = command.replaceAll("%p%", player.getName()); command = command.replaceAll("%p%", player.getName());
command = command.replaceAll("%player%", player.getName()); command = command.replaceAll("%player%", player.getName());
command = command.replaceAll("%uuid%", player.getUniqueId().toString()); command = command.replaceAll("%uuid%", player.getUniqueId().toString());
@ -550,23 +534,23 @@ public class PrisonerManager {
} }
//Remove the scoreboard to them if it is enabled //Remove the scoreboard to them if it is enabled
if(pl.getConfig().getBoolean(Settings.SCOREBOARDENABLED.getPath())) { if (pl.getConfig().getBoolean(Settings.SCOREBOARDENABLED.getPath())) {
pl.getScoreBoardManager().removeScoreBoard(player); pl.getScoreBoardManager().removeScoreBoard(player);
} }
//Call the prisoner released event as we have released them. //Call the prisoner released event as we have released them.
PrisonerReleasedEvent event = new PrisonerReleasedEvent(jail, cell == null ? null : (Cell)cell, prisoner, player); PrisonerReleasedEvent event = new PrisonerReleasedEvent(jail, cell == null ? null : (Cell) cell, prisoner, player);
pl.getServer().getPluginManager().callEvent(event); pl.getServer().getPluginManager().callEvent(event);
player.sendMessage(Lang.UNJAILED.get()); player.sendMessage(Lang.UNJAILED.get());
if(sender != null) sender.sendMessage(Lang.UNJAILSUCCESS.get(player.getName())); if (sender != null) sender.sendMessage(Lang.UNJAILSUCCESS.get(player.getName()));
} }
/** /**
* Forcefully unjails a {@link Prisoner prisoner} from {@link Jail}. * Forcefully unjails a {@link Prisoner prisoner} from {@link Jail}.
* *
* <p> * <p>
* * <p>
* This method forcefully removes all the references to this prisoner, * This method forcefully removes all the references to this prisoner,
* meaning if they're offline the following won't happened: * meaning if they're offline the following won't happened:
* <ul> * <ul>
@ -574,7 +558,7 @@ public class PrisonerManager {
* <li>Teleported anywhere</li> * <li>Teleported anywhere</li>
* <li>No messages sent, they'll be clueless.</li> * <li>No messages sent, they'll be clueless.</li>
* </ul> * </ul>
* * <p>
* But if they're online, it goes through the regular unjailing methods. * But if they're online, it goes through the regular unjailing methods.
* *
* <p> * <p>
@ -594,7 +578,7 @@ public class PrisonerManager {
* *
* *
* <p> * <p>
* * <p>
* This method forcefully removes all the references to this prisoner, * This method forcefully removes all the references to this prisoner,
* meaning if they're offline the following won't happened: * meaning if they're offline the following won't happened:
* <ul> * <ul>
@ -602,7 +586,7 @@ public class PrisonerManager {
* <li>Teleported anywhere</li> * <li>Teleported anywhere</li>
* <li>No messages sent, they'll be clueless.</li> * <li>No messages sent, they'll be clueless.</li>
* </ul> * </ul>
* * <p>
* But if they're online, it goes through the regular unjailing methods. * But if they're online, it goes through the regular unjailing methods.
* *
* <p> * <p>
@ -616,19 +600,19 @@ public class PrisonerManager {
* @throws PrisonerRequiredException when the provided prisoner data is null. * @throws PrisonerRequiredException when the provided prisoner data is null.
*/ */
public void forceUnJail(Jail jail, Cell cell, Player player, Prisoner prisoner, CommandSender sender) throws JailRequiredException, PrisonerRequiredException { public void forceUnJail(Jail jail, Cell cell, Player player, Prisoner prisoner, CommandSender sender) throws JailRequiredException, PrisonerRequiredException {
if(jail == null) if (jail == null)
throw new JailRequiredException("jailing a prisoner"); throw new JailRequiredException("jailing a prisoner");
if(prisoner == null) if (prisoner == null)
throw new PrisonerRequiredException("jailing a prisoner"); throw new PrisonerRequiredException("jailing a prisoner");
if(player == null) { if (player == null) {
//Player is offline, we just forcefully remove them from the database //Player is offline, we just forcefully remove them from the database
pl.getJailIO().removePrisoner(jail, cell, prisoner); pl.getJailIO().removePrisoner(jail, cell, prisoner);
if(cell == null) { if (cell == null) {
jail.removePrisoner(prisoner); jail.removePrisoner(prisoner);
}else { } else {
cell.removePrisoner(); cell.removePrisoner();
} }
@ -636,8 +620,8 @@ public class PrisonerManager {
PrisonerReleasedEvent event = new PrisonerReleasedEvent(jail, cell, prisoner, player); PrisonerReleasedEvent event = new PrisonerReleasedEvent(jail, cell, prisoner, player);
pl.getServer().getPluginManager().callEvent(event); pl.getServer().getPluginManager().callEvent(event);
if(sender != null) sender.sendMessage(Lang.FORCEUNJAILED.get(prisoner.getLastKnownName())); if (sender != null) sender.sendMessage(Lang.FORCEUNJAILED.get(prisoner.getLastKnownName()));
}else { } else {
try { try {
unJail(jail, cell, player, prisoner, sender); unJail(jail, cell, player, prisoner, sender);
} catch (Exception e) { } catch (Exception e) {
@ -659,9 +643,9 @@ public class PrisonerManager {
Player player = pl.getServer().getPlayer(prisoner.getUUID()); Player player = pl.getServer().getPlayer(prisoner.getUUID());
//If there is no origin cell, then we need to basically just put them to their targetJail //If there is no origin cell, then we need to basically just put them to their targetJail
if(originCell == null) { if (originCell == null) {
//But first thing is first, let's check if there is a targetCell we're putting them in //But first thing is first, let's check if there is a targetCell we're putting them in
if(targetCell == null) { if (targetCell == null) {
//There is no cell, so we're just going to be putting them into //There is no cell, so we're just going to be putting them into
//the target jail and that's it //the target jail and that's it
targetJail.addPrisoner(prisoner); targetJail.addPrisoner(prisoner);
@ -670,41 +654,41 @@ public class PrisonerManager {
//If the player is not online, trigger them to be teleported when they //If the player is not online, trigger them to be teleported when they
//come online again //come online again
if(player == null) { if (player == null) {
//Set them to have an action on offline pending, so it gets triggered //Set them to have an action on offline pending, so it gets triggered
prisoner.setOfflinePending(true); prisoner.setOfflinePending(true);
//Now let's set them to be transferred when they come online next //Now let's set them to be transferred when they come online next
prisoner.setToBeTransferred(true); prisoner.setToBeTransferred(true);
}else { } else {
prisoner.setTeleporting(true); prisoner.setTeleporting(true);
player.teleport(targetJail.getTeleportIn()); player.teleport(targetJail.getTeleportIn());
prisoner.setTeleporting(false); prisoner.setTeleporting(false);
player.sendMessage(Lang.TRANSFERRED.get(targetJail.getName())); player.sendMessage(Lang.TRANSFERRED.get(targetJail.getName()));
} }
}else { } else {
//They are set to go to the targetCell, so handle accordingly //They are set to go to the targetCell, so handle accordingly
targetCell.setPrisoner(prisoner); targetCell.setPrisoner(prisoner);
//If the player is not online, trigger them to be teleported when they //If the player is not online, trigger them to be teleported when they
//come online again //come online again
if(player == null) { if (player == null) {
//Set them to have an action on offline pending, so it gets triggered //Set them to have an action on offline pending, so it gets triggered
prisoner.setOfflinePending(true); prisoner.setOfflinePending(true);
//Now let's set them to be transferred when they come online next //Now let's set them to be transferred when they come online next
prisoner.setToBeTransferred(true); prisoner.setToBeTransferred(true);
}else { } else {
prisoner.setTeleporting(true); prisoner.setTeleporting(true);
player.teleport(targetCell.getTeleport()); player.teleport(targetCell.getTeleport());
prisoner.setTeleporting(false); prisoner.setTeleporting(false);
player.sendMessage(Lang.TRANSFERRED.get(targetJail.getName())); player.sendMessage(Lang.TRANSFERRED.get(targetJail.getName()));
} }
} }
}else { } else {
//They are being transferred from a cell, so we need to handle getting the inventory //They are being transferred from a cell, so we need to handle getting the inventory
//and all that sort of stuff from the old cell before we transfer them over to the new cell //and all that sort of stuff from the old cell before we transfer them over to the new cell
//If they're not being sent to a cell any more, handle that differently as well //If they're not being sent to a cell any more, handle that differently as well
if(targetCell == null) { if (targetCell == null) {
//Add them to the target jail //Add them to the target jail
targetJail.addPrisoner(prisoner); targetJail.addPrisoner(prisoner);
//Next, remove them from the cell //Next, remove them from the cell
@ -712,13 +696,13 @@ public class PrisonerManager {
//If the cell they came from has any items from their inventory, //If the cell they came from has any items from their inventory,
//let's get it all and store it //let's get it all and store it
if(originCell.hasChest()) { if (originCell.hasChest()) {
//Convert the inventory to base64 string and store it in the prisoner's file //Convert the inventory to base64 string and store it in the prisoner's file
prisoner.setInventory(Util.toBase64(originCell.getChest().getInventory())); prisoner.setInventory(Util.toBase64(originCell.getChest().getInventory()));
//Clear the origin cell's inventory so nothing is left behind //Clear the origin cell's inventory so nothing is left behind
originCell.getChest().getInventory().clear(); originCell.getChest().getInventory().clear();
} }
}else { } else {
//They are being transferred to a cell in another cell, //They are being transferred to a cell in another cell,
//we aren't going to do any sanity checks as we hope the method that is //we aren't going to do any sanity checks as we hope the method that is
//calling this one does those sanity checks for us. //calling this one does those sanity checks for us.
@ -729,17 +713,17 @@ public class PrisonerManager {
originCell.removePrisoner(); originCell.removePrisoner();
//Check if the origin cell has a chest, put all the player's inventory into it //Check if the origin cell has a chest, put all the player's inventory into it
if(originCell.hasChest()) { if (originCell.hasChest()) {
//If the targetCell has a chest //If the targetCell has a chest
if(targetCell.hasChest()) { if (targetCell.hasChest()) {
//Loop through the origin's chest inventory and add it to the target cell's chest //Loop through the origin's chest inventory and add it to the target cell's chest
for(ItemStack i : originCell.getChest().getInventory().getContents()) for (ItemStack i : originCell.getChest().getInventory().getContents())
if(i != null) if (i != null)
targetCell.getChest().getInventory().addItem(i); targetCell.getChest().getInventory().addItem(i);
//Clear the origin cell's chest as it is clear now //Clear the origin cell's chest as it is clear now
originCell.getChest().getInventory().clear(); originCell.getChest().getInventory().clear();
}else { } else {
//targetCell has no chest so we aren't going to try and put anything into it //targetCell has no chest so we aren't going to try and put anything into it
//Convert the inventory to base64 string and store it in the prisoner's file //Convert the inventory to base64 string and store it in the prisoner's file
@ -752,9 +736,9 @@ public class PrisonerManager {
} }
//Update the signs of both cells //Update the signs of both cells
if(originCell != null) if (originCell != null)
originCell.updateSigns(); originCell.updateSigns();
if(targetCell != null) if (targetCell != null)
targetCell.updateSigns(); targetCell.updateSigns();
//Throw our custom event PrisonerTransferredEvent to say it was successful //Throw our custom event PrisonerTransferredEvent to say it was successful

53
src/main/java/com/graywolf336/jail/ScoreBoardManager.java
View File

@ -1,8 +1,8 @@
package com.graywolf336.jail; package com.graywolf336.jail;
import java.util.HashMap; import com.graywolf336.jail.beans.Jail;
import java.util.UUID; import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.enums.Settings;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.scoreboard.DisplaySlot; import org.bukkit.scoreboard.DisplaySlot;
@ -10,30 +10,25 @@ import org.bukkit.scoreboard.Objective;
import org.bukkit.scoreboard.Scoreboard; import org.bukkit.scoreboard.Scoreboard;
import org.bukkit.scoreboard.ScoreboardManager; import org.bukkit.scoreboard.ScoreboardManager;
import com.graywolf336.jail.beans.Jail; import java.util.HashMap;
import com.graywolf336.jail.beans.Prisoner; import java.util.UUID;
import com.graywolf336.jail.enums.Settings;
public class ScoreBoardManager { public class ScoreBoardManager {
private JailMain pl; private final JailMain pl;
private ScoreboardManager man; private final ScoreboardManager man;
private HashMap<UUID, Scoreboard> boards; private final HashMap<UUID, Scoreboard> boards;
private OfflinePlayer time; private final OfflinePlayer time;
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
protected ScoreBoardManager(JailMain plugin) { protected ScoreBoardManager(JailMain plugin) {
this.pl = plugin; this.pl = plugin;
this.man = plugin.getServer().getScoreboardManager(); this.man = plugin.getServer().getScoreboardManager();
this.boards = new HashMap<UUID, Scoreboard>(); this.boards = new HashMap<>();
this.time = plugin.getServer().getOfflinePlayer(Util.getColorfulMessage(pl.getConfig().getString(Settings.SCOREBOARDTIME.getPath()))); this.time = plugin.getServer().getOfflinePlayer(Util.getColorfulMessage(pl.getConfig().getString(Settings.SCOREBOARDTIME.getPath())));
//Start the task if it is enabled //Start the task if it is enabled
if(plugin.getConfig().getBoolean(Settings.SCOREBOARDENABLED.getPath())) { if (plugin.getConfig().getBoolean(Settings.SCOREBOARDENABLED.getPath())) {
plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() { plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, this::updatePrisonersTime, 200L, 100L);
public void run() {
updatePrisonersTime();
}
}, 200L, 100L);
} }
} }
@ -45,14 +40,14 @@ public class ScoreBoardManager {
*/ */
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public void addScoreBoard(Player player, Prisoner pris) { public void addScoreBoard(Player player, Prisoner pris) {
if(!boards.containsKey(player.getUniqueId())) { if (!boards.containsKey(player.getUniqueId())) {
boards.put(player.getUniqueId(), man.getNewScoreboard()); boards.put(player.getUniqueId(), man.getNewScoreboard());
Objective o = boards.get(player.getUniqueId()).registerNewObjective("test", "dummy"); Objective o = boards.get(player.getUniqueId()).registerNewObjective("test", "dummy");
o.setDisplaySlot(DisplaySlot.SIDEBAR); o.setDisplaySlot(DisplaySlot.SIDEBAR);
o.setDisplayName(Util.getColorfulMessage(pl.getConfig().getString(Settings.SCOREBOARDTITLE.getPath()))); o.setDisplayName(Util.getColorfulMessage(pl.getConfig().getString(Settings.SCOREBOARDTITLE.getPath())));
o.getScore(time).setScore(pris.getRemainingTimeInMinutesInt()); o.getScore(time).setScore(pris.getRemainingTimeInMinutesInt());
player.setScoreboard(boards.get(player.getUniqueId())); player.setScoreboard(boards.get(player.getUniqueId()));
}else { } else {
updatePrisonersBoard(player, pris); updatePrisonersBoard(player, pris);
} }
} }
@ -68,14 +63,16 @@ public class ScoreBoardManager {
player.setScoreboard(man.getMainScoreboard()); player.setScoreboard(man.getMainScoreboard());
} }
/** Removes all of the scoreboards from the prisoners. */ /**
* Removes all of the scoreboards from the prisoners.
*/
public void removeAllScoreboards() { public void removeAllScoreboards() {
HashMap<UUID, Scoreboard> temp = new HashMap<UUID, Scoreboard>(boards); HashMap<UUID, Scoreboard> temp = new HashMap<>(boards);
for(UUID id : temp.keySet()) { for (UUID id : temp.keySet()) {
Player p = pl.getServer().getPlayer(id); Player p = pl.getServer().getPlayer(id);
if(p != null) { if (p != null) {
p.setScoreboard(man.getMainScoreboard()); p.setScoreboard(man.getMainScoreboard());
} }
@ -83,11 +80,13 @@ public class ScoreBoardManager {
} }
} }
/** Updates the prisoners time on their scoreboard. */ /**
* Updates the prisoners time on their scoreboard.
*/
private void updatePrisonersTime() { private void updatePrisonersTime() {
for(Jail j : pl.getJailManager().getJails()) { for (Jail j : pl.getJailManager().getJails()) {
for(Prisoner p : j.getAllPrisoners().values()) { for (Prisoner p : j.getAllPrisoners().values()) {
if(pl.getServer().getPlayer(p.getUUID()) != null) { if (pl.getServer().getPlayer(p.getUUID()) != null) {
addScoreBoard(pl.getServer().getPlayer(p.getUUID()), p); addScoreBoard(pl.getServer().getPlayer(p.getUUID()), p);
} }
} }

37
src/main/java/com/graywolf336/jail/Update.java
View File

@ -1,5 +1,10 @@
package com.graywolf336.jail; package com.graywolf336.jail;
import com.graywolf336.jail.enums.Settings;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
@ -7,14 +12,8 @@ import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
import com.graywolf336.jail.enums.Settings;
public class Update { public class Update {
private JailMain plugin; private final JailMain plugin;
// The project's unique ID // The project's unique ID
private static final int projectID = 31139; private static final int projectID = 31139;
@ -34,14 +33,14 @@ public class Update {
public void query() { public void query() {
String channel = plugin.getConfig().getString(Settings.UPDATECHANNEL.getPath(), "bukkit"); String channel = plugin.getConfig().getString(Settings.UPDATECHANNEL.getPath(), "bukkit");
URL url = null; URL url;
try { try {
if(channel.equalsIgnoreCase("stable-dev")) { if (channel.equalsIgnoreCase("stable-dev")) {
url = new URL(CI_STABLEDEV_API_QUERY); url = new URL(CI_STABLEDEV_API_QUERY);
}else if(channel.equalsIgnoreCase("dev")) { } else if (channel.equalsIgnoreCase("dev")) {
url = new URL(CI_DEV_API_QUERY); url = new URL(CI_DEV_API_QUERY);
}else { } else {
url = new URL(BUKKIT_API_QUERY); url = new URL(BUKKIT_API_QUERY);
} }
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
@ -61,7 +60,7 @@ public class Update {
final BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream())); final BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
String response = reader.readLine(); String response = reader.readLine();
if(channel.equalsIgnoreCase("stable-dev") || channel.equalsIgnoreCase("dev")) { if (channel.equalsIgnoreCase("stable-dev") || channel.equalsIgnoreCase("dev")) {
// Parse the object from the response from the CI server // Parse the object from the response from the CI server
JSONObject obj = (JSONObject) JSONValue.parse(response); JSONObject obj = (JSONObject) JSONValue.parse(response);
// Get the latest build number // Get the latest build number
@ -69,7 +68,7 @@ public class Update {
// Get the current running version // Get the current running version
String[] ver = plugin.getDescription().getVersion().split("-b"); String[] ver = plugin.getDescription().getVersion().split("-b");
// Let them know they're on a custom version when on build #0. // Let them know they're on a custom version when on build #0.
if(ver[ver.length - 1].equalsIgnoreCase("0")) { if (ver[ver.length - 1].equalsIgnoreCase("0")) {
plugin.getLogger().info("You are using a custom version, you can disable update checking."); plugin.getLogger().info("You are using a custom version, you can disable update checking.");
} }
@ -80,13 +79,13 @@ public class Update {
needed = number > curr; needed = number > curr;
// Alert the console that an update is needed, if it is needed // Alert the console that an update is needed, if it is needed
if(needed) { if (needed) {
this.version = obj.get("fullDisplayName").toString(); this.version = obj.get("fullDisplayName").toString();
this.fileUrl = obj.get("url").toString(); this.fileUrl = obj.get("url").toString();
plugin.getLogger().info("New development version of Jail is available: " + this.version); plugin.getLogger().info("New development version of Jail is available: " + this.version);
plugin.getLogger().info(this.fileUrl); plugin.getLogger().info(this.fileUrl);
} }
}else { } else {
// Parse the array of files from the query's response // Parse the array of files from the query's response
JSONArray array = (JSONArray) JSONValue.parse(response); JSONArray array = (JSONArray) JSONValue.parse(response);
@ -104,7 +103,7 @@ public class Update {
plugin.debug(remoteVer + " verus " + currentVer); plugin.debug(remoteVer + " verus " + currentVer);
this.needed = this.versionCompare(remoteVer, currentVer) > 0; this.needed = this.versionCompare(remoteVer, currentVer) > 0;
if(needed) { if (needed) {
this.version = latest.get("name").toString(); this.version = latest.get("name").toString();
this.fileUrl = latest.get("fileUrl").toString(); this.fileUrl = latest.get("fileUrl").toString();
plugin.getLogger().info("New stable version of Jail is available: " + this.version); plugin.getLogger().info("New stable version of Jail is available: " + this.version);
@ -116,23 +115,21 @@ public class Update {
// There was an error reading the query // There was an error reading the query
e.printStackTrace(); e.printStackTrace();
plugin.getLogger().severe("There was an error checking for an update, please see the above stacktrace for details before reporting."); plugin.getLogger().severe("There was an error checking for an update, please see the above stacktrace for details before reporting.");
return;
} }
} }
/** /**
* Compares two version strings. * Compares two version strings.
* * <p>
* Use this instead of String.compareTo() for a non-lexicographical * Use this instead of String.compareTo() for a non-lexicographical
* comparison that works for version strings. e.g. "1.10".compareTo("1.6"). * comparison that works for version strings. e.g. "1.10".compareTo("1.6").
* *
* @note It does not work if "1.10" is supposed to be equal to "1.10.0".
*
* @param str1 a string of ordinal numbers separated by decimal points. * @param str1 a string of ordinal numbers separated by decimal points.
* @param str2 a string of ordinal numbers separated by decimal points. * @param str2 a string of ordinal numbers separated by decimal points.
* @return The result is a negative integer if str1 is _numerically_ less than str2. * @return The result is a negative integer if str1 is _numerically_ less than str2.
* The result is a positive integer if str1 is _numerically_ greater than str2. * The result is a positive integer if str1 is _numerically_ greater than str2.
* The result is zero if the strings are _numerically_ equal. * The result is zero if the strings are _numerically_ equal.
* @note It does not work if "1.10" is supposed to be equal to "1.10.0".
*/ */
private Integer versionCompare(String str1, String str2) { private Integer versionCompare(String str1, String str2) {
String[] vals1 = str1.split("\\."); String[] vals1 = str1.split("\\.");

142
src/main/java/com/graywolf336/jail/Util.java
View File

@ -1,16 +1,7 @@
package com.graywolf336.jail; package com.graywolf336.jail;
import java.io.ByteArrayInputStream; import com.graywolf336.jail.beans.Prisoner;
import java.io.ByteArrayOutputStream; import com.graywolf336.jail.enums.Lang;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
@ -23,19 +14,27 @@ import org.bukkit.util.io.BukkitObjectInputStream;
import org.bukkit.util.io.BukkitObjectOutputStream; import org.bukkit.util.io.BukkitObjectOutputStream;
import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder; import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
import com.graywolf336.jail.beans.Prisoner; import java.io.ByteArrayInputStream;
import com.graywolf336.jail.enums.Lang; import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* Provides a variety of methods, static, that are used throughout the plugin. * Provides a variety of methods, static, that are used throughout the plugin.
* *
* @author graywolf336 * @author graywolf336
* @since 2.x.x
* @version 3.1.0 * @version 3.1.0
* @since 2.x.x
*/ */
public class Util { public class Util {
private final static Pattern DURATION_PATTERN = Pattern.compile("^(\\d+)\\s*(m(?:inute)?s?|h(?:ours?)?|d(?:ays?)?|s(?:econd)?s?)?$", Pattern.CASE_INSENSITIVE); private final static Pattern DURATION_PATTERN = Pattern.compile("^(\\d+)\\s*(m(?:inute)?s?|h(?:ours?)?|d(?:ays?)?|s(?:econd)?s?)?$", Pattern.CASE_INSENSITIVE);
private static String[] signLines = new String[] { "", "", "", "" }; private static String[] signLines = new String[]{"", "", "", ""};
private final static int inventoryMultipule = 9; private final static int inventoryMultipule = 9;
/** /**
@ -65,8 +64,8 @@ public class Util {
* @return true if they are inside, false if not. * @return true if they are inside, false if not.
*/ */
private static boolean isInside(int loc, int first, int second) { private static boolean isInside(int loc, int first, int second) {
int point1 = 0; int point1;
int point2 = 0; int point2;
if (first < second) { if (first < second) {
point1 = first; point1 = first;
point2 = second; point2 = second;
@ -80,16 +79,16 @@ public class Util {
/** /**
* Checks if the given string is inside the array, ignoring the casing. * Checks if the given string is inside the array, ignoring the casing.
* * <p>
* <p /> * <p/>
* *
* @param value to check * @param value to check
* @param array of strings to check * @param array of strings to check
* @return true if the array contains the provided value, false if it doesn't * @return true if the array contains the provided value, false if it doesn't
*/ */
public static boolean isStringInsideArray(String value, String... array) { public static boolean isStringInsideArray(String value, String... array) {
for(String s : array) for (String s : array)
if(s.equalsIgnoreCase(value)) if (s.equalsIgnoreCase(value))
return true; return true;
return false; return false;
@ -97,16 +96,16 @@ public class Util {
/** /**
* Checks if the given string is inside the list, ignoring the casing. * Checks if the given string is inside the list, ignoring the casing.
* * <p>
* <p /> * <p/>
* *
* @param value to check * @param value to check
* @param list of strings to check * @param list of strings to check
* @return true if the list contains the provided value, false if it doesn't * @return true if the list contains the provided value, false if it doesn't
*/ */
public static boolean isStringInsideList(String value, List<String> list) { public static boolean isStringInsideList(String value, List<String> list) {
for(String s : list) for (String s : list)
if(s.equalsIgnoreCase(value)) if (s.equalsIgnoreCase(value))
return true; return true;
return false; return false;
@ -122,8 +121,8 @@ public class Util {
public static String getStringFromArray(String separator, String... array) { public static String getStringFromArray(String separator, String... array) {
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
for(String s : array) { for (String s : array) {
if(result.length() != 0) result.append(separator); if (result.length() != 0) result.append(separator);
result.append(s); result.append(s);
} }
@ -140,8 +139,8 @@ public class Util {
public static String getStringFromList(String separator, List<String> list) { public static String getStringFromList(String separator, List<String> list) {
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
for(String s : list) { for (String s : list) {
if(result.length() != 0) result.append(separator); if (result.length() != 0) result.append(separator);
result.append(s); result.append(s);
} }
@ -172,10 +171,10 @@ public class Util {
.replace("%jailer%", p.getJailer()) .replace("%jailer%", p.getJailer())
.replace("%afktime%", Util.getDurationBreakdown(p.getAFKTime())); .replace("%afktime%", Util.getDurationBreakdown(p.getAFKTime()));
if(p.getRemainingTime() >= 0) { if (p.getRemainingTime() >= 0) {
msg = msg.replace("%timeinminutes%", String.valueOf(p.getRemainingTimeInMinutes())); msg = msg.replace("%timeinminutes%", String.valueOf(p.getRemainingTimeInMinutes()));
msg = msg.replace("%prettytime%", Util.getDurationBreakdown(p.getRemainingTime())); msg = msg.replace("%prettytime%", Util.getDurationBreakdown(p.getRemainingTime()));
}else { } else {
msg = msg.replace("%timeinminutes%", String.valueOf(-1)); msg = msg.replace("%timeinminutes%", String.valueOf(-1));
msg = msg.replace("%prettytime%", Lang.JAILEDFOREVERSIGN.get()); msg = msg.replace("%prettytime%", Lang.JAILEDFOREVERSIGN.get());
} }
@ -193,7 +192,7 @@ public class Util {
public static String[] replaceAllVariables(Prisoner p, String... msgs) { public static String[] replaceAllVariables(Prisoner p, String... msgs) {
String[] results = new String[msgs.length]; String[] results = new String[msgs.length];
for(int i = 0; i < msgs.length; i++) for (int i = 0; i < msgs.length; i++)
results[i] = replaceAllVariables(p, msgs[i]); results[i] = replaceAllVariables(p, msgs[i]);
return results; return results;
@ -208,7 +207,7 @@ public class Util {
ItemStack wand = new ItemStack(Material.BRICK); ItemStack wand = new ItemStack(Material.BRICK);
ItemMeta meta = wand.getItemMeta(); ItemMeta meta = wand.getItemMeta();
meta.setDisplayName(ChatColor.AQUA + "Jail Wand"); meta.setDisplayName(ChatColor.AQUA + "Jail Wand");
LinkedList<String> lore = new LinkedList<String>(); LinkedList<String> lore = new LinkedList<>();
lore.add(ChatColor.BLUE + "The wand for creating"); lore.add(ChatColor.BLUE + "The wand for creating");
lore.add(ChatColor.BLUE + "a jail or cell."); lore.add(ChatColor.BLUE + "a jail or cell.");
meta.setLore(lore); meta.setLore(lore);
@ -237,29 +236,29 @@ public class Util {
* @throws Exception if there are no matches * @throws Exception if there are no matches
*/ */
public static Long getTime(String time) throws Exception { public static Long getTime(String time) throws Exception {
if(time.equalsIgnoreCase("-1")) return -1L; if (time.equalsIgnoreCase("-1")) return -1L;
Long t = 10L; long t;
Matcher match = DURATION_PATTERN.matcher(time); Matcher match = DURATION_PATTERN.matcher(time);
if (match.matches()) { if (match.matches()) {
String units = match.group(2); String units = match.group(2);
if ("seconds".equals(units) || "second".equals(units) || "s".equals(units)) if ("seconds".equals(units) || "second".equals(units) || "s".equals(units))
t = TimeUnit.MILLISECONDS.convert(Long.valueOf(match.group(1)), TimeUnit.SECONDS); t = TimeUnit.MILLISECONDS.convert(Long.parseLong(match.group(1)), TimeUnit.SECONDS);
else if ("minutes".equals(units) || "minute".equals(units) || "mins".equals(units) || "min".equals(units) || "m".equals(units)) else if ("minutes".equals(units) || "minute".equals(units) || "mins".equals(units) || "min".equals(units) || "m".equals(units))
t = TimeUnit.MILLISECONDS.convert(Long.valueOf(match.group(1)), TimeUnit.MINUTES); t = TimeUnit.MILLISECONDS.convert(Long.parseLong(match.group(1)), TimeUnit.MINUTES);
else if ("hours".equals(units) || "hour".equals(units) || "h".equals(units)) else if ("hours".equals(units) || "hour".equals(units) || "h".equals(units))
t = TimeUnit.MILLISECONDS.convert(Long.valueOf(match.group(1)), TimeUnit.HOURS); t = TimeUnit.MILLISECONDS.convert(Long.parseLong(match.group(1)), TimeUnit.HOURS);
else if ("days".equals(units) || "day".equals(units) || "d".equals(units)) else if ("days".equals(units) || "day".equals(units) || "d".equals(units))
t = TimeUnit.MILLISECONDS.convert(Long.valueOf(match.group(1)), TimeUnit.DAYS); t = TimeUnit.MILLISECONDS.convert(Long.parseLong(match.group(1)), TimeUnit.DAYS);
else { else {
try { try {
t = TimeUnit.MILLISECONDS.convert(Long.parseLong(time), TimeUnit.MINUTES); t = TimeUnit.MILLISECONDS.convert(Long.parseLong(time), TimeUnit.MINUTES);
}catch(NumberFormatException e) { } catch (NumberFormatException e) {
throw new Exception("Invalid format."); throw new Exception("Invalid format.");
} }
} }
}else { } else {
throw new Exception("Invalid format."); throw new Exception("Invalid format.");
} }
@ -273,7 +272,7 @@ public class Util {
* @return A string of the form "XdYhZAs". * @return A string of the form "XdYhZAs".
*/ */
public static String getDurationBreakdown(long millis) { public static String getDurationBreakdown(long millis) {
if(millis < 0) { if (millis < 0) {
return Lang.JAILEDFOREVERSIGN.get(); return Lang.JAILEDFOREVERSIGN.get();
} }
@ -286,17 +285,17 @@ public class Util {
long seconds = TimeUnit.MILLISECONDS.toSeconds(millis); long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
StringBuilder sb = new StringBuilder(64); StringBuilder sb = new StringBuilder(64);
if(days > 0) { if (days > 0) {
sb.append(days); sb.append(days);
sb.append("d"); sb.append("d");
} }
if(days > 0 || hours > 0) { if (days > 0 || hours > 0) {
sb.append(hours); sb.append(hours);
sb.append("h"); sb.append("h");
} }
if(days > 0 || hours > 0 || minutes > 0) { if (days > 0 || hours > 0 || minutes > 0) {
sb.append(minutes); sb.append(minutes);
sb.append("m"); sb.append("m");
} }
@ -314,7 +313,7 @@ public class Util {
* @throws Exception Throws an exception if there aren't exactly four lines. * @throws Exception Throws an exception if there aren't exactly four lines.
*/ */
public static void updateSignLinesCache(String[] lines) throws Exception { public static void updateSignLinesCache(String[] lines) throws Exception {
if(lines.length != 4) throw new Exception("Exactly four lines are required for the signs."); if (lines.length != 4) throw new Exception("Exactly four lines are required for the signs.");
signLines = lines; signLines = lines;
} }
@ -328,15 +327,15 @@ public class Util {
} }
public static List<String> getUnusedItems(List<String> items, String[] args, boolean useP) { public static List<String> getUnusedItems(List<String> items, String[] args, boolean useP) {
List<String> used = new ArrayList<String>(); List<String> used = new ArrayList<>();
for(String s : args) for (String s : args)
if(s.contains("-")) if (s.contains("-"))
used.add(s.replace("-", "")); used.add(s.replace("-", ""));
List<String> unused = new ArrayList<String>(); List<String> unused = new ArrayList<>();
for(String t : items) for (String t : items)
if(!used.contains(t)) //don't add it if it is already used if (!used.contains(t)) //don't add it if it is already used
if(!t.equalsIgnoreCase("p") || (useP && t.equalsIgnoreCase("p")))//don't add -p unless otherwise stated if (!t.equalsIgnoreCase("p") || (useP && t.equalsIgnoreCase("p")))//don't add -p unless otherwise stated
unused.add("-" + t); unused.add("-" + t);
Collections.sort(unused); Collections.sort(unused);
@ -345,11 +344,10 @@ public class Util {
} }
/** /**
*
* A method to serialize an {@link ItemStack} array to Base64 String. * A method to serialize an {@link ItemStack} array to Base64 String.
* *
* <p> * <p>
* * <p>
* Based off of {@link #toBase64(Inventory)}. * Based off of {@link #toBase64(Inventory)}.
* *
* @param items to turn into a Base64 String. * @param items to turn into a Base64 String.
@ -381,7 +379,7 @@ public class Util {
* A method to serialize an inventory to Base64 string. * A method to serialize an inventory to Base64 string.
* *
* <p> * <p>
* * <p>
* Special thanks to Comphenix in the Bukkit forums or also known * Special thanks to Comphenix in the Bukkit forums or also known
* as aadnk on GitHub. <a href="https://gist.github.com/aadnk/8138186">Original Source</a> * as aadnk on GitHub. <a href="https://gist.github.com/aadnk/8138186">Original Source</a>
* *
@ -411,11 +409,10 @@ public class Util {
} }
/** /**
*
* A method to get an {@link Inventory} from an encoded, Base64, string. * A method to get an {@link Inventory} from an encoded, Base64, string.
* *
* <p> * <p>
* * <p>
* Special thanks to Comphenix in the Bukkit forums or also known * Special thanks to Comphenix in the Bukkit forums or also known
* as aadnk on GitHub. * as aadnk on GitHub.
* *
@ -426,13 +423,13 @@ public class Util {
* @throws IOException if we were unable to parse the base64 string * @throws IOException if we were unable to parse the base64 string
*/ */
public static Inventory fromBase64(String data) throws IOException { public static Inventory fromBase64(String data) throws IOException {
if(data.isEmpty()) return Bukkit.getServer().createInventory(null, 0); if (data.isEmpty()) return Bukkit.getServer().createInventory(null, 0);
try { try {
ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64Coder.decodeLines(data)); ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64Coder.decodeLines(data));
BukkitObjectInputStream dataInput = new BukkitObjectInputStream(inputStream); BukkitObjectInputStream dataInput = new BukkitObjectInputStream(inputStream);
int size = dataInput.readInt(); int size = dataInput.readInt();
Inventory inventory = Bukkit.getServer().createInventory(null, (int)Math.ceil((double)size / inventoryMultipule) * inventoryMultipule); Inventory inventory = Bukkit.getServer().createInventory(null, (int) Math.ceil((double) size / inventoryMultipule) * inventoryMultipule);
// Read the serialized inventory // Read the serialized inventory
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
@ -451,7 +448,7 @@ public class Util {
* Gets an array of ItemStacks from Base64 string. * Gets an array of ItemStacks from Base64 string.
* *
* <p> * <p>
* * <p>
* Base off of {@link #fromBase64(String)}. * Base off of {@link #fromBase64(String)}.
* *
* @param data Base64 string to convert to ItemStack array. * @param data Base64 string to convert to ItemStack array.
@ -459,7 +456,7 @@ public class Util {
* @throws IOException if we was unable to parse the base64 string * @throws IOException if we was unable to parse the base64 string
*/ */
public static ItemStack[] itemStackArrayFromBase64(String data) throws IOException { public static ItemStack[] itemStackArrayFromBase64(String data) throws IOException {
if(data.isEmpty()) return new ItemStack[] {}; if (data.isEmpty()) return new ItemStack[]{};
try { try {
ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64Coder.decodeLines(data)); ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64Coder.decodeLines(data));
@ -483,16 +480,16 @@ public class Util {
Inventory content = Util.fromBase64(prisoner.getInventory()); Inventory content = Util.fromBase64(prisoner.getInventory());
ItemStack[] armor = Util.itemStackArrayFromBase64(prisoner.getArmor()); ItemStack[] armor = Util.itemStackArrayFromBase64(prisoner.getArmor());
for(ItemStack item : armor) { for (ItemStack item : armor) {
if(item == null) if (item == null) {
continue; }
else if(item.getType().toString().toLowerCase().contains("helmet")) else if (item.getType().toString().toLowerCase().contains("helmet"))
player.getInventory().setHelmet(item); player.getInventory().setHelmet(item);
else if(item.getType().toString().toLowerCase().contains("chestplate")) else if (item.getType().toString().toLowerCase().contains("chestplate"))
player.getInventory().setChestplate(item); player.getInventory().setChestplate(item);
else if(item.getType().toString().toLowerCase().contains("leg")) else if (item.getType().toString().toLowerCase().contains("leg"))
player.getInventory().setLeggings(item); player.getInventory().setLeggings(item);
else if(item.getType().toString().toLowerCase().contains("boots")) else if (item.getType().toString().toLowerCase().contains("boots"))
player.getInventory().setBoots(item); player.getInventory().setBoots(item);
else if (player.getInventory().firstEmpty() == -1) else if (player.getInventory().firstEmpty() == -1)
player.getWorld().dropItem(player.getLocation(), item); player.getWorld().dropItem(player.getLocation(), item);
@ -500,9 +497,10 @@ public class Util {
player.getInventory().addItem(item); player.getInventory().addItem(item);
} }
for(ItemStack item : content.getContents()) { for (ItemStack item : content.getContents()) {
if(item == null) continue; if (item == null) {
else if(player.getInventory().firstEmpty() == -1) }
else if (player.getInventory().firstEmpty() == -1)
player.getWorld().dropItem(player.getLocation(), item); player.getWorld().dropItem(player.getLocation(), item);
else else
player.getInventory().addItem(item); player.getInventory().addItem(item);

38
src/main/java/com/graywolf336/jail/beans/AnyCell.java
View File

@ -1,111 +1,133 @@
package com.graywolf336.jail.beans; package com.graywolf336.jail.beans;
import com.graywolf336.jail.interfaces.ICell;
import org.bukkit.Location;
import org.bukkit.block.Chest;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import org.bukkit.Location;
import org.bukkit.block.Chest;
import com.graywolf336.jail.interfaces.ICell;
/** /**
* Pass this an instance of this class into the jailing of a player and they go to any open cell. * Pass this an instance of this class into the jailing of a player, and they go to any open cell.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* * @since 3.0.0
*/ */
public class AnyCell implements ICell { public class AnyCell implements ICell {
@Override
public int getDatabaseID() { public int getDatabaseID() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public String getName() { public String getName() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public void setPrisoner(Prisoner prisoner) { public void setPrisoner(Prisoner prisoner) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public Prisoner getPrisoner() { public Prisoner getPrisoner() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public void removePrisoner() { public void removePrisoner() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public boolean hasPrisoner() { public boolean hasPrisoner() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public void addAllSigns(HashSet<SimpleLocation> signs) { public void addAllSigns(HashSet<SimpleLocation> signs) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public void addSign(SimpleLocation sign) { public void addSign(SimpleLocation sign) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public HashSet<SimpleLocation> getSigns() { public HashSet<SimpleLocation> getSigns() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public boolean hasSigns() { public boolean hasSigns() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public String getSignString() { public String getSignString() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public List<String> getInvalidSigns() { public List<String> getInvalidSigns() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public List<String> cleanSigns() { public List<String> cleanSigns() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public HashMap<String, List<String>> updateSigns() { public HashMap<String, List<String>> updateSigns() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public void setTeleport(SimpleLocation location) { public void setTeleport(SimpleLocation location) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public Location getTeleport() { public Location getTeleport() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public void setChestLocation(SimpleLocation simpleLocation) { public void setChestLocation(SimpleLocation simpleLocation) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public Location getChestLocation() { public Location getChestLocation() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public Chest getChest() { public Chest getChest() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public boolean hasChest() { public boolean hasChest() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public boolean useChest() { public boolean useChest() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public boolean setChanged(boolean changed) { public boolean setChanged(boolean changed) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public boolean hasChanged() { public boolean hasChanged() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }

6
src/main/java/com/graywolf336/jail/beans/CachePrisoner.java
View File

@ -4,12 +4,12 @@ package com.graywolf336.jail.beans;
* An object for storing online cached prisoners. * An object for storing online cached prisoners.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class CachePrisoner { public class CachePrisoner {
private Jail jail; private final Jail jail;
private Prisoner p; private final Prisoner p;
public CachePrisoner(Jail jail, Prisoner prisoner) { public CachePrisoner(Jail jail, Prisoner prisoner) {
this.jail = jail; this.jail = jail;

86
src/main/java/com/graywolf336/jail/beans/Cell.java
View File

@ -1,10 +1,8 @@
package com.graywolf336.jail.beans; package com.graywolf336.jail.beans;
import java.util.ArrayList; import com.graywolf336.jail.Util;
import java.util.HashMap; import com.graywolf336.jail.enums.Lang;
import java.util.HashSet; import com.graywolf336.jail.interfaces.ICell;
import java.util.List;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -12,32 +10,35 @@ import org.bukkit.block.BlockState;
import org.bukkit.block.Chest; import org.bukkit.block.Chest;
import org.bukkit.block.Sign; import org.bukkit.block.Sign;
import com.graywolf336.jail.Util; import java.util.ArrayList;
import com.graywolf336.jail.enums.Lang; import java.util.HashMap;
import com.graywolf336.jail.interfaces.ICell; import java.util.HashSet;
import java.util.List;
/** Represents a Cell inside of a {@link Jail}. /**
* Represents a Cell inside of a {@link Jail}.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.2.0 * @version 1.2.0
* @since 3.0.0
*/ */
public class Cell implements ICell { public class Cell implements ICell {
private int databaseid; private final int databaseid;
private String name; private final String name;
private Prisoner p; private Prisoner p;
private HashSet<SimpleLocation> signs; private final HashSet<SimpleLocation> signs;
private SimpleLocation teleport, chest; private SimpleLocation teleport, chest;
private boolean changed; private boolean changed;
/** Creates a new Cell with the given name /**
* Creates a new Cell with the given name
* *
* @param name The name of the cell. * @param name The name of the cell.
*/ */
public Cell(String name) { public Cell(String name) {
this.databaseid = -1; this.databaseid = -1;
this.name = name; this.name = name;
this.signs = new HashSet<SimpleLocation>(); this.signs = new HashSet<>();
this.changed = false; this.changed = false;
} }
@ -50,7 +51,7 @@ public class Cell implements ICell {
public Cell(int id, String name) { public Cell(int id, String name) {
this.databaseid = id; this.databaseid = id;
this.name = name; this.name = name;
this.signs = new HashSet<SimpleLocation>(); this.signs = new HashSet<>();
this.changed = false; this.changed = false;
} }
@ -99,25 +100,25 @@ public class Cell implements ICell {
} }
public String getSignString() { public String getSignString() {
String r = ""; StringBuilder r = new StringBuilder();
for(SimpleLocation s : signs) { for (SimpleLocation s : signs) {
if(r.isEmpty()) { if (r.length() == 0) {
r = s.toString(); r = new StringBuilder(s.toString());
}else { } else {
r += ";" + s.toString(); r.append(";").append(s.toString());
} }
} }
return r; return r.toString();
} }
public List<String> getInvalidSigns() { public List<String> getInvalidSigns() {
List<String> invalid = new ArrayList<String>(); List<String> invalid = new ArrayList<>();
for(SimpleLocation s : new HashSet<SimpleLocation>(signs)) for (SimpleLocation s : new HashSet<>(signs))
if (s.getLocation().getBlock().getState() instanceof Sign) if (s.getLocation().getBlock().getState() instanceof Sign) {
continue; }
else else
invalid.add(s.toString()); invalid.add(s.toString());
@ -125,12 +126,11 @@ public class Cell implements ICell {
} }
public List<String> cleanSigns() { public List<String> cleanSigns() {
List<String> cleaned = new ArrayList<String>(); List<String> cleaned = new ArrayList<>();
for(SimpleLocation s : new HashSet<SimpleLocation>(signs)) { for (SimpleLocation s : new HashSet<>(signs)) {
if (s.getLocation().getBlock().getState() instanceof Sign) { if (s.getLocation().getBlock().getState() instanceof Sign) {
continue; } else {
}else {
changed = true; changed = true;
signs.remove(s); signs.remove(s);
cleaned.add(s.toString()); cleaned.add(s.toString());
@ -141,16 +141,16 @@ public class Cell implements ICell {
} }
public HashMap<String, List<String>> updateSigns() { public HashMap<String, List<String>> updateSigns() {
List<String> removed = new ArrayList<String>(); List<String> removed = new ArrayList<>();
List<String> updated = new ArrayList<String>(); List<String> updated = new ArrayList<>();
for(SimpleLocation s : new HashSet<SimpleLocation>(signs)) { for (SimpleLocation s : new HashSet<>(signs)) {
BlockState bs = s.getLocation().getBlock().getState(); BlockState bs = s.getLocation().getBlock().getState();
if (bs instanceof Sign) { if (bs instanceof Sign) {
Sign sign = (Sign) bs; Sign sign = (Sign) bs;
if(hasPrisoner()) { if (hasPrisoner()) {
String[] lines = Util.replaceAllVariables(p, Util.getSignLines()); String[] lines = Util.replaceAllVariables(p, Util.getSignLines());
sign.setLine(0, lines[0]); sign.setLine(0, lines[0]);
@ -158,7 +158,7 @@ public class Cell implements ICell {
sign.setLine(2, lines[2]); sign.setLine(2, lines[2]);
sign.setLine(3, lines[3]); sign.setLine(3, lines[3]);
sign.update(true, false); sign.update(true, false);
}else { } else {
sign.setLine(0, ""); sign.setLine(0, "");
sign.setLine(1, Lang.CELLEMPTYSIGN.get()); sign.setLine(1, Lang.CELLEMPTYSIGN.get());
sign.setLine(2, ""); sign.setLine(2, "");
@ -167,14 +167,14 @@ public class Cell implements ICell {
} }
updated.add(s.toString()); updated.add(s.toString());
}else { } else {
changed = true; changed = true;
signs.remove(s); signs.remove(s);
removed.add(s.toString()); removed.add(s.toString());
} }
} }
HashMap<String, List<String>> results = new HashMap<String, List<String>>(); HashMap<String, List<String>> results = new HashMap<>();
results.put("removed", removed); results.put("removed", removed);
results.put("updated", updated); results.put("updated", updated);
@ -200,8 +200,8 @@ public class Cell implements ICell {
} }
public Chest getChest() { public Chest getChest() {
if(this.chest == null) return null; if (this.chest == null) return null;
if(this.chest.getLocation().getBlock() == null if (this.chest.getLocation().getBlock() == null
|| (this.chest.getLocation().getBlock().getType() != Material.CHEST || (this.chest.getLocation().getBlock().getType() != Material.CHEST
&& this.chest.getLocation().getBlock().getType() != Material.TRAPPED_CHEST)) return null; && this.chest.getLocation().getBlock().getType() != Material.TRAPPED_CHEST)) return null;
@ -210,14 +210,14 @@ public class Cell implements ICell {
public boolean hasChest() { public boolean hasChest() {
Chest c = getChest(); Chest c = getChest();
if(c != null) { if (c != null) {
if(c.getInventory().getSize() >= 40) if (c.getInventory().getSize() >= 40)
return true; return true;
else { else {
Bukkit.getLogger().severe("The cell " + this.name + " has chest that isn't a double chest, please fix."); Bukkit.getLogger().severe("The cell " + this.name + " has chest that isn't a double chest, please fix.");
return false; return false;
} }
}else } else
return false; return false;
} }

8
src/main/java/com/graywolf336/jail/beans/ConfirmPlayer.java
View File

@ -10,10 +10,10 @@ import com.graywolf336.jail.enums.Confirmation;
* @since 3.0.0 * @since 3.0.0
*/ */
public class ConfirmPlayer { public class ConfirmPlayer {
private String name; private final String name;
private String[] args; private final String[] args;
private Confirmation confirm; private final Confirmation confirm;
private Long expires; private final Long expires;
public ConfirmPlayer(String name, String[] args, Confirmation confirm) { public ConfirmPlayer(String name, String[] args, Confirmation confirm) {
this.name = name; this.name = name;

29
src/main/java/com/graywolf336/jail/beans/CreationPlayer.java
View File

@ -1,20 +1,20 @@
package com.graywolf336.jail.beans; package com.graywolf336.jail.beans;
import java.util.HashSet;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import java.util.HashSet;
/** /**
* Represents an instance of a player creating something, whether it be a jail or cell. * Represents an instance of a player creating something, whether it be a jail or cell.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.1.0 * @version 1.1.0
* * @since 3.0.0
*/ */
public class CreationPlayer { public class CreationPlayer {
private String jailName, cellName; private final String jailName;
private String cellName;
private int step; private int step;
private int x1, y1, z1, x2, y2, z2; private int x1, y1, z1, x2, y2, z2;
private String inWorld, freeWorld; private String inWorld, freeWorld;
@ -42,7 +42,7 @@ public class CreationPlayer {
public CreationPlayer(String jailName, String cellName) { public CreationPlayer(String jailName, String cellName) {
this.jailName = jailName; this.jailName = jailName;
this.cellName = cellName; this.cellName = cellName;
this.signs = new HashSet<SimpleLocation>(); this.signs = new HashSet<>();
this.step = 1; this.step = 1;
} }
@ -68,7 +68,7 @@ public class CreationPlayer {
* Returns the step the creation is in. * Returns the step the creation is in.
* *
* <p> * <p>
* * <p>
* If it is a <strong>Jail</strong>, then when these numbers are returned it means the following: * If it is a <strong>Jail</strong>, then when these numbers are returned it means the following:
* <ol> * <ol>
* <li>Creating the first block of the Jail region.</li> * <li>Creating the first block of the Jail region.</li>
@ -76,7 +76,7 @@ public class CreationPlayer {
* <li>Creating the teleport in location.</li> * <li>Creating the teleport in location.</li>
* <li>Creating the teleport out location.</li> * <li>Creating the teleport out location.</li>
* </ol> * </ol>
* * <p>
* If it is a <strong>Cell</strong>, then when these numbers are returned it means the following: * If it is a <strong>Cell</strong>, then when these numbers are returned it means the following:
* <ol> * <ol>
* <li>Setting the teleport in location.</li> * <li>Setting the teleport in location.</li>
@ -107,7 +107,6 @@ public class CreationPlayer {
* <em>Notice:</em> Using this method can cause the step to go above four (three for cell), * <em>Notice:</em> Using this method can cause the step to go above four (three for cell),
* which might cause errors later on. Only use when you know that it won't * which might cause errors later on. Only use when you know that it won't
* be used again or you know for a fact that the next step is not above four (three for cell). * be used again or you know for a fact that the next step is not above four (three for cell).
*
*/ */
public void nextStep() { public void nextStep() {
this.step++; this.step++;
@ -143,7 +142,7 @@ public class CreationPlayer {
* @return the first corner coords * @return the first corner coords
*/ */
public int[] getCornerOne() { public int[] getCornerOne() {
return new int[] {x1, y1, z1}; return new int[]{x1, y1, z1};
} }
/** /**
@ -157,7 +156,8 @@ public class CreationPlayer {
this.z2 = loc.getBlockZ(); this.z2 = loc.getBlockZ();
} }
/** Sets the second corner with the given x, y, and z. /**
* Sets the second corner with the given x, y, and z.
* *
* @param x coordinate of the second corner's x * @param x coordinate of the second corner's x
* @param y coordinate of the second corner's x * @param y coordinate of the second corner's x
@ -169,12 +169,13 @@ public class CreationPlayer {
this.z2 = z; this.z2 = z;
} }
/** Returns the <strong>second corner</strong> coords an array of int. <strong>0 = x</strong>, <strong>1 = y</strong>, <strong>2 = z</strong> /**
* Returns the <strong>second corner</strong> coords an array of int. <strong>0 = x</strong>, <strong>1 = y</strong>, <strong>2 = z</strong>
* *
* @return the first corner coords * @return the first corner coords
*/ */
public int[] getCornerTwo() { public int[] getCornerTwo() {
return new int[] {x2, y2, z2}; return new int[]{x2, y2, z2};
} }
/** /**
@ -294,7 +295,7 @@ public class CreationPlayer {
* @return all of the signs, null if none. * @return all of the signs, null if none.
*/ */
public HashSet<SimpleLocation> getSigns() { public HashSet<SimpleLocation> getSigns() {
return this.signs == null ? null : new HashSet<SimpleLocation>(this.signs); return this.signs == null ? null : new HashSet<>(this.signs);
} }
/** /**

212
src/main/java/com/graywolf336/jail/beans/Jail.java
View File

@ -1,30 +1,30 @@
package com.graywolf336.jail.beans; package com.graywolf336.jail.beans;
import java.util.HashMap; import com.graywolf336.jail.JailMain;
import java.util.HashSet; import com.graywolf336.jail.Util;
import java.util.UUID;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Sign; import org.bukkit.block.Sign;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.graywolf336.jail.JailMain; import java.util.HashMap;
import com.graywolf336.jail.Util; import java.util.HashSet;
import java.util.UUID;
/** Represents a Jail, contains the prisoners and the cells. /**
* Represents a Jail, contains the prisoners and the cells.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.3 * @version 1.0.3
* @since 3.0.0
*/ */
public class Jail { public class Jail {
private JailMain plugin; private final JailMain plugin;
private boolean enabled; private boolean enabled;
private HashMap<String, Cell> cells; private final HashMap<String, Cell> cells;
private HashMap<UUID, Prisoner> nocellPrisoners;//prisoners who aren't in a cell private HashMap<UUID, Prisoner> nocellPrisoners;//prisoners who aren't in a cell
private String name = "", world = ""; private String name, world = "";
private int minX, minY, minZ, maxX, maxY, maxZ; private int minX, minY, minZ, maxX, maxY, maxZ;
private Location in, free; private Location in, free;
@ -32,8 +32,8 @@ public class Jail {
this.plugin = plugin; this.plugin = plugin;
this.enabled = true; this.enabled = true;
this.name = name; this.name = name;
cells = new HashMap<String, Cell>(); cells = new HashMap<>();
nocellPrisoners = new HashMap<UUID, Prisoner>(); nocellPrisoners = new HashMap<>();
} }
/** /**
@ -87,7 +87,7 @@ public class Jail {
* @param location the {@link Location} of the lowest point * @param location the {@link Location} of the lowest point
*/ */
public void setMinPoint(Location location) { public void setMinPoint(Location location) {
if(this.world.isEmpty()) this.world = location.getWorld().getName(); if (this.world.isEmpty()) this.world = location.getWorld().getName();
this.minX = location.getBlockX(); this.minX = location.getBlockX();
this.minY = location.getBlockY(); this.minY = location.getBlockY();
@ -100,7 +100,7 @@ public class Jail {
* @param coords the coordinates of the minimum point * @param coords the coordinates of the minimum point
*/ */
public void setMinPoint(int[] coords) { public void setMinPoint(int[] coords) {
if(coords.length != 3) return; if (coords.length != 3) return;
this.minX = coords[0]; this.minX = coords[0];
this.minY = coords[1]; this.minY = coords[1];
@ -122,7 +122,7 @@ public class Jail {
* @param location the {@link Location} of the maximum point * @param location the {@link Location} of the maximum point
*/ */
public void setMaxPoint(Location location) { public void setMaxPoint(Location location) {
if(this.world.isEmpty()) this.world = location.getWorld().getName(); if (this.world.isEmpty()) this.world = location.getWorld().getName();
this.maxX = location.getBlockX(); this.maxX = location.getBlockX();
this.maxY = location.getBlockY(); this.maxY = location.getBlockY();
@ -138,100 +138,130 @@ public class Jail {
return new Location(plugin.getServer().getWorld(world), maxX, maxY, maxZ); return new Location(plugin.getServer().getWorld(world), maxX, maxY, maxZ);
} }
/** Accepts an array of ints as the coord, where <strong>0 = x</strong>, <strong>1 = y</strong>, <strong>2 = z</strong>. */ /**
* Accepts an array of ints as the coord, where <strong>0 = x</strong>, <strong>1 = y</strong>, <strong>2 = z</strong>.
*/
public void setMaxPoint(int[] coords) { public void setMaxPoint(int[] coords) {
if(coords.length != 3) return; if (coords.length != 3) return;
this.maxX = coords[0]; this.maxX = coords[0];
this.maxY = coords[1]; this.maxY = coords[1];
this.maxZ = coords[2]; this.maxZ = coords[2];
} }
/** Sets the name of the world this Jail is in. */ /**
* Sets the name of the world this Jail is in.
*/
public void setWorld(String name) { public void setWorld(String name) {
this.world = name; this.world = name;
} }
/** Gets the name of the world this Jail is in. */ /**
* Gets the name of the world this Jail is in.
*/
public String getWorldName() { public String getWorldName() {
return this.world; return this.world;
} }
/** Gets the instance of the {@link World world} this Jail is in. */ /**
* Gets the instance of the {@link World world} this Jail is in.
*/
public World getWorld() { public World getWorld() {
return plugin.getServer().getWorld(world); return plugin.getServer().getWorld(world);
} }
/** Sets the {@link Location location} of the teleport <strong>in</strong>. */ /**
* Sets the {@link Location location} of the teleport <strong>in</strong>.
*/
public void setTeleportIn(Location location) { public void setTeleportIn(Location location) {
if(this.world.isEmpty()) this.world = location.getWorld().getName(); if (this.world.isEmpty()) this.world = location.getWorld().getName();
this.in = location; this.in = location;
} }
/** Gets the {@link Location location} of the teleport in. */ /**
* Gets the {@link Location location} of the teleport in.
*/
public Location getTeleportIn() { public Location getTeleportIn() {
return this.in; return this.in;
} }
/** Sets the {@link Location location} of the teleport for the <strong>free</strong> spot. */ /**
* Sets the {@link Location location} of the teleport for the <strong>free</strong> spot.
*/
public void setTeleportFree(Location location) { public void setTeleportFree(Location location) {
this.free = location; this.free = location;
} }
/** Gets the {@link Location location} of the teleport free spot.*/ /**
* Gets the {@link Location location} of the teleport free spot.
*/
public Location getTeleportFree() { public Location getTeleportFree() {
return this.free; return this.free;
} }
/** Add a prisoner to this jail. */ /**
* Add a prisoner to this jail.
*/
public void addPrisoner(Prisoner p) { public void addPrisoner(Prisoner p) {
this.nocellPrisoners.put(p.getUUID(), p); this.nocellPrisoners.put(p.getUUID(), p);
} }
/** Removes a prisoner from this jail, doesn't remove it from the cell. */ /**
* Removes a prisoner from this jail, doesn't remove it from the cell.
*/
public void removePrisoner(Prisoner p) { public void removePrisoner(Prisoner p) {
this.nocellPrisoners.remove(p.getUUID()); this.nocellPrisoners.remove(p.getUUID());
} }
/** Returns if there are any cells or not. */ /**
* Returns if there are any cells or not.
*/
public boolean hasCells() { public boolean hasCells() {
return !this.cells.isEmpty(); return !this.cells.isEmpty();
} }
/** Adds a cell to the Jail. */ /**
* Adds a cell to the Jail.
*/
public boolean addCell(Cell cell, boolean save) { public boolean addCell(Cell cell, boolean save) {
if(save) plugin.getJailIO().saveCell(this, cell, false); if (save) plugin.getJailIO().saveCell(this, cell, false);
//Check if it already exists or not //Check if it already exists or not
if(this.cells.containsKey(cell.getName())) return false; if (this.cells.containsKey(cell.getName())) return false;
else this.cells.put(cell.getName(), cell); else this.cells.put(cell.getName(), cell);
return true; return true;
} }
/** Gets the cell with the given name. */ /**
* Gets the cell with the given name.
*/
public Cell getCell(String name) { public Cell getCell(String name) {
return this.cells.get(name); return this.cells.get(name);
} }
/** Checks if the given name is a valid cell. */ /**
* Checks if the given name is a valid cell.
*/
public boolean isValidCell(String name) { public boolean isValidCell(String name) {
return this.cells.get(name) != null; return this.cells.get(name) != null;
} }
/** Removes the cell from the jail. */ /**
* Removes the cell from the jail.
*/
public void removeCell(String name) { public void removeCell(String name) {
Cell c = this.cells.get(name); Cell c = this.cells.get(name);
//If we have a chest, clear the inventory //If we have a chest, clear the inventory
if(c.hasChest()) { if (c.hasChest()) {
c.getChest().getInventory().clear(); c.getChest().getInventory().clear();
} }
//For each sign, clear the lines on the sign //For each sign, clear the lines on the sign
for(SimpleLocation s : c.getSigns()) { for (SimpleLocation s : c.getSigns()) {
if(s.getLocation().getBlock() instanceof Sign) { if (s.getLocation().getBlock() instanceof Sign) {
Sign sign = (Sign) s.getLocation().getBlock(); Sign sign = (Sign) s.getLocation().getBlock();
for(int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
sign.setLine(i, ""); sign.setLine(i, "");
} }
} }
@ -243,61 +273,73 @@ public class Jail {
this.cells.remove(name); this.cells.remove(name);
} }
/** Returns the cell which the given player name is jailed in, null if not. */ /**
* Returns the cell which the given player name is jailed in, null if not.
*/
public Cell getCellPrisonerIsIn(UUID uuid) { public Cell getCellPrisonerIsIn(UUID uuid) {
for(Cell c : cells.values()) for (Cell c : cells.values())
if(c.hasPrisoner()) if (c.hasPrisoner())
if(c.getPrisoner().getUUID().equals(uuid)) if (c.getPrisoner().getUUID().equals(uuid))
return c; return c;
return null; return null;
} }
/** Returns the first empty cell, returns null if there aren't any cells or any free cells. */ /**
* Returns the first empty cell, returns null if there aren't any cells or any free cells.
*/
public Cell getFirstEmptyCell() { public Cell getFirstEmptyCell() {
for(Cell c : getCells()) for (Cell c : getCells())
if(c.hasPrisoner()) if (c.hasPrisoner()) {
continue; }
else else
return c; return c;
return null; return null;
} }
/** Checks if there is an empty cell in this Jail. */ /**
* Checks if there is an empty cell in this Jail.
*/
public boolean hasEmptyCell() { public boolean hasEmptyCell() {
for(Cell c : getCells()) for (Cell c : getCells())
if(!c.hasPrisoner()) if (!c.hasPrisoner())
return true; return true;
return false; return false;
} }
/** Gets the amount of cells the jail. */ /**
* Gets the amount of cells the jail.
*/
public int getCellCount() { public int getCellCount() {
return this.cells.size(); return this.cells.size();
} }
/** Gets all the cells in the jail. */ /**
* Gets all the cells in the jail.
*/
public HashSet<Cell> getCells() { public HashSet<Cell> getCells() {
return new HashSet<Cell>(this.cells.values()); return new HashSet<>(this.cells.values());
} }
/** Gets the closest cell to the provided location, via the teleport in location of the cells. */ /**
* Gets the closest cell to the provided location, via the teleport in location of the cells.
*/
public Cell getNearestCell(Location loc) { public Cell getNearestCell(Location loc) {
Cell cell = null; Cell cell = null;
double distance = -1; double distance = -1;
for(Cell c : getCells()) { for (Cell c : getCells()) {
//Check if the worlds are the same, if not we can't calculate anything //Check if the worlds are the same, if not we can't calculate anything
if(c.getTeleport().getWorld().getName().equalsIgnoreCase(loc.getWorld().getName())) { if (c.getTeleport().getWorld().getName().equalsIgnoreCase(loc.getWorld().getName())) {
//They are in the same world //They are in the same world
double dist = c.getTeleport().distance(loc); double dist = c.getTeleport().distance(loc);
if (dist < distance || distance < 0) { if (dist < distance || distance < 0) {
cell = c; cell = c;
distance = dist; distance = dist;
} }
}else { } else {
//If they aren't, return the first cell found. //If they aren't, return the first cell found.
return c; return c;
} }
@ -306,41 +348,49 @@ public class Jail {
return cell; return cell;
} }
/** Clears all the prisoners from this Jail. */ /**
* Clears all the prisoners from this Jail.
*/
public void clearPrisoners() { public void clearPrisoners() {
//Remove the prisoners from all the cells //Remove the prisoners from all the cells
for(Cell c : getCells()) { for (Cell c : getCells()) {
c.removePrisoner(); c.removePrisoner();
} }
//Replace all the current no cell prisoners with //Replace all the current no cell prisoners with
//a new hashset of prisoners. //a new hashset of prisoners.
this.nocellPrisoners = new HashMap<UUID, Prisoner>(); this.nocellPrisoners = new HashMap<>();
} }
/** Gets a HashMap of <b>all</b> the prisoners, the ones in cells and ones who aren't. */ /**
* Gets a HashMap of <b>all</b> the prisoners, the ones in cells and ones who aren't.
*/
public HashMap<UUID, Prisoner> getAllPrisoners() { public HashMap<UUID, Prisoner> getAllPrisoners() {
HashMap<UUID, Prisoner> all = new HashMap<UUID, Prisoner>(nocellPrisoners); //initalize the temp one to return with the prisoners not in any cells HashMap<UUID, Prisoner> all = new HashMap<>(nocellPrisoners); //initalize the temp one to return with the prisoners not in any cells
for(Cell c : cells.values()) for (Cell c : cells.values())
if(c.hasPrisoner()) if (c.hasPrisoner())
all.put(c.getPrisoner().getUUID(), c.getPrisoner()); all.put(c.getPrisoner().getUUID(), c.getPrisoner());
return all; return all;
} }
/** Gets a HashSet of the prisoners <b>in cells</b>. */ /**
* Gets a HashSet of the prisoners <b>in cells</b>.
*/
public HashSet<Prisoner> getPrisonersInCells() { public HashSet<Prisoner> getPrisonersInCells() {
HashSet<Prisoner> all = new HashSet<Prisoner>(); HashSet<Prisoner> all = new HashSet<>();
for(Cell c : getCells()) for (Cell c : getCells())
if(c.hasPrisoner()) if (c.hasPrisoner())
all.add(c.getPrisoner()); all.add(c.getPrisoner());
return all; return all;
} }
/** Gets a HashSet of the prisoners <b>not</b> in cells.*/ /**
* Gets a HashSet of the prisoners <b>not</b> in cells.
*/
public HashMap<UUID, Prisoner> getPrisonersNotInCells() { public HashMap<UUID, Prisoner> getPrisonersNotInCells() {
return this.nocellPrisoners; return this.nocellPrisoners;
} }
@ -382,11 +432,11 @@ public class Jail {
* @return true if is jailed in a cell, false if not. * @return true if is jailed in a cell, false if not.
*/ */
public boolean isJailedInACell(UUID uuid) { public boolean isJailedInACell(UUID uuid) {
if(this.nocellPrisoners.containsKey(uuid)) return false; if (this.nocellPrisoners.containsKey(uuid)) return false;
for(Cell c : cells.values()) for (Cell c : cells.values())
if(c.getPrisoner() != null) if (c.getPrisoner() != null)
if(c.getPrisoner().getUUID().equals(uuid)) if (c.getPrisoner().getUUID().equals(uuid))
return true; return true;
return false; return false;
@ -399,8 +449,8 @@ public class Jail {
* @return the prisoner instance, can be null * @return the prisoner instance, can be null
*/ */
public Prisoner getPrisonerByLastKnownName(String name) { public Prisoner getPrisonerByLastKnownName(String name) {
for(Prisoner p : this.getAllPrisoners().values()) for (Prisoner p : this.getAllPrisoners().values())
if(p.getLastKnownName().equalsIgnoreCase(name)) if (p.getLastKnownName().equalsIgnoreCase(name))
return p; return p;
return null; return null;
@ -413,11 +463,11 @@ public class Jail {
* @return the prisoner instance, can be null * @return the prisoner instance, can be null
*/ */
public Prisoner getPrisoner(UUID uuid) { public Prisoner getPrisoner(UUID uuid) {
if(this.nocellPrisoners.containsKey(uuid)) return this.nocellPrisoners.get(uuid); if (this.nocellPrisoners.containsKey(uuid)) return this.nocellPrisoners.get(uuid);
for(Cell c : cells.values()) for (Cell c : cells.values())
if(c.hasPrisoner()) if (c.hasPrisoner())
if(c.getPrisoner().getUUID().equals(uuid)) if (c.getPrisoner().getUUID().equals(uuid))
return c.getPrisoner(); return c.getPrisoner();
return null; return null;
@ -443,9 +493,9 @@ public class Jail {
* @return True if the location is in the jail, false if it isn't * @return True if the location is in the jail, false if it isn't
*/ */
public boolean isInside(Location loc) { public boolean isInside(Location loc) {
if(loc.getWorld().getName().equalsIgnoreCase(world)) { if (loc.getWorld().getName().equalsIgnoreCase(world)) {
return Util.isInsideAB(loc.toVector(), new Vector(minX, minY, minZ), new Vector(maxX, maxY, maxZ)); return Util.isInsideAB(loc.toVector(), new Vector(minX, minY, minZ), new Vector(maxX, maxY, maxZ));
}else { } else {
return false; return false;
} }
} }

39
src/main/java/com/graywolf336/jail/beans/JailVote.java
View File

@ -1,21 +1,21 @@
package com.graywolf336.jail.beans; package com.graywolf336.jail.beans;
import java.util.ArrayList;
import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.UUID;
/** /**
* Represents a vote to jail someone. * Represents a vote to jail someone.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class JailVote { public class JailVote {
private String name; private final String name;
private ArrayList<UUID> voters; private final ArrayList<UUID> voters;
private int yes, no; private int yes, no;
/** /**
@ -25,12 +25,14 @@ public class JailVote {
*/ */
public JailVote(String player) { public JailVote(String player) {
this.name = player; this.name = player;
this.voters = new ArrayList<UUID>(); this.voters = new ArrayList<>();
this.yes = 0; this.yes = 0;
this.no = 0; this.no = 0;
} }
/** The name of the player the vote is for. */ /**
* The name of the player the vote is for.
*/
public String getPlayerName() { public String getPlayerName() {
return this.name; return this.name;
} }
@ -40,12 +42,13 @@ public class JailVote {
* *
* @return the player who the vote is for to jail * @return the player who the vote is for to jail
*/ */
@SuppressWarnings("deprecation")
public Player getPlayer() { public Player getPlayer() {
return Bukkit.getPlayer(name); return Bukkit.getPlayer(name);
} }
/** Checks if the player with the given id has voted already. */ /**
* Checks if the player with the given id has voted already.
*/
public boolean hasVoted(UUID id) { public boolean hasVoted(UUID id) {
return this.voters.contains(id); return this.voters.contains(id);
} }
@ -57,9 +60,9 @@ public class JailVote {
* @return true if it was success, false if they already voted * @return true if it was success, false if they already voted
*/ */
public boolean voteYes(UUID id) { public boolean voteYes(UUID id) {
if(this.voters.contains(id)) { if (this.voters.contains(id)) {
return false; return false;
}else { } else {
this.voters.add(id); this.voters.add(id);
this.yes++; this.yes++;
return true; return true;
@ -73,21 +76,25 @@ public class JailVote {
* @return true if it was success, false if they already voted * @return true if it was success, false if they already voted
*/ */
public boolean voteNo(UUID id) { public boolean voteNo(UUID id) {
if(this.voters.contains(id)) { if (this.voters.contains(id)) {
return false; return false;
}else { } else {
this.voters.add(id); this.voters.add(id);
this.no++; this.no++;
return true; return true;
} }
} }
/** Get the amount of yes votes. */ /**
* Get the amount of yes votes.
*/
public int getYesVotes() { public int getYesVotes() {
return this.yes; return this.yes;
} }
/** Get the amount of no votes. */ /**
* Get the amount of no votes.
*/
public int getNoVotes() { public int getNoVotes() {
return this.no; return this.no;
} }

12
src/main/java/com/graywolf336/jail/beans/NoCell.java
View File

@ -1,21 +1,19 @@
package com.graywolf336.jail.beans; package com.graywolf336.jail.beans;
import com.graywolf336.jail.interfaces.ICell;
import org.bukkit.Location;
import org.bukkit.block.Chest;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import org.bukkit.Location;
import org.bukkit.block.Chest;
import com.graywolf336.jail.interfaces.ICell;
/** /**
* Pass this an instance of this class into the jailing of a player and they won't go into a cell. * Pass this an instance of this class into the jailing of a player and they won't go into a cell.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* * @since 3.0.0
*/ */
public class NoCell implements ICell { public class NoCell implements ICell {
public int getDatabaseID() { public int getDatabaseID() {

190
src/main/java/com/graywolf336/jail/beans/Prisoner.java
View File

@ -1,26 +1,30 @@
package com.graywolf336.jail.beans; package com.graywolf336.jail.beans;
import java.util.UUID; import com.graywolf336.jail.enums.Lang;
import java.util.concurrent.TimeUnit;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.graywolf336.jail.enums.Lang; import java.util.UUID;
import java.util.concurrent.TimeUnit;
/** /**
* Represents a Prisoner, player who is jailed, and contains all the information about him/her. * Represents a Prisoner, player who is jailed, and contains all the information about him/her.
* *
* @author graywolf336 * @author graywolf336
* @since 2.x.x
* @version 3.1.1 * @version 3.1.1
* @since 2.x.x
*/ */
public class Prisoner { public class Prisoner {
private String uuid, name, jailer, reason, inventory, armor; private final String uuid;
private String name;
private String jailer;
private String reason;
private String inventory;
private String armor;
private boolean muted = true, offlinePending = false, teleporting = false, toBeTransferred = false, changed = false; private boolean muted = true, offlinePending = false, teleporting = false, toBeTransferred = false, changed = false;
private long time = -1L, afk = 0L; private long time, afk = 0L;
private Location previousPosition; private Location previousPosition;
private GameMode previousGameMode; private GameMode previousGameMode;
@ -156,39 +160,49 @@ public class Prisoner {
finishSetup(); finishSetup();
} }
/** Finishes the setup of the prisoner data, set to defaults. */ /**
* Finishes the setup of the prisoner data, set to defaults.
*/
private void finishSetup() { private void finishSetup() {
if(jailer == null) if (jailer == null)
jailer = Lang.DEFAULTJAILER.get(); jailer = Lang.DEFAULTJAILER.get();
if(reason == null) if (reason == null)
Lang.DEFAULTJAILEDREASON.get(); Lang.DEFAULTJAILEDREASON.get();
if(inventory == null) if (inventory == null)
inventory = ""; inventory = "";
if(armor == null) if (armor == null)
armor = ""; armor = "";
if(previousGameMode == null) if (previousGameMode == null)
previousGameMode = GameMode.SURVIVAL; previousGameMode = GameMode.SURVIVAL;
previousPosition = null; previousPosition = null;
} }
/** Returns the UUID of the prisoner. */ /**
* Returns the UUID of the prisoner.
*/
public UUID getUUID() { public UUID getUUID() {
return UUID.fromString(this.uuid); return UUID.fromString(this.uuid);
} }
/** Gets the name of this prisoner. */ /**
* Gets the name of this prisoner.
*/
public String getLastKnownName() { public String getLastKnownName() {
return this.name; return this.name;
} }
/** Sets the name of this prisoner. */ /**
* Sets the name of this prisoner.
*/
public String setLastKnownName(String username) { public String setLastKnownName(String username) {
this.name = username; this.name = username;
this.changed = true; this.changed = true;
return this.name; return this.name;
} }
/** Gets the reason this player was jailed for. */ /**
* Gets the reason this player was jailed for.
*/
public String getReason() { public String getReason() {
return this.reason; return this.reason;
} }
@ -205,44 +219,60 @@ public class Prisoner {
return this.reason; return this.reason;
} }
/** Gets the person who jailed this prisoner. */ /**
* Gets the person who jailed this prisoner.
*/
public String getJailer() { public String getJailer() {
return this.jailer; return this.jailer;
} }
/** Sets the person who jailed this prisoner. */ /**
* Sets the person who jailed this prisoner.
*/
public void setJailer(String jailer) { public void setJailer(String jailer) {
this.jailer = jailer; this.jailer = jailer;
this.changed = true; this.changed = true;
} }
/** Gets whether the prisoner is muted or not. */ /**
* Gets whether the prisoner is muted or not.
*/
public boolean isMuted() { public boolean isMuted() {
return this.muted; return this.muted;
} }
/** Sets whether the prisoner is muted or not. */ /**
* Sets whether the prisoner is muted or not.
*/
public void setMuted(boolean muted) { public void setMuted(boolean muted) {
this.muted = muted; this.muted = muted;
this.changed = true; this.changed = true;
} }
/** Gets whether the prisoner is jailed forever or not. */ /**
* Gets whether the prisoner is jailed forever or not.
*/
public boolean isJailedForever() { public boolean isJailedForever() {
return this.time == -1; return this.time == -1;
} }
/** Gets the remaining time the prisoner has. */ /**
* Gets the remaining time the prisoner has.
*/
public long getRemainingTime() { public long getRemainingTime() {
return this.time; return this.time;
} }
/** Gets the remaining time the prisoner has in minutes. */ /**
* Gets the remaining time the prisoner has in minutes.
*/
public long getRemainingTimeInMinutes() { public long getRemainingTimeInMinutes() {
return TimeUnit.MINUTES.convert(time, TimeUnit.MILLISECONDS); return TimeUnit.MINUTES.convert(time, TimeUnit.MILLISECONDS);
} }
/** Gets the remaining time the prison has in minutes except only in int format. */ /**
* Gets the remaining time the prison has in minutes except only in int format.
*/
public int getRemainingTimeInMinutesInt() { public int getRemainingTimeInMinutesInt() {
return (int) this.getRemainingTimeInMinutes(); return (int) this.getRemainingTimeInMinutes();
} }
@ -264,7 +294,7 @@ public class Prisoner {
* @return the new remaining time the prisoner has * @return the new remaining time the prisoner has
*/ */
public long addTime(long time) { public long addTime(long time) {
if(this.time != -1L) { if (this.time != -1L) {
this.time += time; this.time += time;
this.changed = true; this.changed = true;
} }
@ -279,7 +309,7 @@ public class Prisoner {
* @return the new remaining time the prisoner has * @return the new remaining time the prisoner has
*/ */
public long subtractTime(long time) { public long subtractTime(long time) {
if(this.time != -1L) { if (this.time != -1L) {
this.time -= time; this.time -= time;
this.changed = true; this.changed = true;
} }
@ -287,47 +317,63 @@ public class Prisoner {
return this.time; return this.time;
} }
/** Gets whether the player is offline or not. */ /**
* Gets whether the player is offline or not.
*/
public boolean isOfflinePending() { public boolean isOfflinePending() {
return this.offlinePending; return this.offlinePending;
} }
/** Sets whether the player is offline or not. */ /**
* Sets whether the player is offline or not.
*/
public void setOfflinePending(boolean offline) { public void setOfflinePending(boolean offline) {
this.offlinePending = offline; this.offlinePending = offline;
this.changed = true; this.changed = true;
} }
/** Gets whether the player is being teleported or not. */ /**
* Gets whether the player is being teleported or not.
*/
public boolean isTeleporting() { public boolean isTeleporting() {
return this.teleporting; return this.teleporting;
} }
/** Sets whether the player is being teleported or not. */ /**
* Sets whether the player is being teleported or not.
*/
public void setTeleporting(boolean teleport) { public void setTeleporting(boolean teleport) {
this.teleporting = teleport; this.teleporting = teleport;
} }
/** Gets whether the prisoner is going to be transferred or not, mainly for teleporting on join purposes. */ /**
* Gets whether the prisoner is going to be transferred or not, mainly for teleporting on join purposes.
*/
public boolean isToBeTransferred() { public boolean isToBeTransferred() {
return this.toBeTransferred; return this.toBeTransferred;
} }
/** Sets whether the prisoner is going to be transferred or not, mainly for teleporting on join purposes. */ /**
* Sets whether the prisoner is going to be transferred or not, mainly for teleporting on join purposes.
*/
public void setToBeTransferred(boolean transferred) { public void setToBeTransferred(boolean transferred) {
this.toBeTransferred = transferred; this.toBeTransferred = transferred;
this.changed = true; this.changed = true;
} }
/** Gets the previous location of this player, can be null. */ /**
* Gets the previous location of this player, can be null.
*/
public Location getPreviousLocation() { public Location getPreviousLocation() {
return this.previousPosition; return this.previousPosition;
} }
/** Gets the previous location of this player, separated by a comma. */ /**
* Gets the previous location of this player, separated by a comma.
*/
public String getPreviousLocationString() { public String getPreviousLocationString() {
if(previousPosition == null) return ""; if (previousPosition == null) return "";
else if(previousPosition.getWorld() == null) return ""; else if (previousPosition.getWorld() == null) return "";
else return previousPosition.getWorld().getName() + "," + else return previousPosition.getWorld().getName() + "," +
previousPosition.getX() + "," + previousPosition.getX() + "," +
previousPosition.getY() + "," + previousPosition.getY() + "," +
@ -336,83 +382,109 @@ public class Prisoner {
previousPosition.getPitch(); previousPosition.getPitch();
} }
/** Sets the previous location of this player. */ /**
* Sets the previous location of this player.
*/
public void setPreviousPosition(Location location) { public void setPreviousPosition(Location location) {
this.previousPosition = location; this.previousPosition = location;
} }
/** Sets the previous location of this player from a comma separated string. */ /**
* Sets the previous location of this player from a comma separated string.
*/
public void setPreviousPosition(String location) { public void setPreviousPosition(String location) {
if(location == null) return; if (location == null) return;
if(location.isEmpty()) return; if (location.isEmpty()) return;
this.changed = true; this.changed = true;
String[] s = location.split(","); String[] s = location.split(",");
this.previousPosition = new Location(Bukkit.getWorld(s[0]), this.previousPosition = new Location(Bukkit.getWorld(s[0]),
Double.valueOf(s[1]), Double.parseDouble(s[1]),
Double.valueOf(s[2]), Double.parseDouble(s[2]),
Double.valueOf(s[3]), Double.parseDouble(s[3]),
Float.valueOf(s[4]), Float.parseFloat(s[4]),
Float.valueOf(s[5])); Float.parseFloat(s[5]));
} }
/** Gets the previous gamemode of this player. */ /**
* Gets the previous gamemode of this player.
*/
public GameMode getPreviousGameMode() { public GameMode getPreviousGameMode() {
return this.previousGameMode; return this.previousGameMode;
} }
/** Sets the previous gamemode of this player. */ /**
* Sets the previous gamemode of this player.
*/
public void setPreviousGameMode(GameMode previous) { public void setPreviousGameMode(GameMode previous) {
this.previousGameMode = previous; this.previousGameMode = previous;
this.changed = true; this.changed = true;
} }
/** Sets the previous gamemode of this player based upon the provided string. */ /**
* Sets the previous gamemode of this player based upon the provided string.
*/
public void setPreviousGameMode(String previous) { public void setPreviousGameMode(String previous) {
if(previous == null) return; if (previous == null) return;
else if(previous.isEmpty()) return; else if (previous.isEmpty()) return;
else this.previousGameMode = GameMode.valueOf(previous); else this.previousGameMode = GameMode.valueOf(previous);
this.changed = true; this.changed = true;
} }
/** Gets the inventory string for this player, it is encoded in Base64 string. */ /**
* Gets the inventory string for this player, it is encoded in Base64 string.
*/
public String getInventory() { public String getInventory() {
return this.inventory; return this.inventory;
} }
/** Sets the inventory Base64 string. */ /**
* Sets the inventory Base64 string.
*/
public void setInventory(String inventory) { public void setInventory(String inventory) {
this.inventory = inventory; this.inventory = inventory;
this.changed = true; this.changed = true;
} }
/** Gets the armor content, encoded in Base64 string. */ /**
* Gets the armor content, encoded in Base64 string.
*/
public String getArmor() { public String getArmor() {
return this.armor; return this.armor;
} }
/** Sets the armor inventory Base64 string. */ /**
* Sets the armor inventory Base64 string.
*/
public void setArmor(String armor) { public void setArmor(String armor) {
this.armor = armor; this.armor = armor;
this.changed = true; this.changed = true;
} }
/** Gets the time, in milliseconds, this prisoner has been afk. */ /**
* Gets the time, in milliseconds, this prisoner has been afk.
*/
public long getAFKTime() { public long getAFKTime() {
return this.afk; return this.afk;
} }
/** Sets the time, in milliseconds, this prisoner has been afk. */ /**
* Sets the time, in milliseconds, this prisoner has been afk.
*/
public void setAFKTime(long time) { public void setAFKTime(long time) {
this.afk = time; this.afk = time;
} }
/** Checks if the prisoner was changed or not. */ /**
* Checks if the prisoner was changed or not.
*/
public boolean wasChanged() { public boolean wasChanged() {
return this.changed; return this.changed;
} }
/** Sets whether the prisoner was changed or not. */ /**
* Sets whether the prisoner was changed or not.
*/
public boolean setChanged(boolean change) { public boolean setChanged(boolean change) {
this.changed = change; this.changed = change;
return this.changed; return this.changed;

26
src/main/java/com/graywolf336/jail/beans/SimpleLocation.java
View File

@ -8,12 +8,14 @@ import org.bukkit.World;
* Simple location class which doesn't store any instances of {@link World worlds} or {@link org.bukkit.block.Block blocks}, just uses strings, floats, and doubles. * Simple location class which doesn't store any instances of {@link World worlds} or {@link org.bukkit.block.Block blocks}, just uses strings, floats, and doubles.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.1.1 * @version 1.1.1
* @since 3.0.0
*/ */
public class SimpleLocation { public class SimpleLocation {
private String world; private final String world;
private double x, y, z; private final double x;
private final double y;
private final double z;
private float yaw, pitch; private float yaw, pitch;
/** /**
@ -59,9 +61,9 @@ public class SimpleLocation {
*/ */
public SimpleLocation(String world, String x, String y, String z) { public SimpleLocation(String world, String x, String y, String z) {
this.world = world; this.world = world;
this.x = Double.valueOf(x); this.x = Double.parseDouble(x);
this.y = Double.valueOf(y); this.y = Double.parseDouble(y);
this.z = Double.valueOf(z); this.z = Double.parseDouble(z);
this.yaw = 0; this.yaw = 0;
this.pitch = 0; this.pitch = 0;
} }
@ -81,17 +83,23 @@ public class SimpleLocation {
this.z = z; this.z = z;
} }
/** Returns the instance from Bukkit of the world this location is in. */ /**
* Returns the instance from Bukkit of the world this location is in.
*/
public World getWorld() { public World getWorld() {
return Bukkit.getWorld(world); return Bukkit.getWorld(world);
} }
/** Returns the name of the world this location is in. */ /**
* Returns the name of the world this location is in.
*/
public String getWorldName() { public String getWorldName() {
return this.world; return this.world;
} }
/** Returns a new {@link Location} from this SimpleLocation. */ /**
* Returns a new {@link Location} from this SimpleLocation.
*/
public Location getLocation() { public Location getLocation() {
return new Location(Bukkit.getWorld(world), x, y, z, yaw, pitch); return new Location(Bukkit.getWorld(world), x, y, z, yaw, pitch);
} }

12
src/main/java/com/graywolf336/jail/beans/Stick.java
View File

@ -8,9 +8,10 @@ package com.graywolf336.jail.beans;
* @since 3.0.0 * @since 3.0.0
*/ */
public class Stick { public class Stick {
private String jail, reason; private final String jail;
private long time; private final String reason;
private double health; private final long time;
private final double health;
/** /**
* Creates a new Jail Stick instance. * Creates a new Jail Stick instance.
@ -54,10 +55,11 @@ public class Stick {
return this.time; return this.time;
} }
/** Gets the amount of health a player has to have before getting jailed via this stick. /**
* Gets the amount of health a player has to have before getting jailed via this stick.
* *
* <p> * <p>
* * <p>
* See here for reference: http://dev.bukkit.org/bukkit-plugins/jail/tickets/415/ * See here for reference: http://dev.bukkit.org/bukkit-plugins/jail/tickets/415/
*/ */
public double getHealth() { public double getHealth() {

13
src/main/java/com/graywolf336/jail/command/Command.java
View File

@ -1,24 +1,23 @@
package com.graywolf336.jail.command; package com.graywolf336.jail.command;
import java.util.List; import com.graywolf336.jail.JailManager;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import com.graywolf336.jail.JailManager; import java.util.List;
/** /**
* The base of all the commands. * The base of all the commands.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.1.0 * @version 1.1.0
* @since 3.0.0
*/ */
public interface Command { public interface Command {
/** /**
* Execute the command given the arguments, returning whether the command handled it or not. * Execute the command given the arguments, returning whether the command handled it or not.
* *
* <p> * <p>
* * <p>
* When the method returns false, the usage message is printed to the sender. If the method * When the method returns false, the usage message is printed to the sender. If the method
* handles the command in any way, such as sending a message to the sender or actually doing * handles the command in any way, such as sending a message to the sender or actually doing
* something, then it should return true so that the sender of the command doesn't get the * something, then it should return true so that the sender of the command doesn't get the
@ -29,7 +28,7 @@ public interface Command {
* @param args The args, in an array * @param args The args, in an array
* @return True if the method handled it in any way, false if we should send the usage message. * @return True if the method handled it in any way, false if we should send the usage message.
*/ */
public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception; boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception;
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception; List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args);
} }

80
src/main/java/com/graywolf336/jail/command/CommandHandler.java
View File

@ -1,14 +1,5 @@
package com.graywolf336.jail.command; package com.graywolf336.jail.command;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map.Entry;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.graywolf336.jail.JailMain; import com.graywolf336.jail.JailMain;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.command.commands.HandCuffCommand; import com.graywolf336.jail.command.commands.HandCuffCommand;
@ -17,41 +8,49 @@ import com.graywolf336.jail.command.commands.UnHandCuffCommand;
import com.graywolf336.jail.command.commands.UnJailCommand; import com.graywolf336.jail.command.commands.UnJailCommand;
import com.graywolf336.jail.command.commands.UnJailForceCommand; import com.graywolf336.jail.command.commands.UnJailForceCommand;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map.Entry;
/** /**
* Where all the commands are registered, handled, and processed. * Where all the commands are registered, handled, and processed.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.2 * @version 1.0.2
* * @since 3.0.0
*/ */
public class CommandHandler { public class CommandHandler {
private LinkedHashMap<String, Command> commands; private final LinkedHashMap<String, Command> commands;
public CommandHandler(JailMain plugin) { public CommandHandler(JailMain plugin) {
commands = new LinkedHashMap<String, Command>(); commands = new LinkedHashMap<>();
loadCommands(); loadCommands();
plugin.debug("Loaded " + commands.size() + " commands."); plugin.debug("Loaded " + commands.size() + " commands.");
} }
public List<String> parseTabComplete(JailManager jm, CommandSender sender, String commandLine, String[] args) throws Exception { public List<String> parseTabComplete(JailManager jm, CommandSender sender, String commandLine, String[] args) {
List<Command> matches = getMatches(commandLine); List<Command> matches = getMatches(commandLine);
if(matches.isEmpty() || matches.size() > 1) return Collections.emptyList(); if (matches.size() != 1) return Collections.emptyList();
else { else {
CommandInfo i = matches.get(0).getClass().getAnnotation(CommandInfo.class); CommandInfo i = matches.get(0).getClass().getAnnotation(CommandInfo.class);
//Sender provided too many arguments which means there //Sender provided too many arguments which means there
//is nothing to tab complete //is nothing to tab complete
if(i.maxArgs() != -1 && i.maxArgs() < args.length) return Collections.emptyList(); if (i.maxArgs() != -1 && i.maxArgs() < args.length) return Collections.emptyList();
//Don't return anything if a player is required and they're not a player //Don't return anything if a player is required and they're not a player
if(i.needsPlayer() && !(sender instanceof Player)) return Collections.emptyList(); if (i.needsPlayer() && !(sender instanceof Player)) return Collections.emptyList();
//Don't return anything if they don't have permission //Don't return anything if they don't have permission
if(!sender.hasPermission(i.permission())) return Collections.emptyList(); if (!sender.hasPermission(i.permission())) return Collections.emptyList();
//Let the command handle the rest of it //Let the command handle the rest of it
return matches.get(0).provideTabCompletions(jm, sender, args); return matches.get(0).provideTabCompletions(jm, sender, args);
@ -62,7 +61,7 @@ public class CommandHandler {
* Handles the given command and checks that the command is in valid form. * Handles the given command and checks that the command is in valid form.
* *
* <p> * <p>
* * <p>
* It checks in the following order: * It checks in the following order:
* <ol> * <ol>
* <li>If the command is registered or not.</li> * <li>If the command is registered or not.</li>
@ -83,17 +82,15 @@ public class CommandHandler {
List<Command> matches = getMatches(commandLine); List<Command> matches = getMatches(commandLine);
//If no matches were found, send them the unknown command message. //If no matches were found, send them the unknown command message.
if(matches.isEmpty()) { if (matches.isEmpty()) {
if(commandLine.startsWith("jail")) { if (commandLine.startsWith("jail")) {
String j = commandLine.substring(0, 4); String j = commandLine.substring(0, 4);
String a0 = commandLine.substring(4, commandLine.length()); String a0 = commandLine.substring(4);
ArrayList<String> args2 = new ArrayList<String>(); ArrayList<String> args2 = new ArrayList<>(Arrays.asList(args));
for(String s : args)
args2.add(s);
args2.add(a0); args2.add(a0);
if(jailmanager.getPlugin().onCommand(sender, null, j, args2.toArray(new String[args2.size()]))) if (jailmanager.getPlugin().onCommand(sender, null, j, args2.toArray(new String[0])))
return; return;
} }
@ -102,8 +99,8 @@ public class CommandHandler {
} }
//If more than one command was found, send them each command's help message. //If more than one command was found, send them each command's help message.
if(matches.size() > 1) { if (matches.size() > 1) {
for(Command c : matches) for (Command c : matches)
showUsage(sender, c); showUsage(sender, c);
return; return;
} }
@ -112,25 +109,25 @@ public class CommandHandler {
CommandInfo i = c.getClass().getAnnotation(CommandInfo.class); CommandInfo i = c.getClass().getAnnotation(CommandInfo.class);
// First, let's check if the sender has permission for the command. // First, let's check if the sender has permission for the command.
if(!sender.hasPermission(i.permission())) { if (!sender.hasPermission(i.permission())) {
sender.sendMessage(Lang.NOPERMISSION.get()); sender.sendMessage(Lang.NOPERMISSION.get());
return; return;
} }
// Next, let's check if we need a player and then if the sender is actually a player // Next, let's check if we need a player and then if the sender is actually a player
if(i.needsPlayer() && !(sender instanceof Player)) { if (i.needsPlayer() && !(sender instanceof Player)) {
sender.sendMessage(Lang.PLAYERCONTEXTREQUIRED.get()); sender.sendMessage(Lang.PLAYERCONTEXTREQUIRED.get());
return; return;
} }
// Now, let's check the size of the arguments passed. If it is shorter than the minimum required args, let's show the usage. // Now, let's check the size of the arguments passed. If it is shorter than the minimum required args, let's show the usage.
if(args.length < i.minimumArgs()) { if (args.length < i.minimumArgs()) {
showUsage(sender, c); showUsage(sender, c);
return; return;
} }
// Then, if the maximumArgs doesn't equal -1, we need to check if the size of the arguments passed is greater than the maximum args. // Then, if the maximumArgs doesn't equal -1, we need to check if the size of the arguments passed is greater than the maximum args.
if(i.maxArgs() != -1 && i.maxArgs() < args.length) { if (i.maxArgs() != -1 && i.maxArgs() < args.length) {
showUsage(sender, c); showUsage(sender, c);
return; return;
} }
@ -138,9 +135,8 @@ public class CommandHandler {
// Since everything has been checked and we're all clear, let's execute it. // Since everything has been checked and we're all clear, let's execute it.
// But if get back false, let's show the usage message. // But if get back false, let's show the usage message.
try { try {
if(!c.execute(jailmanager, sender, args)) { if (!c.execute(jailmanager, sender, args)) {
showUsage(sender, c); showUsage(sender, c);
return;
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -150,10 +146,10 @@ public class CommandHandler {
} }
private List<Command> getMatches(String command) { private List<Command> getMatches(String command) {
List<Command> result = new ArrayList<Command>(); List<Command> result = new ArrayList<>();
for(Entry<String, Command> entry : commands.entrySet()) { for (Entry<String, Command> entry : commands.entrySet()) {
if(command.matches(entry.getKey())) { if (command.matches(entry.getKey())) {
result.add(entry.getValue()); result.add(entry.getValue());
} }
} }
@ -169,12 +165,14 @@ public class CommandHandler {
*/ */
private void showUsage(CommandSender sender, Command command) { private void showUsage(CommandSender sender, Command command) {
CommandInfo info = command.getClass().getAnnotation(CommandInfo.class); CommandInfo info = command.getClass().getAnnotation(CommandInfo.class);
if(!sender.hasPermission(info.permission())) return; if (!sender.hasPermission(info.permission())) return;
sender.sendMessage(info.usage()); sender.sendMessage(info.usage());
} }
/** Loads all the commands into the hashmap. */ /**
* Loads all the commands into the hashmap.
*/
private void loadCommands() { private void loadCommands() {
load(HandCuffCommand.class); load(HandCuffCommand.class);
load(ToggleJailDebugCommand.class); load(ToggleJailDebugCommand.class);
@ -185,11 +183,11 @@ public class CommandHandler {
private void load(Class<? extends Command> c) { private void load(Class<? extends Command> c) {
CommandInfo info = c.getAnnotation(CommandInfo.class); CommandInfo info = c.getAnnotation(CommandInfo.class);
if(info == null) return; if (info == null) return;
try { try {
commands.put(info.pattern(), c.newInstance()); commands.put(info.pattern(), c.newInstance());
}catch(Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }

19
src/main/java/com/graywolf336/jail/command/CommandInfo.java
View File

@ -7,7 +7,7 @@ import java.lang.annotation.RetentionPolicy;
* Contains a definition of all the annotations {@link Command commands} should have, if a {@link Command command} doesn't have any then it isn't registered. * Contains a definition of all the annotations {@link Command commands} should have, if a {@link Command command} doesn't have any then it isn't registered.
* *
* <p> * <p>
* * <p>
* This helps make loading and registering and verifying commands a lot * This helps make loading and registering and verifying commands a lot
* easier, makes sure that before we really process a command that it * easier, makes sure that before we really process a command that it
* is structured correctly and all the right information is passed. If * is structured correctly and all the right information is passed. If
@ -25,53 +25,52 @@ import java.lang.annotation.RetentionPolicy;
* command. The order of checking is as defined in {@link CommandHandler#handleCommand(com.graywolf336.jail.JailManager, org.bukkit.command.CommandSender, String, String[]) CommandHandler.handleCommand}. * command. The order of checking is as defined in {@link CommandHandler#handleCommand(com.graywolf336.jail.JailManager, org.bukkit.command.CommandSender, String, String[]) CommandHandler.handleCommand}.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* * @since 3.0.0
*/ */
@Retention (RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface CommandInfo { public @interface CommandInfo {
/** /**
* Gets the maximum amount of arguments required, -1 if no maximum (ex: Jailing someone with a reason or editing a reason). * Gets the maximum amount of arguments required, -1 if no maximum (ex: Jailing someone with a reason or editing a reason).
* *
* @return The maximum number of arguments required, -1 if no maximum. * @return The maximum number of arguments required, -1 if no maximum.
*/ */
public int maxArgs(); int maxArgs();
/** /**
* Gets the minimum amount of arguments required. * Gets the minimum amount of arguments required.
* *
* @return The minimum number of arguments required. * @return The minimum number of arguments required.
*/ */
public int minimumArgs(); int minimumArgs();
/** /**
* Whether the command needs a player context or not. * Whether the command needs a player context or not.
* *
* @return True if requires a player, false if not. * @return True if requires a player, false if not.
*/ */
public boolean needsPlayer(); boolean needsPlayer();
/** /**
* A regex pattern that allows for alternatives to the command (ex: /jail or /j, /jailstatus or /js). * A regex pattern that allows for alternatives to the command (ex: /jail or /j, /jailstatus or /js).
* *
* @return The regex pattern to match. * @return The regex pattern to match.
*/ */
public String pattern(); String pattern();
/** /**
* Gets the permission required to execute this command. * Gets the permission required to execute this command.
* *
* @return The permission required. * @return The permission required.
*/ */
public String permission(); String permission();
/** /**
* Gets the usage message for this command. * Gets the usage message for this command.
* *
* @return The usage message. * @return The usage message.
*/ */
public String usage(); String usage();
// /** // /**
// * Gets the help messages for this command, color codes enabled. // * Gets the help messages for this command, color codes enabled.

104
src/main/java/com/graywolf336/jail/command/JailHandler.java
View File

@ -1,14 +1,5 @@
package com.graywolf336.jail.command; package com.graywolf336.jail.command;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map.Entry;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.graywolf336.jail.JailMain; import com.graywolf336.jail.JailMain;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.command.subcommands.JailCheckCommand; import com.graywolf336.jail.command.subcommands.JailCheckCommand;
@ -39,46 +30,53 @@ 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.command.subcommands.JailVoteCommand;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map.Entry;
/** /**
* Where all the <strong>jail</strong> commands are registered, handled, and processed at. * Where all the <strong>jail</strong> commands are registered, handled, and processed at.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.1.0 * @version 1.1.0
* * @since 3.0.0
*/ */
public class JailHandler { public class JailHandler {
private LinkedHashMap<String, Command> commands; private final LinkedHashMap<String, Command> commands;
public JailHandler(JailMain plugin) { public JailHandler(JailMain plugin) {
commands = new LinkedHashMap<String, Command>(); commands = new LinkedHashMap<>();
loadCommands(); loadCommands();
plugin.debug("Loaded " + commands.size() + " sub-commands of /jail."); plugin.debug("Loaded " + commands.size() + " sub-commands of /jail.");
} }
public List<String> parseTabComplete(JailManager jm, CommandSender sender, String[] args) throws Exception { public List<String> parseTabComplete(JailManager jm, CommandSender sender, String[] args) {
if(args[0].isEmpty() || args.length == 1) { if (args[0].isEmpty() || args.length == 1) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
String arg0 = args[0].toLowerCase(); String arg0 = args[0].toLowerCase();
boolean hasJailPermission = false; boolean hasJailPermission = false;
for(Command c : commands.values()) { for (Command c : commands.values()) {
CommandInfo i = c.getClass().getAnnotation(CommandInfo.class); CommandInfo i = c.getClass().getAnnotation(CommandInfo.class);
//Skip the jail subcommand instance, since it is unique //Skip the jail subcommand instance, since it is unique
if(i.pattern().equalsIgnoreCase("jail|j")) { if (i.pattern().equalsIgnoreCase("jail|j")) {
hasJailPermission = sender.hasPermission(i.permission()); hasJailPermission = sender.hasPermission(i.permission());
continue; continue;
} }
//Skip if the command requires a player and the sender isn't a player //Skip if the command requires a player and the sender isn't a player
if(i.needsPlayer() && !(sender instanceof Player)) continue; if (i.needsPlayer() && !(sender instanceof Player)) continue;
//If the sender has permission to the command //If the sender has permission to the command
//and the first argument (sub command) is empty OR //and the first argument (sub command) is empty OR
//the first argument matches the command or starts with the string //the first argument matches the command or starts with the string
if(sender.hasPermission(i.permission()) && (arg0.isEmpty() || (arg0.toLowerCase().matches(i.pattern()) || i.pattern().startsWith(arg0)))) { if (sender.hasPermission(i.permission()) && (arg0.isEmpty() || (arg0.toLowerCase().matches(i.pattern()) || i.pattern().startsWith(arg0)))) {
results.add(i.pattern().split("\\|")[0]); results.add(i.pattern().split("\\|")[0]);
} }
} }
@ -88,36 +86,36 @@ public class JailHandler {
//If the results doesn't contain anything and they have permission to jail someone //If the results doesn't contain anything and they have permission to jail someone
//then send let the jail command provide the tab completion //then send let the jail command provide the tab completion
if(results.isEmpty() && hasJailPermission) if (results.isEmpty() && hasJailPermission)
return getMatches("jail").get(0).provideTabCompletions(jm, sender, args); return getMatches("jail").get(0).provideTabCompletions(jm, sender, args);
else else
return results; return results;
}else { } else {
String arg0 = args[0].toLowerCase(); String arg0 = args[0].toLowerCase();
boolean hasJailPermission = false; boolean hasJailPermission = false;
for(Command c : commands.values()) { for (Command c : commands.values()) {
CommandInfo i = c.getClass().getAnnotation(CommandInfo.class); CommandInfo i = c.getClass().getAnnotation(CommandInfo.class);
//since the pattern won't ever match the jail plugin //since the pattern won't ever match the jail plugin
//we can skip it but first we need to see if they have //we can skip it but first we need to see if they have
//permission to do the jailing //permission to do the jailing
if(i.pattern().equalsIgnoreCase("jail|j")) { if (i.pattern().equalsIgnoreCase("jail|j")) {
hasJailPermission = sender.hasPermission(i.permission()); hasJailPermission = sender.hasPermission(i.permission());
continue; continue;
} }
if(!arg0.toLowerCase().matches(i.pattern())) continue; if (!arg0.toLowerCase().matches(i.pattern())) continue;
//Sender provided too many arguments which means there //Sender provided too many arguments which means there
//is nothing to tab complete //is nothing to tab complete
if(i.maxArgs() != -1 && i.maxArgs() < args.length - 1) continue; if (i.maxArgs() != -1 && i.maxArgs() < args.length - 1) continue;
//Skip if the command requires a player and the sender isn't a player //Skip if the command requires a player and the sender isn't a player
if(i.needsPlayer() && !(sender instanceof Player)) continue; if (i.needsPlayer() && !(sender instanceof Player)) continue;
//If the sender doesn't have permission, we won't send them further //If the sender doesn't have permission, we won't send them further
if(!sender.hasPermission(i.permission())) continue; if (!sender.hasPermission(i.permission())) continue;
return c.provideTabCompletions(jm, sender, args); return c.provideTabCompletions(jm, sender, args);
} }
@ -125,7 +123,7 @@ public class JailHandler {
//By the time it has reached here no other command matched //By the time it has reached here no other command matched
//which means they are probably jailing someone, or trying to //which means they are probably jailing someone, or trying to
//so let's check permission first and go from there. //so let's check permission first and go from there.
if(hasJailPermission) if (hasJailPermission)
return getMatches("jail").get(0).provideTabCompletions(jm, sender, args); return getMatches("jail").get(0).provideTabCompletions(jm, sender, args);
} }
@ -136,7 +134,7 @@ public class JailHandler {
* Handles the given command and checks that the command is in valid form. * Handles the given command and checks that the command is in valid form.
* *
* <p> * <p>
* * <p>
* It checks in the following order: * It checks in the following order:
* <ol> * <ol>
* <li>If they have permission for it, if they don't then we send them a message stating so.</li> * <li>If they have permission for it, if they don't then we send them a message stating so.</li>
@ -151,29 +149,29 @@ public class JailHandler {
* @param args The arguments passed to the command. * @param args The arguments passed to the command.
*/ */
public boolean parseCommand(JailManager jailmanager, CommandSender sender, String[] args) { public boolean parseCommand(JailManager jailmanager, CommandSender sender, String[] args) {
Command c = null; Command c;
//If they didn't provide any arguments (aka just: /jail) then we will need to send them some help //If they didn't provide any arguments (aka just: /jail) then we will need to send them some help
if(args.length == 0) { if (args.length == 0) {
//TODO: Create the help page(s) //TODO: Create the help page(s)
c = getMatches("jail").get(0); c = getMatches("jail").get(0);
}else { } else {
//Get the matches from the first argument passed //Get the matches from the first argument passed
List<Command> matches = getMatches(args[0].toLowerCase()); List<Command> matches = getMatches(args[0].toLowerCase());
if(matches.isEmpty()) { if (matches.isEmpty()) {
//No matches found, thus it is more likely than not they are trying to jail someone //No matches found, thus it is more likely than not they are trying to jail someone
c = getMatches("jail").get(0); c = getMatches("jail").get(0);
} else if(matches.size() > 1) { } else if (matches.size() > 1) {
//If there was found more than one match //If there was found more than one match
//then let's send the usage of each match to the sender //then let's send the usage of each match to the sender
for(Command cmd : matches) for (Command cmd : matches)
showUsage(sender, cmd); showUsage(sender, cmd);
return true; return true;
}else { } else {
//Only one match was found, so let's continue //Only one match was found, so let's continue
c = matches.get(0); c = matches.get(0);
} }
@ -182,14 +180,14 @@ public class JailHandler {
CommandInfo i = c.getClass().getAnnotation(CommandInfo.class); CommandInfo i = c.getClass().getAnnotation(CommandInfo.class);
// First, let's check if the sender has permission for the command. // First, let's check if the sender has permission for the command.
if(!i.permission().isEmpty() && !sender.hasPermission(i.permission())) { if (!i.permission().isEmpty() && !sender.hasPermission(i.permission())) {
jailmanager.getPlugin().debug("Sender has no permission: " + i.permission()); jailmanager.getPlugin().debug("Sender has no permission: " + i.permission());
sender.sendMessage(Lang.NOPERMISSION.get() + (jailmanager.getPlugin().inDebug() ? " (" + i.permission() + ")" : "")); sender.sendMessage(Lang.NOPERMISSION.get() + (jailmanager.getPlugin().inDebug() ? " (" + i.permission() + ")" : ""));
return true; return true;
} }
// Next, let's check if we need a player and then if the sender is actually a player // Next, let's check if we need a player and then if the sender is actually a player
if(i.needsPlayer() && !(sender instanceof Player)) { if (i.needsPlayer() && !(sender instanceof Player)) {
jailmanager.getPlugin().debug("Sender is not a player."); jailmanager.getPlugin().debug("Sender is not a player.");
sender.sendMessage(Lang.PLAYERCONTEXTREQUIRED.get()); sender.sendMessage(Lang.PLAYERCONTEXTREQUIRED.get());
return true; return true;
@ -197,7 +195,7 @@ public class JailHandler {
// Now, let's check the size of the arguments passed. If it is shorter than the minimum required args, let's show the usage. // Now, let's check the size of the arguments passed. If it is shorter than the minimum required args, let's show the usage.
// The reason we are subtracting one is because the command is now `/jail <subcommand>` and the subcommand is viewed as an argument // The reason we are subtracting one is because the command is now `/jail <subcommand>` and the subcommand is viewed as an argument
if(args.length - 1 < i.minimumArgs()) { if (args.length - 1 < i.minimumArgs()) {
jailmanager.getPlugin().debug("Sender didn't provide enough arguments."); jailmanager.getPlugin().debug("Sender didn't provide enough arguments.");
showUsage(sender, c); showUsage(sender, c);
return true; return true;
@ -205,7 +203,7 @@ public class JailHandler {
// Then, if the maximumArgs doesn't equal -1, we need to check if the size of the arguments passed is greater than the maximum args. // Then, if the maximumArgs doesn't equal -1, we need to check if the size of the arguments passed is greater than the maximum args.
// The reason we are subtracting one is because the command is now `/jail <subcommand>` and the subcommand is viewed as an argument // The reason we are subtracting one is because the command is now `/jail <subcommand>` and the subcommand is viewed as an argument
if(i.maxArgs() != -1 && i.maxArgs() < args.length - 1) { if (i.maxArgs() != -1 && i.maxArgs() < args.length - 1) {
jailmanager.getPlugin().debug("Sender provided too many arguments."); jailmanager.getPlugin().debug("Sender provided too many arguments.");
showUsage(sender, c); showUsage(sender, c);
return true; return true;
@ -214,14 +212,14 @@ public class JailHandler {
// Since everything has been checked and we're all clear, let's execute it. // Since everything has been checked and we're all clear, let's execute it.
// But if get back false, let's show the usage message. // But if get back false, let's show the usage message.
try { try {
if(!c.execute(jailmanager, sender, args)) { if (!c.execute(jailmanager, sender, args)) {
showUsage(sender, c); showUsage(sender, c);
return true; return true;
}else { } else {
return true; return true;
} }
} catch (Exception e) { } catch (Exception e) {
if(jailmanager.getPlugin().inDebug()) { if (jailmanager.getPlugin().inDebug()) {
e.printStackTrace(); e.printStackTrace();
} }
@ -232,10 +230,10 @@ public class JailHandler {
} }
private List<Command> getMatches(String command) { private List<Command> getMatches(String command) {
List<Command> result = new ArrayList<Command>(); List<Command> result = new ArrayList<>();
for(Entry<String, Command> entry : commands.entrySet()) { for (Entry<String, Command> entry : commands.entrySet()) {
if(command.matches(entry.getKey())) { if (command.matches(entry.getKey())) {
result.add(entry.getValue()); result.add(entry.getValue());
} }
} }
@ -251,7 +249,7 @@ public class JailHandler {
*/ */
private void showUsage(CommandSender sender, Command command) { private void showUsage(CommandSender sender, Command command) {
CommandInfo info = command.getClass().getAnnotation(CommandInfo.class); CommandInfo info = command.getClass().getAnnotation(CommandInfo.class);
if(!sender.hasPermission(info.permission())) return; if (!sender.hasPermission(info.permission())) return;
sender.sendMessage(info.usage()); sender.sendMessage(info.usage());
} }
@ -286,13 +284,13 @@ public class JailHandler {
load(JailVoteCommand.class); load(JailVoteCommand.class);
} }
private void load(Class<? extends Command> c) { private void load(Class<? extends Command> command) {
CommandInfo info = c.getAnnotation(CommandInfo.class); CommandInfo info = command.getAnnotation(CommandInfo.class);
if(info == null) return; if (info == null) return;
try { try {
commands.put(info.pattern(), c.newInstance()); commands.put(info.pattern(), command.newInstance());
}catch(Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }

40
src/main/java/com/graywolf336/jail/command/commands/HandCuffCommand.java
View File

@ -1,17 +1,16 @@
package com.graywolf336.jail.command.commands; package com.graywolf336.jail.command.commands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 1, maxArgs = 1,
@ -20,23 +19,22 @@ import com.graywolf336.jail.enums.Lang;
pattern = "handcuff|hc", pattern = "handcuff|hc",
permission = "jail.command.handcuff", permission = "jail.command.handcuff",
usage = "/handcuff [player]" usage = "/handcuff [player]"
) )
public class HandCuffCommand implements Command { public class HandCuffCommand implements Command {
@SuppressWarnings("deprecation")
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
Player player = jm.getPlugin().getServer().getPlayer(args[0]); Player player = jm.getPlugin().getServer().getPlayer(args[0]);
if(player == null) { if (player == null) {
sender.sendMessage(Lang.PLAYERNOTONLINE.get()); sender.sendMessage(Lang.PLAYERNOTONLINE.get());
}else if(player.hasPermission("jail.cantbehandcuffed")) { } else if (player.hasPermission("jail.cantbehandcuffed")) {
sender.sendMessage(Lang.CANTBEHANDCUFFED.get(player.getName())); sender.sendMessage(Lang.CANTBEHANDCUFFED.get(player.getName()));
}else if(jm.isPlayerJailed(player.getUniqueId())) { } else if (jm.isPlayerJailed(player.getUniqueId())) {
sender.sendMessage(Lang.CURRENTLYJAILEDHANDCUFF.get(player.getName())); sender.sendMessage(Lang.CURRENTLYJAILEDHANDCUFF.get(player.getName()));
}else if(jm.getPlugin().getHandCuffManager().isHandCuffed(player.getUniqueId())) { } else if (jm.getPlugin().getHandCuffManager().isHandCuffed(player.getUniqueId())) {
sender.sendMessage(Lang.HANDCUFFSRELEASED.get(player.getName())); sender.sendMessage(Lang.HANDCUFFSRELEASED.get(player.getName()));
jm.getPlugin().getHandCuffManager().removeHandCuffs(player.getUniqueId()); jm.getPlugin().getHandCuffManager().removeHandCuffs(player.getUniqueId());
player.sendMessage(Lang.UNHANDCUFFED.get()); player.sendMessage(Lang.UNHANDCUFFED.get());
}else { } else {
jm.getPlugin().getHandCuffManager().addHandCuffs(player.getUniqueId(), player.getLocation()); jm.getPlugin().getHandCuffManager().addHandCuffs(player.getUniqueId(), player.getLocation());
sender.sendMessage(Lang.HANDCUFFSON.get(player.getName())); sender.sendMessage(Lang.HANDCUFFSON.get(player.getName()));
player.sendMessage(Lang.HANDCUFFED.get()); player.sendMessage(Lang.HANDCUFFED.get());
@ -45,13 +43,13 @@ public class HandCuffCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
for(Player p : jm.getPlugin().getServer().getOnlinePlayers()) for (Player p : jm.getPlugin().getServer().getOnlinePlayers())
if(!jm.getPlugin().getHandCuffManager().isHandCuffed(p.getUniqueId())) //don't send someone who is already handcuffed if (!jm.getPlugin().getHandCuffManager().isHandCuffed(p.getUniqueId())) //don't send someone who is already handcuffed
if(!p.hasPermission("jail.cantbehandcuffed")) //don't send someone who can't be handcuffed if (!p.hasPermission("jail.cantbehandcuffed")) //don't send someone who can't be handcuffed
if(args[0].isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), args[0])) if (args[0].isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), args[0]))
results.add(p.getName()); results.add(p.getName());
Collections.sort(results); Collections.sort(results);

15
src/main/java/com/graywolf336/jail/command/commands/ToggleJailDebugCommand.java
View File

@ -1,14 +1,13 @@
package com.graywolf336.jail.command.commands; package com.graywolf336.jail.command.commands;
import java.util.Collections;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 0, maxArgs = 0,
@ -17,7 +16,7 @@ import com.graywolf336.jail.command.CommandInfo;
pattern = "togglejaildebug|tjd", pattern = "togglejaildebug|tjd",
permission = "jail.command.toggledebug", permission = "jail.command.toggledebug",
usage = "/togglejaildebug" usage = "/togglejaildebug"
) )
public class ToggleJailDebugCommand implements Command { public class ToggleJailDebugCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
boolean debug = jm.getPlugin().setDebugging(!jm.getPlugin().inDebug()); boolean debug = jm.getPlugin().setDebugging(!jm.getPlugin().inDebug());
@ -25,7 +24,7 @@ public class ToggleJailDebugCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
//No tab completion required for toggling debug command //No tab completion required for toggling debug command
return Collections.emptyList(); return Collections.emptyList();
} }

34
src/main/java/com/graywolf336/jail/command/commands/UnHandCuffCommand.java
View File

@ -1,17 +1,16 @@
package com.graywolf336.jail.command.commands; package com.graywolf336.jail.command.commands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 1, maxArgs = 1,
@ -20,31 +19,30 @@ import com.graywolf336.jail.enums.Lang;
pattern = "unhandcuff|uhc", pattern = "unhandcuff|uhc",
permission = "jail.command.handcuff", permission = "jail.command.handcuff",
usage = "/unhandcuff [player]" usage = "/unhandcuff [player]"
) )
public class UnHandCuffCommand implements Command { public class UnHandCuffCommand implements Command {
@SuppressWarnings("deprecation")
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
Player player = jm.getPlugin().getServer().getPlayerExact(args[0]); Player player = jm.getPlugin().getServer().getPlayerExact(args[0]);
if(player == null) { if (player == null) {
sender.sendMessage(Lang.PLAYERNOTONLINE.get()); sender.sendMessage(Lang.PLAYERNOTONLINE.get());
}else if(jm.getPlugin().getHandCuffManager().isHandCuffed(player.getUniqueId())) { } else if (jm.getPlugin().getHandCuffManager().isHandCuffed(player.getUniqueId())) {
sender.sendMessage(Lang.HANDCUFFSRELEASED.get(player.getName())); sender.sendMessage(Lang.HANDCUFFSRELEASED.get(player.getName()));
jm.getPlugin().getHandCuffManager().removeHandCuffs(player.getUniqueId()); jm.getPlugin().getHandCuffManager().removeHandCuffs(player.getUniqueId());
player.sendMessage(Lang.UNHANDCUFFED.get()); player.sendMessage(Lang.UNHANDCUFFED.get());
}else { } else {
sender.sendMessage(Lang.NOTHANDCUFFED.get(player.getName())); sender.sendMessage(Lang.NOTHANDCUFFED.get(player.getName()));
} }
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
for(Player p : jm.getPlugin().getServer().getOnlinePlayers()) for (Player p : jm.getPlugin().getServer().getOnlinePlayers())
if(jm.getPlugin().getHandCuffManager().isHandCuffed(p.getUniqueId())) //don't send someone who isn't already handcuffed if (jm.getPlugin().getHandCuffManager().isHandCuffed(p.getUniqueId())) //don't send someone who isn't already handcuffed
if(args[0].isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), args[0])) if (args[0].isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), args[0]))
results.add(p.getName()); results.add(p.getName());
Collections.sort(results); Collections.sort(results);

43
src/main/java/com/graywolf336/jail/command/commands/UnJailCommand.java
View File

@ -1,14 +1,5 @@
package com.graywolf336.jail.command.commands; package com.graywolf336.jail.command.commands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
@ -18,6 +9,14 @@ import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.enums.Settings; import com.graywolf336.jail.enums.Settings;
import com.graywolf336.jail.exceptions.JailRequiredException; import com.graywolf336.jail.exceptions.JailRequiredException;
import com.graywolf336.jail.exceptions.PrisonerRequiredException; import com.graywolf336.jail.exceptions.PrisonerRequiredException;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 1, maxArgs = 1,
@ -26,29 +25,29 @@ import com.graywolf336.jail.exceptions.PrisonerRequiredException;
pattern = "unjail|uj", pattern = "unjail|uj",
permission = "jail.command.unjail", permission = "jail.command.unjail",
usage = "/unjail [player]" usage = "/unjail [player]"
) )
public class UnJailCommand implements Command { public class UnJailCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) throws JailRequiredException, PrisonerRequiredException { public boolean execute(JailManager jm, CommandSender sender, String... args) throws JailRequiredException, PrisonerRequiredException {
//Check if the player is jailed //Check if the player is jailed
if(jm.isPlayerJailedByLastKnownUsername(args[0])) { if (jm.isPlayerJailedByLastKnownUsername(args[0])) {
Jail j = jm.getJailPlayerIsInByLastKnownName(args[0]); Jail j = jm.getJailPlayerIsInByLastKnownName(args[0]);
Prisoner pris = j.getPrisonerByLastKnownName(args[0]); Prisoner pris = j.getPrisonerByLastKnownName(args[0]);
Player p = jm.getPlugin().getServer().getPlayer(pris.getUUID()); Player p = jm.getPlugin().getServer().getPlayer(pris.getUUID());
//Check if the player is on the server or not //Check if the player is on the server or not
if(p == null) { if (p == null) {
//Check if the player has offline pending and their remaining time is above 0, if so then //Check if the player has offline pending and their remaining time is above 0, if so then
//forceably unjail them //forceably unjail them
if(pris.isOfflinePending() && pris.getRemainingTime() != 0L) { if (pris.isOfflinePending() && pris.getRemainingTime() != 0L) {
jm.getPlugin().getPrisonerManager().forceUnJail(j, j.getCellPrisonerIsIn(pris.getUUID()), p, pris, sender); jm.getPlugin().getPrisonerManager().forceUnJail(j, j.getCellPrisonerIsIn(pris.getUUID()), p, pris, sender);
}else { } else {
//The player is not, so we'll set the remaining time to zero and do it when they login next //The player is not, so we'll set the remaining time to zero and do it when they login next
pris.setRemainingTime(0L); pris.setRemainingTime(0L);
pris.setOfflinePending(true); pris.setOfflinePending(true);
sender.sendMessage(Lang.WILLBEUNJAILED.get(args[0])); sender.sendMessage(Lang.WILLBEUNJAILED.get(args[0]));
} }
}else { } else {
//Player is online, so let's try unjailing them //Player is online, so let's try unjailing them
try { try {
jm.getPlugin().getPrisonerManager().unJail(j, j.getCellPrisonerIsIn(pris.getUUID()), p, pris, sender); jm.getPlugin().getPrisonerManager().unJail(j, j.getCellPrisonerIsIn(pris.getUUID()), p, pris, sender);
@ -57,10 +56,10 @@ public class UnJailCommand implements Command {
} }
} }
if(jm.getPlugin().getConfig().getBoolean(Settings.LOGJAILINGTOCONSOLE.getPath())) { if (jm.getPlugin().getConfig().getBoolean(Settings.LOGJAILINGTOCONSOLE.getPath())) {
jm.getPlugin().getLogger().info(ChatColor.stripColor(Lang.BROADCASTUNJAILING.get(new String[] { args[0], sender.getName() }))); jm.getPlugin().getLogger().info(ChatColor.stripColor(Lang.BROADCASTUNJAILING.get(args[0], sender.getName())));
} }
}else { } else {
//The player is not currently jailed //The player is not currently jailed
sender.sendMessage(Lang.NOTJAILED.get(args[0])); sender.sendMessage(Lang.NOTJAILED.get(args[0]));
} }
@ -68,11 +67,11 @@ public class UnJailCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
for(Prisoner p : jm.getAllPrisoners().values()) for (Prisoner p : jm.getAllPrisoners().values())
if(args[0].isEmpty() || StringUtil.startsWithIgnoreCase(p.getLastKnownName(), args[0])) if (args[0].isEmpty() || StringUtil.startsWithIgnoreCase(p.getLastKnownName(), args[0]))
results.add(p.getLastKnownName()); results.add(p.getLastKnownName());
Collections.sort(results); Collections.sort(results);

33
src/main/java/com/graywolf336/jail/command/commands/UnJailForceCommand.java
View File

@ -1,13 +1,5 @@
package com.graywolf336.jail.command.commands; package com.graywolf336.jail.command.commands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
@ -16,6 +8,13 @@ import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.enums.Settings; import com.graywolf336.jail.enums.Settings;
import com.graywolf336.jail.exceptions.JailRequiredException; import com.graywolf336.jail.exceptions.JailRequiredException;
import com.graywolf336.jail.exceptions.PrisonerRequiredException; import com.graywolf336.jail.exceptions.PrisonerRequiredException;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 1, maxArgs = 1,
@ -24,18 +23,18 @@ import com.graywolf336.jail.exceptions.PrisonerRequiredException;
pattern = "unjailforce|ujf", pattern = "unjailforce|ujf",
permission = "jail.command.unjailforce", permission = "jail.command.unjailforce",
usage = "/unjailforce [player]" usage = "/unjailforce [player]"
) )
public class UnJailForceCommand implements Command { public class UnJailForceCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) throws JailRequiredException, PrisonerRequiredException { public boolean execute(JailManager jm, CommandSender sender, String... args) throws JailRequiredException, PrisonerRequiredException {
//Check if the player is jailed //Check if the player is jailed
if(jm.isPlayerJailedByLastKnownUsername(args[0])) { if (jm.isPlayerJailedByLastKnownUsername(args[0])) {
jm.getPlugin().getPrisonerManager().forceRelease(jm.getPrisonerByLastKnownName(args[0]), sender); jm.getPlugin().getPrisonerManager().forceRelease(jm.getPrisonerByLastKnownName(args[0]), sender);
if(jm.getPlugin().getConfig().getBoolean(Settings.LOGJAILINGTOCONSOLE.getPath())) { if (jm.getPlugin().getConfig().getBoolean(Settings.LOGJAILINGTOCONSOLE.getPath())) {
jm.getPlugin().getLogger().info(ChatColor.stripColor(Lang.BROADCASTUNJAILING.get(new String[] { args[0], sender.getName() }))); jm.getPlugin().getLogger().info(ChatColor.stripColor(Lang.BROADCASTUNJAILING.get(args[0], sender.getName())));
} }
}else { } else {
//The player is not currently jailed //The player is not currently jailed
sender.sendMessage(Lang.NOTJAILED.get(args[0])); sender.sendMessage(Lang.NOTJAILED.get(args[0]));
} }
@ -43,11 +42,11 @@ public class UnJailForceCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
for(Prisoner p : jm.getAllPrisoners().values()) for (Prisoner p : jm.getAllPrisoners().values())
if(args[0].isEmpty() || StringUtil.startsWithIgnoreCase(p.getLastKnownName(), args[0])) if (args[0].isEmpty() || StringUtil.startsWithIgnoreCase(p.getLastKnownName(), args[0]))
results.add(p.getLastKnownName()); results.add(p.getLastKnownName());
Collections.sort(results); Collections.sort(results);

63
src/main/java/com/graywolf336/jail/command/commands/jewels/Jailing.java
View File

@ -1,44 +1,51 @@
package com.graywolf336.jail.command.commands.jewels; package com.graywolf336.jail.command.commands.jewels;
import java.util.List;
import com.lexicalscope.jewel.cli.Option; import com.lexicalscope.jewel.cli.Option;
import java.util.List;
public interface Jailing { public interface Jailing {
@Option(longName={"player", "pl"}, shortName="p", description = "the player's name") @Option(longName = {"player", "pl"}, shortName = "p", description = "the player's name")
public String getPlayer(); String getPlayer();
@Option(longName={"force"}, shortName="f", description = "force jailing someone who has never been online") @Option(longName = {"force"}, shortName = "f", description = "force jailing someone who has never been online")
public boolean getForce(); boolean getForce();
@Option(longName={"time", "length"}, shortName="t", description = "the amount of time") @Option(longName = {"time", "length"}, shortName = "t", description = "the amount of time")
public String getTime(); String getTime();
@Option(longName={"forever", "eternity", "infinite"}, shortName="i", description = "jail the player for eternity") @Option(longName = {"forever", "eternity", "infinite"}, shortName = "i", description = "jail the player for eternity")
public boolean getInfinite(); boolean getInfinite();
@Option(longName={"jail", "prison"}, shortName="j", description = "the jail") @Option(longName = {"jail", "prison"}, shortName = "j", description = "the jail")
public String getJail(); String getJail();
@Option(longName={"cell"}, shortName="c", description = "the cell") @Option(longName = {"cell"}, shortName = "c", description = "the cell")
public String getCell(); String getCell();
@Option(longName={"anycell"}, shortName="a", description = "decides whether the plugin will pick any open cell") @Option(longName = {"anycell"}, shortName = "a", description = "decides whether the plugin will pick any open cell")
public boolean getAnyCell(); boolean getAnyCell();
@Option(longName={"muted", "canttalk"}, shortName="m", description = "whether the prisoner is muted or not") @Option(longName = {"muted", "canttalk"}, shortName = "m", description = "whether the prisoner is muted or not")
public boolean getMuted(); boolean getMuted();
@Option(longName={"reason"}, shortName="r", description = "the reason this player is being jailed") @Option(longName = {"reason"}, shortName = "r", description = "the reason this player is being jailed")
public List<String> getReason(); List<String> getReason();
public boolean isForce(); boolean isForce();
public boolean isInfinite();
public boolean isTime(); boolean isInfinite();
public boolean isJail();
public boolean isCell(); boolean isTime();
public boolean isAnyCell();
public boolean isMuted(); boolean isJail();
public boolean isReason();
boolean isCell();
boolean isAnyCell();
boolean isMuted();
boolean isReason();
} }

20
src/main/java/com/graywolf336/jail/command/commands/jewels/Transfer.java
View File

@ -4,16 +4,18 @@ import com.lexicalscope.jewel.cli.Option;
public interface Transfer { public interface Transfer {
@Option(longName={"player", "pl"}, shortName="p", description = "the player's name") @Option(longName = {"player", "pl"}, shortName = "p", description = "the player's name")
public String getPlayer(); String getPlayer();
@Option(longName={"jail", "prison"}, shortName="j", description = "the jail") @Option(longName = {"jail", "prison"}, shortName = "j", description = "the jail")
public String getJail(); String getJail();
@Option(longName={"cell"}, shortName="c", description = "the cell") @Option(longName = {"cell"}, shortName = "c", description = "the cell")
public String getCell(); String getCell();
public boolean isPlayer(); boolean isPlayer();
public boolean isJail();
public boolean isCell(); boolean isJail();
boolean isCell();
} }

43
src/main/java/com/graywolf336/jail/command/subcommands/JailCheckCommand.java
View File

@ -1,20 +1,19 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.ArrayList; import com.graywolf336.jail.JailManager;
import java.util.Collections; import com.graywolf336.jail.Util;
import java.util.List; import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil; import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import java.util.ArrayList;
import com.graywolf336.jail.beans.Prisoner; import java.util.Collections;
import com.graywolf336.jail.command.Command; import java.util.List;
import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.Util;
import com.graywolf336.jail.enums.Lang;
@CommandInfo( @CommandInfo(
maxArgs = 1, maxArgs = 1,
@ -23,42 +22,42 @@ import com.graywolf336.jail.enums.Lang;
pattern = "check", pattern = "check",
permission = "jail.command.jailcheck", permission = "jail.command.jailcheck",
usage = "/jail check [name]" usage = "/jail check [name]"
) )
public class JailCheckCommand implements Command { public class JailCheckCommand implements Command {
// Checks the status of the specified prisoner // Checks the status of the specified prisoner
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
//Otherwise let's check the first argument //Otherwise let's check the first argument
if(jm.isPlayerJailedByLastKnownUsername(args[1])) { if (jm.isPlayerJailedByLastKnownUsername(args[1])) {
Prisoner p = jm.getPrisonerByLastKnownName(args[1]); Prisoner p = jm.getPrisonerByLastKnownName(args[1]);
//graywolf663: Being gray's evil twin; CONSOLE (10) //graywolf663: Being gray's evil twin; CONSOLE (10)
//prisoner: reason; jailer (time in minutes) //prisoner: reason; jailer (time in minutes)
sender.sendMessage(ChatColor.BLUE + " " + p.getLastKnownName() + ": " + p.getReason() + "; " + p.getJailer() + " (" + Util.getDurationBreakdown(p.getRemainingTime()) + " )"); sender.sendMessage(ChatColor.BLUE + " " + p.getLastKnownName() + ": " + p.getReason() + "; " + p.getJailer() + " (" + Util.getDurationBreakdown(p.getRemainingTime()) + " )");
}else { } else {
sender.sendMessage(Lang.NOTJAILED.get(args[1])); sender.sendMessage(Lang.NOTJAILED.get(args[1]));
} }
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
for(Prisoner p : jm.getAllPrisoners().values()) { for (Prisoner p : jm.getAllPrisoners().values()) {
if(args.length == 2 && StringUtil.startsWithIgnoreCase(p.getLastKnownName(), args[1].toLowerCase())) { if (args.length == 2 && StringUtil.startsWithIgnoreCase(p.getLastKnownName(), args[1].toLowerCase())) {
results.add(p.getLastKnownName()); results.add(p.getLastKnownName());
}else { } else {
results.add(p.getLastKnownName()); results.add(p.getLastKnownName());
} }
} }
Collections.sort(results); Collections.sort(results);
if(args.length == 2) if (args.length == 2)
for(Player p : jm.getPlugin().getServer().getOnlinePlayers()) for (Player p : jm.getPlugin().getServer().getOnlinePlayers())
if(args[1].isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), args[1])) if (args[1].isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), args[1]))
if(!results.contains(p.getName())) if (!results.contains(p.getName()))
results.add(p.getName()); results.add(p.getName());
return results; return results;

37
src/main/java/com/graywolf336/jail/command/subcommands/JailClearCommand.java
View File

@ -1,12 +1,5 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.beans.ConfirmPlayer; import com.graywolf336.jail.beans.ConfirmPlayer;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
@ -14,6 +7,12 @@ import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Confirmation; import com.graywolf336.jail.enums.Confirmation;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 2, maxArgs = 2,
@ -22,22 +21,24 @@ import com.graywolf336.jail.enums.Lang;
pattern = "clear|clearforce", pattern = "clear|clearforce",
permission = "jail.command.jailclear", permission = "jail.command.jailclear",
usage = "/jail clear (-f) (jail)" usage = "/jail clear (-f) (jail)"
) )
public class JailClearCommand implements Command { public class JailClearCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
boolean force = false; boolean force = false;
//Check if we need to forcefully clear something //Check if we need to forcefully clear something
for(String s : args) for (String s : args)
if(s.equalsIgnoreCase("-f") || s.equalsIgnoreCase("-force")) if (s.equalsIgnoreCase("-f") || s.equalsIgnoreCase("-force")) {
force = true; force = true;
break;
}
if(jm.isConfirming(sender.getName())) { if (jm.isConfirming(sender.getName())) {
sender.sendMessage(Lang.ALREADY.get()); sender.sendMessage(Lang.ALREADY.get());
}else if(force && sender.hasPermission("jail.command.jailclearforce")) { } else if (force && sender.hasPermission("jail.command.jailclearforce")) {
jm.addConfirming(sender.getName(), new ConfirmPlayer(sender.getName(), args, Confirmation.CLEARFORCE)); jm.addConfirming(sender.getName(), new ConfirmPlayer(sender.getName(), args, Confirmation.CLEARFORCE));
sender.sendMessage(Lang.START.get()); sender.sendMessage(Lang.START.get());
}else { } else {
jm.addConfirming(sender.getName(), new ConfirmPlayer(sender.getName(), args, Confirmation.CLEAR)); jm.addConfirming(sender.getName(), new ConfirmPlayer(sender.getName(), args, Confirmation.CLEAR));
sender.sendMessage(Lang.START.get()); sender.sendMessage(Lang.START.get());
} }
@ -45,14 +46,14 @@ public class JailClearCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
for(Jail j : jm.getJails()) { for (Jail j : jm.getJails()) {
if((args.length == 2 && StringUtil.startsWithIgnoreCase(j.getName(), args[1])) if ((args.length == 2 && StringUtil.startsWithIgnoreCase(j.getName(), args[1]))
|| (args.length == 3 && StringUtil.startsWithIgnoreCase(j.getName(), args[2]))) { || (args.length == 3 && StringUtil.startsWithIgnoreCase(j.getName(), args[2]))) {
results.add(j.getName()); results.add(j.getName());
}else { } else {
results.add(j.getName()); results.add(j.getName());
} }
} }

171
src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java
View File

@ -1,19 +1,5 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import org.apache.commons.lang3.ArrayUtils;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.Util; import com.graywolf336.jail.Util;
import com.graywolf336.jail.beans.Cell; import com.graywolf336.jail.beans.Cell;
@ -28,6 +14,18 @@ import com.graywolf336.jail.events.PrePrisonerJailedEvent;
import com.graywolf336.jail.interfaces.ICell; import com.graywolf336.jail.interfaces.ICell;
import com.lexicalscope.jewel.cli.ArgumentValidationException; import com.lexicalscope.jewel.cli.ArgumentValidationException;
import com.lexicalscope.jewel.cli.CliFactory; import com.lexicalscope.jewel.cli.CliFactory;
import org.apache.commons.lang.ArrayUtils;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = -1, maxArgs = -1,
@ -36,10 +34,10 @@ import com.lexicalscope.jewel.cli.CliFactory;
pattern = "jail|j", pattern = "jail|j",
permission = "jail.command.jail", permission = "jail.command.jail",
usage = "/jail [name] (-t time) (-j JailName) (-c CellName) (-a AnyCell) (-m Muted) (-r A reason for jailing)" usage = "/jail [name] (-t time) (-j JailName) (-c CellName) (-a AnyCell) (-m Muted) (-r A reason for jailing)"
) )
public class JailCommand implements Command { public class JailCommand implements Command {
private static final String noJailPermission = "jail.cantbejailed"; private static final String noJailPermission = "jail.cantbejailed";
private List<String> commands = Arrays.asList(new String[] { "p", "t", "i", "j", "c", "a", "m", "r", "f" }); private final List<String> commands = Arrays.asList("p", "t", "i", "j", "c", "a", "m", "r", "f");
/* /*
* Executes the command. Checks the following: * Executes the command. Checks the following:
@ -54,36 +52,36 @@ public class JailCommand implements Command {
*/ */
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
if(jm.getJails().isEmpty()) { if (jm.getJails().isEmpty()) {
sender.sendMessage(Lang.NOJAILS.get()); sender.sendMessage(Lang.NOJAILS.get());
return true; return true;
} }
//This is just to add the -p param so CliFactory doesn't blow up //This is just to add the -p param so CliFactory doesn't blow up
List<String> arguments = new LinkedList<String>(Arrays.asList(args)); List<String> arguments = new LinkedList<>(Arrays.asList(args));
//Only add the "-p" if it doesn't already contain it, this way people can do `/jail -p check` in the event someone //Only add the "-p" if it doesn't already contain it, this way people can do `/jail -p check` in the event someone
//has a name which is one of our subcommands //has a name which is one of our subcommands
if(!arguments.contains("-p")) arguments.add(0, "-p"); if (!arguments.contains("-p")) arguments.add(0, "-p");
Jailing params = null; Jailing params;
try { try {
params = CliFactory.parseArguments(Jailing.class, arguments.toArray(new String[arguments.size()])); params = CliFactory.parseArguments(Jailing.class, arguments.toArray(new String[0]));
}catch(ArgumentValidationException e) { } catch (ArgumentValidationException e) {
sender.sendMessage(ChatColor.RED + e.getMessage()); sender.sendMessage(ChatColor.RED + e.getMessage());
return true; return true;
} }
//Check if they've actually given us a player to jail //Check if they've actually given us a player to jail
if(params.getPlayer() == null) { if (params.getPlayer() == null) {
sender.sendMessage(Lang.PROVIDEAPLAYER.get(Lang.JAILING)); sender.sendMessage(Lang.PROVIDEAPLAYER.get(Lang.JAILING));
return true; return true;
}else { } else {
jm.getPlugin().debug("We are getting ready to handle jailing: " + params.getPlayer()); jm.getPlugin().debug("We are getting ready to handle jailing: " + params.getPlayer());
} }
//Check if the given player is already jailed or not //Check if the given player is already jailed or not
if(jm.isPlayerJailedByLastKnownUsername(params.getPlayer())) { if (jm.isPlayerJailedByLastKnownUsername(params.getPlayer())) {
sender.sendMessage(Lang.ALREADYJAILED.get(params.getPlayer())); sender.sendMessage(Lang.ALREADYJAILED.get(params.getPlayer()));
return true; return true;
} }
@ -92,13 +90,13 @@ public class JailCommand implements Command {
//If the player instance is not null and the player has the permission //If the player instance is not null and the player has the permission
//'jail.cantbejailed' then don't allow this to happen //'jail.cantbejailed' then don't allow this to happen
if(p != null && p.hasPermission(noJailPermission)) { if (p != null && p.hasPermission(noJailPermission)) {
sender.sendMessage(Lang.CANTBEJAILED.get()); sender.sendMessage(Lang.CANTBEJAILED.get());
return true; return true;
} }
String uuid = ""; String uuid;
if(p == null) { if (p == null) {
if (!jm.getPlugin().getConfig().getBoolean(Settings.ALLOWJAILINGOFFLINEPLAYERS.getPath())) { if (!jm.getPlugin().getConfig().getBoolean(Settings.ALLOWJAILINGOFFLINEPLAYERS.getPath())) {
sender.sendMessage(Lang.PLAYERHASNEVERPLAYEDBEFORE.get()); sender.sendMessage(Lang.PLAYERHASNEVERPLAYEDBEFORE.get());
return true; return true;
@ -107,33 +105,33 @@ public class JailCommand implements Command {
//TODO: Make this whole jail command non-blocking //TODO: Make this whole jail command non-blocking
OfflinePlayer of = jm.getPlugin().getServer().getOfflinePlayer(params.getPlayer()); OfflinePlayer of = jm.getPlugin().getServer().getOfflinePlayer(params.getPlayer());
if(!of.hasPlayedBefore() && !jm.getPlugin().getConfig().getBoolean(Settings.ALLOWJAILINGNEVERPLAYEDBEFOREPLAYERS.getPath()) && !params.isForce()) { if (!of.hasPlayedBefore() && !jm.getPlugin().getConfig().getBoolean(Settings.ALLOWJAILINGNEVERPLAYEDBEFOREPLAYERS.getPath()) && !params.isForce()) {
sender.sendMessage(Lang.PLAYERHASNEVERPLAYEDBEFORE.get(params.getPlayer())); sender.sendMessage(Lang.PLAYERHASNEVERPLAYEDBEFORE.get(params.getPlayer()));
return true; return true;
}else { } else {
uuid = of.getUniqueId().toString(); uuid = of.getUniqueId().toString();
} }
}else { } else {
uuid = p.getUniqueId().toString(); uuid = p.getUniqueId().toString();
} }
//Try to parse the time, if they give us nothing in the time parameter then we get the default time //Try to parse the time, if they give us nothing in the time parameter then we get the default time
//from the config and if that isn't there then we default to thirty minutes. //from the config and if that isn't there then we default to thirty minutes.
Long time = 10L; Long time;
try { try {
if(params.isTime()) { if (params.isTime()) {
time = Util.getTime(params.getTime()); time = Util.getTime(params.getTime());
}else { } else {
time = Util.getTime(jm.getPlugin().getConfig().getString(Settings.DEFAULTTIME.getPath(), "30m")); time = Util.getTime(jm.getPlugin().getConfig().getString(Settings.DEFAULTTIME.getPath(), "30m"));
} }
}catch(Exception e) { } catch (Exception e) {
sender.sendMessage(Lang.NUMBERFORMATINCORRECT.get()); sender.sendMessage(Lang.NUMBERFORMATINCORRECT.get());
return true; return true;
} }
//Check if they provided the infinite argument //Check if they provided the infinite argument
//if so, then set the time jailed forever //if so, then set the time jailed forever
if(params.isInfinite()) { if (params.isInfinite()) {
time = -1L; time = -1L;
} }
@ -141,65 +139,65 @@ public class JailCommand implements Command {
//from the config. If that is nearest, let's make a call to getting the nearest jail to //from the config. If that is nearest, let's make a call to getting the nearest jail to
//the sender but otherwise if it isn't nearest then let's set it to the default jail //the sender but otherwise if it isn't nearest then let's set it to the default jail
//which is defined in the config. //which is defined in the config.
String jailName = ""; String jailName;
if(!params.isJail()) { if (!params.isJail()) {
String dJail = jm.getPlugin().getConfig().getString(Settings.DEFAULTJAIL.getPath()); String dJail = jm.getPlugin().getConfig().getString(Settings.DEFAULTJAIL.getPath());
if(dJail.equalsIgnoreCase("nearest")) { if (dJail.equalsIgnoreCase("nearest")) {
jailName = jm.getNearestJail(sender).getName(); jailName = jm.getNearestJail(sender).getName();
}else { } else {
jailName = dJail; jailName = dJail;
} }
}else if(!jm.isValidJail(params.getJail())) { } else if (!jm.isValidJail(params.getJail())) {
sender.sendMessage(Lang.NOJAIL.get(params.getJail())); sender.sendMessage(Lang.NOJAIL.get(params.getJail()));
return true; return true;
}else { } else {
jailName = params.getJail(); jailName = params.getJail();
} }
//Get the jail instance from the name of jail in the params. //Get the jail instance from the name of jail in the params.
Jail j = jm.getJail(jailName); Jail j = jm.getJail(jailName);
if(!j.isEnabled()) { if (!j.isEnabled()) {
sender.sendMessage(Lang.WORLDUNLOADED.get(j.getName())); sender.sendMessage(Lang.WORLDUNLOADED.get(j.getName()));
return true; return true;
} }
ICell c = null; ICell c = null;
//Check if the cell is defined //Check if the cell is defined
if(params.isCell()) { if (params.isCell()) {
//Check if it is a valid cell //Check if it is a valid cell
if(!jm.getJail(jailName).isValidCell(params.getCell())) { if (!jm.getJail(jailName).isValidCell(params.getCell())) {
//There is no cell by that name //There is no cell by that name
sender.sendMessage(Lang.NOCELL.get(new String[] { params.getCell(), jailName })); sender.sendMessage(Lang.NOCELL.get(params.getCell(), jailName));
return true; return true;
}else if(jm.getJail(jailName).getCell(params.getCell()).hasPrisoner()) { } else if (jm.getJail(jailName).getCell(params.getCell()).hasPrisoner()) {
//If the cell has a prisoner, don't allow jailing them to that particular cell but suggest another one //If the cell has a prisoner, don't allow jailing them to that particular cell but suggest another one
sender.sendMessage(Lang.CELLNOTEMPTY.get(params.getCell())); sender.sendMessage(Lang.CELLNOTEMPTY.get(params.getCell()));
Cell suggestedCell = jm.getJail(jailName).getFirstEmptyCell(); Cell suggestedCell = jm.getJail(jailName).getFirstEmptyCell();
if(suggestedCell != null) { if (suggestedCell != null) {
sender.sendMessage(Lang.SUGGESTEDCELL.get(new String[] { jailName, suggestedCell.getName() })); sender.sendMessage(Lang.SUGGESTEDCELL.get(jailName, suggestedCell.getName()));
}else { } else {
sender.sendMessage(Lang.NOEMPTYCELLS.get(jailName)); sender.sendMessage(Lang.NOEMPTYCELLS.get(jailName));
} }
return true; return true;
}else { } else {
c = jm.getJail(jailName).getCell(params.getCell()); c = jm.getJail(jailName).getCell(params.getCell());
} }
} }
//If they want just any open cell or automatic jailing in cells is turned on //If they want just any open cell or automatic jailing in cells is turned on
//and a cell wasn't already found, then find try to find a cell //and a cell wasn't already found, then find try to find a cell
if(params.isAnyCell() && c == null) { if (params.isAnyCell() && c == null) {
c = jm.getJail(jailName).getFirstEmptyCell(); c = jm.getJail(jailName).getFirstEmptyCell();
if(c == null) { if (c == null) {
//If there wasn't an empty cell, then tell them so. //If there wasn't an empty cell, then tell them so.
sender.sendMessage(Lang.NOEMPTYCELLS.get(jailName)); sender.sendMessage(Lang.NOEMPTYCELLS.get(jailName));
return true; return true;
} }
}else if(jm.getPlugin().getConfig().getBoolean(Settings.AUTOMATICCELL.getPath(), true) && j.hasCells() && c == null) { } else if (jm.getPlugin().getConfig().getBoolean(Settings.AUTOMATICCELL.getPath(), true) && j.hasCells() && c == null) {
c = jm.getJail(jailName).getFirstEmptyCell(); c = jm.getJail(jailName).getFirstEmptyCell();
if(c == null) { if (c == null) {
//If there wasn't an empty cell, then tell them so. //If there wasn't an empty cell, then tell them so.
sender.sendMessage(Lang.NOEMPTYCELLS.get(jailName)); sender.sendMessage(Lang.NOEMPTYCELLS.get(jailName));
return true; return true;
@ -207,23 +205,23 @@ public class JailCommand implements Command {
} }
//If the jailer gave no reason, then let's get the default reason //If the jailer gave no reason, then let's get the default reason
String reason = ""; String reason;
if(params.isReason()) { if (params.isReason()) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for(String s : params.getReason()) { for (String s : params.getReason()) {
sb.append(s).append(' '); sb.append(s).append(' ');
} }
sb.deleteCharAt(sb.length() - 1); sb.deleteCharAt(sb.length() - 1);
reason = sb.toString(); reason = sb.toString();
}else { } else {
reason = Lang.DEFAULTJAILEDREASON.get(); reason = Lang.DEFAULTJAILEDREASON.get();
} }
//If the config has automatic muting, then let's set them as muted //If the config has automatic muting, then let's set them as muted
boolean muted = params.getMuted(); boolean muted = params.getMuted();
if(jm.getPlugin().getConfig().getBoolean(Settings.AUTOMATICMUTE.getPath())) { if (jm.getPlugin().getConfig().getBoolean(Settings.AUTOMATICMUTE.getPath())) {
muted = true; muted = true;
} }
@ -234,8 +232,8 @@ public class JailCommand implements Command {
jm.getPlugin().getServer().getPluginManager().callEvent(event); jm.getPlugin().getServer().getPluginManager().callEvent(event);
//check if the event is cancelled //check if the event is cancelled
if(event.isCancelled()) { if (event.isCancelled()) {
if(event.getCancelledMessage().isEmpty()) if (event.getCancelledMessage().isEmpty())
sender.sendMessage(Lang.CANCELLEDBYANOTHERPLUGIN.get(params.getPlayer())); sender.sendMessage(Lang.CANCELLEDBYANOTHERPLUGIN.get(params.getPlayer()));
else else
sender.sendMessage(event.getCancelledMessage()); sender.sendMessage(event.getCancelledMessage());
@ -250,11 +248,11 @@ public class JailCommand implements Command {
p = event.getPlayer(); p = event.getPlayer();
//Player is not online //Player is not online
if(p == null) { if (p == null) {
sender.sendMessage(Lang.OFFLINEJAIL.get(new String[] { pris.getLastKnownName(), String.valueOf(pris.getRemainingTimeInMinutes()) })); sender.sendMessage(Lang.OFFLINEJAIL.get(pris.getLastKnownName(), String.valueOf(pris.getRemainingTimeInMinutes())));
}else { } else {
//Player *is* online //Player *is* online
sender.sendMessage(Lang.ONLINEJAIL.get(new String[] { pris.getLastKnownName(), String.valueOf(pris.getRemainingTimeInMinutes()) })); sender.sendMessage(Lang.ONLINEJAIL.get(pris.getLastKnownName(), String.valueOf(pris.getRemainingTimeInMinutes())));
} }
try { try {
@ -267,40 +265,41 @@ public class JailCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
//by the time it gets to this command it'll have at least two arguments //by the time it gets to this command it'll have at least two arguments
String last = args[args.length - 1]; String last = args[args.length - 1];
jm.getPlugin().debug("The last item is: " + last); jm.getPlugin().debug("The last item is: " + last);
if(last.isEmpty() || !commands.contains(last.replace("-", ""))) { if (last.isEmpty() || !commands.contains(last.replace("-", ""))) {
//the current part is empty. Need to look at their previous //the current part is empty. Need to look at their previous
//item and if it is a valid option, then provide them a valid tab complete option //item and if it is a valid option, then provide them a valid tab complete option
if(args.length - 2 > -1) { if (args.length - 2 > -1) {
String previous = args[args.length - 2]; String previous = args[args.length - 2];
jm.getPlugin().debug("args[args.length - 2]: " + previous); jm.getPlugin().debug("args[args.length - 2]: " + previous);
if(previous.equalsIgnoreCase("-p")) return getPlayers(jm, last); if (previous.equalsIgnoreCase("-p")) return getPlayers(jm, last);
else if(previous.equalsIgnoreCase("-j")) return jm.getJailsByPrefix(last); else if (previous.equalsIgnoreCase("-j")) return jm.getJailsByPrefix(last);
else if(previous.equalsIgnoreCase("-c")) { else if (previous.equalsIgnoreCase("-c")) {
//Since we need to give them a list of the cells in a jail //Since we need to give them a list of the cells in a jail
//we need to get the jail they're giving //we need to get the jail they're giving
int jailIndex = ArrayUtils.indexOf(args, "-j"); int jailIndex = ArrayUtils.indexOf(args, "-j");
if(jailIndex != -1) { if (jailIndex != -1) {
String jail = args[jailIndex + 1]; String jail = args[jailIndex + 1];
jm.getPlugin().debug("The jail is: " + jail); jm.getPlugin().debug("The jail is: " + jail);
if(jm.isValidJail(jail)) return getCells(jm, jail, last); if (jm.isValidJail(jail)) return getCells(jm, jail, last);
} }
}else if(previous.endsWith("r")) return Collections.emptyList(); } else if (previous.endsWith("r")) return Collections.emptyList();
else if(!commands.contains(args[args.length - 2].replace("-", ""))) return Util.getUnusedItems(commands, args, false); else if (!commands.contains(args[args.length - 2].replace("-", "")))
}else { return Util.getUnusedItems(commands, args, false);
} else {
return getPlayers(jm, last); return getPlayers(jm, last);
} }
}else if(last.equalsIgnoreCase("-")) { } else if (last.equalsIgnoreCase("-")) {
//add some smart checking so that it only returns a list of what isn't already //add some smart checking so that it only returns a list of what isn't already
//in the command :) //in the command :)
return Util.getUnusedItems(commands, args, false); return Util.getUnusedItems(commands, args, false);
}else { } else {
jm.getPlugin().debug("Getting the list of online players."); jm.getPlugin().debug("Getting the list of online players.");
return getPlayers(jm, last); return getPlayers(jm, last);
} }
@ -310,11 +309,11 @@ public class JailCommand implements Command {
} }
private List<String> getPlayers(JailManager jm, String first) { private List<String> getPlayers(JailManager jm, String first) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
for(Player p : jm.getPlugin().getServer().getOnlinePlayers()) for (Player p : jm.getPlugin().getServer().getOnlinePlayers())
if(first.isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), first)) if (first.isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), first))
if(!jm.isPlayerJailed(p.getUniqueId()) && !p.hasPermission(noJailPermission)) //don't send back them if they're already jailed or can't be jailed if (!jm.isPlayerJailed(p.getUniqueId()) && !p.hasPermission(noJailPermission)) //don't send back them if they're already jailed or can't be jailed
results.add(p.getName()); results.add(p.getName());
Collections.sort(results); Collections.sort(results);
@ -324,10 +323,10 @@ public class JailCommand implements Command {
} }
private List<String> getCells(JailManager jm, String jail, String cell) { private List<String> getCells(JailManager jm, String jail, String cell) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
for(Cell c : jm.getJail(jail).getCells()) for (Cell c : jm.getJail(jail).getCells())
if(!c.hasPrisoner() && (cell.isEmpty() || StringUtil.startsWithIgnoreCase(c.getName(), cell))) if (!c.hasPrisoner() && (cell.isEmpty() || StringUtil.startsWithIgnoreCase(c.getName(), cell)))
results.add(c.getName()); results.add(c.getName());
Collections.sort(results); Collections.sort(results);

27
src/main/java/com/graywolf336/jail/command/subcommands/JailConfirmCommand.java
View File

@ -1,14 +1,13 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 0, maxArgs = 0,
@ -17,18 +16,18 @@ import com.graywolf336.jail.enums.Lang;
pattern = "confirm|con", pattern = "confirm|con",
permission = "", permission = "",
usage = "/jail confirm" usage = "/jail confirm"
) )
public class JailConfirmCommand implements Command{ public class JailConfirmCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
//Check if the sender is actually confirming something. //Check if the sender is actually confirming something.
if(jm.isConfirming(sender.getName())) { if (jm.isConfirming(sender.getName())) {
if(jm.confirmingHasExpired(sender.getName())) { if (jm.confirmingHasExpired(sender.getName())) {
//Their confirmation time frame has closed //Their confirmation time frame has closed
sender.sendMessage(Lang.EXPIRED.get()); sender.sendMessage(Lang.EXPIRED.get());
jm.removeConfirming(sender.getName()); jm.removeConfirming(sender.getName());
}else { } else {
switch(jm.getWhatIsConfirming(sender.getName())) { switch (jm.getWhatIsConfirming(sender.getName())) {
case CLEAR: case CLEAR:
//Copy the original arguments for easy access //Copy the original arguments for easy access
String[] cArgs = jm.getOriginalArgs(sender.getName()); String[] cArgs = jm.getOriginalArgs(sender.getName());
@ -63,7 +62,7 @@ public class JailConfirmCommand implements Command{
//delete a cell from a jail with the given arguments //delete a cell from a jail with the given arguments
String[] msgs4 = jm.deleteAllJailCells(cArgs4[1]); String[] msgs4 = jm.deleteAllJailCells(cArgs4[1]);
//Send the messages we got back //Send the messages we got back
for(String s : msgs4) { for (String s : msgs4) {
sender.sendMessage(s); sender.sendMessage(s);
} }
@ -84,7 +83,7 @@ public class JailConfirmCommand implements Command{
break; break;
} }
} }
}else { } else {
//They aren't confirming anything right now. //They aren't confirming anything right now.
sender.sendMessage(Lang.NOTHING.get()); sender.sendMessage(Lang.NOTHING.get());
} }
@ -92,7 +91,7 @@ public class JailConfirmCommand implements Command{
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
//confirming doesn't require any tab completing //confirming doesn't require any tab completing
return Collections.emptyList(); return Collections.emptyList();
} }

43
src/main/java/com/graywolf336/jail/command/subcommands/JailCreateCellCommand.java
View File

@ -1,16 +1,15 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.Collections;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 2, maxArgs = 2,
@ -19,7 +18,7 @@ import com.graywolf336.jail.command.CommandInfo;
pattern = "createcells|createcell|cellcreate|cellscreate|cc", pattern = "createcells|createcell|cellcreate|cellscreate|cc",
permission = "jail.command.jailcreatecells", permission = "jail.command.jailcreatecells",
usage = "/jail createcell [jail] (cellname)" usage = "/jail createcell [jail] (cellname)"
) )
public class JailCreateCellCommand implements Command { public class JailCreateCellCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
@ -29,36 +28,36 @@ public class JailCreateCellCommand implements Command {
String cell = ""; String cell = "";
//Only get the cell name they provide if they provide it //Only get the cell name they provide if they provide it
if(args.length >= 3) { if (args.length >= 3) {
cell = args[2]; cell = args[2];
} }
//Check if the player is currently creating something else //Check if the player is currently creating something else
if(jm.isCreatingSomething(name)) { if (jm.isCreatingSomething(name)) {
String message = jm.getStepMessage(name); String message = jm.getStepMessage(name);
if(!message.isEmpty()) { if (!message.isEmpty()) {
player.sendMessage(ChatColor.RED + message); player.sendMessage(ChatColor.RED + message);
}else { } else {
player.sendMessage(ChatColor.RED + "You're already creating something else, please finish it or cancel."); player.sendMessage(ChatColor.RED + "You're already creating something else, please finish it or cancel.");
} }
}else { } else {
//Not creating anything, so let them create some cells. //Not creating anything, so let them create some cells.
if(jm.isValidJail(jail)) { if (jm.isValidJail(jail)) {
Jail j = jm.getJail(jail); Jail j = jm.getJail(jail);
//If they didn't provide a cell name, let's provide one ourself. //If they didn't provide a cell name, let's provide one ourself.
if(cell.isEmpty()) cell = "cell_n" + (j.getCellCount() + 1); if (cell.isEmpty()) cell = "cell_n" + (j.getCellCount() + 1);
if(j.getCell(cell) == null) { if (j.getCell(cell) == null) {
if(jm.addCreatingCell(name, jail, cell)) { if (jm.addCreatingCell(name, jail, cell)) {
jm.getCellCreationSteps().startStepping(player); jm.getCellCreationSteps().startStepping(player);
}else { } else {
player.sendMessage(ChatColor.RED + "Appears you're creating a cell or something went wrong on our side."); player.sendMessage(ChatColor.RED + "Appears you're creating a cell or something went wrong on our side.");
} }
}else { } else {
player.sendMessage(ChatColor.RED + "There's already a cell with the name '" + cell + "', please pick a new one or remove that cell."); player.sendMessage(ChatColor.RED + "There's already a cell with the name '" + cell + "', please pick a new one or remove that cell.");
} }
}else { } else {
player.sendMessage(ChatColor.RED + "No such jail found by the name of '" + jail + "'."); player.sendMessage(ChatColor.RED + "No such jail found by the name of '" + jail + "'.");
} }
} }
@ -66,9 +65,9 @@ public class JailCreateCellCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
//We shouldn't provide when they want a cell name //We shouldn't provide when they want a cell name
if(args.length >= 3) return Collections.emptyList(); if (args.length >= 3) return Collections.emptyList();
return jm.getJailsByPrefix(args.length == 2 ? args[1] : ""); return jm.getJailsByPrefix(args.length == 2 ? args[1] : "");
} }

33
src/main/java/com/graywolf336/jail/command/subcommands/JailCreateCommand.java
View File

@ -1,15 +1,14 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.Collections;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 1, maxArgs = 1,
@ -18,7 +17,7 @@ import com.graywolf336.jail.command.CommandInfo;
pattern = "create", pattern = "create",
permission = "jail.command.jailcreate", permission = "jail.command.jailcreate",
usage = "/jail create [name]" usage = "/jail create [name]"
) )
public class JailCreateCommand implements Command { public class JailCreateCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
@ -27,20 +26,20 @@ public class JailCreateCommand implements Command {
String jail = args[1]; String jail = args[1];
//Check if the player is currently creating something else //Check if the player is currently creating something else
if(jm.isCreatingSomething(name)) { if (jm.isCreatingSomething(name)) {
String message = jm.getStepMessage(name); String message = jm.getStepMessage(name);
if(!message.isEmpty()) { if (!message.isEmpty()) {
player.sendMessage(ChatColor.RED + message); player.sendMessage(ChatColor.RED + message);
}else { } else {
player.sendMessage(ChatColor.RED + "You're already creating something else, please finish it or cancel."); player.sendMessage(ChatColor.RED + "You're already creating something else, please finish it or cancel.");
} }
}else { } else {
if(jm.isValidJail(jail)) { if (jm.isValidJail(jail)) {
player.sendMessage(ChatColor.RED + "Jail by the name of '" + jail + "' already exist!"); player.sendMessage(ChatColor.RED + "Jail by the name of '" + jail + "' already exist!");
}else { } else {
if(jm.addCreatingJail(name, jail)) { if (jm.addCreatingJail(name, jail)) {
jm.getJailCreationSteps().startStepping(player); jm.getJailCreationSteps().startStepping(player);
}else { } else {
player.sendMessage(ChatColor.RED + "Seems like you're already creating a Jail or something went wrong on our side."); player.sendMessage(ChatColor.RED + "Seems like you're already creating a Jail or something went wrong on our side.");
} }
} }
@ -49,7 +48,7 @@ public class JailCreateCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
//Creating a jail shouldn't provide tab completion //Creating a jail shouldn't provide tab completion
return Collections.emptyList(); return Collections.emptyList();
} }

33
src/main/java/com/graywolf336/jail/command/subcommands/JailDeleteCellCommand.java
View File

@ -1,12 +1,5 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.beans.Cell; import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.ConfirmPlayer; import com.graywolf336.jail.beans.ConfirmPlayer;
@ -15,6 +8,12 @@ import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Confirmation; import com.graywolf336.jail.enums.Confirmation;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 2, maxArgs = 2,
@ -23,12 +22,12 @@ import com.graywolf336.jail.enums.Lang;
pattern = "deletecell|dc", pattern = "deletecell|dc",
permission = "jail.command.jaildeletecell", permission = "jail.command.jaildeletecell",
usage = "/jail deletecell [jail] [cell]" usage = "/jail deletecell [jail] [cell]"
) )
public class JailDeleteCellCommand implements Command { public class JailDeleteCellCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception { public boolean execute(JailManager jm, CommandSender sender, String... args) {
if(jm.isConfirming(sender.getName())) { if (jm.isConfirming(sender.getName())) {
sender.sendMessage(Lang.ALREADY.get()); sender.sendMessage(Lang.ALREADY.get());
}else { } else {
jm.addConfirming(sender.getName(), new ConfirmPlayer(sender.getName(), args, Confirmation.DELETECELL)); jm.addConfirming(sender.getName(), new ConfirmPlayer(sender.getName(), args, Confirmation.DELETECELL));
sender.sendMessage(Lang.START.get()); sender.sendMessage(Lang.START.get());
} }
@ -36,10 +35,10 @@ public class JailDeleteCellCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
switch(args.length) { switch (args.length) {
case 1: case 1:
results.addAll(jm.getJailsByPrefix("")); results.addAll(jm.getJailsByPrefix(""));
break; break;
@ -47,11 +46,11 @@ public class JailDeleteCellCommand implements Command {
results = jm.getJailsByPrefix(args[1]); results = jm.getJailsByPrefix(args[1]);
break; break;
case 3: case 3:
if(jm.isValidJail(args[1])) { if (jm.isValidJail(args[1])) {
Jail j = jm.getJail(args[1]); Jail j = jm.getJail(args[1]);
for(Cell c : j.getCells()) for (Cell c : j.getCells())
if(args[2].isEmpty() || StringUtil.startsWithIgnoreCase(c.getName(), args[2])) if (args[2].isEmpty() || StringUtil.startsWithIgnoreCase(c.getName(), args[2]))
results.add(c.getName()); results.add(c.getName());
} }
break; break;

17
src/main/java/com/graywolf336/jail/command/subcommands/JailDeleteCellsCommand.java
View File

@ -1,15 +1,14 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.List;
import org.bukkit.command.CommandSender;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.beans.ConfirmPlayer; import com.graywolf336.jail.beans.ConfirmPlayer;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Confirmation; import com.graywolf336.jail.enums.Confirmation;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 1, maxArgs = 1,
@ -18,12 +17,12 @@ import com.graywolf336.jail.enums.Lang;
pattern = "deletecells|dcs", pattern = "deletecells|dcs",
permission = "jail.command.jaildeletecells", permission = "jail.command.jaildeletecells",
usage = "/jail deletecells [jail]" usage = "/jail deletecells [jail]"
) )
public class JailDeleteCellsCommand implements Command { public class JailDeleteCellsCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception { public boolean execute(JailManager jm, CommandSender sender, String... args) {
if(jm.isConfirming(sender.getName())) { if (jm.isConfirming(sender.getName())) {
sender.sendMessage(Lang.ALREADY.get()); sender.sendMessage(Lang.ALREADY.get());
}else { } else {
jm.addConfirming(sender.getName(), new ConfirmPlayer(sender.getName(), args, Confirmation.DELETECELLS)); jm.addConfirming(sender.getName(), new ConfirmPlayer(sender.getName(), args, Confirmation.DELETECELLS));
sender.sendMessage(Lang.START.get()); sender.sendMessage(Lang.START.get());
} }
@ -31,7 +30,7 @@ public class JailDeleteCellsCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
return jm.getJailsByPrefix(args.length == 2 ? args[1] : ""); return jm.getJailsByPrefix(args.length == 2 ? args[1] : "");
} }
} }

17
src/main/java/com/graywolf336/jail/command/subcommands/JailDeleteCommand.java
View File

@ -1,15 +1,14 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.List;
import org.bukkit.command.CommandSender;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.beans.ConfirmPlayer; import com.graywolf336.jail.beans.ConfirmPlayer;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Confirmation; import com.graywolf336.jail.enums.Confirmation;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 1, maxArgs = 1,
@ -18,12 +17,12 @@ import com.graywolf336.jail.enums.Lang;
pattern = "delete|d", pattern = "delete|d",
permission = "jail.command.jaildelete", permission = "jail.command.jaildelete",
usage = "/jail delete [jail]" usage = "/jail delete [jail]"
) )
public class JailDeleteCommand implements Command { public class JailDeleteCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception { public boolean execute(JailManager jm, CommandSender sender, String... args) {
if(jm.isConfirming(sender.getName())) { if (jm.isConfirming(sender.getName())) {
sender.sendMessage(Lang.ALREADY.get()); sender.sendMessage(Lang.ALREADY.get());
}else { } else {
jm.addConfirming(sender.getName(), new ConfirmPlayer(sender.getName(), args, Confirmation.DELETE)); jm.addConfirming(sender.getName(), new ConfirmPlayer(sender.getName(), args, Confirmation.DELETE));
sender.sendMessage(Lang.START.get()); sender.sendMessage(Lang.START.get());
} }
@ -31,7 +30,7 @@ public class JailDeleteCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
return jm.getJailsByPrefix(args.length == 2 ? args[1] : ""); return jm.getJailsByPrefix(args.length == 2 ? args[1] : "");
} }
} }

17
src/main/java/com/graywolf336/jail/command/subcommands/JailHelpCommand.java
View File

@ -1,14 +1,13 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.Collections;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 1, maxArgs = 1,
@ -17,15 +16,15 @@ import com.graywolf336.jail.command.CommandInfo;
pattern = "help|h", pattern = "help|h",
permission = "jail.command.jailhelp", permission = "jail.command.jailhelp",
usage = "/jail help [page]" usage = "/jail help [page]"
) )
public class JailHelpCommand implements Command { public class JailHelpCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception { public boolean execute(JailManager jm, CommandSender sender, String... args) {
sender.sendMessage(ChatColor.GREEN + "This command will be filled out shortly, use this link for now:"); sender.sendMessage(ChatColor.GREEN + "This command will be filled out shortly, use this link for now:");
sender.sendMessage(ChatColor.GREEN + "https://github.com/graywolf336/Jail/wiki/Commands"); sender.sendMessage(ChatColor.GREEN + "https://github.com/graywolf336/Jail/wiki/Commands");
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
//TODO implement //TODO implement
return Collections.emptyList(); return Collections.emptyList();
} }

29
src/main/java/com/graywolf336/jail/command/subcommands/JailListCellsCommand.java
View File

@ -1,12 +1,5 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.Util; import com.graywolf336.jail.Util;
import com.graywolf336.jail.beans.Cell; import com.graywolf336.jail.beans.Cell;
@ -14,6 +7,12 @@ import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 1, maxArgs = 1,
@ -22,28 +21,28 @@ import com.graywolf336.jail.enums.Lang;
pattern = "listcells|lc", pattern = "listcells|lc",
permission = "jail.command.jaillistcells", permission = "jail.command.jaillistcells",
usage = "/jail listcells [jail]" usage = "/jail listcells [jail]"
) )
public class JailListCellsCommand implements Command { public class JailListCellsCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
sender.sendMessage(ChatColor.AQUA + "----------Cells----------"); sender.sendMessage(ChatColor.AQUA + "----------Cells----------");
if(!jm.getJails().isEmpty()) { if (!jm.getJails().isEmpty()) {
if(jm.getJail(args[1]) != null) { if (jm.getJail(args[1]) != null) {
Jail j = jm.getJail(args[1]); Jail j = jm.getJail(args[1]);
List<String> cells = new ArrayList<String>(); List<String> cells = new ArrayList<>();
for(Cell c : j.getCells()) { for (Cell c : j.getCells()) {
cells.add(c.getName() + (c.getPrisoner() == null ? "" : " (" + c.getPrisoner().getLastKnownName() + ")")); cells.add(c.getName() + (c.getPrisoner() == null ? "" : " (" + c.getPrisoner().getLastKnownName() + ")"));
} }
Collections.sort(cells); Collections.sort(cells);
sender.sendMessage(cells.isEmpty() ? Lang.NOCELLS.get(j.getName()) : ChatColor.GREEN + Util.getStringFromList(", ", cells)); sender.sendMessage(cells.isEmpty() ? Lang.NOCELLS.get(j.getName()) : ChatColor.GREEN + Util.getStringFromList(", ", cells));
}else { } else {
sender.sendMessage(Lang.NOJAIL.get(args[1])); sender.sendMessage(Lang.NOJAIL.get(args[1]));
} }
}else { } else {
sender.sendMessage(Lang.NOJAILS.get()); sender.sendMessage(Lang.NOJAILS.get());
} }
@ -51,7 +50,7 @@ public class JailListCellsCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
return jm.getJailsByPrefix(args.length == 2 ? args[1] : ""); return jm.getJailsByPrefix(args.length == 2 ? args[1] : "");
} }
} }

41
src/main/java/com/graywolf336/jail/command/subcommands/JailListCommand.java
View File

@ -1,17 +1,16 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.Collection;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import java.util.Collection;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 1, maxArgs = 1,
@ -20,36 +19,38 @@ import com.graywolf336.jail.enums.Lang;
pattern = "list|l", pattern = "list|l",
permission = "jail.command.jaillist", permission = "jail.command.jaillist",
usage = "/jail list (jail)" usage = "/jail list (jail)"
) )
public class JailListCommand implements Command { public class JailListCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
sender.sendMessage(ChatColor.AQUA + "----------" + (args.length == 1 ? "Jails" : "Prisoners") + "----------"); sender.sendMessage(ChatColor.AQUA + "----------" + (args.length == 1 ? "Jails" : "Prisoners") + "----------");
//Check if there are any jails //Check if there are any jails
if(jm.getJails().isEmpty()) { if (jm.getJails().isEmpty()) {
sender.sendMessage(" " + Lang.NOJAILS.get()); sender.sendMessage(" " + Lang.NOJAILS.get());
}else { } else {
//Check if they have provided a jail to list or not //Check if they have provided a jail to list or not
if(args.length == 1) { if (args.length == 1) {
//No jail provided, so give them a list of the jails //No jail provided, so give them a list of the jails
for(Jail j : jm.getJails()) { for (Jail j : jm.getJails()) {
if(j.isEnabled()) sender.sendMessage(ChatColor.BLUE + " " + j.getName() + " (" + j.getAllPrisoners().size() + ")"); if (j.isEnabled())
else sender.sendMessage(ChatColor.RED + " " + j.getName() + " (" + j.getAllPrisoners().size() + ") - WORLD UNLOADED"); sender.sendMessage(ChatColor.BLUE + " " + j.getName() + " (" + j.getAllPrisoners().size() + ")");
else
sender.sendMessage(ChatColor.RED + " " + j.getName() + " (" + j.getAllPrisoners().size() + ") - WORLD UNLOADED");
} }
}else { } else {
Jail j = jm.getJail(args[1]); Jail j = jm.getJail(args[1]);
if(j == null) { if (j == null) {
//No jail was found //No jail was found
sender.sendMessage(" " + Lang.NOJAIL.get(args[1])); sender.sendMessage(" " + Lang.NOJAIL.get(args[1]));
}else { } else {
Collection<Prisoner> pris = j.getAllPrisoners().values(); Collection<Prisoner> pris = j.getAllPrisoners().values();
if(pris.isEmpty()) { if (pris.isEmpty()) {
//If there are no prisoners, then send that message //If there are no prisoners, then send that message
sender.sendMessage(" " + Lang.NOPRISONERS.get(j.getName())); sender.sendMessage(" " + Lang.NOPRISONERS.get(j.getName()));
}else { } else {
for(Prisoner p : pris) { for (Prisoner p : pris) {
//graywolf663: Being gray's evil twin; CONSOLE (10) //graywolf663: Being gray's evil twin; CONSOLE (10)
//prisoner: reason; jailer (time in minutes) //prisoner: reason; jailer (time in minutes)
sender.sendMessage(ChatColor.BLUE + " " + p.getLastKnownName() + ": " + p.getReason() + "; " + p.getJailer() + " (" + p.getRemainingTimeInMinutes() + " mins)"); sender.sendMessage(ChatColor.BLUE + " " + p.getLastKnownName() + ": " + p.getReason() + "; " + p.getJailer() + " (" + p.getRemainingTimeInMinutes() + " mins)");
@ -63,7 +64,7 @@ public class JailListCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
return jm.getJailsByPrefix(args.length == 2 ? args[1] : ""); return jm.getJailsByPrefix(args.length == 2 ? args[1] : "");
} }
} }

39
src/main/java/com/graywolf336/jail/command/subcommands/JailMuteCommand.java
View File

@ -1,17 +1,16 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 1, maxArgs = 1,
@ -20,21 +19,21 @@ import com.graywolf336.jail.enums.Lang;
pattern = "mute|m", pattern = "mute|m",
permission = "jail.command.jailmute", permission = "jail.command.jailmute",
usage = "/jail mute [name]" usage = "/jail mute [name]"
) )
public class JailMuteCommand implements Command { public class JailMuteCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception { public boolean execute(JailManager jm, CommandSender sender, String... args) {
//Let's check if the player they're sending us is jailed //Let's check if the player they're sending us is jailed
if(jm.isPlayerJailedByLastKnownUsername(args[1])) { if (jm.isPlayerJailedByLastKnownUsername(args[1])) {
//They are, so let's toggle whether they are muted or not //They are, so let's toggle whether they are muted or not
boolean muted = !jm.getPrisonerByLastKnownName(args[1]).isMuted(); boolean muted = !jm.getPrisonerByLastKnownName(args[1]).isMuted();
jm.getPrisonerByLastKnownName(args[1]).setMuted(muted); jm.getPrisonerByLastKnownName(args[1]).setMuted(muted);
//Send the message to the sender based upon whether they are muted or unmuted //Send the message to the sender based upon whether they are muted or unmuted
if(muted) if (muted)
sender.sendMessage(Lang.NOWMUTED.get(args[1])); sender.sendMessage(Lang.NOWMUTED.get(args[1]));
else else
sender.sendMessage(Lang.NOWUNMUTED.get(args[1])); sender.sendMessage(Lang.NOWUNMUTED.get(args[1]));
}else { } else {
//The player provided is not jailed, so let's tell the sender that //The player provided is not jailed, so let's tell the sender that
sender.sendMessage(Lang.NOTJAILED.get(args[1])); sender.sendMessage(Lang.NOTJAILED.get(args[1]));
} }
@ -42,18 +41,16 @@ public class JailMuteCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
switch(args.length) { if (args.length == 2) {
case 2: List<String> results = new ArrayList<>();
List<String> results = new ArrayList<String>(); for (Player p : jm.getPlugin().getServer().getOnlinePlayers())
for(Player p : jm.getPlugin().getServer().getOnlinePlayers()) if (StringUtil.startsWithIgnoreCase(p.getName(), args[1].toLowerCase()))
if(StringUtil.startsWithIgnoreCase(p.getName(), args[1].toLowerCase()))
results.add(p.getName()); results.add(p.getName());
Collections.sort(results); Collections.sort(results);
return results; return results;
default: }
return Collections.emptyList(); return Collections.emptyList();
} }
}
} }

158
src/main/java/com/graywolf336/jail/command/subcommands/JailPayCommand.java
View File

@ -1,15 +1,5 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
@ -17,6 +7,15 @@ import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.enums.Settings; import com.graywolf336.jail.enums.Settings;
import com.graywolf336.jail.interfaces.IJailPayManager; import com.graywolf336.jail.interfaces.IJailPayManager;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
@CommandInfo( @CommandInfo(
maxArgs = 2, maxArgs = 2,
@ -25,42 +24,42 @@ import com.graywolf336.jail.interfaces.IJailPayManager;
pattern = "pay", pattern = "pay",
permission = "jail.usercmd.jailpay", permission = "jail.usercmd.jailpay",
usage = "/jail pay (amount) (name)" usage = "/jail pay (amount) (name)"
) )
public class JailPayCommand implements Command { public class JailPayCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception { public boolean execute(JailManager jm, CommandSender sender, String... args) {
if(jm.getPlugin().getConfig().getBoolean(Settings.JAILPAYENABLED.getPath())) { if (jm.getPlugin().getConfig().getBoolean(Settings.JAILPAYENABLED.getPath())) {
IJailPayManager pm = jm.getPlugin().getJailPayManager(); IJailPayManager pm = jm.getPlugin().getJailPayManager();
switch(args.length) { switch (args.length) {
case 1: case 1:
// `/jail pay` // `/jail pay`
//send how much it costs to get out //send how much it costs to get out
if(jm.isPlayerJailedByLastKnownUsername(sender.getName())) { if (jm.isPlayerJailedByLastKnownUsername(sender.getName())) {
Prisoner p = jm.getPrisonerByLastKnownName(sender.getName()); Prisoner p = jm.getPrisonerByLastKnownName(sender.getName());
String amt = ""; String amt;
if(pm.usingItemsForPayment()) { if (pm.usingItemsForPayment()) {
amt = String.valueOf((int) Math.ceil(pm.calculateBill(p))); amt = String.valueOf((int) Math.ceil(pm.calculateBill(p)));
}else { } else {
amt = String.valueOf(pm.calculateBill(p)); amt = String.valueOf(pm.calculateBill(p));
} }
if(p.getRemainingTime() > 0) { if (p.getRemainingTime() > 0) {
if(pm.isTimedEnabled()) { if (pm.isTimedEnabled()) {
sender.sendMessage(Lang.PAYCOST.get(new String[] { pm.getCostPerMinute(), pm.getCurrencyName(), amt })); sender.sendMessage(Lang.PAYCOST.get(pm.getCostPerMinute(), pm.getCurrencyName(), amt));
}else { } else {
sender.sendMessage(Lang.PAYNOTENABLED.get()); sender.sendMessage(Lang.PAYNOTENABLED.get());
jm.getPlugin().debug("Jail pay 'timed' paying is not enabled (config has 0 as the cost)."); jm.getPlugin().debug("Jail pay 'timed' paying is not enabled (config has 0 as the cost).");
} }
}else { } else {
if(pm.isInfiniteEnabled()) { if (pm.isInfiniteEnabled()) {
sender.sendMessage(Lang.PAYCOST.get(new String[] { amt, pm.getCurrencyName() })); sender.sendMessage(Lang.PAYCOST.get(amt, pm.getCurrencyName()));
}else { } else {
sender.sendMessage(Lang.PAYNOTENABLED.get()); sender.sendMessage(Lang.PAYNOTENABLED.get());
jm.getPlugin().debug("Jail pay 'infinite' paying is not enabled (config has 0 as the cost)."); jm.getPlugin().debug("Jail pay 'infinite' paying is not enabled (config has 0 as the cost).");
} }
} }
}else { } else {
sender.sendMessage(Lang.YOUARENOTJAILED.get()); sender.sendMessage(Lang.YOUARENOTJAILED.get());
} }
@ -68,133 +67,133 @@ public class JailPayCommand implements Command {
case 2: case 2:
// `/jail pay <amount>` // `/jail pay <amount>`
//They are trying to pay for their self //They are trying to pay for their self
if(jm.isPlayerJailedByLastKnownUsername(sender.getName())) { if (jm.isPlayerJailedByLastKnownUsername(sender.getName())) {
Prisoner p = jm.getPrisonerByLastKnownName(sender.getName()); Prisoner p = jm.getPrisonerByLastKnownName(sender.getName());
if(p.getRemainingTime() > 0) { if (p.getRemainingTime() > 0) {
if(!pm.isTimedEnabled()) { if (!pm.isTimedEnabled()) {
sender.sendMessage(Lang.PAYNOTENABLED.get()); sender.sendMessage(Lang.PAYNOTENABLED.get());
return true; return true;
} }
}else { } else {
if(!pm.isInfiniteEnabled()) { if (!pm.isInfiniteEnabled()) {
sender.sendMessage(Lang.PAYNOTENABLED.get()); sender.sendMessage(Lang.PAYNOTENABLED.get());
return true; return true;
} }
} }
if(args[1].startsWith("-")) { if (args[1].startsWith("-")) {
sender.sendMessage(Lang.PAYNONEGATIVEAMOUNTS.get()); sender.sendMessage(Lang.PAYNONEGATIVEAMOUNTS.get());
}else { } else {
double amt = 0; double amt;
try { try {
amt = Double.parseDouble(args[1]); amt = Double.parseDouble(args[1]);
}catch(NumberFormatException e) { } catch (NumberFormatException e) {
sender.sendMessage(ChatColor.RED + "<amount> must be a number."); sender.sendMessage(ChatColor.RED + "<amount> must be a number.");
throw e; throw e;
} }
if(pm.hasEnoughToPay((Player) sender, amt)) { if (pm.hasEnoughToPay((Player) sender, amt)) {
double bill = pm.calculateBill(p); double bill = pm.calculateBill(p);
if(p.getRemainingTime() > 0) { if (p.getRemainingTime() > 0) {
//timed sentence //timed sentence
if(amt >= bill) { if (amt >= bill) {
pm.pay((Player) sender, bill); pm.pay((Player) sender, bill);
sender.sendMessage(Lang.PAYPAIDRELEASED.get(String.valueOf(bill))); sender.sendMessage(Lang.PAYPAIDRELEASED.get(String.valueOf(bill)));
jm.getPlugin().getPrisonerManager().schedulePrisonerRelease(p); jm.getPlugin().getPrisonerManager().schedulePrisonerRelease(p);
}else { } else {
long minutes = pm.getMinutesPayingFor(amt); long minutes = pm.getMinutesPayingFor(amt);
pm.pay((Player) sender, amt); pm.pay((Player) sender, amt);
long remain = p.subtractTime(TimeUnit.MILLISECONDS.convert(minutes, TimeUnit.MINUTES)); long remain = p.subtractTime(TimeUnit.MILLISECONDS.convert(minutes, TimeUnit.MINUTES));
sender.sendMessage(Lang.PAYPAIDLOWEREDTIME.get(new String[] { String.valueOf(amt), String.valueOf(TimeUnit.MINUTES.convert(remain, TimeUnit.MILLISECONDS)) })); sender.sendMessage(Lang.PAYPAIDLOWEREDTIME.get(String.valueOf(amt), String.valueOf(TimeUnit.MINUTES.convert(remain, TimeUnit.MILLISECONDS))));
} }
}else { } else {
//infinite jailing //infinite jailing
if(amt >= bill) { if (amt >= bill) {
pm.pay((Player) sender, bill); pm.pay((Player) sender, bill);
sender.sendMessage(Lang.PAYPAIDRELEASED.get(String.valueOf(bill))); sender.sendMessage(Lang.PAYPAIDRELEASED.get(String.valueOf(bill)));
jm.getPlugin().getPrisonerManager().schedulePrisonerRelease(p); jm.getPlugin().getPrisonerManager().schedulePrisonerRelease(p);
}else { } else {
//You haven't provided enough money to get them out //You haven't provided enough money to get them out
sender.sendMessage(Lang.PAYNOTENOUGHMONEYPROVIDED.get()); sender.sendMessage(Lang.PAYNOTENOUGHMONEYPROVIDED.get());
} }
} }
}else { } else {
sender.sendMessage(Lang.PAYNOTENOUGHMONEY.get()); sender.sendMessage(Lang.PAYNOTENOUGHMONEY.get());
} }
} }
}else { } else {
sender.sendMessage(Lang.YOUARENOTJAILED.get()); sender.sendMessage(Lang.YOUARENOTJAILED.get());
} }
break; break;
case 3: case 3:
// `/jail pay <amount> <person> // `/jail pay <amount> <person>
//they are trying to pay for someone else //they are trying to pay for someone else
if(jm.isPlayerJailedByLastKnownUsername(sender.getName())) { if (jm.isPlayerJailedByLastKnownUsername(sender.getName())) {
//When they are jailed they can not pay for someone else //When they are jailed they can not pay for someone else
sender.sendMessage(Lang.PAYCANTPAYWHILEJAILED.get()); sender.sendMessage(Lang.PAYCANTPAYWHILEJAILED.get());
}else { } else {
if(jm.isPlayerJailedByLastKnownUsername(args[2])) { if (jm.isPlayerJailedByLastKnownUsername(args[2])) {
Prisoner p = jm.getPrisonerByLastKnownName(args[2]); Prisoner p = jm.getPrisonerByLastKnownName(args[2]);
if(p.isJailedForever()) { if (p.isJailedForever()) {
if(!pm.isInfiniteEnabled()) { if (!pm.isInfiniteEnabled()) {
sender.sendMessage(Lang.PAYNOTENABLED.get()); sender.sendMessage(Lang.PAYNOTENABLED.get());
return true; return true;
} }
}else { } else {
if(!pm.isTimedEnabled()) { if (!pm.isTimedEnabled()) {
sender.sendMessage(Lang.PAYNOTENABLED.get()); sender.sendMessage(Lang.PAYNOTENABLED.get());
return true; return true;
} }
} }
if(args[1].startsWith("-")) { if (args[1].startsWith("-")) {
sender.sendMessage(Lang.PAYNONEGATIVEAMOUNTS.get()); sender.sendMessage(Lang.PAYNONEGATIVEAMOUNTS.get());
}else { } else {
double amt = 0; double amt;
try { try {
amt = Double.parseDouble(args[1]); amt = Double.parseDouble(args[1]);
}catch(NumberFormatException e) { } catch (NumberFormatException e) {
sender.sendMessage(ChatColor.RED + "<amount> must be a number."); sender.sendMessage(ChatColor.RED + "<amount> must be a number.");
throw e; throw e;
} }
if(pm.hasEnoughToPay((Player) sender, amt)) { if (pm.hasEnoughToPay((Player) sender, amt)) {
double bill = pm.calculateBill(p); double bill = pm.calculateBill(p);
if(p.getRemainingTime() > 0) { if (p.getRemainingTime() > 0) {
//timed sentence //timed sentence
if(amt >= bill) { if (amt >= bill) {
pm.pay((Player) sender, bill); pm.pay((Player) sender, bill);
sender.sendMessage(Lang.PAYPAIDRELEASEDELSE.get(new String[] { String.valueOf(bill), p.getLastKnownName() })); sender.sendMessage(Lang.PAYPAIDRELEASEDELSE.get(String.valueOf(bill), p.getLastKnownName()));
jm.getPlugin().getPrisonerManager().schedulePrisonerRelease(p); jm.getPlugin().getPrisonerManager().schedulePrisonerRelease(p);
}else { } else {
long minutes = pm.getMinutesPayingFor(amt); long minutes = pm.getMinutesPayingFor(amt);
pm.pay((Player) sender, amt); pm.pay((Player) sender, amt);
long remain = p.subtractTime(TimeUnit.MILLISECONDS.convert(minutes, TimeUnit.MINUTES)); long remain = p.subtractTime(TimeUnit.MILLISECONDS.convert(minutes, TimeUnit.MINUTES));
sender.sendMessage(Lang.PAYPAIDLOWEREDTIMEELSE.get(new String[] { String.valueOf(amt), p.getLastKnownName(), String.valueOf(TimeUnit.MINUTES.convert(remain, TimeUnit.MILLISECONDS)) })); sender.sendMessage(Lang.PAYPAIDLOWEREDTIMEELSE.get(String.valueOf(amt), p.getLastKnownName(), String.valueOf(TimeUnit.MINUTES.convert(remain, TimeUnit.MILLISECONDS))));
} }
}else { } else {
//infinite jailing //infinite jailing
if(amt >= bill) { if (amt >= bill) {
pm.pay((Player) sender, bill); pm.pay((Player) sender, bill);
sender.sendMessage(Lang.PAYPAIDRELEASEDELSE.get(new String[] { String.valueOf(bill), p.getLastKnownName() })); sender.sendMessage(Lang.PAYPAIDRELEASEDELSE.get(String.valueOf(bill), p.getLastKnownName()));
jm.getPlugin().getPrisonerManager().schedulePrisonerRelease(p); jm.getPlugin().getPrisonerManager().schedulePrisonerRelease(p);
}else { } else {
//You haven't provided enough money to get them out //You haven't provided enough money to get them out
sender.sendMessage(Lang.PAYNOTENOUGHMONEYPROVIDED.get()); sender.sendMessage(Lang.PAYNOTENOUGHMONEYPROVIDED.get());
} }
} }
}else { } else {
sender.sendMessage(Lang.PAYNOTENOUGHMONEY.get()); sender.sendMessage(Lang.PAYNOTENOUGHMONEY.get());
} }
} }
}else { } else {
//Person they're trying to pay for is not jailed //Person they're trying to pay for is not jailed
sender.sendMessage(Lang.NOTJAILED.get(args[2])); sender.sendMessage(Lang.NOTJAILED.get(args[2]));
} }
@ -203,7 +202,7 @@ public class JailPayCommand implements Command {
default: default:
return false; return false;
} }
}else { } else {
jm.getPlugin().debug("Jail pay not enabled."); jm.getPlugin().debug("Jail pay not enabled.");
sender.sendMessage(Lang.PAYNOTENABLED.get()); sender.sendMessage(Lang.PAYNOTENABLED.get());
} }
@ -211,22 +210,19 @@ public class JailPayCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
if(jm.getPlugin().getConfig().getBoolean(Settings.JAILPAYENABLED.getPath())) { if (jm.getPlugin().getConfig().getBoolean(Settings.JAILPAYENABLED.getPath())) {
switch(args.length) { if (args.length == 3) {
case 3: List<String> results = new ArrayList<>();
List<String> results = new ArrayList<String>(); for (Prisoner p : jm.getAllPrisoners().values())
for(Prisoner p : jm.getAllPrisoners().values()) if (!p.isOfflinePending()) //Don't list if they're offline pending
if(!p.isOfflinePending()) //Don't list if they're offline pending if (p.getRemainingTime() != -1) //Don't list if they're jailed forever
if(p.getRemainingTime() != -1) //Don't list if they're jailed forever if (StringUtil.startsWithIgnoreCase(p.getLastKnownName(), args[2]))
if(StringUtil.startsWithIgnoreCase(p.getLastKnownName(), args[2]))
results.add(p.getLastKnownName()); results.add(p.getLastKnownName());
Collections.sort(results); Collections.sort(results);
return results; return results;
default:
break;
} }
} }

25
src/main/java/com/graywolf336/jail/command/subcommands/JailRecordCommand.java
View File

@ -1,14 +1,13 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 2, maxArgs = 2,
@ -17,26 +16,26 @@ import com.graywolf336.jail.enums.Lang;
pattern = "record|r", pattern = "record|r",
permission = "jail.command.jailrecord", permission = "jail.command.jailrecord",
usage = "/jail record [name] (display)" usage = "/jail record [name] (display)"
) )
public class JailRecordCommand implements Command { public class JailRecordCommand implements Command {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
if(args.length == 2) { if (args.length == 2) {
// /jail record <username> // /jail record <username>
List<String> entries = jm.getPlugin().getJailIO().getRecordEntries(args[1]); List<String> entries = jm.getPlugin().getJailIO().getRecordEntries(args[1]);
sender.sendMessage(Lang.RECORDTIMESJAILED.get(new String[] { args[1], String.valueOf(entries.size()) })); sender.sendMessage(Lang.RECORDTIMESJAILED.get(args[1], String.valueOf(entries.size())));
}else if(args.length == 3) { } else if (args.length == 3) {
// /jail record <username> something // /jail record <username> something
List<String> entries = jm.getPlugin().getJailIO().getRecordEntries(args[1]); List<String> entries = jm.getPlugin().getJailIO().getRecordEntries(args[1]);
//Send all the record entries //Send all the record entries
for(String s : entries) { for (String s : entries) {
sender.sendMessage(s); sender.sendMessage(s);
} }
sender.sendMessage(Lang.RECORDTIMESJAILED.get(new String[] { args[1], String.valueOf(entries.size()) })); sender.sendMessage(Lang.RECORDTIMESJAILED.get(args[1], String.valueOf(entries.size())));
}else { } else {
//They didn't do the command right //They didn't do the command right
//send them back to get the usage //send them back to get the usage
return false; return false;
@ -45,7 +44,7 @@ public class JailRecordCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
//We won't be implementing tab complete on this for now (unless requested) //We won't be implementing tab complete on this for now (unless requested)
return Collections.emptyList(); return Collections.emptyList();
} }

17
src/main/java/com/graywolf336/jail/command/subcommands/JailReloadCommand.java
View File

@ -1,15 +1,14 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.Collections;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 0, maxArgs = 0,
@ -18,13 +17,13 @@ import com.graywolf336.jail.enums.Lang;
pattern = "reload", pattern = "reload",
permission = "jail.command.jailreload", permission = "jail.command.jailreload",
usage = "/jail reload" usage = "/jail reload"
) )
public class JailReloadCommand implements Command { public class JailReloadCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
try { try {
jm.getPlugin().reloadEverything(); jm.getPlugin().reloadEverything();
sender.sendMessage(Lang.PLUGINRELOADED.get()); sender.sendMessage(Lang.PLUGINRELOADED.get());
}catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
sender.sendMessage(ChatColor.RED + "Failed to reload due to (see the console): " + e.getMessage()); sender.sendMessage(ChatColor.RED + "Failed to reload due to (see the console): " + e.getMessage());
} }
@ -32,7 +31,7 @@ public class JailReloadCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
//Reloading the plugin doesn't require tab completions //Reloading the plugin doesn't require tab completions
return Collections.emptyList(); return Collections.emptyList();
} }

87
src/main/java/com/graywolf336/jail/command/subcommands/JailSignsCommand.java
View File

@ -1,14 +1,5 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import org.bukkit.command.CommandSender;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.Util; import com.graywolf336.jail.Util;
import com.graywolf336.jail.beans.Cell; import com.graywolf336.jail.beans.Cell;
@ -16,6 +7,14 @@ import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
@CommandInfo( @CommandInfo(
maxArgs = -1, maxArgs = -1,
@ -24,48 +23,48 @@ import com.graywolf336.jail.enums.Lang;
pattern = "signs", pattern = "signs",
permission = "jail.command.jailsigns", permission = "jail.command.jailsigns",
usage = "/jail signs [clean|refresh|update|verify] [jail] (cell)..." usage = "/jail signs [clean|refresh|update|verify] [jail] (cell)..."
) )
public class JailSignsCommand implements Command { public class JailSignsCommand implements Command {
private static final String[] options = new String[] { "clean", "refresh", "update", "verify" }; private static final String[] options = new String[]{"clean", "refresh", "update", "verify"};
public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception { public boolean execute(JailManager jm, CommandSender sender, String... args) {
if(!jm.isValidJail(args[2])) { if (!jm.isValidJail(args[2])) {
sender.sendMessage(" " + Lang.NOJAIL.get(args[1])); sender.sendMessage(" " + Lang.NOJAIL.get(args[1]));
return true; return true;
} }
Jail j = jm.getJail(args[2]); Jail j = jm.getJail(args[2]);
HashMap<String, List<String>> items = new HashMap<String, List<String>>(); HashMap<String, List<String>> items = new HashMap<>();
if(args[1].equalsIgnoreCase("clean")) { if (args[1].equalsIgnoreCase("clean")) {
//if they type clean, we can remove all signs which are no longer signs //if they type clean, we can remove all signs which are no longer signs
//then provide them a list of signs which got cleaned up //then provide them a list of signs which got cleaned up
for(Cell c : j.getCells()) { for (Cell c : j.getCells()) {
if(Util.isStringInsideArray(c.getName(), args) || args.length == 3) { if (Util.isStringInsideArray(c.getName(), args) || args.length == 3) {
if(c.hasSigns()) { if (c.hasSigns()) {
List<String> cleaned = c.cleanSigns(); List<String> cleaned = c.cleanSigns();
if(!cleaned.isEmpty()) { if (!cleaned.isEmpty()) {
items.put(c.getName(), cleaned); items.put(c.getName(), cleaned);
} }
} }
} }
} }
if(items.isEmpty()) { if (items.isEmpty()) {
sender.sendMessage(Lang.NOINVALIDSIGNS.get()); sender.sendMessage(Lang.NOINVALIDSIGNS.get());
}else { } else {
sender.sendMessage(Lang.CLEANEDSIGNS.get()); sender.sendMessage(Lang.CLEANEDSIGNS.get());
for(Entry<String, List<String>> e : items.entrySet()) { for (Entry<String, List<String>> e : items.entrySet()) {
sender.sendMessage(" " + e.getKey()); sender.sendMessage(" " + e.getKey());
for(String s : e.getValue()) for (String s : e.getValue())
sender.sendMessage(" Sign: " + s); sender.sendMessage(" Sign: " + s);
} }
} }
return true; return true;
}else if(args[1].equalsIgnoreCase("refresh") || args[1].equalsIgnoreCase("update")) { } else if (args[1].equalsIgnoreCase("refresh") || args[1].equalsIgnoreCase("update")) {
//if they type refresh, we will go through all the signs and update them to //if they type refresh, we will go through all the signs and update them to
//display the correct message on the sign whether empty or time //display the correct message on the sign whether empty or time
@ -73,8 +72,8 @@ public class JailSignsCommand implements Command {
int updated = 0; int updated = 0;
int removed = 0; int removed = 0;
for(Cell c : j.getCells()) { for (Cell c : j.getCells()) {
if(Util.isStringInsideArray(c.getName(), args) || args.length == 3) { if (Util.isStringInsideArray(c.getName(), args) || args.length == 3) {
HashMap<String, List<String>> results = c.updateSigns(); HashMap<String, List<String>> results = c.updateSigns();
updated += results.get("updated").size(); updated += results.get("updated").size();
removed += results.get("removed").size(); removed += results.get("removed").size();
@ -82,53 +81,53 @@ public class JailSignsCommand implements Command {
} }
} }
sender.sendMessage(Lang.SIGNSREFRESHED.get(new String[] { String.valueOf(updated), String.valueOf(removed), String.valueOf(cells) })); sender.sendMessage(Lang.SIGNSREFRESHED.get(String.valueOf(updated), String.valueOf(removed), String.valueOf(cells)));
return true; return true;
}else if(args[1].equalsIgnoreCase("verify")) { } else if (args[1].equalsIgnoreCase("verify")) {
//if they type verify, we will go through all the signs and then provide them //if they type verify, we will go through all the signs and then provide them
//as a list of cells which have signs that aren't actually signs and provide //as a list of cells which have signs that aren't actually signs and provide
//the location where the signs are //the location where the signs are
for(Cell c : j.getCells()) { for (Cell c : j.getCells()) {
if(Util.isStringInsideArray(c.getName(), args) || args.length == 3) { if (Util.isStringInsideArray(c.getName(), args) || args.length == 3) {
List<String> invalids = c.getInvalidSigns(); List<String> invalids = c.getInvalidSigns();
if(!invalids.isEmpty()) { if (!invalids.isEmpty()) {
items.put(c.getName(), invalids); items.put(c.getName(), invalids);
} }
} }
} }
if(items.isEmpty()) { if (items.isEmpty()) {
sender.sendMessage(Lang.NOINVALIDSIGNS.get()); sender.sendMessage(Lang.NOINVALIDSIGNS.get());
}else { } else {
sender.sendMessage(Lang.INVALIDSIGNS.get()); sender.sendMessage(Lang.INVALIDSIGNS.get());
for(Entry<String, List<String>> e : items.entrySet()) { for (Entry<String, List<String>> e : items.entrySet()) {
sender.sendMessage(" " + e.getKey()); sender.sendMessage(" " + e.getKey());
for(String s : e.getValue()) for (String s : e.getValue())
sender.sendMessage(" " + Lang.SIGN.get() + ": " + s); sender.sendMessage(" " + Lang.SIGN.get() + ": " + s);
} }
} }
return true; return true;
}else } else
return false; return false;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
switch(args.length) { switch (args.length) {
case 2: case 2:
for(String s : options) for (String s : options)
if(args[1].isEmpty() || StringUtil.startsWithIgnoreCase(s, args[1])) if (args[1].isEmpty() || StringUtil.startsWithIgnoreCase(s, args[1]))
results.add(s); results.add(s);
break; break;
case 3: case 3:
results.addAll(jm.getJailsByPrefix(args[2])); results.addAll(jm.getJailsByPrefix(args[2]));
break; break;
default: default:
if(jm.isValidJail(args[2])) if (jm.isValidJail(args[2]))
for(Cell c : jm.getJail(args[2]).getCells()) for (Cell c : jm.getJail(args[2]).getCells())
if(!Util.isStringInsideArray(c.getName(), args)) if (!Util.isStringInsideArray(c.getName(), args))
results.add(c.getName()); results.add(c.getName());
break; break;
} }

23
src/main/java/com/graywolf336/jail/command/subcommands/JailStatusCommand.java
View File

@ -1,17 +1,16 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.Util; import com.graywolf336.jail.Util;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 0, maxArgs = 0,
@ -20,17 +19,17 @@ import com.graywolf336.jail.enums.Lang;
pattern = "status|s", pattern = "status|s",
permission = "jail.usercmd.jailstatus", permission = "jail.usercmd.jailstatus",
usage = "/jail status" usage = "/jail status"
) )
public class JailStatusCommand implements Command{ public class JailStatusCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
Player pl = (Player) sender; Player pl = (Player) sender;
if(jm.isPlayerJailed(pl.getUniqueId())) { if (jm.isPlayerJailed(pl.getUniqueId())) {
Prisoner p = jm.getPrisoner(pl.getUniqueId()); Prisoner p = jm.getPrisoner(pl.getUniqueId());
//They are jailed, so let's tell them some information //They are jailed, so let's tell them some information
sender.sendMessage(Lang.STATUS.get(new String[] { p.getReason(), p.getJailer(), String.valueOf(p.getRemainingTimeInMinutes()), Util.getDurationBreakdown(p.getRemainingTime()) })); sender.sendMessage(Lang.STATUS.get(p.getReason(), p.getJailer(), String.valueOf(p.getRemainingTimeInMinutes()), Util.getDurationBreakdown(p.getRemainingTime())));
}else { } else {
//the sender of the command is not jailed, tell them that //the sender of the command is not jailed, tell them that
sender.sendMessage(Lang.YOUARENOTJAILED.get()); sender.sendMessage(Lang.YOUARENOTJAILED.get());
} }
@ -38,7 +37,7 @@ public class JailStatusCommand implements Command{
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
//Checking your jail status doesn't require tab completion //Checking your jail status doesn't require tab completion
return Collections.emptyList(); return Collections.emptyList();
} }

25
src/main/java/com/graywolf336/jail/command/subcommands/JailStickCommand.java
View File

@ -1,16 +1,15 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.enums.Settings; import com.graywolf336.jail.enums.Settings;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 0, maxArgs = 0,
@ -19,25 +18,25 @@ import com.graywolf336.jail.enums.Settings;
pattern = "stick", pattern = "stick",
permission = "jail.usercmd.jailstick", permission = "jail.usercmd.jailstick",
usage = "/jail stick" usage = "/jail stick"
) )
public class JailStickCommand implements Command { public class JailStickCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception { public boolean execute(JailManager jm, CommandSender sender, String... args) {
if(jm.getPlugin().getConfig().getBoolean(Settings.JAILSTICKENABLED.getPath())) { if (jm.getPlugin().getConfig().getBoolean(Settings.JAILSTICKENABLED.getPath())) {
boolean using = jm.getPlugin().getJailStickManager().toggleUsingStick(((Player) sender).getUniqueId()); boolean using = jm.getPlugin().getJailStickManager().toggleUsingStick(((Player) sender).getUniqueId());
if(using) { if (using) {
sender.sendMessage(Lang.JAILSTICKENABLED.get()); sender.sendMessage(Lang.JAILSTICKENABLED.get());
}else { } else {
sender.sendMessage(Lang.JAILSTICKDISABLED.get()); sender.sendMessage(Lang.JAILSTICKDISABLED.get());
} }
}else { } else {
sender.sendMessage(Lang.JAILSTICKUSAGEDISABLED.get()); sender.sendMessage(Lang.JAILSTICKUSAGEDISABLED.get());
} }
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
//Nothing to tab complete on jail stick //Nothing to tab complete on jail stick
return Collections.emptyList(); return Collections.emptyList();
} }

21
src/main/java/com/graywolf336/jail/command/subcommands/JailStopCommand.java
View File

@ -1,14 +1,13 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.Collections;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 0, maxArgs = 0,
@ -17,31 +16,31 @@ import com.graywolf336.jail.command.CommandInfo;
pattern = "stop", pattern = "stop",
permission = "jail.command.jailstop", permission = "jail.command.jailstop",
usage = "/jail stop" usage = "/jail stop"
) )
public class JailStopCommand implements Command { public class JailStopCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
boolean nothing = true; boolean nothing = true;
if(jm.isCreatingACell(sender.getName())) { if (jm.isCreatingACell(sender.getName())) {
jm.removeCellCreationPlayer(sender.getName()); jm.removeCellCreationPlayer(sender.getName());
sender.sendMessage(ChatColor.RED + "You have stopped creating cells."); sender.sendMessage(ChatColor.RED + "You have stopped creating cells.");
nothing = false; nothing = false;
} }
if(jm.isCreatingAJail(sender.getName())) { if (jm.isCreatingAJail(sender.getName())) {
jm.removeJailCreationPlayer(sender.getName()); jm.removeJailCreationPlayer(sender.getName());
sender.sendMessage(ChatColor.RED + "You have stopped creating a jail."); sender.sendMessage(ChatColor.RED + "You have stopped creating a jail.");
nothing = false; nothing = false;
} }
if(nothing) { if (nothing) {
sender.sendMessage(ChatColor.RED + "You've stopped creating....nothing."); sender.sendMessage(ChatColor.RED + "You've stopped creating....nothing.");
} }
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
//no tab completion required for stop command //no tab completion required for stop command
return Collections.emptyList(); return Collections.emptyList();
} }

50
src/main/java/com/graywolf336/jail/command/subcommands/JailTeleInCommand.java
View File

@ -1,18 +1,17 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 2, maxArgs = 2,
@ -21,35 +20,34 @@ import com.graywolf336.jail.enums.Lang;
pattern = "teleportin|telein", pattern = "teleportin|telein",
permission = "jail.command.jailtelein", permission = "jail.command.jailtelein",
usage = "/jail telein [jail] (name)" usage = "/jail telein [jail] (name)"
) )
public class JailTeleInCommand implements Command { public class JailTeleInCommand implements Command {
@SuppressWarnings("deprecation") public boolean execute(JailManager jm, CommandSender sender, String... args) {
public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception {
Jail j = jm.getJail(args[1]); Jail j = jm.getJail(args[1]);
//The jail doesn't exist //The jail doesn't exist
if(j == null) { if (j == null) {
sender.sendMessage(Lang.NOJAIL.get(args[1])); sender.sendMessage(Lang.NOJAIL.get(args[1]));
}else { } else {
//The jail does exist //The jail does exist
//now let's check the size of the command //now let's check the size of the command
//if it has two args then someone is sending someone else in //if it has two args then someone is sending someone else in
//otherwise it is just the sender going in //otherwise it is just the sender going in
if(args.length == 3) { if (args.length == 3) {
Player p = jm.getPlugin().getServer().getPlayer(args[2]); Player p = jm.getPlugin().getServer().getPlayer(args[2]);
//If the player they're trying to send is offline, don't do anything //If the player they're trying to send is offline, don't do anything
if(p == null) { if (p == null) {
sender.sendMessage(Lang.PLAYERNOTONLINE.get(args[2])); sender.sendMessage(Lang.PLAYERNOTONLINE.get(args[2]));
}else { } else {
p.teleport(j.getTeleportIn()); p.teleport(j.getTeleportIn());
sender.sendMessage(Lang.TELEIN.get(new String[] { args[2], args[1] })); sender.sendMessage(Lang.TELEIN.get(args[2], args[1]));
} }
}else { } else {
if(sender instanceof Player) { if (sender instanceof Player) {
((Player) sender).teleport(j.getTeleportIn()); ((Player) sender).teleport(j.getTeleportIn());
sender.sendMessage(Lang.TELEIN.get(new String[] { sender.getName(), args[1] })); sender.sendMessage(Lang.TELEIN.get(sender.getName(), args[1]));
}else { } else {
sender.sendMessage(Lang.PLAYERCONTEXTREQUIRED.get()); sender.sendMessage(Lang.PLAYERCONTEXTREQUIRED.get());
} }
} }
@ -58,15 +56,15 @@ public class JailTeleInCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
switch(args.length) { switch (args.length) {
case 2: case 2:
return jm.getJailsByPrefix(args[1]); return jm.getJailsByPrefix(args[1]);
case 3: case 3:
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
for(Player p : jm.getPlugin().getServer().getOnlinePlayers()) for (Player p : jm.getPlugin().getServer().getOnlinePlayers())
if(args[2].isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), args[2])) if (args[2].isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), args[2]))
results.add(p.getName()); results.add(p.getName());
Collections.sort(results); Collections.sort(results);

50
src/main/java/com/graywolf336/jail/command/subcommands/JailTeleOutCommand.java
View File

@ -1,18 +1,17 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 2, maxArgs = 2,
@ -21,35 +20,34 @@ import com.graywolf336.jail.enums.Lang;
pattern = "teleportout|teleout", pattern = "teleportout|teleout",
permission = "jail.command.jailteleout", permission = "jail.command.jailteleout",
usage = "/jail teleout [jail] (name)" usage = "/jail teleout [jail] (name)"
) )
public class JailTeleOutCommand implements Command { public class JailTeleOutCommand implements Command {
@SuppressWarnings("deprecation") public boolean execute(JailManager jm, CommandSender sender, String... args) {
public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception {
Jail j = jm.getJail(args[1]); Jail j = jm.getJail(args[1]);
//The jail doesn't exist //The jail doesn't exist
if(j == null) { if (j == null) {
sender.sendMessage(Lang.NOJAIL.get(args[1])); sender.sendMessage(Lang.NOJAIL.get(args[1]));
}else { } else {
//The jail does exist //The jail does exist
//now let's check the size of the command //now let's check the size of the command
//if it has two args then someone is sending someone else in //if it has two args then someone is sending someone else in
//otherwise it is just the sender going in //otherwise it is just the sender going in
if(args.length == 3) { if (args.length == 3) {
Player p = jm.getPlugin().getServer().getPlayer(args[2]); Player p = jm.getPlugin().getServer().getPlayer(args[2]);
//If the player they're trying to send is offline, don't do anything //If the player they're trying to send is offline, don't do anything
if(p == null) { if (p == null) {
sender.sendMessage(Lang.PLAYERNOTONLINE.get(args[2])); sender.sendMessage(Lang.PLAYERNOTONLINE.get(args[2]));
}else { } else {
p.teleport(j.getTeleportFree()); p.teleport(j.getTeleportFree());
sender.sendMessage(Lang.TELEOUT.get(new String[] { args[2], args[1] })); sender.sendMessage(Lang.TELEOUT.get(args[2], args[1]));
} }
}else { } else {
if(sender instanceof Player) { if (sender instanceof Player) {
((Player) sender).teleport(j.getTeleportFree()); ((Player) sender).teleport(j.getTeleportFree());
sender.sendMessage(Lang.TELEOUT.get(new String[] { sender.getName(), args[1] })); sender.sendMessage(Lang.TELEOUT.get(sender.getName(), args[1]));
}else { } else {
sender.sendMessage(Lang.PLAYERCONTEXTREQUIRED.get()); sender.sendMessage(Lang.PLAYERCONTEXTREQUIRED.get());
} }
} }
@ -58,15 +56,15 @@ public class JailTeleOutCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
switch(args.length) { switch (args.length) {
case 2: case 2:
return jm.getJailsByPrefix(args[1]); return jm.getJailsByPrefix(args[1]);
case 3: case 3:
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
for(Player p : jm.getPlugin().getServer().getOnlinePlayers()) for (Player p : jm.getPlugin().getServer().getOnlinePlayers())
if(args[2].isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), args[2])) if (args[2].isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), args[2]))
results.add(p.getName()); results.add(p.getName());
Collections.sort(results); Collections.sort(results);

53
src/main/java/com/graywolf336/jail/command/subcommands/JailTimeCommand.java
View File

@ -1,18 +1,17 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.Util; import com.graywolf336.jail.Util;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 3, maxArgs = 3,
@ -21,57 +20,57 @@ import com.graywolf336.jail.enums.Lang;
pattern = "time|t", pattern = "time|t",
permission = "jail.command.jailtime", permission = "jail.command.jailtime",
usage = "/jail time [add|remove|set|show] [name] <time>" usage = "/jail time [add|remove|set|show] [name] <time>"
) )
public class JailTimeCommand implements Command { public class JailTimeCommand implements Command {
private static final String[] options = new String[] { "add", "remove", "set", "show" }; private static final String[] options = new String[]{"add", "remove", "set", "show"};
public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception { public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception {
if(jm.isPlayerJailedByLastKnownUsername(args[2])) { if (jm.isPlayerJailedByLastKnownUsername(args[2])) {
Prisoner p = jm.getPrisonerByLastKnownName(args[2]); Prisoner p = jm.getPrisonerByLastKnownName(args[2]);
switch(args.length) { switch (args.length) {
case 3: case 3:
if(args[1].equalsIgnoreCase("show")) { if (args[1].equalsIgnoreCase("show")) {
sender.sendMessage(Lang.PRISONERSTIME.get(new String[] { p.getLastKnownName(), String.valueOf(p.getRemainingTimeInMinutes()) })); sender.sendMessage(Lang.PRISONERSTIME.get(p.getLastKnownName(), String.valueOf(p.getRemainingTimeInMinutes())));
}else { } else {
return false; return false;
} }
break; break;
case 4: case 4:
if(args[1].equalsIgnoreCase("add")) { if (args[1].equalsIgnoreCase("add")) {
p.addTime(Util.getTime(args[3])); p.addTime(Util.getTime(args[3]));
}else if(args[1].equalsIgnoreCase("remove")) { } else if (args[1].equalsIgnoreCase("remove")) {
p.subtractTime(Util.getTime(args[3])); p.subtractTime(Util.getTime(args[3]));
}else if(args[1].equalsIgnoreCase("set")) { } else if (args[1].equalsIgnoreCase("set")) {
p.setRemainingTime(Util.getTime(args[3])); p.setRemainingTime(Util.getTime(args[3]));
}else { } else {
return false; return false;
} }
sender.sendMessage(Lang.PRISONERSTIME.get(new String[] { p.getLastKnownName(), String.valueOf(p.getRemainingTimeInMinutes()) })); sender.sendMessage(Lang.PRISONERSTIME.get(p.getLastKnownName(), String.valueOf(p.getRemainingTimeInMinutes())));
break; break;
default: default:
return false; return false;
} }
}else { } else {
sender.sendMessage(Lang.NOTJAILED.get(args[2])); sender.sendMessage(Lang.NOTJAILED.get(args[2]));
} }
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
switch(args.length) { switch (args.length) {
case 2: case 2:
for(String s : options) for (String s : options)
if(args[1].isEmpty() || StringUtil.startsWithIgnoreCase(s, args[1])) if (args[1].isEmpty() || StringUtil.startsWithIgnoreCase(s, args[1]))
results.add(s); results.add(s);
break; break;
case 3: case 3:
for(Prisoner p : jm.getAllPrisoners().values()) for (Prisoner p : jm.getAllPrisoners().values())
if(StringUtil.startsWithIgnoreCase(p.getLastKnownName(), args[2])) if (StringUtil.startsWithIgnoreCase(p.getLastKnownName(), args[2]))
results.add(p.getLastKnownName()); results.add(p.getLastKnownName());
break; break;
default: default:

41
src/main/java/com/graywolf336/jail/command/subcommands/JailTransferAllCommand.java
View File

@ -1,19 +1,18 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.command.CommandSender;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 2, maxArgs = 2,
@ -22,10 +21,10 @@ import com.graywolf336.jail.enums.Lang;
pattern = "transferall|transall|ta", pattern = "transferall|transall|ta",
permission = "jail.command.jailtransferall", permission = "jail.command.jailtransferall",
usage = "/jail transferall [current] [target]" usage = "/jail transferall [current] [target]"
) )
public class JailTransferAllCommand implements Command { public class JailTransferAllCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception { public boolean execute(JailManager jm, CommandSender sender, String... args) {
if(jm.getJails().isEmpty()) { if (jm.getJails().isEmpty()) {
sender.sendMessage(Lang.NOJAILS.get()); sender.sendMessage(Lang.NOJAILS.get());
return true; return true;
} }
@ -33,10 +32,10 @@ public class JailTransferAllCommand implements Command {
jm.getPlugin().debug("Starting to transfer everyone from '" + args[1] + "' into '" + args[2] + "'."); jm.getPlugin().debug("Starting to transfer everyone from '" + args[1] + "' into '" + args[2] + "'.");
//Check if the oldjail is not a valid jail //Check if the oldjail is not a valid jail
if(!jm.isValidJail(args[1])) { if (!jm.isValidJail(args[1])) {
sender.sendMessage(Lang.NOJAIL.get(args[1])); sender.sendMessage(Lang.NOJAIL.get(args[1]));
return true; return true;
}else if(!jm.isValidJail(args[2])) { } else if (!jm.isValidJail(args[2])) {
//Check if the targetjail is a valid jail as well //Check if the targetjail is a valid jail as well
sender.sendMessage(Lang.NOJAIL.get(args[2])); sender.sendMessage(Lang.NOJAIL.get(args[2]));
return true; return true;
@ -45,28 +44,28 @@ public class JailTransferAllCommand implements Command {
jm.getPlugin().debug("Sending the transferring off, jail checks all came clean."); jm.getPlugin().debug("Sending the transferring off, jail checks all came clean.");
Jail old = jm.getJail(args[1]); Jail old = jm.getJail(args[1]);
HashSet<Prisoner> oldPrisoners = new HashSet<Prisoner>(old.getAllPrisoners().values()); HashSet<Prisoner> oldPrisoners = new HashSet<>(old.getAllPrisoners().values());
//Transfer all the prisoners //Transfer all the prisoners
for(Prisoner p : oldPrisoners) { for (Prisoner p : oldPrisoners) {
jm.getPlugin().getPrisonerManager().transferPrisoner(old, old.getCellPrisonerIsIn(p.getUUID()), jm.getJail(args[2]), null, p); jm.getPlugin().getPrisonerManager().transferPrisoner(old, old.getCellPrisonerIsIn(p.getUUID()), jm.getJail(args[2]), null, p);
} }
//Send the messages to the sender when completed //Send the messages to the sender when completed
sender.sendMessage(Lang.TRANSFERALLCOMPLETE.get(new String[] { old.getName(), args[2] })); sender.sendMessage(Lang.TRANSFERALLCOMPLETE.get(old.getName(), args[2]));
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
switch(args.length) { switch (args.length) {
case 2: case 2:
return jm.getJailsByPrefix(args[1]); return jm.getJailsByPrefix(args[1]);
case 3: case 3:
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
for(Jail j : jm.getJails()) for (Jail j : jm.getJails())
if(!j.getName().equalsIgnoreCase(args[1]) && (args[2].isEmpty() || StringUtil.startsWithIgnoreCase(j.getName(), args[2]))) if (!j.getName().equalsIgnoreCase(args[1]) && (args[2].isEmpty() || StringUtil.startsWithIgnoreCase(j.getName(), args[2])))
results.add(j.getName()); results.add(j.getName());
Collections.sort(results); Collections.sort(results);

112
src/main/java/com/graywolf336/jail/command/subcommands/JailTransferCommand.java
View File

@ -1,17 +1,5 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import org.apache.commons.lang3.ArrayUtils;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.Util; import com.graywolf336.jail.Util;
import com.graywolf336.jail.beans.Cell; import com.graywolf336.jail.beans.Cell;
@ -24,6 +12,17 @@ import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.events.PrePrisonerTransferredEvent; import com.graywolf336.jail.events.PrePrisonerTransferredEvent;
import com.lexicalscope.jewel.cli.ArgumentValidationException; import com.lexicalscope.jewel.cli.ArgumentValidationException;
import com.lexicalscope.jewel.cli.CliFactory; import com.lexicalscope.jewel.cli.CliFactory;
import org.apache.commons.lang.ArrayUtils;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 6, maxArgs = 6,
@ -32,36 +31,36 @@ import com.lexicalscope.jewel.cli.CliFactory;
pattern = "transfer|trans", pattern = "transfer|trans",
permission = "jail.command.jailtransfer", permission = "jail.command.jailtransfer",
usage = "/jail transfer [-p player] (-j jail) (-c cell)" usage = "/jail transfer [-p player] (-j jail) (-c cell)"
) )
public class JailTransferCommand implements Command { public class JailTransferCommand implements Command {
private List<String> commands = Arrays.asList(new String[] { "p", "j", "c" }); private final List<String> commands = Arrays.asList("p", "j", "c");
public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception { public boolean execute(JailManager jm, CommandSender sender, String... args) {
if(jm.getJails().isEmpty()) { if (jm.getJails().isEmpty()) {
sender.sendMessage(Lang.NOJAILS.get()); sender.sendMessage(Lang.NOJAILS.get());
return true; return true;
} }
//Convert to a List<String> so we can edit the list //Convert to a List<String> so we can edit the list
List<String> arguments = new LinkedList<String>(Arrays.asList(args)); List<String> arguments = new LinkedList<>(Arrays.asList(args));
//remove the first argument of "transfer" //remove the first argument of "transfer"
arguments.remove(0); arguments.remove(0);
//Parse the command //Parse the command
Transfer params = null; Transfer params;
try { try {
params = CliFactory.parseArguments(Transfer.class, arguments.toArray(new String[arguments.size()])); params = CliFactory.parseArguments(Transfer.class, arguments.toArray(new String[0]));
}catch(ArgumentValidationException e) { } catch (ArgumentValidationException e) {
sender.sendMessage(ChatColor.RED + e.getMessage()); sender.sendMessage(ChatColor.RED + e.getMessage());
return true; return true;
} }
//Verify they gave us a player and if so check if they're jailed //Verify they gave us a player and if so check if they're jailed
if(params.getPlayer() == null) { if (params.getPlayer() == null) {
sender.sendMessage(Lang.PROVIDEAPLAYER.get(Lang.TRANSFERRING)); sender.sendMessage(Lang.PROVIDEAPLAYER.get(Lang.TRANSFERRING));
return true; return true;
}else if(!jm.isPlayerJailedByLastKnownUsername(params.getPlayer())) { } else if (!jm.isPlayerJailedByLastKnownUsername(params.getPlayer())) {
sender.sendMessage(Lang.NOTJAILED.get(params.getPlayer())); sender.sendMessage(Lang.NOTJAILED.get(params.getPlayer()));
return true; return true;
} }
@ -69,10 +68,10 @@ public class JailTransferCommand implements Command {
jm.getPlugin().debug("Checking everything before we transfer: " + params.getPlayer()); jm.getPlugin().debug("Checking everything before we transfer: " + params.getPlayer());
//If they didn't provide a jail, tell them we need one //If they didn't provide a jail, tell them we need one
if(params.getJail() == null) { if (params.getJail() == null) {
sender.sendMessage(Lang.PROVIDEAJAIL.get(Lang.TRANSFERRING)); sender.sendMessage(Lang.PROVIDEAJAIL.get(Lang.TRANSFERRING));
return true; return true;
}else if(!jm.isValidJail(params.getJail())) { } else if (!jm.isValidJail(params.getJail())) {
//Check if the jail they did provided is not a valid jail //Check if the jail they did provided is not a valid jail
sender.sendMessage(Lang.NOJAIL.get(params.getJail())); sender.sendMessage(Lang.NOJAIL.get(params.getJail()));
return true; return true;
@ -84,22 +83,22 @@ public class JailTransferCommand implements Command {
Cell targetCell = null; Cell targetCell = null;
//Check if they provided a cell and if so does it exist //Check if they provided a cell and if so does it exist
if(params.getCell() != null) { if (params.getCell() != null) {
if(target.getCell(params.getCell()) == null) { if (target.getCell(params.getCell()) == null) {
sender.sendMessage(Lang.NOCELL.get(new String[] { params.getCell(), params.getJail() })); sender.sendMessage(Lang.NOCELL.get(params.getCell(), params.getJail()));
return true; return true;
}else { } else {
//Store the cell for easy of access and also check if it already is full //Store the cell for easy of access and also check if it already is full
targetCell = target.getCell(params.getCell()); targetCell = target.getCell(params.getCell());
if(targetCell.hasPrisoner()) { if (targetCell.hasPrisoner()) {
//If the cell has a prisoner, don't allow jailing them to that particular cell //If the cell has a prisoner, don't allow jailing them to that particular cell
sender.sendMessage(Lang.CELLNOTEMPTY.get(params.getCell())); sender.sendMessage(Lang.CELLNOTEMPTY.get(params.getCell()));
//But suggest the first empty cell we find //But suggest the first empty cell we find
Cell suggestedCell = jm.getJail(params.getCell()).getFirstEmptyCell(); Cell suggestedCell = jm.getJail(params.getCell()).getFirstEmptyCell();
if(suggestedCell != null) { if (suggestedCell != null) {
sender.sendMessage(Lang.SUGGESTEDCELL.get(new String[] { params.getCell(), suggestedCell.getName() })); sender.sendMessage(Lang.SUGGESTEDCELL.get(params.getCell(), suggestedCell.getName()));
}else { } else {
sender.sendMessage(Lang.NOEMPTYCELLS.get(params.getCell())); sender.sendMessage(Lang.NOEMPTYCELLS.get(params.getCell()));
} }
@ -117,11 +116,11 @@ public class JailTransferCommand implements Command {
target, targetCell, p, jm.getPlugin().getServer().getPlayer(p.getUUID()), sender.getName()); target, targetCell, p, jm.getPlugin().getServer().getPlayer(p.getUUID()), sender.getName());
jm.getPlugin().getServer().getPluginManager().callEvent(event); jm.getPlugin().getServer().getPluginManager().callEvent(event);
if(event.isCancelled()) { if (event.isCancelled()) {
if(event.getCancelledMessage().isEmpty()) { if (event.getCancelledMessage().isEmpty()) {
//The plugin didn't provide a cancel message/reason so send the default one //The plugin didn't provide a cancel message/reason so send the default one
sender.sendMessage(Lang.TRANSFERCANCELLEDBYANOTHERPLUGIN.get(params.getPlayer())); sender.sendMessage(Lang.TRANSFERCANCELLEDBYANOTHERPLUGIN.get(params.getPlayer()));
}else { } else {
sender.sendMessage(event.getCancelledMessage()); sender.sendMessage(event.getCancelledMessage());
} }
@ -134,44 +133,45 @@ public class JailTransferCommand implements Command {
target, targetCell, p); target, targetCell, p);
//Send the messages to the sender, if no cell then say that but if cell send that as well //Send the messages to the sender, if no cell then say that but if cell send that as well
if(targetCell == null) { if (targetCell == null) {
sender.sendMessage(Lang.TRANSFERCOMPLETENOCELL.get(new String[] { params.getPlayer(), target.getName() })); sender.sendMessage(Lang.TRANSFERCOMPLETENOCELL.get(params.getPlayer(), target.getName()));
}else { } else {
sender.sendMessage(Lang.TRANSFERCOMPLETECELL.get(new String[] { params.getPlayer(), target.getName(), targetCell.getName() })); sender.sendMessage(Lang.TRANSFERCOMPLETECELL.get(params.getPlayer(), target.getName(), targetCell.getName()));
} }
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
//by the time it gets to this command it'll have at least two arguments //by the time it gets to this command it'll have at least two arguments
String last = args[args.length - 1]; String last = args[args.length - 1];
if(last.isEmpty() || !commands.contains(last.replace("-", ""))) { if (last.isEmpty() || !commands.contains(last.replace("-", ""))) {
//the current part is empty. Need to look at their previous //the current part is empty. Need to look at their previous
//item and if it is a valid option, then provide them a valid tab complete option //item and if it is a valid option, then provide them a valid tab complete option
if(args.length - 2 > -1) { if (args.length - 2 > -1) {
String previous = args[args.length - 2]; String previous = args[args.length - 2];
jm.getPlugin().debug("args[args.length - 2]: " + previous); jm.getPlugin().debug("args[args.length - 2]: " + previous);
if(previous.equalsIgnoreCase("-p")) return getPlayers(jm, last); if (previous.equalsIgnoreCase("-p")) return getPlayers(jm, last);
else if(previous.equalsIgnoreCase("-j")) return jm.getJailsByPrefix(last); else if (previous.equalsIgnoreCase("-j")) return jm.getJailsByPrefix(last);
else if(previous.equalsIgnoreCase("-c")) { else if (previous.equalsIgnoreCase("-c")) {
//Since we need to give them a list of the cells in a jail //Since we need to give them a list of the cells in a jail
//we need to get the jail they're giving //we need to get the jail they're giving
int jailIndex = ArrayUtils.indexOf(args, "-j"); int jailIndex = ArrayUtils.indexOf(args, "-j");
if(jailIndex != -1) { if (jailIndex != -1) {
String jail = args[jailIndex + 1]; String jail = args[jailIndex + 1];
jm.getPlugin().debug("The jail is: " + jail); jm.getPlugin().debug("The jail is: " + jail);
if(jm.isValidJail(jail)) return getCells(jm, jail, last); if (jm.isValidJail(jail)) return getCells(jm, jail, last);
} }
}else if(!commands.contains(args[args.length - 2].replace("-", ""))) return Util.getUnusedItems(commands, args, true); } else if (!commands.contains(args[args.length - 2].replace("-", "")))
return Util.getUnusedItems(commands, args, true);
} }
}else if(last.equalsIgnoreCase("-")) { } else if (last.equalsIgnoreCase("-")) {
//add some smart checking so that it only returns a list of what isn't already //add some smart checking so that it only returns a list of what isn't already
//in the command :) //in the command :)
return Util.getUnusedItems(commands, args, true); return Util.getUnusedItems(commands, args, true);
}else { } else {
return getPlayers(jm, last); return getPlayers(jm, last);
} }
@ -179,10 +179,10 @@ public class JailTransferCommand implements Command {
} }
private List<String> getPlayers(JailManager jm, String first) { private List<String> getPlayers(JailManager jm, String first) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
for(Player p : jm.getPlugin().getServer().getOnlinePlayers()) for (Player p : jm.getPlugin().getServer().getOnlinePlayers())
if(first.isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), first)) if (first.isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), first))
results.add(p.getName()); results.add(p.getName());
Collections.sort(results); Collections.sort(results);
@ -191,10 +191,10 @@ public class JailTransferCommand implements Command {
} }
private List<String> getCells(JailManager jm, String jail, String cell) { private List<String> getCells(JailManager jm, String jail, String cell) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
for(Cell c : jm.getJail(jail).getCells()) for (Cell c : jm.getJail(jail).getCells())
if(!c.hasPrisoner() && (cell.isEmpty() || StringUtil.startsWithIgnoreCase(c.getName(), cell))) if (!c.hasPrisoner() && (cell.isEmpty() || StringUtil.startsWithIgnoreCase(c.getName(), cell)))
results.add(c.getName()); results.add(c.getName());
Collections.sort(results); Collections.sort(results);

13
src/main/java/com/graywolf336/jail/command/subcommands/JailVersionCommand.java
View File

@ -1,13 +1,12 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.command.Command; import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import org.bukkit.command.CommandSender;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 0, maxArgs = 0,
@ -16,7 +15,7 @@ import com.graywolf336.jail.command.CommandInfo;
pattern = "version|ver", 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) {
@ -26,7 +25,7 @@ public class JailVersionCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
//no tab completion required for version command //no tab completion required for version command
return Collections.emptyList(); return Collections.emptyList();
} }

84
src/main/java/com/graywolf336/jail/command/subcommands/JailVoteCommand.java
View File

@ -1,13 +1,5 @@
package com.graywolf336.jail.command.subcommands; package com.graywolf336.jail.command.subcommands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.JailVoteManager; import com.graywolf336.jail.JailVoteManager;
import com.graywolf336.jail.beans.JailVote; import com.graywolf336.jail.beans.JailVote;
@ -15,6 +7,13 @@ import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo; import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.enums.Settings; import com.graywolf336.jail.enums.Settings;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@CommandInfo( @CommandInfo(
maxArgs = 2, maxArgs = 2,
@ -23,41 +22,40 @@ import com.graywolf336.jail.enums.Settings;
pattern = "vote|v", pattern = "vote|v",
permission = "jail.usercmd.jailvote", permission = "jail.usercmd.jailvote",
usage = "/jail vote [player] (yes|no)" usage = "/jail vote [player] (yes|no)"
) )
public class JailVoteCommand implements Command { public class JailVoteCommand implements Command {
private static final String[] options = new String[] { "yes", "no" }; private static final String[] options = new String[]{"yes", "no"};
@SuppressWarnings("deprecation")
public boolean execute(JailManager jm, CommandSender sender, String... args) { public boolean execute(JailManager jm, CommandSender sender, String... args) {
if(jm.getPlugin().getConfig().getBoolean(Settings.JAILVOTEENABLED.getPath()) && jm.getPlugin().getJailVoteManager() != null && !jm.getJails().isEmpty()) { if (jm.getPlugin().getConfig().getBoolean(Settings.JAILVOTEENABLED.getPath()) && jm.getPlugin().getJailVoteManager() != null && !jm.getJails().isEmpty()) {
Player p = (Player) sender; Player p = (Player) sender;
JailVoteManager jvm = jm.getPlugin().getJailVoteManager(); JailVoteManager jvm = jm.getPlugin().getJailVoteManager();
switch(args.length) { switch (args.length) {
case 2: case 2:
if(jvm.isVotedFor(args[1])) { if (jvm.isVotedFor(args[1])) {
if(jvm.hasVotedAlready(args[1], p.getUniqueId())) { if (jvm.hasVotedAlready(args[1], p.getUniqueId())) {
sender.sendMessage(Lang.VOTEALREADYVOTEDFOR.get(args[1])); sender.sendMessage(Lang.VOTEALREADYVOTEDFOR.get(args[1]));
}else { } else {
if(jvm.addVote(args[1], p.getUniqueId(), true)) { if (jvm.addVote(args[1], p.getUniqueId(), true)) {
sender.sendMessage(Lang.VOTEYESSUCCESS.get(args[1])); sender.sendMessage(Lang.VOTEYESSUCCESS.get(args[1]));
}else { } else {
sender.sendMessage(Lang.VOTEUNSUCCESSFUL.get()); sender.sendMessage(Lang.VOTEUNSUCCESSFUL.get());
} }
} }
}else if(sender.hasPermission("jail.vote.start")) { } else if (sender.hasPermission("jail.vote.start")) {
Player voteAgainst = jm.getPlugin().getServer().getPlayer(args[1]); Player voteAgainst = jm.getPlugin().getServer().getPlayer(args[1]);
if(voteAgainst == null) { if (voteAgainst == null) {
sender.sendMessage(Lang.PLAYERNOTONLINE.get()); sender.sendMessage(Lang.PLAYERNOTONLINE.get());
}else { } else {
if(voteAgainst.hasPermission("jail.cantbejailed")) { if (voteAgainst.hasPermission("jail.cantbejailed")) {
sender.sendMessage(Lang.CANTBEJAILED.get()); sender.sendMessage(Lang.CANTBEJAILED.get());
}else { } else {
jvm.addVote(new JailVote(voteAgainst.getName())); jvm.addVote(new JailVote(voteAgainst.getName()));
jvm.addVote(voteAgainst.getName(), p.getUniqueId(), true); jvm.addVote(voteAgainst.getName(), p.getUniqueId(), true);
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTHEADER.get()); 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.VOTEBROADCASTLINE1.get(sender.getName(), args[1]));
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE2.get(voteAgainst.getName())); jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE2.get(voteAgainst.getName()));
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE3.get(voteAgainst.getName())); jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE3.get(voteAgainst.getName()));
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE4.get(jvm.getTimerLengthDescription())); jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE4.get(jvm.getTimerLengthDescription()));
@ -66,7 +64,7 @@ public class JailVoteCommand implements Command {
jvm.scheduleCalculating(args[1]); jvm.scheduleCalculating(args[1]);
} }
} }
}else { } else {
jm.getPlugin().debug(sender.getName() + " tried to start a vote to jail someone but didn't have permission, jail.vote.start"); 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])); sender.sendMessage(Lang.VOTENOPERMISSIONTOSTART.get(args[1]));
} }
@ -74,31 +72,31 @@ public class JailVoteCommand implements Command {
case 3: case 3:
String name = args[1]; String name = args[1];
if(jvm.isVotedFor(name)) { if (jvm.isVotedFor(name)) {
if(jvm.hasVotedAlready(args[1], p.getUniqueId())) { if (jvm.hasVotedAlready(args[1], p.getUniqueId())) {
sender.sendMessage(Lang.VOTEALREADYVOTEDFOR.get(args[1])); sender.sendMessage(Lang.VOTEALREADYVOTEDFOR.get(args[1]));
}else { } else {
if(args[2].equalsIgnoreCase("yes")) { if (args[2].equalsIgnoreCase("yes")) {
jvm.addVote(args[1], p.getUniqueId(), true); jvm.addVote(args[1], p.getUniqueId(), true);
sender.sendMessage(Lang.VOTEYESSUCCESS.get(args[1])); sender.sendMessage(Lang.VOTEYESSUCCESS.get(args[1]));
}else { } else {
jvm.addVote(args[1], p.getUniqueId(), false); jvm.addVote(args[1], p.getUniqueId(), false);
sender.sendMessage(Lang.VOTENOSUCCESS.get(args[1])); sender.sendMessage(Lang.VOTENOSUCCESS.get(args[1]));
} }
} }
}else { } else {
sender.sendMessage(Lang.VOTENOVOTEFORTHATPLAYER.get(name)); sender.sendMessage(Lang.VOTENOVOTEFORTHATPLAYER.get(name));
} }
break; break;
default: default:
return false; return false;
} }
}else { } else {
sender.sendMessage(Lang.VOTENOTENABLED.get()); sender.sendMessage(Lang.VOTENOTENABLED.get());
if(jm.getPlugin().getJailVoteManager() == null) { if (jm.getPlugin().getJailVoteManager() == null) {
jm.getPlugin().getLogger().severe("Jail Vote Manager didn't load correctly, it is null."); jm.getPlugin().getLogger().severe("Jail Vote Manager didn't load correctly, it is null.");
}else if(jm.getJails().isEmpty()) { } else if (jm.getJails().isEmpty()) {
jm.getPlugin().getLogger().severe("There are no jails, Jail Vote needs a Jail to work."); jm.getPlugin().getLogger().severe("There are no jails, Jail Vote needs a Jail to work.");
} }
} }
@ -106,19 +104,19 @@ public class JailVoteCommand implements Command {
return true; return true;
} }
public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) throws Exception { public List<String> provideTabCompletions(JailManager jm, CommandSender sender, String... args) {
if(jm.getPlugin().getConfig().getBoolean(Settings.JAILVOTEENABLED.getPath()) && jm.getPlugin().getJailVoteManager() != null && !jm.getJails().isEmpty()) { if (jm.getPlugin().getConfig().getBoolean(Settings.JAILVOTEENABLED.getPath()) && jm.getPlugin().getJailVoteManager() != null && !jm.getJails().isEmpty()) {
List<String> results = new ArrayList<String>(); List<String> results = new ArrayList<>();
switch(args.length) { switch (args.length) {
case 2: case 2:
for(Player p : jm.getPlugin().getServer().getOnlinePlayers()) for (Player p : jm.getPlugin().getServer().getOnlinePlayers())
if(args[1].isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), args[1])) if (args[1].isEmpty() || StringUtil.startsWithIgnoreCase(p.getName(), args[1]))
results.add(p.getName()); results.add(p.getName());
break; break;
case 3: case 3:
for(String s : options) for (String s : options)
if(args[2].isEmpty() || StringUtil.startsWithIgnoreCase(s, args[2])) if (args[2].isEmpty() || StringUtil.startsWithIgnoreCase(s, args[2]))
results.add(s); results.add(s);
break; break;
default: default:
@ -128,7 +126,7 @@ public class JailVoteCommand implements Command {
Collections.sort(results); Collections.sort(results);
return results; return results;
}else { } else {
return Collections.emptyList(); return Collections.emptyList();
} }
} }

22
src/main/java/com/graywolf336/jail/enums/Confirmation.java
View File

@ -1,14 +1,24 @@
package com.graywolf336.jail.enums; package com.graywolf336.jail.enums;
public enum Confirmation { public enum Confirmation {
/** When they are clearing a jail from all their prisoner's with releasing properly. */ /**
* When they are clearing a jail from all their prisoner's with releasing properly.
*/
CLEAR, CLEAR,
/** When they are clearing a jail from all their prisoner's by force. */ /**
* When they are clearing a jail from all their prisoner's by force.
*/
CLEARFORCE, CLEARFORCE,
/** When they are deleting a cell from a jail. */ /**
* When they are deleting a cell from a jail.
*/
DELETECELL, DELETECELL,
/** When they are deleting all a jail's cells. */ /**
* When they are deleting all a jail's cells.
*/
DELETECELLS, DELETECELLS,
/** When they are deleting a jail. */ /**
DELETE; * When they are deleting a jail.
*/
DELETE
} }

36
src/main/java/com/graywolf336/jail/enums/JailVoteResult.java
View File

@ -1,22 +1,40 @@
package com.graywolf336.jail.enums; package com.graywolf336.jail.enums;
public enum JailVoteResult { public enum JailVoteResult {
/** The result when the PrePrisonerJailedEvent is cancelled. */ /**
* The result when the PrePrisonerJailedEvent is cancelled.
*/
EVENTCANCELLED, EVENTCANCELLED,
/** The result when the jailing results in an exception for some reason. */ /**
* The result when the jailing results in an exception for some reason.
*/
JAILEDEXCEPTION, JAILEDEXCEPTION,
/** The result when the jail which is picked is not enabled. */ /**
* The result when the jail which is picked is not enabled.
*/
JAILNOTENABLED, JAILNOTENABLED,
/** The result when the player who the vote is for is no longer online. */ /**
* The result when the player who the vote is for is no longer online.
*/
NOTONLINE, NOTONLINE,
/** The result when there aren't enough yes votes as configured. */ /**
* The result when there aren't enough yes votes as configured.
*/
NOTENOUGHYESVOTES, NOTENOUGHYESVOTES,
/** The result when there are no jails. */ /**
* The result when there are no jails.
*/
NOJAIL, NOJAIL,
/** The result when there are more no votes than yes votes. */ /**
* The result when there are more no votes than yes votes.
*/
NO, NO,
/** The result when the votes are tied, resulting in no jailing. */ /**
* The result when the votes are tied, resulting in no jailing.
*/
TIED, TIED,
/** The result when there are enough yes votes over no votes for the vote to be successful. */ /**
* The result when there are enough yes votes over no votes for the vote to be successful.
*/
YES YES
} }

526
src/main/java/com/graywolf336/jail/enums/Lang.java
View File

@ -5,266 +5,514 @@ import org.bukkit.configuration.file.YamlConfiguration;
public enum Lang { public enum Lang {
// actions section // actions section
/** Section for when they break a block. */ /**
* Section for when they break a block.
*/
BLOCKBREAKING("actions"), BLOCKBREAKING("actions"),
/** Section for when they place a block. */ /**
* Section for when they place a block.
*/
BLOCKPLACING("actions"), BLOCKPLACING("actions"),
/** Section for when they try to do a command that isn't whitelisted. */ /**
* Section for when they try to do a command that isn't whitelisted.
*/
COMMAND("actions"), COMMAND("actions"),
/** Section for when a player tramples a crop and protection is enabled. */ /**
* Section for when a player tramples a crop and protection is enabled.
*/
CROPTRAMPLING("actions"), CROPTRAMPLING("actions"),
/** Section for when a player interacts with a block that is blacklisted. */ /**
* Section for when a player interacts with a block that is blacklisted.
*/
INTERACTIONBLOCKS("actions"), INTERACTIONBLOCKS("actions"),
/** Section for when a player interacts with an item that is blacklisted. */ /**
* Section for when a player interacts with an item that is blacklisted.
*/
INTERACTIONITEMS("actions"), INTERACTIONITEMS("actions"),
/** Section for when a player moves outside of the jail. */ /**
* Section for when a player moves outside of the jail.
*/
MOVING("actions"), MOVING("actions"),
// Jailing section // Jailing section
/** The message displayed when players are kicked for being afk. */ /**
* The message displayed when players are kicked for being afk.
*/
AFKKICKMESSAGE("jailing"), AFKKICKMESSAGE("jailing"),
/** The message sent when jailing someone that is already jailed. */ /**
* The message sent when jailing someone that is already jailed.
*/
ALREADYJAILED("jailing"), ALREADYJAILED("jailing"),
/** The message sent when we broadcast/log the message for time below -1. */ /**
* The message sent when we broadcast/log the message for time below -1.
*/
BROADCASTMESSAGEFOREVER("jailing"), BROADCASTMESSAGEFOREVER("jailing"),
/** The message sent when we broadcast/log the message for any time above -1. */ /**
* The message sent when we broadcast/log the message for any time above -1.
*/
BROADCASTMESSAGEFORMINUTES("jailing"), BROADCASTMESSAGEFORMINUTES("jailing"),
/** The message sent to the broadcast/log the unjailing of someone. */ /**
* The message sent to the broadcast/log the unjailing of someone.
*/
BROADCASTUNJAILING("jailing"), BROADCASTUNJAILING("jailing"),
/** The message sent to the sender when trying to jail someone and a plugin cancels it but doesn't leave a message why. */ /**
* The message sent to the sender when trying to jail someone and a plugin cancels it but doesn't leave a message why.
*/
CANCELLEDBYANOTHERPLUGIN("jailing"), CANCELLEDBYANOTHERPLUGIN("jailing"),
/** The message sent when trying to jail someone who can't be jailed by permission. */ /**
* The message sent when trying to jail someone who can't be jailed by permission.
*/
CANTBEJAILED("jailing"), CANTBEJAILED("jailing"),
/** The message sent to the sender when they are trying to jail into a cell which is not empty. */ /**
* The message sent to the sender when they are trying to jail into a cell which is not empty.
*/
CELLNOTEMPTY("jailing"), CELLNOTEMPTY("jailing"),
/** The jailer set whenever a jailer is not provided. */ /**
* The jailer set whenever a jailer is not provided.
*/
DEFAULTJAILER("jailing"), DEFAULTJAILER("jailing"),
/** The message sent when someone is jailed without a reason. */ /**
* The message sent when someone is jailed without a reason.
*/
DEFAULTJAILEDREASON("jailing"), DEFAULTJAILEDREASON("jailing"),
/** The message sent when someone is unjailed yet they never came online and so they were forcefully unjailed. */ /**
* The message sent when someone is unjailed yet they never came online and so they were forcefully unjailed.
*/
FORCEUNJAILED("jailing"), FORCEUNJAILED("jailing"),
/** The message sent when players are jailed without a reason. */ /**
* The message sent when players are jailed without a reason.
*/
JAILED("jailing"), JAILED("jailing"),
/** The message sent when players are jailed with a reason. */ /**
* The message sent when players are jailed with a reason.
*/
JAILEDWITHREASON("jailing"), JAILEDWITHREASON("jailing"),
/** The message sent when players are jailed and they try to talk. */ /**
* The message sent when players are jailed and they try to talk.
*/
MUTED("jailing"), MUTED("jailing"),
/** The message sent when the sender tries to jail someone in a cell and there aren't any cells to suggest. */ /**
* The message sent when the sender tries to jail someone in a cell and there aren't any cells to suggest.
*/
NOEMPTYCELLS("jailing"), NOEMPTYCELLS("jailing"),
/** The message sent to the sender when they list all the prisoners in a jail which has no prisoners. */ /**
* The message sent to the sender when they list all the prisoners in a jail which has no prisoners.
*/
NOPRISONERS("jailing"), NOPRISONERS("jailing"),
/** The message sent when a player is not jailed and the sender is trying to see/do something about it. */ /**
* The message sent when a player is not jailed and the sender is trying to see/do something about it.
*/
NOTJAILED("jailing"), NOTJAILED("jailing"),
/** The message sent to the sender when they mute a prisoner. */ /**
* The message sent to the sender when they mute a prisoner.
*/
NOWMUTED("jailing"), NOWMUTED("jailing"),
/** The message sent to the sender when they unmute a prisoner. */ /**
* The message sent to the sender when they unmute a prisoner.
*/
NOWUNMUTED("jailing"), NOWUNMUTED("jailing"),
/** The message sent to the jailer when they jail someone offline. */ /**
* The message sent to the jailer when they jail someone offline.
*/
OFFLINEJAIL("jailing"), OFFLINEJAIL("jailing"),
/** The message sent to the jailer when they jail someone who is online. */ /**
* The message sent to the jailer when they jail someone who is online.
*/
ONLINEJAIL("jailing"), ONLINEJAIL("jailing"),
/** The message sent to the jailer when they jail someone who has never played before. */ /**
* The message sent to the jailer when they jail someone who has never played before.
*/
PLAYERHASNEVERPLAYEDBEFORE("jailing"), PLAYERHASNEVERPLAYEDBEFORE("jailing"),
/** The message sent when finding out how much time a prisoner has. */ /**
* The message sent when finding out how much time a prisoner has.
*/
PRISONERSTIME("jailing"), PRISONERSTIME("jailing"),
/** The message sent to the prisoner when they try to do something but it is protected. */ /**
* The message sent to the prisoner when they try to do something but it is protected.
*/
PROTECTIONMESSAGE("jailing"), PROTECTIONMESSAGE("jailing"),
/** The message sent to the prisoner when they try to do something and it is protected, but no penalty. */ /**
* The message sent to the prisoner when they try to do something and it is protected, but no penalty.
*/
PROTECTIONMESSAGENOPENALTY("jailing"), PROTECTIONMESSAGENOPENALTY("jailing"),
/** The message sent to the sender when they need to provide a player. */ /**
* The message sent to the sender when they need to provide a player.
*/
PROVIDEAPLAYER("jailing"), PROVIDEAPLAYER("jailing"),
/** The message sent to the sender when they need to provide a jail. */ /**
* The message sent to the sender when they need to provide a jail.
*/
PROVIDEAJAIL("jailing"), PROVIDEAJAIL("jailing"),
/** The message sent to someone trying to jail someone else with a jail stick that requires health below a certain amount. */ /**
* The message sent to someone trying to jail someone else with a jail stick that requires health below a certain amount.
*/
RESISTEDARRESTJAILER("jailing"), RESISTEDARRESTJAILER("jailing"),
/** The message sent to the person someone else is trying to jail that requires their health below a certain amount. */ /**
* The message sent to the person someone else is trying to jail that requires their health below a certain amount.
*/
RESISTEDARRESTPLAYER("jailing"), RESISTEDARRESTPLAYER("jailing"),
/** The message sent when to a prisoner about their status in jail. */ /**
* The message sent when to a prisoner about their status in jail.
*/
STATUS("jailing"), STATUS("jailing"),
/** The message sent to the sender of a command when suggesting a cell. */ /**
* The message sent to the sender of a command when suggesting a cell.
*/
SUGGESTEDCELL("jailing"), SUGGESTEDCELL("jailing"),
/** The message sent to the sender when they teleport someone to a jail's teleport in location. */ /**
* The message sent to the sender when they teleport someone to a jail's teleport in location.
*/
TELEIN("jailing"), TELEIN("jailing"),
/** The message sent to the sender when they teleport someone to a jail's teleport out location. */ /**
* The message sent to the sender when they teleport someone to a jail's teleport out location.
*/
TELEOUT("jailing"), TELEOUT("jailing"),
/** The message sent to the sender when they transfer all a jail's prisoners to another jail. */ /**
* The message sent to the sender when they transfer all a jail's prisoners to another jail.
*/
TRANSFERALLCOMPLETE("jailing"), TRANSFERALLCOMPLETE("jailing"),
/** The message sent when another plugin cancels the transferring but doesn't provide a reason why. */ /**
* The message sent when another plugin cancels the transferring but doesn't provide a reason why.
*/
TRANSFERCANCELLEDBYANOTHERPLUGIN("jailing"), TRANSFERCANCELLEDBYANOTHERPLUGIN("jailing"),
/** The message sent to the sender when they transfer someone to a jail and a cell. */ /**
* The message sent to the sender when they transfer someone to a jail and a cell.
*/
TRANSFERCOMPLETECELL("jailing"), TRANSFERCOMPLETECELL("jailing"),
/** The message sent to the sender when they transfer someone to a jail. */ /**
* The message sent to the sender when they transfer someone to a jail.
*/
TRANSFERCOMPLETENOCELL("jailing"), TRANSFERCOMPLETENOCELL("jailing"),
/** The message sent to the player when they get transferred to a new jail. */ /**
* The message sent to the player when they get transferred to a new jail.
*/
TRANSFERRED("jailing"), TRANSFERRED("jailing"),
/** The message sent when players are released from jail. */ /**
* The message sent when players are released from jail.
*/
UNJAILED("jailing"), UNJAILED("jailing"),
/** The message sent to the person who released a prisoner from jail. */ /**
* The message sent to the person who released a prisoner from jail.
*/
UNJAILSUCCESS("jailing"), UNJAILSUCCESS("jailing"),
/** The message sent when you jailing offline players is not allowed. */ /**
* The message sent when you jailing offline players is not allowed.
*/
UNALLOWEDTOJAILOFFLINE("jailing"), UNALLOWEDTOJAILOFFLINE("jailing"),
/** The message went when an offline player is unjailed. */ /**
* The message went when an offline player is unjailed.
*/
WILLBEUNJAILED("jailing"), WILLBEUNJAILED("jailing"),
/** The message sent when trying to jail a player in an unloaded world. */ /**
* The message sent when trying to jail a player in an unloaded world.
*/
WORLDUNLOADED("jailing"), WORLDUNLOADED("jailing"),
/** The message sent when a player joins and is jailed in a world that is unloaded. */ /**
* The message sent when a player joins and is jailed in a world that is unloaded.
*/
WORLDUNLOADEDKICK("jailing"), WORLDUNLOADEDKICK("jailing"),
/** The message sent to the sender when they check their jail status and they aren't jailed. */ /**
* The message sent to the sender when they check their jail status and they aren't jailed.
*/
YOUARENOTJAILED("jailing"), YOUARENOTJAILED("jailing"),
// Handcuffing section // Handcuffing section
/** The message sent to the sender when trying to handcuff someone who can't be. */ /**
* The message sent to the sender when trying to handcuff someone who can't be.
*/
CANTBEHANDCUFFED("handcuffing"), CANTBEHANDCUFFED("handcuffing"),
/** The message sent to the sender whenever they try to handcuff someone who is in jail. */ /**
* The message sent to the sender whenever they try to handcuff someone who is in jail.
*/
CURRENTLYJAILEDHANDCUFF("handcuffing", "currentlyjailed"), CURRENTLYJAILEDHANDCUFF("handcuffing", "currentlyjailed"),
/** The message sent to the sender when the player doesn't have any handcuffs. */ /**
* The message sent to the sender when the player doesn't have any handcuffs.
*/
NOTHANDCUFFED("handcuffing"), NOTHANDCUFFED("handcuffing"),
/** The message sent to the handcuff on a successful handcuffing. */ /**
* The message sent to the handcuff on a successful handcuffing.
*/
HANDCUFFSON("handcuffing"), HANDCUFFSON("handcuffing"),
/** The message sent when players are handcuffed. */ /**
* The message sent when players are handcuffed.
*/
HANDCUFFED("handcuffing"), HANDCUFFED("handcuffing"),
/** The message sent to the player who has release handcuffs. */ /**
* The message sent to the player who has release handcuffs.
*/
HANDCUFFSRELEASED("handcuffing"), HANDCUFFSRELEASED("handcuffing"),
/** The message sent when the player has his/her handcuffs removed. */ /**
* The message sent when the player has his/her handcuffs removed.
*/
UNHANDCUFFED("handcuffing"), UNHANDCUFFED("handcuffing"),
// General section, used by different parts // General section, used by different parts
/** Part message of any messages which require 'all the jails' or such. */ /**
* Part message of any messages which require 'all the jails' or such.
*/
ALLJAILS("general"), ALLJAILS("general"),
/** The one line on signs when the cell is empty. */ /**
* The one line on signs when the cell is empty.
*/
CELLEMPTYSIGN("general"), CELLEMPTYSIGN("general"),
/** The message sent to the sender whenever they try to remove a cell but was unsuccessful due to a prisoner. */ /**
* The message sent to the sender whenever they try to remove a cell but was unsuccessful due to a prisoner.
*/
CELLREMOVALUNSUCCESSFUL("general"), CELLREMOVALUNSUCCESSFUL("general"),
/** The message sent whenever a cell is successfully removed. */ /**
* The message sent whenever a cell is successfully removed.
*/
CELLREMOVED("general"), CELLREMOVED("general"),
/** The message sent when cleaning our cell signs. */ /**
* The message sent when cleaning our cell signs.
*/
CLEANEDSIGNS("general"), CLEANEDSIGNS("general"),
/** The message sent when seeing what signs are invalid. */ /**
* The message sent when seeing what signs are invalid.
*/
INVALIDSIGNS("general"), INVALIDSIGNS("general"),
/** The line on a cell's sign when the prisoner is jailed forever. */ /**
* The line on a cell's sign when the prisoner is jailed forever.
*/
JAILEDFOREVERSIGN("general"), JAILEDFOREVERSIGN("general"),
/** The simple word jailing to be put in other parts. */ /**
* The simple word jailing to be put in other parts.
*/
JAILING("general"), JAILING("general"),
/** The message sent to the sender when they try to remove a jail but there are still prisoners in there. */ /**
* The message sent to the sender when they try to remove a jail but there are still prisoners in there.
*/
JAILREMOVALUNSUCCESSFUL("general"), JAILREMOVALUNSUCCESSFUL("general"),
/** The message sent whenever a jail is successfully removed. */ /**
* The message sent whenever a jail is successfully removed.
*/
JAILREMOVED("general"), JAILREMOVED("general"),
/** The message sent whenever a player toggles using jail stick to disabled. */ /**
* The message sent whenever a player toggles using jail stick to disabled.
*/
JAILSTICKDISABLED("general"), JAILSTICKDISABLED("general"),
/** The message sent whenever a player toggles using jail stick to enabled. */ /**
* The message sent whenever a player toggles using jail stick to enabled.
*/
JAILSTICKENABLED("general"), JAILSTICKENABLED("general"),
/** The message sent whenever a player tries to toggle using jail stick but the config has it disabled. */ /**
* The message sent whenever a player tries to toggle using jail stick but the config has it disabled.
*/
JAILSTICKUSAGEDISABLED("general"), JAILSTICKUSAGEDISABLED("general"),
/** Message sent when doing something that requires a cell but the given name of a cell doesn't exist. */ /**
* Message sent when doing something that requires a cell but the given name of a cell doesn't exist.
*/
NOCELL("general"), NOCELL("general"),
/** Message sent when needing a cell or something and there are no cells. */ /**
* Message sent when needing a cell or something and there are no cells.
*/
NOCELLS("general"), NOCELLS("general"),
/** Message sent when no invalid signs were found. */ /**
* Message sent when no invalid signs were found.
*/
NOINVALIDSIGNS("general"), NOINVALIDSIGNS("general"),
/** The message sent whenever the sender does something which the jail does not found. */ /**
* The message sent whenever the sender does something which the jail does not found.
*/
NOJAIL("general"), NOJAIL("general"),
/** The message sent whenever the sender does something and there are no jails. */ /**
* The message sent whenever the sender does something and there are no jails.
*/
NOJAILS("general"), NOJAILS("general"),
/** The message sent whenever the sender/player doesn't have permission. */ /**
* The message sent whenever the sender/player doesn't have permission.
*/
NOPERMISSION("general"), NOPERMISSION("general"),
/** The message sent whenever the sender/player supplies a number format that is incorrect. */ /**
* The message sent whenever the sender/player supplies a number format that is incorrect.
*/
NUMBERFORMATINCORRECT("general"), NUMBERFORMATINCORRECT("general"),
/** The message sent whenever something is done that needs a player but doesn't have it. */ /**
* The message sent whenever something is done that needs a player but doesn't have it.
*/
PLAYERCONTEXTREQUIRED("general"), PLAYERCONTEXTREQUIRED("general"),
/** The message sent whenever an online player is required but not found. */ /**
* The message sent whenever an online player is required but not found.
*/
PLAYERNOTONLINE("general"), PLAYERNOTONLINE("general"),
/** The message sent to the sender when the plugin data has been reloaded. */ /**
* The message sent to the sender when the plugin data has been reloaded.
*/
PLUGINRELOADED("general"), PLUGINRELOADED("general"),
/** The message sent to the sender of a command when the plugin didn't start correct. */ /**
* The message sent to the sender of a command when the plugin didn't start correct.
*/
PLUGINNOTLOADED("general"), PLUGINNOTLOADED("general"),
/** The message sent whenever the prisoners are cleared from jail(s). */ /**
* The message sent whenever the prisoners are cleared from jail(s).
*/
PRISONERSCLEARED("general"), PRISONERSCLEARED("general"),
/** The format we should use when entering a record into flatfile or showing it. */ /**
* The format we should use when entering a record into flatfile or showing it.
*/
RECORDENTRY("general"), RECORDENTRY("general"),
/** The message format sent saying how many times a user has been jailed. */ /**
* The message format sent saying how many times a user has been jailed.
*/
RECORDTIMESJAILED("general"), RECORDTIMESJAILED("general"),
/** The simple word: sign. */ /**
* The simple word: sign.
*/
SIGN("general"), SIGN("general"),
/** The message sent when the signs are refreshed. */ /**
* The message sent when the signs are refreshed.
*/
SIGNSREFRESHED("general"), SIGNSREFRESHED("general"),
/** The format of the time entry we should use for the record entries. */ /**
* The format of the time entry we should use for the record entries.
*/
TIMEFORMAT("general"), TIMEFORMAT("general"),
/** The simple word transferring to be put in other parts. */ /**
* The simple word transferring to be put in other parts.
*/
TRANSFERRING("general"), TRANSFERRING("general"),
/** The message sent whenever someone does a command we don't know. */ /**
* The message sent whenever someone does a command we don't know.
*/
UNKNOWNCOMMAND("general"), UNKNOWNCOMMAND("general"),
// Jail pay // Jail pay
/** The message sent when the jail pay portion is not enabled. */ /**
* The message sent when the jail pay portion is not enabled.
*/
PAYNOTENABLED("jailpay", "notenabled"), PAYNOTENABLED("jailpay", "notenabled"),
/** The message sent when finding out how much it costs. */ /**
* The message sent when finding out how much it costs.
*/
PAYCOST("jailpay", "cost"), PAYCOST("jailpay", "cost"),
/** The message sent when finding out how much it costs and they are jailed forever. */ /**
* The message sent when finding out how much it costs and they are jailed forever.
*/
PAYCOSTINFINITE("jailpay", "costinfinite"), PAYCOSTINFINITE("jailpay", "costinfinite"),
/** The message sent when someone tries to pay a negative amount. */ /**
* The message sent when someone tries to pay a negative amount.
*/
PAYNONEGATIVEAMOUNTS("jailpay", "nonegativeamounts"), PAYNONEGATIVEAMOUNTS("jailpay", "nonegativeamounts"),
/** The message sent when someone is jailed and tries to pay for someone else. */ /**
* The message sent when someone is jailed and tries to pay for someone else.
*/
PAYCANTPAYWHILEJAILED("jailpay", "cantpayforotherswhilejailed"), PAYCANTPAYWHILEJAILED("jailpay", "cantpayforotherswhilejailed"),
/** The message sent whenever someone tries to pay an amount they don't have. */ /**
* The message sent whenever someone tries to pay an amount they don't have.
*/
PAYNOTENOUGHMONEY("jailpay", "notenoughmoney"), PAYNOTENOUGHMONEY("jailpay", "notenoughmoney"),
/** The message sent when they try to pay an amount but it isn't enough for the jailing sentence. */ /**
* The message sent when they try to pay an amount but it isn't enough for the jailing sentence.
*/
PAYNOTENOUGHMONEYPROVIDED("jailpay", "notenoughmoneyprovided"), PAYNOTENOUGHMONEYPROVIDED("jailpay", "notenoughmoneyprovided"),
/** The message sent when they pay and get released. */ /**
* The message sent when they pay and get released.
*/
PAYPAIDRELEASED("jailpay", "paidreleased"), PAYPAIDRELEASED("jailpay", "paidreleased"),
/** The message sent when they pay for someone else and release them. */ /**
* The message sent when they pay for someone else and release them.
*/
PAYPAIDRELEASEDELSE("jailpay", "paidreleasedelse"), PAYPAIDRELEASEDELSE("jailpay", "paidreleasedelse"),
/** The message sent when they pay and lower their time. */ /**
* The message sent when they pay and lower their time.
*/
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 // Jail vote
/** The header sent when broadcasting a new jail vote. */ /**
* The header sent when broadcasting a new jail vote.
*/
VOTEBROADCASTHEADER("jailvote.broadcast", "header"), VOTEBROADCASTHEADER("jailvote.broadcast", "header"),
/** The footer sent when broadcasting a new jail vote. */ /**
* The footer sent when broadcasting a new jail vote.
*/
VOTEBROADCASTFOOTER("jailvote.broadcast", "footer"), VOTEBROADCASTFOOTER("jailvote.broadcast", "footer"),
/** Line1 of the broadcast message sent when a new jail vote is happening. */ /**
* Line1 of the broadcast message sent when a new jail vote is happening.
*/
VOTEBROADCASTLINE1("jailvote.broadcast", "line1"), VOTEBROADCASTLINE1("jailvote.broadcast", "line1"),
/** Line2 of the broadcast message sent when a new jail vote is happening. */ /**
* Line2 of the broadcast message sent when a new jail vote is happening.
*/
VOTEBROADCASTLINE2("jailvote.broadcast", "line2"), VOTEBROADCASTLINE2("jailvote.broadcast", "line2"),
/** Line3 of the broadcast message sent when a new jail vote is happening. */ /**
* Line3 of the broadcast message sent when a new jail vote is happening.
*/
VOTEBROADCASTLINE3("jailvote.broadcast", "line3"), VOTEBROADCASTLINE3("jailvote.broadcast", "line3"),
/** Line4 of the broadcast message sent when a new jail vote is happening. */ /**
* Line4 of the broadcast message sent when a new jail vote is happening.
*/
VOTEBROADCASTLINE4("jailvote.broadcast", "line4"), VOTEBROADCASTLINE4("jailvote.broadcast", "line4"),
/** The message sent when someone tries to vote for a player when a vote isn't running. */ /**
* The message sent when someone tries to vote for a player when a vote isn't running.
*/
VOTENOVOTEFORTHATPLAYER("jailvote", "novotegoingforthatplayer"), VOTENOVOTEFORTHATPLAYER("jailvote", "novotegoingforthatplayer"),
/** The message sent to a player who tries to start a vote to jail someone and doesn't have permission. */ /**
* The message sent to a player who tries to start a vote to jail someone and doesn't have permission.
*/
VOTENOPERMISSIONTOSTART("jailvote", "nopermissiontostartvote"), VOTENOPERMISSIONTOSTART("jailvote", "nopermissiontostartvote"),
/** The message sent when jail vote is not enabled. */ /**
* The message sent when jail vote is not enabled.
*/
VOTENOTENABLED("jailvote", "notenabled"), VOTENOTENABLED("jailvote", "notenabled"),
/** The message sent whenever someone's vote is not successful. */ /**
* The message sent whenever someone's vote is not successful.
*/
VOTEUNSUCCESSFUL("jailvote", "voteunsuccessful"), VOTEUNSUCCESSFUL("jailvote", "voteunsuccessful"),
/** The message sent whenever a player successfully votes no. */ /**
* The message sent whenever a player successfully votes no.
*/
VOTENOSUCCESS("jailvote", "votenosuccessful"), VOTENOSUCCESS("jailvote", "votenosuccessful"),
/** The message sent whenever a player successfully votes yes. */ /**
* The message sent whenever a player successfully votes yes.
*/
VOTEYESSUCCESS("jailvote", "voteyessuccessful"), VOTEYESSUCCESS("jailvote", "voteyessuccessful"),
/** The message broadcasted whenever a vote is tied. */ /**
* The message broadcasted whenever a vote is tied.
*/
VOTESTIED("jailvote", "votestied"), VOTESTIED("jailvote", "votestied"),
/** The message broadcasted whenever there are more no votes. */ /**
* The message broadcasted whenever there are more no votes.
*/
VOTESSAIDNO("jailvote", "morenovotes"), VOTESSAIDNO("jailvote", "morenovotes"),
/** The message broadcasted whenever there aren't the minimum yes votes. */ /**
* The message broadcasted whenever there aren't the minimum yes votes.
*/
VOTESNOTENOUGHYES("jailvote", "notenoughyes"), VOTESNOTENOUGHYES("jailvote", "notenoughyes"),
/** The message broadcasted whenever the player the vote is for is no longer online. */ /**
* The message broadcasted whenever the player the vote is for is no longer online.
*/
VOTEPLAYERNOLONGERONLINE("jailvote", "playernolongeronline"), VOTEPLAYERNOLONGERONLINE("jailvote", "playernolongeronline"),
/** The message sent when a player tries to vote again for someone. */ /**
* The message sent when a player tries to vote again for someone.
*/
VOTEALREADYVOTEDFOR("jailvote", "alreadyvotedfor"), 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.
*/
ALREADY("confirm"), ALREADY("confirm"),
/** The message sent when their confirmation has expired. */ /**
* The message sent when their confirmation has expired.
*/
EXPIRED("confirm"), EXPIRED("confirm"),
/** The message sent to the sender when they tried to confirm something but don't have anything to confirm. */ /**
* The message sent to the sender when they tried to confirm something but don't have anything to confirm.
*/
NOTHING("confirm"), NOTHING("confirm"),
/** The message sent to the sender when they type something and need to confirm it. */ /**
* The message sent to the sender when they type something and need to confirm it.
*/
START("confirm"); START("confirm");
private String section, name, path; private final String section;
private final String name;
private final String path;
private static YamlConfiguration lang; private static YamlConfiguration lang;
Lang(String section) { Lang(String section) {
@ -282,24 +530,27 @@ public enum Lang {
/** /**
* Sets the {@link YamlConfiguration} instance to use. * Sets the {@link YamlConfiguration} instance to use.
* *
* @param file * @param file of the language to use.
* of the language to use.
*/ */
public static void setFile(YamlConfiguration file) { public static void setFile(YamlConfiguration file) {
lang = file; lang = file;
} }
/** Gets the {@link YamlConfiguration} instance. */ /**
* Gets the {@link YamlConfiguration} instance.
*/
public static YamlConfiguration getFile() { public static YamlConfiguration getFile() {
return lang; return lang;
} }
/** Writes any new language settings to the language file in storage. */ /**
* Writes any new language settings to the language file in storage.
*/
public static boolean writeNewLanguage(YamlConfiguration newLang) { public static boolean writeNewLanguage(YamlConfiguration newLang) {
boolean anything = false; boolean anything = false;
for(Lang l : values()) { for (Lang l : values()) {
if(!lang.contains(l.path)) { if (!lang.contains(l.path)) {
lang.set(l.path, newLang.getString(l.path)); lang.set(l.path, newLang.getString(l.path));
anything = true; anything = true;
} }
@ -308,21 +559,24 @@ public enum Lang {
return anything; return anything;
} }
/** Returns the message in the language, no variables are replaced. */ /**
* Returns the message in the language, no variables are replaced.
*/
public String get() { public String get() {
return get(new String[] {}); return get(new String[]{});
} }
/** Returns the message in the language, no variables are replaced. */ /**
* Returns the message in the language, no variables are replaced.
*/
public String get(Lang langString) { public String get(Lang langString) {
return get(new String[] { langString.get() }); return get(langString.get());
} }
/** /**
* Returns the message in the language, with the provided variables being replaced. * Returns the message in the language, with the provided variables being replaced.
* *
* @param variables * @param variables All the variables to replace, in order from 0 to however many.
* All the variables to replace, in order from 0 to however many.
* @return The message as a colorful message or an empty message if that * @return The message as a colorful message or an empty message if that
* isn't defined in the language file. * isn't defined in the language file.
*/ */

19
src/main/java/com/graywolf336/jail/enums/Settings.java
View File

@ -43,13 +43,13 @@ public enum Settings {
JAILEDSTOREINVENTORY("jailing.jail.inventory.store"), JAILEDSTOREINVENTORY("jailing.jail.inventory.store"),
JAILPAYENABLED("jailpay.enabled"), JAILPAYENABLED("jailpay.enabled"),
JAILPAYITEM("jailpay.item"), JAILPAYITEM("jailpay.item"),
JAILPAYPRICEPERMINUTE ("jailpay.pricePerMinute"), JAILPAYPRICEPERMINUTE("jailpay.pricePerMinute"),
JAILPAYPRICEINFINITE ("jailpay.priceInfinite"), JAILPAYPRICEINFINITE("jailpay.priceInfinite"),
JAILVOTEENABLED ("jailvote.enabled"), JAILVOTEENABLED("jailvote.enabled"),
JAILVOTETIMER ("jailvote.voteTimer"), JAILVOTETIMER("jailvote.voteTimer"),
JAILMINYESVOTES ("jailvote.minimumYes"), JAILMINYESVOTES("jailvote.minimumYes"),
JAILVOTEREASON ("jailvote.reason"), JAILVOTEREASON("jailvote.reason"),
JAILVOTETIME ("jailvote.time"), 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"),
@ -73,14 +73,15 @@ public enum Settings {
UPDATETIME("system.updates.time"), UPDATETIME("system.updates.time"),
USEBUKKITTIMER("system.useBukkitTimer"); USEBUKKITTIMER("system.useBukkitTimer");
private String path; private final String path;
private Settings(String path) { Settings(String path) {
this.path = path; this.path = path;
} }
/** /**
* Gets the path this setting is in config. * Gets the path this setting is in config.
*
* @return The path where this setting resides in the config. * @return The path where this setting resides in the config.
*/ */
public String getPath() { public String getPath() {

9
src/main/java/com/graywolf336/jail/events/JailPluginReloadedEvent.java
View File

@ -1,26 +1,25 @@
package com.graywolf336.jail.events; package com.graywolf336.jail.events;
import com.graywolf336.jail.JailMain;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import com.graywolf336.jail.JailMain;
/** /**
* Event thrown after the plugin is reloaded, internal usage only. * Event thrown after the plugin is reloaded, internal usage only.
* *
* <p> * <p>
* * <p>
* This event is called right after the plugin and mostly everything has reloaded. * This event is called right after the plugin and mostly everything has reloaded.
* We listen to this event for updating various items in classes which are only * We listen to this event for updating various items in classes which are only
* listeners so we don't store instances of them elsewhere. * listeners so we don't store instances of them elsewhere.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class JailPluginReloadedEvent extends Event { public class JailPluginReloadedEvent extends Event {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private JailMain plugin; private final JailMain plugin;
public JailPluginReloadedEvent(JailMain main) { public JailPluginReloadedEvent(JailMain main) {
this.plugin = main; this.plugin = main;

39
src/main/java/com/graywolf336/jail/events/OfflinePrisonerJailedEvent.java
View File

@ -1,30 +1,29 @@
package com.graywolf336.jail.events; package com.graywolf336.jail.events;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.interfaces.ICell; import com.graywolf336.jail.interfaces.ICell;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
/** /**
* Event thrown when a prisoner is offline put will be put into jail next time they come online. * Event thrown when a prisoner is offline put will be put into jail next time they come online.
* *
* <p> * <p>
* * <p>
* This event is called before everything for the jailing takes place, as the player is offline. * This event is called before everything for the jailing takes place, as the player is offline.
* This event is called for informative purposes, see {@link PrePrisonerJailedEvent} * This event is called for informative purposes, see {@link PrePrisonerJailedEvent}
* for the event called before they teleported in and all that fancy stuff. * for the event called before they teleported in and all that fancy stuff.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class OfflinePrisonerJailedEvent extends Event { public class OfflinePrisonerJailedEvent extends Event {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private Jail jail; private final Jail jail;
private ICell cell; private final ICell cell;
private Prisoner prisoner; private final Prisoner prisoner;
/** /**
* Creates a new {@link OfflinePrisonerJailedEvent prisoner jailed event} for the given prisoner. * Creates a new {@link OfflinePrisonerJailedEvent prisoner jailed event} for the given prisoner.
@ -39,32 +38,44 @@ public class OfflinePrisonerJailedEvent extends Event {
this.prisoner = prisoner; this.prisoner = prisoner;
} }
/** Gets the {@link Jail} this prisoner is being sent to. */ /**
* Gets the {@link Jail} this prisoner is being sent to.
*/
public Jail getJail() { public Jail getJail() {
return this.jail; return this.jail;
} }
/** Gets the cell we're going to be sending the prisoner to, can be null. */ /**
* Gets the cell we're going to be sending the prisoner to, can be null.
*/
public ICell getCell() { public ICell getCell() {
return this.cell; return this.cell;
} }
/** Checks if there was a cell involved. */ /**
* Checks if there was a cell involved.
*/
public boolean hasCell() { public boolean hasCell() {
return this.cell != null; return this.cell != null;
} }
/** Gets the {@link Prisoner} data for this prisoner. */ /**
* Gets the {@link Prisoner} data for this prisoner.
*/
public Prisoner getPrisoner() { public Prisoner getPrisoner() {
return this.prisoner; return this.prisoner;
} }
/** Gets the jailer who jailed this prisoner. */ /**
* Gets the jailer who jailed this prisoner.
*/
public String getJailer() { public String getJailer() {
return this.prisoner.getJailer(); return this.prisoner.getJailer();
} }
/** Gets the reason the prisoner was jailed. */ /**
* Gets the reason the prisoner was jailed.
*/
public String getReason() { public String getReason() {
return this.prisoner.getReason(); return this.prisoner.getReason();
} }

69
src/main/java/com/graywolf336/jail/events/PrePrisonerJailedByJailStickEvent.java
View File

@ -1,36 +1,35 @@
package com.graywolf336.jail.events; package com.graywolf336.jail.events;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.graywolf336.jail.beans.Cell; import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.beans.Stick; import com.graywolf336.jail.beans.Stick;
import com.graywolf336.jail.interfaces.ICell; import com.graywolf336.jail.interfaces.ICell;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
/** /**
* Event thrown before we a player is jailed by someone hitting them with a {@link Stick jail stick}. * Event thrown before we a player is jailed by someone hitting them with a {@link Stick jail stick}.
* *
* <p> * <p>
* * <p>
* This event is called right before we actually jail a player, and is cancellable. * This event is called right before we actually jail a player, and is cancellable.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class PrePrisonerJailedByJailStickEvent extends Event implements Cancellable { public class PrePrisonerJailedByJailStickEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private boolean cancelled = false; private boolean cancelled = false;
private Jail jail; private final Jail jail;
private ICell cell; private ICell cell;
private Prisoner prisoner; private final Prisoner prisoner;
private Player player; private final Player player;
private String jailer, cancelMsg; private String jailer, cancelMsg;
private Stick stick; private final Stick stick;
/** /**
* Creates a new {@link PrePrisonerJailedByJailStickEvent prisoner jailed by a jail stick event} for the given player before they get sent to jail. * Creates a new {@link PrePrisonerJailedByJailStickEvent prisoner jailed by a jail stick event} for the given player before they get sent to jail.
@ -52,37 +51,51 @@ public class PrePrisonerJailedByJailStickEvent extends Event implements Cancella
this.cancelMsg = ""; this.cancelMsg = "";
} }
/** Gets the {@link Jail} this prisoner is being sent to. */ /**
* Gets the {@link Jail} this prisoner is being sent to.
*/
public Jail getJail() { public Jail getJail() {
return this.jail; return this.jail;
} }
/** Gets the cell we're going to be sending the prisoner to. */ /**
* Gets the cell we're going to be sending the prisoner to.
*/
public ICell getCell() { public ICell getCell() {
return this.cell; return this.cell;
} }
/** Sets the cell we're going to be sending the prisoner to. */ /**
* Sets the cell we're going to be sending the prisoner to.
*/
public void setCell(Cell cell) { public void setCell(Cell cell) {
this.cell = cell; this.cell = cell;
} }
/** Checks if there is a cell involved. */ /**
* Checks if there is a cell involved.
*/
public boolean hasCell() { public boolean hasCell() {
return this.cell != null; return this.cell != null;
} }
/** Gets the {@link Prisoner} data for this prisoner. */ /**
* Gets the {@link Prisoner} data for this prisoner.
*/
public Prisoner getPrisoner() { public Prisoner getPrisoner() {
return this.prisoner; return this.prisoner;
} }
/** Gets the instance of the player being jailed. */ /**
* Gets the instance of the player being jailed.
*/
public Player getPlayer() { public Player getPlayer() {
return this.player; return this.player;
} }
/** Gets the jailer who jailed this prisoner. */ /**
* Gets the jailer who jailed this prisoner.
*/
public String getJailer() { public String getJailer() {
return this.jailer; return this.jailer;
} }
@ -96,27 +109,37 @@ public class PrePrisonerJailedByJailStickEvent extends Event implements Cancella
this.jailer = jailer; this.jailer = jailer;
} }
/** Gets the jail stick used. */ /**
* Gets the jail stick used.
*/
public Stick getJailStick() { public Stick getJailStick() {
return this.stick; return this.stick;
} }
/** Checks whether this event is cancelled or not. */ /**
* Checks whether this event is cancelled or not.
*/
public boolean isCancelled() { public boolean isCancelled() {
return this.cancelled; return this.cancelled;
} }
/** Sets whether this event should be cancelled. */ /**
* Sets whether this event should be cancelled.
*/
public void setCancelled(boolean cancel) { public void setCancelled(boolean cancel) {
this.cancelled = cancel; this.cancelled = cancel;
} }
/** Returns the cancelled message. */ /**
* Returns the cancelled message.
*/
public String getCancelledMessage() { public String getCancelledMessage() {
return this.cancelMsg; return this.cancelMsg;
} }
/** Sets the cancelled message. */ /**
* Sets the cancelled message.
*/
public void setCancelledMessage(String msg) { public void setCancelledMessage(String msg) {
this.cancelMsg = msg; this.cancelMsg = msg;
} }

73
src/main/java/com/graywolf336/jail/events/PrePrisonerJailedEvent.java
View File

@ -1,34 +1,33 @@
package com.graywolf336.jail.events; package com.graywolf336.jail.events;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.graywolf336.jail.beans.Cell; import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.interfaces.ICell; import com.graywolf336.jail.interfaces.ICell;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
/** /**
* Event thrown before we are jailing a player, both offline and online players. * Event thrown before we are jailing a player, both offline and online players.
* *
* <p> * <p>
* * <p>
* This event is called right before we actually jail a player, and is cancellable, whether the player is offline or online, getPlayer() will always return null if isOnline() return false. * This event is called right before we actually jail a player, and is cancellable, whether the player is offline or online, getPlayer() will always return null if isOnline() return false.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class PrePrisonerJailedEvent extends Event implements Cancellable { public class PrePrisonerJailedEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private boolean cancelled = false; private boolean cancelled = false;
private boolean online; private final boolean online;
private Jail jail; private final Jail jail;
private ICell cell; private ICell cell;
private Prisoner prisoner; private final Prisoner prisoner;
private Player player; private final Player player;
private String jailer, cancelMsg; private String jailer, cancelMsg;
/** /**
@ -51,42 +50,58 @@ public class PrePrisonerJailedEvent extends Event implements Cancellable {
this.cancelMsg = ""; this.cancelMsg = "";
} }
/** Gets the {@link Jail} this prisoner is being sent to. */ /**
* Gets the {@link Jail} this prisoner is being sent to.
*/
public Jail getJail() { public Jail getJail() {
return this.jail; return this.jail;
} }
/** Gets the cell we're going to be sending the prisoner to. */ /**
* Gets the cell we're going to be sending the prisoner to.
*/
public ICell getCell() { public ICell getCell() {
return this.cell; return this.cell;
} }
/** Sets the cell we're going to be sending the prisoner to. */ /**
* Sets the cell we're going to be sending the prisoner to.
*/
public void setCell(Cell cell) { public void setCell(Cell cell) {
this.cell = cell; this.cell = cell;
} }
/** Checks if there is a cell involved. */ /**
* Checks if there is a cell involved.
*/
public boolean hasCell() { public boolean hasCell() {
return this.cell != null; return this.cell != null;
} }
/** Gets the {@link Prisoner} data for this prisoner. */ /**
* Gets the {@link Prisoner} data for this prisoner.
*/
public Prisoner getPrisoner() { public Prisoner getPrisoner() {
return this.prisoner; return this.prisoner;
} }
/** Gets the instance of the player being jailed <strong>but will return null if {@link #isOnline()} returns false</strong>. */ /**
* Gets the instance of the player being jailed <strong>but will return null if {@link #isOnline()} returns false</strong>.
*/
public Player getPlayer() { public Player getPlayer() {
return this.player; return this.player;
} }
/** Gets whether the prisoner being jailed is online or not. */ /**
* Gets whether the prisoner being jailed is online or not.
*/
public boolean isOnline() { public boolean isOnline() {
return this.online; return this.online;
} }
/** Gets the jailer who jailed this prisoner. */ /**
* Gets the jailer who jailed this prisoner.
*/
public String getJailer() { public String getJailer() {
return this.jailer; return this.jailer;
} }
@ -100,7 +115,9 @@ public class PrePrisonerJailedEvent extends Event implements Cancellable {
this.jailer = jailer; this.jailer = jailer;
} }
/** Gets the reason the player was jailed for. */ /**
* Gets the reason the player was jailed for.
*/
public String getReason() { public String getReason() {
return this.prisoner.getReason(); return this.prisoner.getReason();
} }
@ -114,22 +131,30 @@ public class PrePrisonerJailedEvent extends Event implements Cancellable {
this.prisoner.setReason(reason); this.prisoner.setReason(reason);
} }
/** Checks whether this event is cancelled or not. */ /**
* Checks whether this event is cancelled or not.
*/
public boolean isCancelled() { public boolean isCancelled() {
return this.cancelled; return this.cancelled;
} }
/** Sets whether this event should be cancelled. */ /**
* Sets whether this event should be cancelled.
*/
public void setCancelled(boolean cancel) { public void setCancelled(boolean cancel) {
this.cancelled = cancel; this.cancelled = cancel;
} }
/** Returns the cancelled message. */ /**
* Returns the cancelled message.
*/
public String getCancelledMessage() { public String getCancelledMessage() {
return this.cancelMsg; return this.cancelMsg;
} }
/** Sets the cancelled message. */ /**
* Sets the cancelled message.
*/
public void setCancelledMessage(String msg) { public void setCancelledMessage(String msg) {
this.cancelMsg = msg; this.cancelMsg = msg;
} }

39
src/main/java/com/graywolf336/jail/events/PrePrisonerReleasedEvent.java
View File

@ -1,32 +1,31 @@
package com.graywolf336.jail.events; package com.graywolf336.jail.events;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.interfaces.ICell; import com.graywolf336.jail.interfaces.ICell;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
/** /**
* Event thrown after a prisoner is released. * Event thrown after a prisoner is released.
* *
* <p> * <p>
* * <p>
* This event is called before everything for the releasing takes place. * This event is called before everything for the releasing takes place.
* This event is called for informative purposes, see {@link PrisonerReleasedEvent} * This event is called for informative purposes, see {@link PrisonerReleasedEvent}
* for the event called after they get teleported out and all that fancy stuff. * for the event called after they get teleported out and all that fancy stuff.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class PrePrisonerReleasedEvent extends Event { public class PrePrisonerReleasedEvent extends Event {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private Jail jail; private final Jail jail;
private ICell cell; private final ICell cell;
private Prisoner prisoner; private final Prisoner prisoner;
private Player player; private final Player player;
/** /**
* Creates a new {@link PrePrisonerReleasedEvent pre-prisoner released event} for the given player. * Creates a new {@link PrePrisonerReleasedEvent pre-prisoner released event} for the given player.
@ -43,27 +42,37 @@ public class PrePrisonerReleasedEvent extends Event {
this.player = player; this.player = player;
} }
/** Gets the {@link Jail} this prisoner is coming from. */ /**
* Gets the {@link Jail} this prisoner is coming from.
*/
public Jail getJail() { public Jail getJail() {
return this.jail; return this.jail;
} }
/** Gets the cell where the prisoner was jailed in, null if they weren't in one. */ /**
* Gets the cell where the prisoner was jailed in, null if they weren't in one.
*/
public ICell getCell() { public ICell getCell() {
return this.cell; return this.cell;
} }
/** Checks if there is a cell involved. */ /**
* Checks if there is a cell involved.
*/
public boolean hasCell() { public boolean hasCell() {
return this.cell != null; return this.cell != null;
} }
/** Gets the {@link Prisoner} data for this prisoner. */ /**
* Gets the {@link Prisoner} data for this prisoner.
*/
public Prisoner getPrisoner() { public Prisoner getPrisoner() {
return this.prisoner; return this.prisoner;
} }
/** Gets the instance of the player being released. */ /**
* Gets the instance of the player being released.
*/
public Player getPlayer() { public Player getPlayer() {
return this.player; return this.player;
} }

64
src/main/java/com/graywolf336/jail/events/PrePrisonerTransferredEvent.java
View File

@ -1,32 +1,33 @@
package com.graywolf336.jail.events; package com.graywolf336.jail.events;
import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner;
/** /**
* Event thrown before we transfer a prisoner, both offline and online prisoner. * Event thrown before we transfer a prisoner, both offline and online prisoner.
* *
* <p> * <p>
* * <p>
* This event is called right before we actually transfer a prisoner, and is cancellable, whether the prisoner is offline or online, getPlayer() will always return null if isOnline() return false. * This event is called right before we actually transfer a prisoner, and is cancellable, whether the prisoner is offline or online, getPlayer() will always return null if isOnline() return false.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.1 * @version 1.0.1
* @since 3.0.0
*/ */
public class PrePrisonerTransferredEvent extends Event implements Cancellable { public class PrePrisonerTransferredEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private boolean cancelled = false; private boolean cancelled = false;
private Jail originalJail, targetJail; private final Jail originalJail;
private Cell originalCell, targetCell; private Jail targetJail;
private Prisoner prisoner; private final Cell originalCell;
private Player player; private Cell targetCell;
private final Prisoner prisoner;
private final Player player;
private String transferor, cancelMsg; private String transferor, cancelMsg;
/** /**
@ -51,22 +52,30 @@ public class PrePrisonerTransferredEvent extends Event implements Cancellable {
this.cancelMsg = ""; this.cancelMsg = "";
} }
/** Gets the {@link Jail} this prisoner is coming from. */ /**
* Gets the {@link Jail} this prisoner is coming from.
*/
public Jail getOriginalJail() { public Jail getOriginalJail() {
return this.originalJail; return this.originalJail;
} }
/** Gets the {@link Cell} this prisoner is coming from, can be null. */ /**
* Gets the {@link Cell} this prisoner is coming from, can be null.
*/
public Cell getOriginalCell() { public Cell getOriginalCell() {
return this.originalCell; return this.originalCell;
} }
/** Checks if there is an original cell involved. */ /**
* Checks if there is an original cell involved.
*/
public boolean hasOriginalCell() { public boolean hasOriginalCell() {
return this.originalCell != null; return this.originalCell != null;
} }
/** Gets the {@link Jail} this prisoner is being transferred to. */ /**
* Gets the {@link Jail} this prisoner is being transferred to.
*/
public Jail getTargetJail() { public Jail getTargetJail() {
return this.targetJail; return this.targetJail;
} }
@ -80,16 +89,19 @@ public class PrePrisonerTransferredEvent extends Event implements Cancellable {
this.targetJail = jail; this.targetJail = jail;
} }
/** Gets the {@link Cell} this prisoner is being sent to, can be null. /**
* * Gets the {@link Cell} this prisoner is being sent to, can be null.
* <p>
* Will return null if the cell is not in the targetJail. * Will return null if the cell is not in the targetJail.
*/ */
public Cell getTargetCell() { public Cell getTargetCell() {
if(this.targetJail.isValidCell(this.targetCell.getName())) return this.targetCell; if (this.targetJail.isValidCell(this.targetCell.getName())) return this.targetCell;
else return null; else return null;
} }
/** Checks if there is a target cell involved. */ /**
* Checks if there is a target cell involved.
*/
public boolean hasTargetCell() { public boolean hasTargetCell() {
return this.getTargetCell() != null; return this.getTargetCell() != null;
} }
@ -148,22 +160,30 @@ public class PrePrisonerTransferredEvent extends Event implements Cancellable {
this.transferor = transferor; this.transferor = transferor;
} }
/** Checks whether this event is cancelled or not. */ /**
* Checks whether this event is cancelled or not.
*/
public boolean isCancelled() { public boolean isCancelled() {
return this.cancelled; return this.cancelled;
} }
/** Sets whether this event should be cancelled. */ /**
* Sets whether this event should be cancelled.
*/
public void setCancelled(boolean cancel) { public void setCancelled(boolean cancel) {
this.cancelled = cancel; this.cancelled = cancel;
} }
/** Returns the cancelled message. */ /**
* Returns the cancelled message.
*/
public String getCancelledMessage() { public String getCancelledMessage() {
return this.cancelMsg; return this.cancelMsg;
} }
/** Sets the cancelled message. */ /**
* Sets the cancelled message.
*/
public void setCancelledMessage(String msg) { public void setCancelledMessage(String msg) {
this.cancelMsg = msg; this.cancelMsg = msg;
} }

43
src/main/java/com/graywolf336/jail/events/PrisonerDeathEvent.java
View File

@ -1,28 +1,27 @@
package com.graywolf336.jail.events; package com.graywolf336.jail.events;
import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent;
import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner;
/** /**
* Event thrown when a prisoner dies. * Event thrown when a prisoner dies.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class PrisonerDeathEvent extends Event { public class PrisonerDeathEvent extends Event {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private PlayerDeathEvent event; private final PlayerDeathEvent event;
private Jail jail; private final Jail jail;
private Cell cell; private final Cell cell;
private Prisoner prisoner; private final Prisoner prisoner;
private Player player; private final Player player;
/** /**
* Creates a new {@link PrisonerDeathEvent prisoner death event} for the given player. * Creates a new {@link PrisonerDeathEvent prisoner death event} for the given player.
@ -41,32 +40,44 @@ public class PrisonerDeathEvent extends Event {
this.player = player; this.player = player;
} }
/** Gets the {@link PlayerDeathEvent} which triggered this PrisonerDeathEvent. */ /**
* Gets the {@link PlayerDeathEvent} which triggered this PrisonerDeathEvent.
*/
public PlayerDeathEvent getPlayerDeathEvent() { public PlayerDeathEvent getPlayerDeathEvent() {
return this.event; return this.event;
} }
/** Gets the {@link Jail} this prisoner is in. */ /**
* Gets the {@link Jail} this prisoner is in.
*/
public Jail getJail() { public Jail getJail() {
return this.jail; return this.jail;
} }
/** Gets the cell the prisoner is in, can be null. */ /**
* Gets the cell the prisoner is in, can be null.
*/
public Cell getCell() { public Cell getCell() {
return this.cell; return this.cell;
} }
/** Checks if there is a cell involved. */ /**
* Checks if there is a cell involved.
*/
public boolean hasCell() { public boolean hasCell() {
return this.cell != null; return this.cell != null;
} }
/** Gets the {@link Prisoner}'s data. */ /**
* Gets the {@link Prisoner}'s data.
*/
public Prisoner getPrisoner() { public Prisoner getPrisoner() {
return this.prisoner; return this.prisoner;
} }
/** Gets the instance of the player who died. */ /**
* Gets the instance of the player who died.
*/
public Player getPlayer() { public Player getPlayer() {
return this.player; return this.player;
} }

47
src/main/java/com/graywolf336/jail/events/PrisonerJailedEvent.java
View File

@ -1,32 +1,31 @@
package com.graywolf336.jail.events; package com.graywolf336.jail.events;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.graywolf336.jail.beans.Cell; import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
/** /**
* Event thrown after a prisoner is put into jail. * Event thrown after a prisoner is put into jail.
* *
* <p> * <p>
* * <p>
* This event is called after everything for the jailing takes place. * This event is called after everything for the jailing takes place.
* This event is called for informative purposes, see {@link PrePrisonerJailedEvent} * This event is called for informative purposes, see {@link PrePrisonerJailedEvent}
* for the event called before they teleported in and all that fancy stuff. * for the event called before they teleported in and all that fancy stuff.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class PrisonerJailedEvent extends Event { public class PrisonerJailedEvent extends Event {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private Jail jail; private final Jail jail;
private Cell cell; private final Cell cell;
private Prisoner prisoner; private final Prisoner prisoner;
private Player player; private final Player player;
/** /**
* Creates a new {@link PrisonerJailedEvent prisoner jailed event} for the given player. * Creates a new {@link PrisonerJailedEvent prisoner jailed event} for the given player.
@ -43,37 +42,51 @@ public class PrisonerJailedEvent extends Event {
this.player = player; this.player = player;
} }
/** Gets the {@link Jail} this prisoner is being sent to. */ /**
* Gets the {@link Jail} this prisoner is being sent to.
*/
public Jail getJail() { public Jail getJail() {
return this.jail; return this.jail;
} }
/** Gets the cell we're going to be sending the prisoner to, can be null. */ /**
* Gets the cell we're going to be sending the prisoner to, can be null.
*/
public Cell getCell() { public Cell getCell() {
return this.cell; return this.cell;
} }
/** Checks if there was a cell involved. */ /**
* Checks if there was a cell involved.
*/
public boolean hasCell() { public boolean hasCell() {
return this.cell != null; return this.cell != null;
} }
/** Gets the {@link Prisoner} data for this prisoner. */ /**
* Gets the {@link Prisoner} data for this prisoner.
*/
public Prisoner getPrisoner() { public Prisoner getPrisoner() {
return this.prisoner; return this.prisoner;
} }
/** Gets the instance of the player being jailed. */ /**
* Gets the instance of the player being jailed.
*/
public Player getPlayer() { public Player getPlayer() {
return this.player; return this.player;
} }
/** Gets the jailer who jailed this prisoner. */ /**
* Gets the jailer who jailed this prisoner.
*/
public String getJailer() { public String getJailer() {
return this.prisoner.getJailer(); return this.prisoner.getJailer();
} }
/** Gets the reason the prisoner was jailed. */ /**
* Gets the reason the prisoner was jailed.
*/
public String getReason() { public String getReason() {
return this.prisoner.getReason(); return this.prisoner.getReason();
} }

39
src/main/java/com/graywolf336/jail/events/PrisonerReleasedEvent.java
View File

@ -1,32 +1,31 @@
package com.graywolf336.jail.events; package com.graywolf336.jail.events;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.graywolf336.jail.beans.Cell; import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
/** /**
* Event thrown after a prisoner is released. * Event thrown after a prisoner is released.
* *
* <p> * <p>
* * <p>
* This event is called after everything for the releasing takes place. * This event is called after everything for the releasing takes place.
* This event is called for informative purposes, see {@link PrePrisonerReleasedEvent} * This event is called for informative purposes, see {@link PrePrisonerReleasedEvent}
* for the event called before they teleported out and all that fancy stuff. * for the event called before they teleported out and all that fancy stuff.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class PrisonerReleasedEvent extends Event { public class PrisonerReleasedEvent extends Event {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private Jail jail; private final Jail jail;
private Cell cell; private final Cell cell;
private Prisoner prisoner; private final Prisoner prisoner;
private Player player; private final Player player;
/** /**
* Creates a new {@link PrisonerReleasedEvent prisoner released event} for the given player. * Creates a new {@link PrisonerReleasedEvent prisoner released event} for the given player.
@ -43,27 +42,37 @@ public class PrisonerReleasedEvent extends Event {
this.player = player; this.player = player;
} }
/** Gets the {@link Jail} this prisoner is coming from. */ /**
* Gets the {@link Jail} this prisoner is coming from.
*/
public Jail getJail() { public Jail getJail() {
return this.jail; return this.jail;
} }
/** Gets the cell where the prisoner was jailed in, null if they weren't in one. */ /**
* Gets the cell where the prisoner was jailed in, null if they weren't in one.
*/
public Cell getCell() { public Cell getCell() {
return this.cell; return this.cell;
} }
/** Checks if there was a cell involved. */ /**
* Checks if there was a cell involved.
*/
public boolean hasCell() { public boolean hasCell() {
return this.cell != null; return this.cell != null;
} }
/** Gets the {@link Prisoner} data for this prisoner. */ /**
* Gets the {@link Prisoner} data for this prisoner.
*/
public Prisoner getPrisoner() { public Prisoner getPrisoner() {
return this.prisoner; return this.prisoner;
} }
/** Gets the instance of the player being released. */ /**
* Gets the instance of the player being released.
*/
public Player getPlayer() { public Player getPlayer() {
return this.player; return this.player;
} }

66
src/main/java/com/graywolf336/jail/events/PrisonerTimeChangeEvent.java
View File

@ -1,29 +1,29 @@
package com.graywolf336.jail.events; package com.graywolf336.jail.events;
import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner;
/** /**
* Event thrown when a prisoner's time changes. * Event thrown when a prisoner's time changes.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class PrisonerTimeChangeEvent extends Event implements Cancellable { public class PrisonerTimeChangeEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private boolean cancelled = false; private boolean cancelled = false;
private Jail jail; private final Jail jail;
private Cell cell; private final Cell cell;
private Prisoner prisoner; private final Prisoner prisoner;
private Player player; private final Player player;
private long before, after; private final long before;
private long after;
/** /**
* Creates a new {@link PrisonerTimeChangeEvent prisoner time change event} for the given prisoner. * Creates a new {@link PrisonerTimeChangeEvent prisoner time change event} for the given prisoner.
@ -44,51 +44,67 @@ public class PrisonerTimeChangeEvent extends Event implements Cancellable {
this.after = after; this.after = after;
} }
/** Gets the {@link Jail} this prisoner is in. */ /**
* Gets the {@link Jail} this prisoner is in.
*/
public Jail getJail() { public Jail getJail() {
return this.jail; return this.jail;
} }
/** Gets the cell the prisoner is in, can be null. */ /**
* Gets the cell the prisoner is in, can be null.
*/
public Cell getCell() { public Cell getCell() {
return this.cell; return this.cell;
} }
/** Checks if there is a cell involved. */ /**
* Checks if there is a cell involved.
*/
public boolean hasCell() { public boolean hasCell() {
return this.cell != null; return this.cell != null;
} }
/** Gets the {@link Prisoner}'s data. */ /**
* Gets the {@link Prisoner}'s data.
*/
public Prisoner getPrisoner() { public Prisoner getPrisoner() {
return this.prisoner; return this.prisoner;
} }
/** Gets the instance of the player who died. */ /**
* Gets the instance of the player who died.
*/
public Player getPlayer() { public Player getPlayer() {
return this.player; return this.player;
} }
/** Gets the time the prisoner had before it changed. */ /**
* Gets the time the prisoner had before it changed.
*/
public long getTimeBeforeChange() { public long getTimeBeforeChange() {
return this.before; return this.before;
} }
/** Gets the time the prisoner will have after the change. */ /**
* Gets the time the prisoner will have after the change.
*/
public long getTimeAfterChange() { public long getTimeAfterChange() {
return this.after; return this.after;
} }
/** Sets the time the prisoner will have after the change. */ /**
* Sets the time the prisoner will have after the change.
*/
public void setTimeAfterChange(long newtime) { public void setTimeAfterChange(long newtime) {
this.after = Math.max(0, newtime); this.after = Math.max(0, newtime);
} }
/** /**
* Gets the difference the change is making. * Gets the difference the change is making.
* * <p>
* <p /> * <p/>
* * <p>
* The change can be positive or negative. If it is positive then the * The change can be positive or negative. If it is positive then the
* time after is smaller than it was before. If it is negative then the * time after is smaller than it was before. If it is negative then the
* time after is larger than it was before. * time after is larger than it was before.
@ -99,12 +115,16 @@ public class PrisonerTimeChangeEvent extends Event implements Cancellable {
return this.before - this.after; return this.before - this.after;
} }
/** Checks whether this event is cancelled or not. */ /**
* Checks whether this event is cancelled or not.
*/
public boolean isCancelled() { public boolean isCancelled() {
return this.cancelled; return this.cancelled;
} }
/** Sets whether this event should be cancelled. */ /**
* Sets whether this event should be cancelled.
*/
public void setCancelled(boolean cancel) { public void setCancelled(boolean cancel) {
this.cancelled = cancel; this.cancelled = cancel;
} }

60
src/main/java/com/graywolf336/jail/events/PrisonerTransferredEvent.java
View File

@ -1,30 +1,31 @@
package com.graywolf336.jail.events; package com.graywolf336.jail.events;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.graywolf336.jail.beans.Cell; import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
/** /**
* Event thrown after we transfer a prisoner, both an offline and an online prisoner. * Event thrown after we transfer a prisoner, both an offline and an online prisoner.
* *
* <p> * <p>
* * <p>
* This event is called after we transfer the prisoner whether the prisoner is offline or online, getPlayer() will always return null if isOnline() return false. * This event is called after we transfer the prisoner whether the prisoner is offline or online, getPlayer() will always return null if isOnline() return false.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class PrisonerTransferredEvent extends Event { public class PrisonerTransferredEvent extends Event {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private Jail originalJail, targetJail; private final Jail originalJail;
private Cell originalCell, targetCell; private final Jail targetJail;
private Prisoner prisoner; private final Cell originalCell;
private Player player; private final Cell targetCell;
private final Prisoner prisoner;
private final Player player;
/** /**
* Creates a new {@link PrisonerTransferredEvent prisoner transferred event} for the given player after they get transferred to their new jail and cell. * Creates a new {@link PrisonerTransferredEvent prisoner transferred event} for the given player after they get transferred to their new jail and cell.
@ -45,51 +46,68 @@ public class PrisonerTransferredEvent extends Event {
this.player = player; this.player = player;
} }
/** Gets the {@link Jail} this prisoner is coming from. */ /**
* Gets the {@link Jail} this prisoner is coming from.
*/
public Jail getOriginalJail() { public Jail getOriginalJail() {
return this.originalJail; return this.originalJail;
} }
/** Gets the {@link Cell} this prisoner is coming from, can be null. */ /**
* Gets the {@link Cell} this prisoner is coming from, can be null.
*/
public Cell getOriginalCell() { public Cell getOriginalCell() {
return this.originalCell; return this.originalCell;
} }
/** Checks if there was an original cell involved. */ /**
* Checks if there was an original cell involved.
*/
public boolean hasOriginalCell() { public boolean hasOriginalCell() {
return this.originalCell != null; return this.originalCell != null;
} }
/** Gets the {@link Jail} this prisoner is being transferred to. */ /**
* Gets the {@link Jail} this prisoner is being transferred to.
*/
public Jail getTargetJail() { public Jail getTargetJail() {
return this.targetJail; return this.targetJail;
} }
/** Gets the {@link Cell} this prisoner is being sent to, can be null. /**
* * Gets the {@link Cell} this prisoner is being sent to, can be null.
* <p>
* Will return null if the cell is not in the targetJail. * Will return null if the cell is not in the targetJail.
*/ */
public Cell getTargetCell() { public Cell getTargetCell() {
if(this.targetJail.isValidCell(this.targetCell.getName())) return this.targetCell; if (this.targetJail.isValidCell(this.targetCell.getName())) return this.targetCell;
else return null; else return null;
} }
/** Checks if there was a target cell involved. */ /**
* Checks if there was a target cell involved.
*/
public boolean hasTargetCell() { public boolean hasTargetCell() {
return this.getTargetCell() != null; return this.getTargetCell() != null;
} }
/** Gets the {@link Prisoner} data for this prisoner. */ /**
* Gets the {@link Prisoner} data for this prisoner.
*/
public Prisoner getPrisoner() { public Prisoner getPrisoner() {
return this.prisoner; return this.prisoner;
} }
/** Gets the instance of the player being transferred <strong>but will return null if {@link #isOnline()} returns false</strong>. */ /**
* Gets the instance of the player being transferred <strong>but will return null if {@link #isOnline()} returns false</strong>.
*/
public Player getPlayer() { public Player getPlayer() {
return this.player; return this.player;
} }
/** Gets whether the prisoner being transferred is online or not. */ /**
* Gets whether the prisoner being transferred is online or not.
*/
public boolean isOnline() { public boolean isOnline() {
return player == null; return player == null;
} }

4
src/main/java/com/graywolf336/jail/exceptions/AsyncUnJailingNotSupportedException.java
View File

@ -1,19 +1,17 @@
package com.graywolf336.jail.exceptions; package com.graywolf336.jail.exceptions;
/** /**
*
* The exception thrown trying to unjail via a thread that is NOT the primary thread. * The exception thrown trying to unjail via a thread that is NOT the primary thread.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class AsyncUnJailingNotSupportedException extends Exception { public class AsyncUnJailingNotSupportedException extends Exception {
private static final long serialVersionUID = -1540695375715404835L; private static final long serialVersionUID = -1540695375715404835L;
/** /**
* Creation of an exception from unjailing via a thread that is not the primary one. * Creation of an exception from unjailing via a thread that is not the primary one.
*
*/ */
public AsyncUnJailingNotSupportedException() { public AsyncUnJailingNotSupportedException() {
super("Unjailing via a thread that is NOT the primary thread is not supported."); super("Unjailing via a thread that is NOT the primary thread is not supported.");

3
src/main/java/com/graywolf336/jail/exceptions/CellRequiredException.java
View File

@ -1,12 +1,11 @@
package com.graywolf336.jail.exceptions; package com.graywolf336.jail.exceptions;
/** /**
*
* The exception thrown when a cell is required but wasn't provided. * The exception thrown when a cell is required but wasn't provided.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class CellRequiredException extends Exception { public class CellRequiredException extends Exception {
private static final long serialVersionUID = 6496748770371151376L; private static final long serialVersionUID = 6496748770371151376L;

3
src/main/java/com/graywolf336/jail/exceptions/JailRequiredException.java
View File

@ -1,12 +1,11 @@
package com.graywolf336.jail.exceptions; package com.graywolf336.jail.exceptions;
/** /**
*
* The exception thrown when a jail is required but wasn't provided. * The exception thrown when a jail is required but wasn't provided.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class JailRequiredException extends Exception { public class JailRequiredException extends Exception {
private static final long serialVersionUID = 1046287197309037470L; private static final long serialVersionUID = 1046287197309037470L;

4
src/main/java/com/graywolf336/jail/exceptions/PrisonerAlreadyJailedException.java
View File

@ -1,19 +1,17 @@
package com.graywolf336.jail.exceptions; package com.graywolf336.jail.exceptions;
/** /**
*
* The exception thrown when a prisoner is already jailed. * The exception thrown when a prisoner is already jailed.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class PrisonerAlreadyJailedException extends Exception { public class PrisonerAlreadyJailedException extends Exception {
private static final long serialVersionUID = -5830449694077279409L; private static final long serialVersionUID = -5830449694077279409L;
/** /**
* Creation of a prisoner is already jailed exception. * Creation of a prisoner is already jailed exception.
*
*/ */
public PrisonerAlreadyJailedException() { public PrisonerAlreadyJailedException() {
super("A prisoner (no name or uuid provided) is already jailed and can not be jailed twice."); super("A prisoner (no name or uuid provided) is already jailed and can not be jailed twice.");

3
src/main/java/com/graywolf336/jail/exceptions/PrisonerRequiredException.java
View File

@ -1,12 +1,11 @@
package com.graywolf336.jail.exceptions; package com.graywolf336.jail.exceptions;
/** /**
*
* The exception thrown when a prisoner's data is required but wasn't provided. * The exception thrown when a prisoner's data is required but wasn't provided.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0
*/ */
public class PrisonerRequiredException extends Exception { public class PrisonerRequiredException extends Exception {
private static final long serialVersionUID = 5289068334047189357L; private static final long serialVersionUID = 5289068334047189357L;

61
src/main/java/com/graywolf336/jail/interfaces/ICell.java
View File

@ -1,158 +1,159 @@
package com.graywolf336.jail.interfaces; package com.graywolf336.jail.interfaces;
import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.beans.SimpleLocation;
import org.bukkit.Location;
import org.bukkit.block.Chest;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import org.bukkit.Location;
import org.bukkit.block.Chest;
import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.beans.SimpleLocation;
public interface ICell { public interface ICell {
/** /**
* Gets the id of the cell in the database, <strong>internal usage only</strong> * Gets the id of the cell in the database, <strong>internal usage only</strong>
* *
* @return database's id, don't use for external reasons * @return database's id, don't use for external reasons
*/ */
public int getDatabaseID(); int getDatabaseID();
/** /**
* Gets the name of the cell. * Gets the name of the cell.
* *
* @return Cell's name * @return Cell's name
*/ */
public String getName(); String getName();
/** /**
* Sets the prisoner in this cell. * Sets the prisoner in this cell.
* *
* @param prisoner the {@link Prisoner} to set * @param prisoner the {@link Prisoner} to set
*/ */
public void setPrisoner(Prisoner prisoner); void setPrisoner(Prisoner prisoner);
/** /**
* Gets the prisoner being held in this cell. * Gets the prisoner being held in this cell.
* *
* @return the {@link Prisoner} instance in this cell, null if no prisoner * @return the {@link Prisoner} instance in this cell, null if no prisoner
*/ */
public Prisoner getPrisoner(); Prisoner getPrisoner();
/** Nullifies the prisoner data. */ /**
public void removePrisoner(); * Nullifies the prisoner data.
*/
void removePrisoner();
/** /**
* Returns true if there is currently a prisoner in this cell. * Returns true if there is currently a prisoner in this cell.
* *
* @return Whether there is a prisoner or not * @return Whether there is a prisoner or not
*/ */
public boolean hasPrisoner(); boolean hasPrisoner();
/** /**
* Adds all the given signs to the cell. * Adds all the given signs to the cell.
* *
* @param signs all of the signs to add * @param signs all of the signs to add
*/ */
public void addAllSigns(HashSet<SimpleLocation> signs); void addAllSigns(HashSet<SimpleLocation> signs);
/** /**
* Adds a sign to the cell. * Adds a sign to the cell.
* *
* @param sign the {@link SimpleLocation} of the sign to add * @param sign the {@link SimpleLocation} of the sign to add
*/ */
public void addSign(SimpleLocation sign); void addSign(SimpleLocation sign);
/** /**
* Returns all the signs for this cell. * Returns all the signs for this cell.
* *
* @return All the signs used by this cell * @return All the signs used by this cell
*/ */
public HashSet<SimpleLocation> getSigns(); HashSet<SimpleLocation> getSigns();
/** /**
* Checks if there are any signs for this cell. * Checks if there are any signs for this cell.
* *
* @return Whether this cell has signs or not. * @return Whether this cell has signs or not.
*/ */
public boolean hasSigns(); boolean hasSigns();
/** /**
* Returns the entire list of signs in a string. * Returns the entire list of signs in a string.
* *
* @return the serialized string of sign locations * @return the serialized string of sign locations
*/ */
public String getSignString(); String getSignString();
/** /**
* Gets a list of all the signs which are invalid (not signs anymore). * Gets a list of all the signs which are invalid (not signs anymore).
* *
* @return Returns a list of all the invalid signs * @return Returns a list of all the invalid signs
*/ */
public List<String> getInvalidSigns(); List<String> getInvalidSigns();
/** /**
* Removes all the signs which are no longer sign blocks. * Removes all the signs which are no longer sign blocks.
* *
* @return The signs cleaned up * @return The signs cleaned up
*/ */
public List<String> cleanSigns(); List<String> cleanSigns();
/** /**
* Updates all the signs this cell has. * Updates all the signs this cell has.
* *
* @return collection of changes. The <strong>"removed"</strong> entry has all the signs which were removed. The <strong>"updated"</strong> entry has all the signs which got updated. * @return collection of changes. The <strong>"removed"</strong> entry has all the signs which were removed. The <strong>"updated"</strong> entry has all the signs which got updated.
*/ */
public HashMap<String, List<String>> updateSigns(); HashMap<String, List<String>> updateSigns();
/** /**
* Sets the location of where the prisoner will be teleported at when jailed here. * Sets the location of where the prisoner will be teleported at when jailed here.
* *
* @param location the {@link SimpleLocation} of the teleport * @param location the {@link SimpleLocation} of the teleport
*/ */
public void setTeleport(SimpleLocation location); void setTeleport(SimpleLocation location);
/** /**
* Gets the teleport location where the prisoner will be teleported at when jailed here. * Gets the teleport location where the prisoner will be teleported at when jailed here.
* *
* @return the teleport in {@link Location location} * @return the teleport in {@link Location location}
*/ */
public Location getTeleport(); Location getTeleport();
/** /**
* Sets the location of the chest. * Sets the location of the chest.
* *
* @param simpleLocation the {@link SimpleLocation} of the chest * @param simpleLocation the {@link SimpleLocation} of the chest
*/ */
public void setChestLocation(SimpleLocation simpleLocation); void setChestLocation(SimpleLocation simpleLocation);
/** /**
* Gets the location of the chest, returns null if no chest is stored at this cell. * Gets the location of the chest, returns null if no chest is stored at this cell.
* *
* @return The location of the chest, null if none. * @return The location of the chest, null if none.
*/ */
public Location getChestLocation(); Location getChestLocation();
/** /**
* Gets the chest for this cell, returns null if there is no chest or the location we have is not a chest. * Gets the chest for this cell, returns null if there is no chest or the location we have is not a chest.
* *
* @return The chest and its state. * @return The chest and its state.
*/ */
public Chest getChest(); Chest getChest();
/** /**
* Checks if the chest location doesn't equal null and if it is a double chest. * Checks if the chest location doesn't equal null and if it is a double chest.
* *
* @return true if there is a chest, false if there isn't. * @return true if there is a chest, false if there isn't.
*/ */
public boolean hasChest(); boolean hasChest();
/** /**
* Checks to see if this cell uses a chest or not. * Checks to see if this cell uses a chest or not.
* *
* @return Whether there is a location for chest stored. * @return Whether there is a location for chest stored.
*/ */
public boolean useChest(); boolean useChest();
/** /**
* Sets whether this cell has been changed or not. * Sets whether this cell has been changed or not.
@ -160,12 +161,12 @@ public interface ICell {
* @param changed true if we've changed it, mostly use if you want to force an update * @param changed true if we've changed it, mostly use if you want to force an update
* @return the resulting change, whether it is changed or not * @return the resulting change, whether it is changed or not
*/ */
public boolean setChanged(boolean changed); boolean setChanged(boolean changed);
/** /**
* Gets whether the Cell has changed from the last save or not. * Gets whether the Cell has changed from the last save or not.
* *
* @return Whether the cell has changed or not since last save * @return Whether the cell has changed or not since last save
*/ */
public boolean hasChanged(); boolean hasChanged();
} }

26
src/main/java/com/graywolf336/jail/interfaces/IJailPayManager.java
View File

@ -1,12 +1,10 @@
package com.graywolf336.jail.interfaces; package com.graywolf336.jail.interfaces;
import com.graywolf336.jail.beans.Prisoner;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.graywolf336.jail.beans.Prisoner;
public interface IJailPayManager { public interface IJailPayManager {
/** /**
@ -14,21 +12,21 @@ public interface IJailPayManager {
* *
* @return Whether infinite paying is enabled. * @return Whether infinite paying is enabled.
*/ */
public boolean isInfiniteEnabled(); boolean isInfiniteEnabled();
/** /**
* Checks if paying for timed is enabled. * Checks if paying for timed is enabled.
* *
* @return Whether time paying is enabled. * @return Whether time paying is enabled.
*/ */
public boolean isTimedEnabled(); boolean isTimedEnabled();
/** /**
* Gets how much it cost per minute in string format. * Gets how much it cost per minute in string format.
* *
* @return How much it costs per minute * @return How much it costs per minute
*/ */
public String getCostPerMinute(); String getCostPerMinute();
/** /**
* Calculates how much players have to pay to get completely free. * Calculates how much players have to pay to get completely free.
@ -36,7 +34,7 @@ public interface IJailPayManager {
* @param prisoner data of who we're calculating * @param prisoner data of who we're calculating
* @return The economy cost the prisoner will need to pay to get completely free. * @return The economy cost the prisoner will need to pay to get completely free.
*/ */
public double calculateBill(Prisoner prisoner); double calculateBill(Prisoner prisoner);
/** /**
* Gets how many minutes someone is paying for (rounds to the lowest number). * Gets how many minutes someone is paying for (rounds to the lowest number).
@ -44,21 +42,21 @@ public interface IJailPayManager {
* @param amount amount of money * @param amount amount of money
* @return the amount of time they're paying for * @return the amount of time they're paying for
*/ */
public long getMinutesPayingFor(double amount); long getMinutesPayingFor(double amount);
/** /**
* Returns if we are using items for payment instead of economy. * Returns if we are using items for payment instead of economy.
* *
* @return Whether paying using items is enabled * @return Whether paying using items is enabled
*/ */
public boolean usingItemsForPayment(); boolean usingItemsForPayment();
/** /**
* Gets the {@link Material} it costs for jail pay, will be air if using economy. * Gets the {@link Material} it costs for jail pay, will be air if using economy.
* *
* @return The item type it costs, air if using virtual economy. * @return The item type it costs, air if using virtual economy.
*/ */
public Material getItemItCost(); Material getItemItCost();
/** /**
* Checks if the player has enough money/items to pay what they have said they want to. * Checks if the player has enough money/items to pay what they have said they want to.
@ -67,7 +65,7 @@ public interface IJailPayManager {
* @param amount The amount to check they if they have. * @param amount The amount to check they if they have.
* @return true if they have enough, false if not. * @return true if they have enough, false if not.
*/ */
public boolean hasEnoughToPay(Player player, double amount); boolean hasEnoughToPay(Player player, double amount);
/** /**
* Pays the required fees from the given player, removing items or money from economy. * Pays the required fees from the given player, removing items or money from economy.
@ -75,19 +73,19 @@ public interface IJailPayManager {
* @param player The player who is paying. * @param player The player who is paying.
* @param amount The amount of items or money to withdraw from the player. * @param amount The amount of items or money to withdraw from the player.
*/ */
public void pay(Player player, double amount); void pay(Player player, double amount);
/** /**
* Gets the name of the item in nice capitals. * Gets the name of the item in nice capitals.
* *
* @return The currency name in nice capital letters. * @return The currency name in nice capital letters.
*/ */
public String getCurrencyName(); String getCurrencyName();
/** /**
* Returns the economy provider to do transaction with. * Returns the economy provider to do transaction with.
* *
* @return the {@link Economy} instance * @return the {@link Economy} instance
*/ */
public Economy getEconomy(); Economy getEconomy();
} }

24
src/main/java/com/graywolf336/jail/interfaces/IJailStickManager.java
View File

@ -1,10 +1,9 @@
package com.graywolf336.jail.interfaces; package com.graywolf336.jail.interfaces;
import java.util.UUID; import com.graywolf336.jail.beans.Stick;
import org.bukkit.Material; import org.bukkit.Material;
import com.graywolf336.jail.beans.Stick; import java.util.UUID;
/** /**
* Interface for the jail stick manager. * Interface for the jail stick manager.
@ -12,7 +11,6 @@ import com.graywolf336.jail.beans.Stick;
* @author graywolf336 * @author graywolf336
* @version 1.0.0 * @version 1.0.0
* @since 3.0.0 * @since 3.0.0
*
*/ */
public interface IJailStickManager { public interface IJailStickManager {
@ -22,7 +20,7 @@ public interface IJailStickManager {
* @param mat of the stick to get * @param mat of the stick to get
* @return The {@link Stick jail stick} * @return The {@link Stick jail stick}
*/ */
public Stick getStick(Material mat); Stick getStick(Material mat);
/** /**
* Checks if the provided Material is a valid {@link Stick jail stick} * Checks if the provided Material is a valid {@link Stick jail stick}
@ -30,21 +28,21 @@ public interface IJailStickManager {
* @param mat the {@link Material} to check * @param mat the {@link Material} to check
* @return whether the provided material is a valid stick * @return whether the provided material is a valid stick
*/ */
public boolean isValidStick(Material mat); boolean isValidStick(Material mat);
/** /**
* Adds a player to be using a jail stick, with the uuid of the player. * Adds a player to be using a jail stick, with the uuid of the player.
* *
* @param id of the player to add * @param id of the player to add
*/ */
public void addUsingStick(UUID id); void addUsingStick(UUID id);
/** /**
* Removes a player from using a jail stick, with the uuid of the player. * Removes a player from using a jail stick, with the uuid of the player.
* *
* @param id of the player to remove using a jail stick * @param id of the player to remove using a jail stick
*/ */
public void removeUsingStick(UUID id); void removeUsingStick(UUID id);
/** /**
* Returns whether or not the player is using a jail stick. * Returns whether or not the player is using a jail stick.
@ -52,7 +50,7 @@ public interface IJailStickManager {
* @param id of the player to check if using one * @param id of the player to check if using one
* @return true if the player is using a jail stick, false if not * @return true if the player is using a jail stick, false if not
*/ */
public boolean isUsingJailStick(UUID id); boolean isUsingJailStick(UUID id);
/** /**
* Toggles whether the player is using a jail stick, returning the true if enabled false if disabled. * Toggles whether the player is using a jail stick, returning the true if enabled false if disabled.
@ -60,8 +58,10 @@ public interface IJailStickManager {
* @param id of the player to toggle using a stick * @param id of the player to toggle using a stick
* @return true if we enabled it, false if we disabled it. * @return true if we enabled it, false if we disabled it.
*/ */
public boolean toggleUsingStick(UUID id); boolean toggleUsingStick(UUID id);
/** Removes all the users currently using the sticks. */ /**
public void removeAllStickUsers(); * Removes all the users currently using the sticks.
*/
void removeAllStickUsers();
} }

32
src/main/java/com/graywolf336/jail/listeners/CacheListener.java
View File

@ -1,12 +1,5 @@
package com.graywolf336.jail.listeners; package com.graywolf336.jail.listeners;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerKickEvent;
import org.bukkit.event.player.PlayerQuitEvent;
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.Jail;
@ -15,23 +8,28 @@ import com.graywolf336.jail.events.PrePrisonerReleasedEvent;
import com.graywolf336.jail.events.PrePrisonerTransferredEvent; import com.graywolf336.jail.events.PrePrisonerTransferredEvent;
import com.graywolf336.jail.events.PrisonerJailedEvent; import com.graywolf336.jail.events.PrisonerJailedEvent;
import com.graywolf336.jail.events.PrisonerTransferredEvent; import com.graywolf336.jail.events.PrisonerTransferredEvent;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerKickEvent;
import org.bukkit.event.player.PlayerQuitEvent;
/** /**
* The listen for all events which need to add/remove to the prisoner cache. * The listen for all events which need to add/remove to the prisoner cache.
* *
* <p> * <p>
* * <p>
* These listeners add and remove prisoner cache objects to the cache, * These listeners add and remove prisoner cache objects to the cache,
* this way we gain performance for servers which have a high amount * this way we gain performance for servers which have a high amount
* of prisoners jailed. (500+) * of prisoners jailed. (500+)
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.0 * @version 1.0.0
* * @since 3.0.0
*/ */
public class CacheListener implements Listener { public class CacheListener implements Listener {
private JailMain pl; private final JailMain pl;
public CacheListener(JailMain plugin) { public CacheListener(JailMain plugin) {
this.pl = plugin; this.pl = plugin;
@ -39,7 +37,7 @@ public class CacheListener implements Listener {
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void joinListener(PlayerJoinEvent event) { public void joinListener(PlayerJoinEvent event) {
if(pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) { if (pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) {
Jail j = pl.getJailManager().getJailPlayerIsIn(event.getPlayer().getUniqueId()); Jail j = pl.getJailManager().getJailPlayerIsIn(event.getPlayer().getUniqueId());
Prisoner p = j.getPrisoner(event.getPlayer().getUniqueId()); Prisoner p = j.getPrisoner(event.getPlayer().getUniqueId());
@ -49,14 +47,14 @@ public class CacheListener implements Listener {
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void leaveListener(PlayerQuitEvent event) { public void leaveListener(PlayerQuitEvent event) {
if(pl.getJailManager().inCache(event.getPlayer().getUniqueId())) { if (pl.getJailManager().inCache(event.getPlayer().getUniqueId())) {
pl.getJailManager().removeCacheObject(event.getPlayer().getUniqueId()); pl.getJailManager().removeCacheObject(event.getPlayer().getUniqueId());
} }
} }
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void kickListener(PlayerKickEvent event) { public void kickListener(PlayerKickEvent event) {
if(pl.getJailManager().inCache(event.getPlayer().getUniqueId())) { if (pl.getJailManager().inCache(event.getPlayer().getUniqueId())) {
pl.getJailManager().removeCacheObject(event.getPlayer().getUniqueId()); pl.getJailManager().removeCacheObject(event.getPlayer().getUniqueId());
} }
} }
@ -68,15 +66,15 @@ public class CacheListener implements Listener {
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void beforeReleaseListener(PrePrisonerReleasedEvent event) { public void beforeReleaseListener(PrePrisonerReleasedEvent event) {
if(pl.getJailManager().inCache(event.getPlayer().getUniqueId())) { if (pl.getJailManager().inCache(event.getPlayer().getUniqueId())) {
pl.getJailManager().removeCacheObject(event.getPlayer().getUniqueId()); pl.getJailManager().removeCacheObject(event.getPlayer().getUniqueId());
} }
} }
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void beforeTransferringListener(PrePrisonerTransferredEvent event) { public void beforeTransferringListener(PrePrisonerTransferredEvent event) {
if(event.isPlayerOnline()) { if (event.isPlayerOnline()) {
if(pl.getJailManager().inCache(event.getPlayer().getUniqueId())) { if (pl.getJailManager().inCache(event.getPlayer().getUniqueId())) {
pl.getJailManager().removeCacheObject(event.getPlayer().getUniqueId()); pl.getJailManager().removeCacheObject(event.getPlayer().getUniqueId());
} }
} }

39
src/main/java/com/graywolf336/jail/listeners/CellSignListener.java
View File

@ -1,11 +1,5 @@
package com.graywolf336.jail.listeners; package com.graywolf336.jail.listeners;
import java.util.List;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import com.graywolf336.jail.JailMain; import com.graywolf336.jail.JailMain;
import com.graywolf336.jail.Util; import com.graywolf336.jail.Util;
import com.graywolf336.jail.enums.Settings; import com.graywolf336.jail.enums.Settings;
@ -15,23 +9,28 @@ import com.graywolf336.jail.events.PrisonerJailedEvent;
import com.graywolf336.jail.events.PrisonerReleasedEvent; import com.graywolf336.jail.events.PrisonerReleasedEvent;
import com.graywolf336.jail.events.PrisonerTimeChangeEvent; import com.graywolf336.jail.events.PrisonerTimeChangeEvent;
import com.graywolf336.jail.events.PrisonerTransferredEvent; import com.graywolf336.jail.events.PrisonerTransferredEvent;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import java.util.List;
public class CellSignListener implements Listener { public class CellSignListener implements Listener {
private String lineOne = "", lineTwo = "", lineThree = "", lineFour = ""; private String lineOne = "", lineTwo = "", lineThree = "", lineFour = "";
private JailMain pl; private final JailMain pl;
public CellSignListener(JailMain plugin) { public CellSignListener(JailMain plugin) {
pl = plugin; pl = plugin;
List<String> lines = pl.getConfig().getStringList(Settings.CELLSIGNLINES.getPath()); List<String> lines = pl.getConfig().getStringList(Settings.CELLSIGNLINES.getPath());
if(lines.size() >= 1) lineOne = lines.get(0); if (lines.size() >= 1) lineOne = lines.get(0);
if(lines.size() >= 2) lineTwo = lines.get(1); if (lines.size() >= 2) lineTwo = lines.get(1);
if(lines.size() >= 3) lineThree = lines.get(2); if (lines.size() >= 3) lineThree = lines.get(2);
if(lines.size() >= 4) lineFour = lines.get(3); if (lines.size() >= 4) lineFour = lines.get(3);
try { try {
Util.updateSignLinesCache(new String[] { lineOne, lineTwo, lineThree, lineFour }); Util.updateSignLinesCache(new String[]{lineOne, lineTwo, lineThree, lineFour});
}catch(Exception e) { } catch (Exception e) {
//this should never happen //this should never happen
pl.debug("Error on Cell Sign Listener constructor:" + e.getMessage()); pl.debug("Error on Cell Sign Listener constructor:" + e.getMessage());
} }
@ -39,12 +38,10 @@ public class CellSignListener implements Listener {
@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
public void changeTheCellSigns(final PrisonerTimeChangeEvent event) { public void changeTheCellSigns(final PrisonerTimeChangeEvent event) {
pl.getServer().getScheduler().scheduleSyncDelayedTask(pl, new Runnable() { pl.getServer().getScheduler().scheduleSyncDelayedTask(pl, () -> {
public void run() {
if (event.hasCell() && event.getCell().hasSigns()) { if (event.hasCell() && event.getCell().hasSigns()) {
event.getCell().updateSigns(); event.getCell().updateSigns();
} }
}
}); });
} }
@ -90,11 +87,11 @@ public class CellSignListener implements Listener {
lineThree = ""; lineThree = "";
lineFour = ""; lineFour = "";
if(lines.size() >= 1) lineOne = lines.get(0); if (lines.size() >= 1) lineOne = lines.get(0);
if(lines.size() >= 2) lineTwo = lines.get(1); if (lines.size() >= 2) lineTwo = lines.get(1);
if(lines.size() >= 3) lineThree = lines.get(2); if (lines.size() >= 3) lineThree = lines.get(2);
if(lines.size() >= 4) lineFour = lines.get(3); if (lines.size() >= 4) lineFour = lines.get(3);
Util.updateSignLinesCache(new String[] { lineOne, lineTwo, lineThree, lineFour }); Util.updateSignLinesCache(new String[]{lineOne, lineTwo, lineThree, lineFour});
} }
} }

21
src/main/java/com/graywolf336/jail/listeners/EntityListener.java
View File

@ -1,31 +1,30 @@
package com.graywolf336.jail.listeners; package com.graywolf336.jail.listeners;
import com.graywolf336.jail.JailMain;
import com.graywolf336.jail.enums.Settings;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.event.entity.EntityChangeBlockEvent;
import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.EntityExplodeEvent;
import com.graywolf336.jail.JailMain;
import com.graywolf336.jail.enums.Settings;
public class EntityListener implements Listener { public class EntityListener implements Listener {
private JailMain pl; private final JailMain pl;
public EntityListener(JailMain plugin) { public EntityListener(JailMain plugin) {
this.pl = plugin; this.pl = plugin;
} }
@EventHandler(ignoreCancelled=true) @EventHandler(ignoreCancelled = true)
public void onEntityExplode(EntityExplodeEvent event) { public void onEntityExplode(EntityExplodeEvent event) {
//Only do the checking if plugin has it enabled //Only do the checking if plugin has it enabled
//otherwise let's not go through all the blocks //otherwise let's not go through all the blocks
if(pl.getConfig().getBoolean(Settings.EXPLOSIONPROTECTION.getPath())) { if (pl.getConfig().getBoolean(Settings.EXPLOSIONPROTECTION.getPath())) {
//Loop through the blocklist and do stuff //Loop through the blocklist and do stuff
for(Block b : event.blockList()) { for (Block b : event.blockList()) {
//Check the current block and if it is inside a jail, //Check the current block and if it is inside a jail,
//then let's do something else //then let's do something else
if(pl.getJailManager().isLocationAJail(b.getLocation())) { if (pl.getJailManager().isLocationAJail(b.getLocation())) {
//Clear the blocklist, this way the explosion effect still happens //Clear the blocklist, this way the explosion effect still happens
event.blockList().clear(); event.blockList().clear();
return; return;
@ -34,12 +33,12 @@ public class EntityListener implements Listener {
} }
} }
@EventHandler(ignoreCancelled=true) @EventHandler(ignoreCancelled = true)
public void protectFromEndermen(EntityChangeBlockEvent event) { public void protectFromEndermen(EntityChangeBlockEvent event) {
//If we are protecting the jails from endermen protection //If we are protecting the jails from endermen protection
if(pl.getConfig().getBoolean(Settings.ENDERMENPROTECTION.getPath())) { if (pl.getConfig().getBoolean(Settings.ENDERMENPROTECTION.getPath())) {
//Check if there are any jails where the block's location is //Check if there are any jails where the block's location is
if(pl.getJailManager().isLocationAJail(event.getBlock().getLocation())) { if (pl.getJailManager().isLocationAJail(event.getBlock().getLocation())) {
//Let's cancel the event so it doesn't happen //Let's cancel the event so it doesn't happen
event.setCancelled(true); event.setCancelled(true);
} }

39
src/main/java/com/graywolf336/jail/listeners/HandCuffListener.java
View File

@ -1,7 +1,6 @@
package com.graywolf336.jail.listeners; package com.graywolf336.jail.listeners;
import java.util.HashMap; import com.graywolf336.jail.JailMain;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -13,20 +12,20 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent;
import com.graywolf336.jail.JailMain; import java.util.HashMap;
public class HandCuffListener implements Listener { public class HandCuffListener implements Listener {
private JailMain pl; private final JailMain pl;
private HashMap<String, Location> tos; private final HashMap<String, Location> tos;
public HandCuffListener(JailMain plugin) { public HandCuffListener(JailMain plugin) {
this.pl = plugin; this.pl = plugin;
this.tos = new HashMap<String, Location>(); this.tos = new HashMap<>();
} }
@EventHandler(ignoreCancelled=true) @EventHandler(ignoreCancelled = true)
public void onPlayerMove(PlayerMoveEvent event) { public void onPlayerMove(PlayerMoveEvent event) {
if(event.isCancelled()) return; if (false) return;
if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId())) { if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId())) {
Location to = pl.getHandCuffManager().getLocation(event.getPlayer().getUniqueId()); Location to = pl.getHandCuffManager().getLocation(event.getPlayer().getUniqueId());
@ -36,16 +35,16 @@ public class HandCuffListener implements Listener {
tos.put(event.getPlayer().getName(), to); tos.put(event.getPlayer().getName(), to);
event.getPlayer().teleport(to); event.getPlayer().teleport(to);
if(System.currentTimeMillis() >= pl.getHandCuffManager().getNextMessageTime(event.getPlayer().getUniqueId())) { if (System.currentTimeMillis() >= pl.getHandCuffManager().getNextMessageTime(event.getPlayer().getUniqueId())) {
event.getPlayer().sendMessage(ChatColor.RED + "You are handcuffed and cant move!"); event.getPlayer().sendMessage(ChatColor.RED + "You are handcuffed and cant move!");
pl.getHandCuffManager().updateNextTime(event.getPlayer().getUniqueId()); pl.getHandCuffManager().updateNextTime(event.getPlayer().getUniqueId());
} }
} }
} }
@EventHandler(ignoreCancelled=true) @EventHandler(ignoreCancelled = true)
public void onPlayerTeleport(PlayerTeleportEvent event) { public void onPlayerTeleport(PlayerTeleportEvent event) {
if(event.isCancelled()) return; if (false) return;
if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId()) && event.getTo() != tos.get(event.getPlayer().getName())) { if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId()) && event.getTo() != tos.get(event.getPlayer().getName())) {
Location to = pl.getHandCuffManager().getLocation(event.getPlayer().getUniqueId()); Location to = pl.getHandCuffManager().getLocation(event.getPlayer().getUniqueId());
@ -55,16 +54,16 @@ public class HandCuffListener implements Listener {
tos.put(event.getPlayer().getName(), to); tos.put(event.getPlayer().getName(), to);
event.getPlayer().teleport(to); event.getPlayer().teleport(to);
if(System.currentTimeMillis() >= pl.getHandCuffManager().getNextMessageTime(event.getPlayer().getUniqueId())) { if (System.currentTimeMillis() >= pl.getHandCuffManager().getNextMessageTime(event.getPlayer().getUniqueId())) {
event.getPlayer().sendMessage(ChatColor.RED + "You are handcuffed and cant move!"); event.getPlayer().sendMessage(ChatColor.RED + "You are handcuffed and cant move!");
pl.getHandCuffManager().updateNextTime(event.getPlayer().getUniqueId()); pl.getHandCuffManager().updateNextTime(event.getPlayer().getUniqueId());
} }
} }
} }
@EventHandler(ignoreCancelled=true) @EventHandler(ignoreCancelled = true)
public void playerChat(AsyncPlayerChatEvent event) { public void playerChat(AsyncPlayerChatEvent event) {
if(event.isCancelled()) return; if (false) return;
if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId()) && !event.getPlayer().hasPermission("jail.command.handcuff")) { if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId()) && !event.getPlayer().hasPermission("jail.command.handcuff")) {
event.setCancelled(true); event.setCancelled(true);
@ -72,9 +71,9 @@ public class HandCuffListener implements Listener {
} }
} }
@EventHandler(ignoreCancelled=true) @EventHandler(ignoreCancelled = true)
public void blockBreak(BlockBreakEvent event) { public void blockBreak(BlockBreakEvent event) {
if(event.isCancelled()) return; if (false) return;
if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId())) { if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId())) {
event.setCancelled(true); event.setCancelled(true);
@ -82,9 +81,9 @@ public class HandCuffListener implements Listener {
} }
} }
@EventHandler(ignoreCancelled=true) @EventHandler(ignoreCancelled = true)
public void blockPlace(BlockPlaceEvent event) { public void blockPlace(BlockPlaceEvent event) {
if(event.isCancelled()) return; if (false) return;
if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId())) { if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId())) {
event.setCancelled(true); event.setCancelled(true);
@ -92,9 +91,9 @@ public class HandCuffListener implements Listener {
} }
} }
@EventHandler(ignoreCancelled=true) @EventHandler(ignoreCancelled = true)
public void preCommands(PlayerCommandPreprocessEvent event) { public void preCommands(PlayerCommandPreprocessEvent event) {
if(event.isCancelled()) return; if (false) return;
if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId()) && !event.getPlayer().hasPermission("jail.command.handcuff") && (!event.getMessage().startsWith("/r") || !event.getMessage().startsWith("/reply"))) { if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId()) && !event.getPlayer().hasPermission("jail.command.handcuff") && (!event.getMessage().startsWith("/r") || !event.getMessage().startsWith("/reply"))) {
event.setCancelled(true); event.setCancelled(true);

47
src/main/java/com/graywolf336/jail/listeners/JailingListener.java
View File

@ -1,35 +1,34 @@
package com.graywolf336.jail.listeners; package com.graywolf336.jail.listeners;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.bukkit.Color;
import org.bukkit.Material;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.LeatherArmorMeta;
import com.graywolf336.jail.JailMain; import com.graywolf336.jail.JailMain;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.enums.Settings; import com.graywolf336.jail.enums.Settings;
import com.graywolf336.jail.events.PrePrisonerJailedByJailStickEvent; import com.graywolf336.jail.events.PrePrisonerJailedByJailStickEvent;
import com.graywolf336.jail.events.PrePrisonerJailedEvent; import com.graywolf336.jail.events.PrePrisonerJailedEvent;
import com.graywolf336.jail.events.PrisonerJailedEvent; import com.graywolf336.jail.events.PrisonerJailedEvent;
import org.bukkit.Color;
import org.bukkit.Material;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.LeatherArmorMeta;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
public class JailingListener implements Listener { public class JailingListener implements Listener {
private JailMain pl; private final JailMain pl;
private DateFormat dateFormat; private final DateFormat dateFormat;
public JailingListener(JailMain plugin) { public JailingListener(JailMain plugin) {
this.pl = plugin; this.pl = plugin;
this.dateFormat = new SimpleDateFormat(Lang.TIMEFORMAT.get()); this.dateFormat = new SimpleDateFormat(Lang.TIMEFORMAT.get());
} }
@EventHandler(ignoreCancelled=true) @EventHandler(ignoreCancelled = true)
public void preJailingListener(PrePrisonerJailedEvent event) { public void preJailingListener(PrePrisonerJailedEvent event) {
if(pl.getConfig().getBoolean(Settings.LOGJAILINGTOPROFILE.getPath())) { if (pl.getConfig().getBoolean(Settings.LOGJAILINGTOPROFILE.getPath())) {
pl.getJailIO().addRecordEntry(event.getPrisoner().getUUID().toString(), pl.getJailIO().addRecordEntry(event.getPrisoner().getUUID().toString(),
event.getPrisoner().getLastKnownName(), event.getPrisoner().getLastKnownName(),
event.getPrisoner().getJailer(), dateFormat.format(new Date()), event.getPrisoner().getJailer(), dateFormat.format(new Date()),
@ -37,9 +36,9 @@ public class JailingListener implements Listener {
} }
} }
@EventHandler(ignoreCancelled=true) @EventHandler(ignoreCancelled = true)
public void preJailingListener(PrePrisonerJailedByJailStickEvent event) { public void preJailingListener(PrePrisonerJailedByJailStickEvent event) {
if(pl.getConfig().getBoolean(Settings.LOGJAILINGTOPROFILE.getPath())) { if (pl.getConfig().getBoolean(Settings.LOGJAILINGTOPROFILE.getPath())) {
pl.getJailIO().addRecordEntry(event.getPrisoner().getUUID().toString(), pl.getJailIO().addRecordEntry(event.getPrisoner().getUUID().toString(),
event.getPrisoner().getLastKnownName(), event.getPrisoner().getLastKnownName(),
event.getPrisoner().getJailer(), dateFormat.format(new Date()), event.getPrisoner().getJailer(), dateFormat.format(new Date()),
@ -49,11 +48,10 @@ public class JailingListener implements Listener {
@EventHandler @EventHandler
public void setInmatesClothing(final PrisonerJailedEvent event) { public void setInmatesClothing(final PrisonerJailedEvent event) {
if(pl.getConfig().getBoolean(Settings.CLOTHINGENABLED.getPath())) { if (pl.getConfig().getBoolean(Settings.CLOTHINGENABLED.getPath())) {
pl.getServer().getScheduler().runTaskLater(pl, new Runnable() { pl.getServer().getScheduler().runTaskLater(pl, () -> {
public void run() {
String[] helmet = pl.getConfig().getString(Settings.CLOTHINGHELMET.getPath()).toUpperCase().split("~"); String[] helmet = pl.getConfig().getString(Settings.CLOTHINGHELMET.getPath()).toUpperCase().split("~");
switch(helmet.length) { switch (helmet.length) {
case 1: case 1:
event.getPlayer().getInventory().setHelmet(new ItemStack(Material.valueOf(helmet[0]))); event.getPlayer().getInventory().setHelmet(new ItemStack(Material.valueOf(helmet[0])));
break; break;
@ -70,7 +68,7 @@ public class JailingListener implements Listener {
} }
String[] chest = pl.getConfig().getString(Settings.CLOTHINGCHEST.getPath()).toUpperCase().split("~"); String[] chest = pl.getConfig().getString(Settings.CLOTHINGCHEST.getPath()).toUpperCase().split("~");
switch(chest.length) { switch (chest.length) {
case 1: case 1:
event.getPlayer().getInventory().setChestplate(new ItemStack(Material.valueOf(chest[0]))); event.getPlayer().getInventory().setChestplate(new ItemStack(Material.valueOf(chest[0])));
break; break;
@ -87,7 +85,7 @@ public class JailingListener implements Listener {
} }
String[] legs = pl.getConfig().getString(Settings.CLOTHINGLEGS.getPath()).toUpperCase().split("~"); String[] legs = pl.getConfig().getString(Settings.CLOTHINGLEGS.getPath()).toUpperCase().split("~");
switch(legs.length) { switch (legs.length) {
case 1: case 1:
event.getPlayer().getInventory().setLeggings(new ItemStack(Material.valueOf(legs[0]))); event.getPlayer().getInventory().setLeggings(new ItemStack(Material.valueOf(legs[0])));
break; break;
@ -104,7 +102,7 @@ public class JailingListener implements Listener {
} }
String[] boots = pl.getConfig().getString(Settings.CLOTHINGBOOTS.getPath()).toUpperCase().split("~"); String[] boots = pl.getConfig().getString(Settings.CLOTHINGBOOTS.getPath()).toUpperCase().split("~");
switch(boots.length) { switch (boots.length) {
case 1: case 1:
event.getPlayer().getInventory().setBoots(new ItemStack(Material.valueOf(boots[0]))); event.getPlayer().getInventory().setBoots(new ItemStack(Material.valueOf(boots[0])));
break; break;
@ -119,7 +117,6 @@ public class JailingListener implements Listener {
default: default:
break; break;
} }
};
}, 20); }, 20);
} }
} }

41
src/main/java/com/graywolf336/jail/listeners/MoveProtectionListener.java
View File

@ -1,12 +1,5 @@
package com.graywolf336.jail.listeners; package com.graywolf336.jail.listeners;
import java.util.concurrent.TimeUnit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
import com.graywolf336.jail.JailMain; import com.graywolf336.jail.JailMain;
import com.graywolf336.jail.Util; import com.graywolf336.jail.Util;
import com.graywolf336.jail.beans.CachePrisoner; import com.graywolf336.jail.beans.CachePrisoner;
@ -14,35 +7,41 @@ import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.enums.Settings; import com.graywolf336.jail.enums.Settings;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
import java.util.concurrent.TimeUnit;
public class MoveProtectionListener implements Listener { public class MoveProtectionListener implements Listener {
private JailMain pl; private final JailMain pl;
public MoveProtectionListener(JailMain plugin) { public MoveProtectionListener(JailMain plugin) {
this.pl = plugin; this.pl = plugin;
} }
@EventHandler(ignoreCancelled=true) @EventHandler(ignoreCancelled = true)
public void moveProtection(PlayerMoveEvent event) { public void moveProtection(PlayerMoveEvent event) {
//If they haven't moved on the X or Z axis, then we shouldn't try to handle their moving //If they haven't moved on the X or Z axis, then we shouldn't try to handle their moving
//this was suggested as Pull Request 63. Going to test it some, but the hope is that //this was suggested as Pull Request 63. Going to test it some, but the hope is that
//we don't handle move events so much and thus improve performance. //we don't handle move events so much and thus improve performance.
if(event.getFrom().getBlockX() == event.getTo().getBlockX() && event.getFrom().getBlockZ() == event.getTo().getBlockZ()) { if (event.getFrom().getBlockX() == event.getTo().getBlockX() && event.getFrom().getBlockZ() == event.getTo().getBlockZ()) {
return; return;
} }
//If we have the move protection enabled, then let's do it. //If we have the move protection enabled, then let's do it.
//Other wise we don't need to deal with it. //Other wise we don't need to deal with it.
if(pl.getConfig().getBoolean(Settings.MOVEPROTECTION.getPath())) { if (pl.getConfig().getBoolean(Settings.MOVEPROTECTION.getPath())) {
//Let's be sure the player we're dealing with is in jail //Let's be sure the player we're dealing with is in jail
if(pl.getJailManager().inCache(event.getPlayer().getUniqueId())) { if (pl.getJailManager().inCache(event.getPlayer().getUniqueId())) {
CachePrisoner cp = pl.getJailManager().getCacheObject(event.getPlayer().getUniqueId()); CachePrisoner cp = pl.getJailManager().getCacheObject(event.getPlayer().getUniqueId());
Jail j = cp.getJail(); Jail j = cp.getJail();
Prisoner p = cp.getPrisoner(); Prisoner p = cp.getPrisoner();
//If the player is being teleported, let's ignore it //If the player is being teleported, let's ignore it
if(p.isTeleporting()) { if (p.isTeleporting()) {
return; return;
} }
@ -57,27 +56,27 @@ public class MoveProtectionListener implements Listener {
long add = Util.getTime(pl.getConfig().getString(Settings.MOVEPENALTY.getPath())); long add = Util.getTime(pl.getConfig().getString(Settings.MOVEPENALTY.getPath()));
p.addTime(add); p.addTime(add);
String msg = ""; String msg;
if(add == 0L) { if (add == 0L) {
//Generate the protection message, provide the method with one argument //Generate the protection message, provide the method with one argument
//which is the thing we are protecting against //which is the thing we are protecting against
msg = Lang.PROTECTIONMESSAGENOPENALTY.get(Lang.MOVING); msg = Lang.PROTECTIONMESSAGENOPENALTY.get(Lang.MOVING);
}else { } else {
//Generate the protection message, provide the method with two arguments //Generate the protection message, provide the method with two arguments
//First is the time in minutes and second is the thing we are protecting against //First is the time in minutes and second is the thing we are protecting against
msg = Lang.PROTECTIONMESSAGE.get(new String[] { String.valueOf(TimeUnit.MINUTES.convert(add, TimeUnit.MILLISECONDS)), Lang.MOVING.get() }); msg = Lang.PROTECTIONMESSAGE.get(String.valueOf(TimeUnit.MINUTES.convert(add, TimeUnit.MILLISECONDS)), Lang.MOVING.get());
} }
//Send the message //Send the message
event.getPlayer().sendMessage(msg); event.getPlayer().sendMessage(msg);
}catch(Exception e) { } catch (Exception e) {
pl.getLogger().severe("Moving (escaping) outside a jail penalty time is in the wrong format, please fix."); pl.getLogger().severe("Moving (escaping) outside a jail penalty time is in the wrong format, please fix.");
} }
//If the prisoner is in a cell, then let's teleport them to the cell's in location //If the prisoner is in a cell, then let's teleport them to the cell's in location
if(j.isJailedInACell(event.getPlayer().getUniqueId())) { if (j.isJailedInACell(event.getPlayer().getUniqueId())) {
event.setTo(j.getCellPrisonerIsIn(event.getPlayer().getUniqueId()).getTeleport()); event.setTo(j.getCellPrisonerIsIn(event.getPlayer().getUniqueId()).getTeleport());
}else { } else {
//Otherwise let's teleport them to the in location of the jail //Otherwise let's teleport them to the in location of the jail
event.setTo(j.getTeleportIn()); event.setTo(j.getTeleportIn());
} }
@ -86,7 +85,7 @@ public class MoveProtectionListener implements Listener {
} }
} }
@EventHandler(ignoreCancelled=true) @EventHandler(ignoreCancelled = true)
public void onPlayerTeleport(PlayerTeleportEvent event) { public void onPlayerTeleport(PlayerTeleportEvent event) {
PlayerMoveEvent move = new PlayerMoveEvent(event.getPlayer(), event.getFrom(), event.getTo()); PlayerMoveEvent move = new PlayerMoveEvent(event.getPlayer(), event.getFrom(), event.getTo());
moveProtection(move); moveProtection(move);

163
src/main/java/com/graywolf336/jail/listeners/PlayerListener.java
View File

@ -1,10 +1,18 @@
package com.graywolf336.jail.listeners; package com.graywolf336.jail.listeners;
import java.util.HashMap; import com.graywolf336.jail.JailMain;
import java.util.HashSet; import com.graywolf336.jail.JailManager;
import java.util.Set; import com.graywolf336.jail.Util;
import java.util.UUID; import com.graywolf336.jail.beans.AnyCell;
import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.beans.Stick;
import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.enums.Settings;
import com.graywolf336.jail.events.PrePrisonerJailedByJailStickEvent;
import com.graywolf336.jail.events.PrisonerDeathEvent;
import com.graywolf336.jail.interfaces.ICell;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -22,55 +30,46 @@ import org.bukkit.event.player.PlayerKickEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerRespawnEvent;
import com.graywolf336.jail.JailMain; import java.util.HashMap;
import com.graywolf336.jail.JailManager; import java.util.HashSet;
import com.graywolf336.jail.Util; import java.util.Set;
import com.graywolf336.jail.beans.AnyCell; import java.util.UUID;
import com.graywolf336.jail.beans.Cell;
import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.Prisoner;
import com.graywolf336.jail.beans.Stick;
import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.enums.Settings;
import com.graywolf336.jail.events.PrePrisonerJailedByJailStickEvent;
import com.graywolf336.jail.events.PrisonerDeathEvent;
import com.graywolf336.jail.interfaces.ICell;
public class PlayerListener implements Listener { public class PlayerListener implements Listener {
private JailMain pl; private final JailMain pl;
private HashMap<UUID, Long> clicks; private final HashMap<UUID, Long> clicks;
public PlayerListener(JailMain plugin) { public PlayerListener(JailMain plugin) {
this.pl = plugin; this.pl = plugin;
this.clicks = new HashMap<UUID, Long>(); this.clicks = new HashMap<>();
} }
@EventHandler(ignoreCancelled=true) @EventHandler(ignoreCancelled = true)
public void jailOrCellCreation(PlayerInteractEvent event) { public void jailOrCellCreation(PlayerInteractEvent event) {
if(event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) { if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) {
Player p = event.getPlayer(); Player p = event.getPlayer();
Location loc = event.getClickedBlock() == null ? p.getLocation() : event.getClickedBlock().getLocation(); Location loc = event.getClickedBlock() == null ? p.getLocation() : event.getClickedBlock().getLocation();
JailManager jm = pl.getJailManager(); JailManager jm = pl.getJailManager();
if(p.getInventory().getItemInMainHand().isSimilar(Util.getWand())) { if (p.getInventory().getItemInMainHand().isSimilar(Util.getWand())) {
if(jm.isCreatingSomething(p.getName())) { if (jm.isCreatingSomething(p.getName())) {
long current = System.currentTimeMillis(); long current = System.currentTimeMillis();
if(clicks.containsKey(p.getUniqueId())) { if (clicks.containsKey(p.getUniqueId())) {
if(current - clicks.get(p.getUniqueId()) > 500) { if (current - clicks.get(p.getUniqueId()) > 500) {
clicks.put(p.getUniqueId(), current); clicks.put(p.getUniqueId(), current);
}else { } else {
pl.debug("Prevented a double click for " + p.getName() + "!"); pl.debug("Prevented a double click for " + p.getName() + "!");
return; return;
} }
}else { } else {
clicks.put(p.getUniqueId(), current); clicks.put(p.getUniqueId(), current);
} }
if(jm.isCreatingAJail(p.getName())) { if (jm.isCreatingAJail(p.getName())) {
pl.debug("Stepping into creating a jail."); pl.debug("Stepping into creating a jail.");
jm.getJailCreationSteps().step(jm, p, jm.getJailCreationPlayer(p.getName()), loc); jm.getJailCreationSteps().step(jm, p, jm.getJailCreationPlayer(p.getName()), loc);
}else if(jm.isCreatingACell(p.getName())) { } else if (jm.isCreatingACell(p.getName())) {
pl.debug("Stepping into creating a cell."); pl.debug("Stepping into creating a cell.");
jm.getCellCreationSteps().step(jm, p, jm.getCellCreationPlayer(p.getName()), loc); jm.getCellCreationSteps().step(jm, p, jm.getCellCreationPlayer(p.getName()), loc);
} }
@ -79,10 +78,10 @@ public class PlayerListener implements Listener {
} }
} }
@EventHandler(ignoreCancelled=true, priority = EventPriority.LOW) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOW)
public void chatting(AsyncPlayerChatEvent event) { public void chatting(AsyncPlayerChatEvent event) {
if(pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) { if (pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) {
if(pl.getJailManager().getPrisoner(event.getPlayer().getUniqueId()).isMuted()) { if (pl.getJailManager().getPrisoner(event.getPlayer().getUniqueId()).isMuted()) {
event.setCancelled(true); event.setCancelled(true);
event.getPlayer().sendMessage(Lang.MUTED.get()); event.getPlayer().sendMessage(Lang.MUTED.get());
} }
@ -90,28 +89,30 @@ public class PlayerListener implements Listener {
//If the config has receive messages set to false, let's remove all the prisoners //If the config has receive messages set to false, let's remove all the prisoners
//from getting the chat messages. //from getting the chat messages.
if(!pl.getConfig().getBoolean(Settings.RECIEVEMESSAGES.getPath())) { if (!pl.getConfig().getBoolean(Settings.RECIEVEMESSAGES.getPath())) {
if(pl.inDebug()) pl.getLogger().info("Debug - There are " + event.getRecipients().size() + " players getting the message before."); if (pl.inDebug())
Set<Player> rec = new HashSet<Player>(event.getRecipients()); pl.getLogger().info("Debug - There are " + event.getRecipients().size() + " players getting the message before.");
Set<Player> rec = new HashSet<>(event.getRecipients());
for(Jail j : pl.getJailManager().getJails()) for (Jail j : pl.getJailManager().getJails())
for(Prisoner p : j.getAllPrisoners().values()) for (Prisoner p : j.getAllPrisoners().values())
rec.remove(pl.getServer().getPlayer(p.getUUID())); rec.remove(pl.getServer().getPlayer(p.getUUID()));
event.getRecipients().clear(); event.getRecipients().clear();
event.getRecipients().addAll(rec); event.getRecipients().addAll(rec);
if(pl.inDebug()) pl.getLogger().info("Debug - There are now " + event.getRecipients().size() + " players getting the message."); if (pl.inDebug())
pl.getLogger().info("Debug - There are now " + event.getRecipients().size() + " players getting the message.");
} }
} }
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public void checkForOfflineJailStuff(PlayerJoinEvent event) { public void checkForOfflineJailStuff(PlayerJoinEvent event) {
//Let's check if the player is jailed //Let's check if the player is jailed
if(pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) { if (pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) {
//Get the prisoner object //Get the prisoner object
Jail j = pl.getJailManager().getJailPlayerIsIn(event.getPlayer().getUniqueId()); Jail j = pl.getJailManager().getJailPlayerIsIn(event.getPlayer().getUniqueId());
if(!j.isEnabled()) { if (!j.isEnabled()) {
event.getPlayer().kickPlayer(Lang.WORLDUNLOADEDKICK.get()); event.getPlayer().kickPlayer(Lang.WORLDUNLOADEDKICK.get());
pl.getLogger().warning(j.getName() + " is located in a world which is unloaded and " + event.getPlayer().getName() + " (" + event.getPlayer().getUniqueId() + ") tried to join while jailed in it."); pl.getLogger().warning(j.getName() + " is located in a world which is unloaded and " + event.getPlayer().getName() + " (" + event.getPlayer().getUniqueId() + ") tried to join while jailed in it.");
return; return;
@ -122,24 +123,23 @@ public class PlayerListener implements Listener {
p.setLastKnownName(event.getPlayer().getName()); p.setLastKnownName(event.getPlayer().getName());
//Check if they're offline pending, as if this is true then they were jailed offline //Check if they're offline pending, as if this is true then they were jailed offline
if(p.isOfflinePending()) { if (p.isOfflinePending()) {
if(p.getRemainingTime() == 0L) { if (p.getRemainingTime() == 0L) {
//If their remaining time is 0, let's unjail them //If their remaining time is 0, let's unjail them
pl.getPrisonerManager().schedulePrisonerRelease(p); pl.getPrisonerManager().schedulePrisonerRelease(p);
}else if(p.isToBeTransferred()) { } else if (p.isToBeTransferred()) {
Cell c = j.getCellPrisonerIsIn(event.getPlayer().getUniqueId()); Cell c = j.getCellPrisonerIsIn(event.getPlayer().getUniqueId());
//If the player is not jailed in a cell, teleport them to the jail's in //If the player is not jailed in a cell, teleport them to the jail's in
if(c == null) { if (c == null) {
p.setTeleporting(true); p.setTeleporting(true);
event.getPlayer().teleport(j.getTeleportIn()); event.getPlayer().teleport(j.getTeleportIn());
p.setTeleporting(false); } else {
}else {
//If they are in a cell, teleport them into that cell //If they are in a cell, teleport them into that cell
p.setTeleporting(true); p.setTeleporting(true);
event.getPlayer().teleport(c.getTeleport()); event.getPlayer().teleport(c.getTeleport());
p.setTeleporting(false);
} }
p.setTeleporting(false);
p.setToBeTransferred(false); p.setToBeTransferred(false);
} else { } else {
@ -149,12 +149,12 @@ public class PlayerListener implements Listener {
} }
//Add the scoreboard to them if it is enabled //Add the scoreboard to them if it is enabled
if(pl.getConfig().getBoolean(Settings.SCOREBOARDENABLED.getPath())) { if (pl.getConfig().getBoolean(Settings.SCOREBOARDENABLED.getPath())) {
pl.getScoreBoardManager().addScoreBoard(event.getPlayer(), p); pl.getScoreBoardManager().addScoreBoard(event.getPlayer(), p);
} }
//if we are ignoring a prisoner's sleeping state, then let's set that //if we are ignoring a prisoner's sleeping state, then let's set that
if(pl.getConfig().getBoolean(Settings.IGNORESLEEPINGSTATE.getPath())) { if (pl.getConfig().getBoolean(Settings.IGNORESLEEPINGSTATE.getPath())) {
event.getPlayer().setSleepingIgnored(true); event.getPlayer().setSleepingIgnored(true);
} }
} }
@ -162,8 +162,8 @@ public class PlayerListener implements Listener {
@EventHandler @EventHandler
public void notifyUpdate(PlayerJoinEvent event) { public void notifyUpdate(PlayerJoinEvent event) {
if(pl.getConfig().getBoolean(Settings.UPDATENOTIFICATIONS.getPath())) { if (pl.getConfig().getBoolean(Settings.UPDATENOTIFICATIONS.getPath())) {
if(event.getPlayer().isOp() && pl.getUpdate().isAvailable()) { if (event.getPlayer().isOp() && pl.getUpdate().isAvailable()) {
event.getPlayer().sendMessage(ChatColor.BLUE + "" + ChatColor.BOLD + "An update for Jail is available: " + pl.getUpdate().getNewVersion()); event.getPlayer().sendMessage(ChatColor.BLUE + "" + ChatColor.BOLD + "An update for Jail is available: " + pl.getUpdate().getNewVersion());
event.getPlayer().sendMessage(ChatColor.BLUE + "" + ChatColor.BOLD + pl.getUpdate().getFileUrl()); event.getPlayer().sendMessage(ChatColor.BLUE + "" + ChatColor.BOLD + pl.getUpdate().getFileUrl());
} }
@ -172,19 +172,19 @@ public class PlayerListener implements Listener {
@EventHandler @EventHandler
public void handleGoingOffline(PlayerQuitEvent event) { public void handleGoingOffline(PlayerQuitEvent event) {
if(pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) { if (pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) {
//Remove the scoreboard to them if it is enabled //Remove the scoreboard to them if it is enabled
if(pl.getConfig().getBoolean(Settings.SCOREBOARDENABLED.getPath())) { if (pl.getConfig().getBoolean(Settings.SCOREBOARDENABLED.getPath())) {
pl.getScoreBoardManager().removeScoreBoard(event.getPlayer()); pl.getScoreBoardManager().removeScoreBoard(event.getPlayer());
} }
} }
} }
@EventHandler(ignoreCancelled=true) @EventHandler(ignoreCancelled = true)
public void handleGettingKicked(PlayerKickEvent event) { public void handleGettingKicked(PlayerKickEvent event) {
if(pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) { if (pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) {
//Remove the scoreboard to them if it is enabled //Remove the scoreboard to them if it is enabled
if(pl.getConfig().getBoolean(Settings.SCOREBOARDENABLED.getPath())) { if (pl.getConfig().getBoolean(Settings.SCOREBOARDENABLED.getPath())) {
pl.getScoreBoardManager().removeScoreBoard(event.getPlayer()); pl.getScoreBoardManager().removeScoreBoard(event.getPlayer());
} }
} }
@ -194,14 +194,14 @@ public class PlayerListener implements Listener {
@EventHandler(priority = EventPriority.LOW) @EventHandler(priority = EventPriority.LOW)
public void foodControl(FoodLevelChangeEvent event) { public void foodControl(FoodLevelChangeEvent event) {
if(pl.getConfig().getBoolean(Settings.FOODCONTROL.getPath())) { if (pl.getConfig().getBoolean(Settings.FOODCONTROL.getPath())) {
if(pl.getJailManager().isPlayerJailed(event.getEntity().getUniqueId())) { if (pl.getJailManager().isPlayerJailed(event.getEntity().getUniqueId())) {
int min = pl.getConfig().getInt(Settings.FOODCONTROLMIN.getPath()); int min = pl.getConfig().getInt(Settings.FOODCONTROLMIN.getPath());
int max = pl.getConfig().getInt(Settings.FOODCONTROLMAX.getPath()); int max = pl.getConfig().getInt(Settings.FOODCONTROLMAX.getPath());
if (event.getFoodLevel() < min) { if (event.getFoodLevel() < min) {
event.setFoodLevel(min); event.setFoodLevel(min);
}else { } else {
event.setFoodLevel(max); event.setFoodLevel(max);
} }
} }
@ -210,7 +210,7 @@ public class PlayerListener implements Listener {
@EventHandler @EventHandler
public void onPlayerDeath(PlayerDeathEvent event) { public void onPlayerDeath(PlayerDeathEvent event) {
if(pl.getJailManager().isPlayerJailed(event.getEntity().getUniqueId())) { if (pl.getJailManager().isPlayerJailed(event.getEntity().getUniqueId())) {
Jail j = pl.getJailManager().getJailPlayerIsIn(event.getEntity().getUniqueId()); Jail j = pl.getJailManager().getJailPlayerIsIn(event.getEntity().getUniqueId());
PrisonerDeathEvent prisonerEvent = new PrisonerDeathEvent(event, j, j.getCellPrisonerIsIn(event.getEntity().getUniqueId()), j.getPrisoner(event.getEntity().getUniqueId()), event.getEntity()); PrisonerDeathEvent prisonerEvent = new PrisonerDeathEvent(event, j, j.getCellPrisonerIsIn(event.getEntity().getUniqueId()), j.getPrisoner(event.getEntity().getUniqueId()), event.getEntity());
@ -220,44 +220,45 @@ public class PlayerListener implements Listener {
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerRespawn(PlayerRespawnEvent event) { public void onPlayerRespawn(PlayerRespawnEvent event) {
if(pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) { if (pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) {
Jail j = pl.getJailManager().getJailPlayerIsIn(event.getPlayer().getUniqueId()); Jail j = pl.getJailManager().getJailPlayerIsIn(event.getPlayer().getUniqueId());
if(j.isJailedInACell(event.getPlayer().getUniqueId())) { if (j.isJailedInACell(event.getPlayer().getUniqueId())) {
event.setRespawnLocation(j.getCellPrisonerIsIn(event.getPlayer().getUniqueId()).getTeleport()); event.setRespawnLocation(j.getCellPrisonerIsIn(event.getPlayer().getUniqueId()).getTeleport());
}else { } else {
event.setRespawnLocation(j.getTeleportIn()); event.setRespawnLocation(j.getTeleportIn());
} }
} }
} }
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled=true) @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void jailStickHandling(EntityDamageByEntityEvent event) { public void jailStickHandling(EntityDamageByEntityEvent event) {
if(pl.getConfig().getBoolean(Settings.JAILSTICKENABLED.getPath())) { if (pl.getConfig().getBoolean(Settings.JAILSTICKENABLED.getPath())) {
//If the damager and the entity getting damage is not a player, //If the damager and the entity getting damage is not a player,
//we don't want to handle it in this method //we don't want to handle it in this method
if(!(event.getDamager() instanceof Player) || !(event.getEntity() instanceof Player)) return; if (!(event.getDamager() instanceof Player) || !(event.getEntity() instanceof Player)) return;
Player attacker = (Player) event.getDamager(); Player attacker = (Player) event.getDamager();
Player player = (Player) event.getEntity(); Player player = (Player) event.getEntity();
//They aren't using the jail stick, they need to toggle themselves //They aren't using the jail stick, they need to toggle themselves
if(!pl.getJailStickManager().isUsingJailStick(attacker.getUniqueId())) return; if (!pl.getJailStickManager().isUsingJailStick(attacker.getUniqueId())) return;
//They don't have a valid jail stick type //They don't have a valid jail stick type
if(!pl.getJailStickManager().isValidStick(attacker.getInventory().getItemInMainHand().getType())) return; if (!pl.getJailStickManager().isValidStick(attacker.getInventory().getItemInMainHand().getType())) return;
//They don't have permission for that type of jail stick //They don't have permission for that type of jail stick
if(!attacker.hasPermission("jail.usejailstick." + attacker.getInventory().getItemInMainHand().getType().toString().toLowerCase())) return; if (!attacker.hasPermission("jail.usejailstick." + attacker.getInventory().getItemInMainHand().getType().toString().toLowerCase()))
return;
//The player they hit is already jailed. //The player they hit is already jailed.
if(pl.getJailManager().isPlayerJailed(player.getUniqueId())) { if (pl.getJailManager().isPlayerJailed(player.getUniqueId())) {
attacker.sendMessage(Lang.ALREADYJAILED.get(player.getName())); attacker.sendMessage(Lang.ALREADYJAILED.get(player.getName()));
return; return;
} }
//The player can't be jailed due to permissions. //The player can't be jailed due to permissions.
if(player.hasPermission("jail.cantbejailed")) { if (player.hasPermission("jail.cantbejailed")) {
attacker.sendMessage(Lang.CANTBEJAILED.get()); attacker.sendMessage(Lang.CANTBEJAILED.get());
return; return;
} }
@ -267,7 +268,7 @@ public class PlayerListener implements Listener {
//Check if the player can resist arrest via health with this stick //Check if the player can resist arrest via health with this stick
pl.debug("Jail stick health resist check: " + "(" + s.getHealth() + "," + player.getHealth() + ") - " + (s.getHealth() <= player.getHealth() && s.getHealth() != -1)); pl.debug("Jail stick health resist check: " + "(" + s.getHealth() + "," + player.getHealth() + ") - " + (s.getHealth() <= player.getHealth() && s.getHealth() != -1));
if(s.getHealth() < player.getHealth() && s.getHealth() != -1) { if (s.getHealth() < player.getHealth() && s.getHealth() != -1) {
attacker.sendMessage(Lang.RESISTEDARRESTJAILER.get(player.getName())); attacker.sendMessage(Lang.RESISTEDARRESTJAILER.get(player.getName()));
player.sendMessage(Lang.RESISTEDARRESTPLAYER.get(attacker.getName())); player.sendMessage(Lang.RESISTEDARRESTPLAYER.get(attacker.getName()));
return; return;
@ -283,12 +284,12 @@ public class PlayerListener implements Listener {
pl.getServer().getPluginManager().callEvent(jEvent); pl.getServer().getPluginManager().callEvent(jEvent);
if(jEvent.isCancelled()) { if (jEvent.isCancelled()) {
if(jEvent.getCancelledMessage().isEmpty()) if (jEvent.getCancelledMessage().isEmpty())
attacker.sendMessage(Lang.CANCELLEDBYANOTHERPLUGIN.get(player.getName())); attacker.sendMessage(Lang.CANCELLEDBYANOTHERPLUGIN.get(player.getName()));
else else
attacker.sendMessage(jEvent.getCancelledMessage()); attacker.sendMessage(jEvent.getCancelledMessage());
}else { } else {
//recall data from the event //recall data from the event
Jail j = jEvent.getJail(); Jail j = jEvent.getJail();
ICell c = jEvent.getCell(); ICell c = jEvent.getCell();
@ -296,11 +297,11 @@ public class PlayerListener implements Listener {
player = jEvent.getPlayer(); player = jEvent.getPlayer();
//Player is not online //Player is not online
if(player == null) { if (player == null) {
attacker.sendMessage(Lang.OFFLINEJAIL.get(new String[] { p.getLastKnownName(), String.valueOf(p.getRemainingTimeInMinutes()) })); attacker.sendMessage(Lang.OFFLINEJAIL.get(p.getLastKnownName(), String.valueOf(p.getRemainingTimeInMinutes())));
}else { } else {
//Player *is* online //Player *is* online
attacker.sendMessage(Lang.ONLINEJAIL.get(new String[] { p.getLastKnownName(), String.valueOf(p.getRemainingTimeInMinutes()) })); attacker.sendMessage(Lang.ONLINEJAIL.get(p.getLastKnownName(), String.valueOf(p.getRemainingTimeInMinutes())));
} }
try { try {

157
src/main/java/com/graywolf336/jail/listeners/ProtectionListener.java
View File

@ -1,7 +1,9 @@
package com.graywolf336.jail.listeners; package com.graywolf336.jail.listeners;
import java.util.concurrent.TimeUnit; import com.graywolf336.jail.JailMain;
import com.graywolf336.jail.Util;
import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.enums.Settings;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -12,27 +14,24 @@ import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import com.graywolf336.jail.JailMain; import java.util.concurrent.TimeUnit;
import com.graywolf336.jail.Util;
import com.graywolf336.jail.enums.Lang;
import com.graywolf336.jail.enums.Settings;
public class ProtectionListener implements Listener { public class ProtectionListener implements Listener {
private JailMain pl; private final JailMain pl;
public ProtectionListener(JailMain plugin) { public ProtectionListener(JailMain plugin) {
this.pl = plugin; this.pl = plugin;
} }
@EventHandler(ignoreCancelled=true, priority = EventPriority.LOW) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOW)
public void protectionBlockBreaking(BlockBreakEvent event) { public void protectionBlockBreaking(BlockBreakEvent event) {
//Before we check if the player is jailed, let's save a //Before we check if the player is jailed, let's save a
//tiny bit of resources and check if this protection is enabled //tiny bit of resources and check if this protection is enabled
if(pl.getConfig().getBoolean(Settings.BLOCKBREAKPROTECTION.getPath())) { if (pl.getConfig().getBoolean(Settings.BLOCKBREAKPROTECTION.getPath())) {
//Let's check if the player is jailed //Let's check if the player is jailed
if(pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) { if (pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) {
//Get the breaking whitelist, check if the current item is in there //Get the breaking whitelist, check if the current item is in there
if(!Util.isStringInsideList(event.getBlock().getType().toString().toLowerCase(), if (!Util.isStringInsideList(event.getBlock().getType().toString().toLowerCase(),
pl.getConfig().getStringList(Settings.BLOCKBREAKWHITELIST.getPath()))) { pl.getConfig().getStringList(Settings.BLOCKBREAKWHITELIST.getPath()))) {
//As our Util.getTime throws an exception when the time is in an //As our Util.getTime throws an exception when the time is in an
//incorrect format, we catch the exception and don't add any time //incorrect format, we catch the exception and don't add any time
@ -41,50 +40,50 @@ public class ProtectionListener implements Listener {
long add = Util.getTime(pl.getConfig().getString(Settings.BLOCKBREAKPENALTY.getPath())); long add = Util.getTime(pl.getConfig().getString(Settings.BLOCKBREAKPENALTY.getPath()));
pl.getJailManager().getPrisoner(event.getPlayer().getUniqueId()).addTime(add); pl.getJailManager().getPrisoner(event.getPlayer().getUniqueId()).addTime(add);
String msg = ""; String msg;
if(add == 0L) { if (add == 0L) {
//Generate the protection message, provide the method with one argument //Generate the protection message, provide the method with one argument
//which is the thing we are protecting against //which is the thing we are protecting against
msg = Lang.PROTECTIONMESSAGENOPENALTY.get(Lang.BLOCKBREAKING.get()); msg = Lang.PROTECTIONMESSAGENOPENALTY.get(Lang.BLOCKBREAKING.get());
}else { } else {
//Generate the protection message, provide the method with two arguments //Generate the protection message, provide the method with two arguments
//First is the time in minutes and second is the thing we are protecting against //First is the time in minutes and second is the thing we are protecting against
msg = Lang.PROTECTIONMESSAGE.get(new String[] { String.valueOf(TimeUnit.MINUTES.convert(add, TimeUnit.MILLISECONDS)), Lang.BLOCKBREAKING.get() }); msg = Lang.PROTECTIONMESSAGE.get(String.valueOf(TimeUnit.MINUTES.convert(add, TimeUnit.MILLISECONDS)), Lang.BLOCKBREAKING.get());
} }
//Send the message //Send the message
event.getPlayer().sendMessage(msg); event.getPlayer().sendMessage(msg);
}catch (Exception e) { } catch (Exception e) {
pl.getLogger().severe("Block break penalty's time is in the wrong format, please fix."); pl.getLogger().severe("Block break penalty's time is in the wrong format, please fix.");
} }
//Stop the event from happening, as the block wasn't in the whitelist //Stop the event from happening, as the block wasn't in the whitelist
event.setCancelled(true); event.setCancelled(true);
} }
}else { } else {
//The player is not jailed but they're trying to break blocks inside of the Jail //The player is not jailed but they're trying to break blocks inside of the Jail
//If there is no jail let's skedaddle //If there is no jail let's skedaddle
if(pl.getJailManager().getJailFromLocation(event.getBlock().getLocation()) == null) return; if (pl.getJailManager().getJailFromLocation(event.getBlock().getLocation()) == null) return;
//If the player doesn't have permission to modify the jail, //If the player doesn't have permission to modify the jail,
//then we stop it here. We won't be doing any of the additions to //then we stop it here. We won't be doing any of the additions to
//a prisoner's sentence here as that's for the protections listener //a prisoner's sentence here as that's for the protections listener
if(!event.getPlayer().hasPermission("jail.modifyjail")) { if (!event.getPlayer().hasPermission("jail.modifyjail")) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
} }
} }
@EventHandler(ignoreCancelled=true, priority = EventPriority.LOW) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOW)
public void protectionBlockPlacing(BlockPlaceEvent event) { public void protectionBlockPlacing(BlockPlaceEvent event) {
//Before we check if the player is jailed, let's save a //Before we check if the player is jailed, let's save a
//tiny bit of resources and check if this protection is enabled //tiny bit of resources and check if this protection is enabled
if(pl.getConfig().getBoolean(Settings.BLOCKPLACEPROTECTION.getPath())) { if (pl.getConfig().getBoolean(Settings.BLOCKPLACEPROTECTION.getPath())) {
//Let's check if the player is jailed //Let's check if the player is jailed
if(pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) { if (pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) {
//Get the placing whitelist, check if the current item is in there //Get the placing whitelist, check if the current item is in there
if(!Util.isStringInsideList(event.getBlock().getType().toString().toLowerCase(), if (!Util.isStringInsideList(event.getBlock().getType().toString().toLowerCase(),
pl.getConfig().getStringList(Settings.BLOCKPLACEWHITELIST.getPath()))) { pl.getConfig().getStringList(Settings.BLOCKPLACEWHITELIST.getPath()))) {
//As our Util.getTime throws an exception when the time is in an //As our Util.getTime throws an exception when the time is in an
//incorrect format, we catch the exception and don't add any time //incorrect format, we catch the exception and don't add any time
@ -93,75 +92,75 @@ public class ProtectionListener implements Listener {
long add = Util.getTime(pl.getConfig().getString(Settings.BLOCKPLACEPENALTY.getPath())); long add = Util.getTime(pl.getConfig().getString(Settings.BLOCKPLACEPENALTY.getPath()));
pl.getJailManager().getPrisoner(event.getPlayer().getUniqueId()).addTime(add); pl.getJailManager().getPrisoner(event.getPlayer().getUniqueId()).addTime(add);
String msg = ""; String msg;
if(add == 0L) { if (add == 0L) {
//Generate the protection message, provide the method with one argument //Generate the protection message, provide the method with one argument
//which is the thing we are protecting against //which is the thing we are protecting against
msg = Lang.PROTECTIONMESSAGENOPENALTY.get(Lang.BLOCKPLACING); msg = Lang.PROTECTIONMESSAGENOPENALTY.get(Lang.BLOCKPLACING);
}else { } else {
//Generate the protection message, provide the method with two arguments //Generate the protection message, provide the method with two arguments
//First is the time in minutes and second is the thing we are protecting against //First is the time in minutes and second is the thing we are protecting against
msg = Lang.PROTECTIONMESSAGE.get(new String[] { String.valueOf(TimeUnit.MINUTES.convert(add, TimeUnit.MILLISECONDS)), Lang.BLOCKPLACING.get() }); msg = Lang.PROTECTIONMESSAGE.get(String.valueOf(TimeUnit.MINUTES.convert(add, TimeUnit.MILLISECONDS)), Lang.BLOCKPLACING.get());
} }
//Send the message //Send the message
event.getPlayer().sendMessage(msg); event.getPlayer().sendMessage(msg);
}catch (Exception e) { } catch (Exception e) {
pl.getLogger().severe("Block place penalty's time is in the wrong format, please fix."); pl.getLogger().severe("Block place penalty's time is in the wrong format, please fix.");
} }
//Stop the event from happening, as the block wasn't in the whitelist //Stop the event from happening, as the block wasn't in the whitelist
event.setCancelled(true); event.setCancelled(true);
} }
}else { } else {
//The player is not jailed but they're trying to place blocks inside of the Jail //The player is not jailed but they're trying to place blocks inside of the Jail
//If there is no jail let's skedaddle //If there is no jail let's skedaddle
if(pl.getJailManager().getJailFromLocation(event.getBlock().getLocation()) == null) return; if (pl.getJailManager().getJailFromLocation(event.getBlock().getLocation()) == null) return;
//If the player doesn't have permission to modify the jail, //If the player doesn't have permission to modify the jail,
//then we stop it here. We won't be doing any of the additions to //then we stop it here. We won't be doing any of the additions to
//a prisoner's sentence here as that's for the protections listener //a prisoner's sentence here as that's for the protections listener
if(!event.getPlayer().hasPermission("jail.modifyjail")) { if (!event.getPlayer().hasPermission("jail.modifyjail")) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
} }
} }
@EventHandler(ignoreCancelled=true, priority = EventPriority.LOW) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOW)
public void commandProtection(PlayerCommandPreprocessEvent event) { public void commandProtection(PlayerCommandPreprocessEvent event) {
//Before we check if the player is jailed, let's save a //Before we check if the player is jailed, let's save a
//tiny bit of resources and check if this protection is enabled //tiny bit of resources and check if this protection is enabled
if(pl.getConfig().getBoolean(Settings.COMMANDPROTECTION.getPath())) { if (pl.getConfig().getBoolean(Settings.COMMANDPROTECTION.getPath())) {
//Let's check if this player is jailed, if so then we continue //Let's check if this player is jailed, if so then we continue
//otherwise we don't care about commands in here //otherwise we don't care about commands in here
if(pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) { if (pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) {
boolean match = false; boolean match = false;
for(String whited : pl.getConfig().getStringList(Settings.COMMANDWHITELIST.getPath())) for (String whited : pl.getConfig().getStringList(Settings.COMMANDWHITELIST.getPath()))
if(event.getMessage().toLowerCase().startsWith(whited.toLowerCase())) if (event.getMessage().toLowerCase().startsWith(whited.toLowerCase()))
match = true; match = true;
//If no match found in the whitelist, then let's block this command. //If no match found in the whitelist, then let's block this command.
if(!match) { if (!match) {
try { try {
long add = Util.getTime(pl.getConfig().getString(Settings.COMMANDPENALTY.getPath())); long add = Util.getTime(pl.getConfig().getString(Settings.COMMANDPENALTY.getPath()));
pl.getJailManager().getPrisoner(event.getPlayer().getUniqueId()).addTime(add); pl.getJailManager().getPrisoner(event.getPlayer().getUniqueId()).addTime(add);
String msg = ""; String msg;
if(add == 0L) { if (add == 0L) {
//Generate the protection message, provide the method with one argument //Generate the protection message, provide the method with one argument
//which is the thing we are protecting against //which is the thing we are protecting against
msg = Lang.PROTECTIONMESSAGENOPENALTY.get(Lang.COMMAND); msg = Lang.PROTECTIONMESSAGENOPENALTY.get(Lang.COMMAND);
}else { } else {
//Generate the protection message, provide the method with two arguments //Generate the protection message, provide the method with two arguments
//First is the time in minutes and second is the thing we are protecting against //First is the time in minutes and second is the thing we are protecting against
msg = Lang.PROTECTIONMESSAGE.get(new String[] { String.valueOf(TimeUnit.MINUTES.convert(add, TimeUnit.MILLISECONDS)), Lang.COMMAND.get() }); msg = Lang.PROTECTIONMESSAGE.get(String.valueOf(TimeUnit.MINUTES.convert(add, TimeUnit.MILLISECONDS)), Lang.COMMAND.get());
} }
//Send the message //Send the message
event.getPlayer().sendMessage(msg); event.getPlayer().sendMessage(msg);
}catch (Exception e) { } catch (Exception e) {
pl.getLogger().severe("Command Protection penalty's time is in the wrong format, please fix."); pl.getLogger().severe("Command Protection penalty's time is in the wrong format, please fix.");
} }
@ -172,17 +171,17 @@ public class ProtectionListener implements Listener {
} }
} }
@EventHandler(ignoreCancelled=true, priority = EventPriority.LOW) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOW)
public void chestProtection(PlayerInteractEvent event) { public void chestProtection(PlayerInteractEvent event) {
//First thing is first, let's be sure the player we're dealing with is in jail //First thing is first, let's be sure the player we're dealing with is in jail
if(pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) { if (pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) {
//Next, let's check if it is a chest and if they're in a cell //Next, let's check if it is a chest and if they're in a cell
//If they are in a cell and are opening a chest, then we check //If they are in a cell and are opening a chest, then we check
//the config to see if they can open the chests //the config to see if they can open the chests
if(event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getType() == Material.CHEST) { if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getType() == Material.CHEST) {
//Let's get the cell the player is in, then check if it is null or not. //Let's get the cell the player is in, then check if it is null or not.
if(pl.getJailManager().getJailPlayerIsIn(event.getPlayer().getUniqueId()).isJailedInACell(event.getPlayer().getUniqueId())) { if (pl.getJailManager().getJailPlayerIsIn(event.getPlayer().getUniqueId()).isJailedInACell(event.getPlayer().getUniqueId())) {
if(pl.getConfig().getBoolean(Settings.PRISONEROPENCHEST.getPath())) { if (pl.getConfig().getBoolean(Settings.PRISONEROPENCHEST.getPath())) {
//The prisoner is in a cell, so let's check if it is a couple chest. //The prisoner is in a cell, so let's check if it is a couple chest.
Material bpos1 = event.getClickedBlock().getLocation().add(-1, 0, 0).getBlock().getType(); Material bpos1 = event.getClickedBlock().getLocation().add(-1, 0, 0).getBlock().getType();
Material bpos2 = event.getClickedBlock().getLocation().add(+1, 0, 0).getBlock().getType(); Material bpos2 = event.getClickedBlock().getLocation().add(+1, 0, 0).getBlock().getType();
@ -194,55 +193,53 @@ public class ProtectionListener implements Listener {
boolean pos3 = bpos3 == Material.CHEST || bpos3 == Material.TRAPPED_CHEST; boolean pos3 = bpos3 == Material.CHEST || bpos3 == Material.TRAPPED_CHEST;
boolean pos4 = bpos4 == Material.CHEST || bpos4 == Material.TRAPPED_CHEST; boolean pos4 = bpos4 == Material.CHEST || bpos4 == Material.TRAPPED_CHEST;
if(pos1 || pos2 || pos3 || pos4) { if (pos1 || pos2 || pos3 || pos4) {
//it is a double chest, so they're free to go! //it is a double chest, so they're free to go!
if(pl.inDebug()) event.getPlayer().sendMessage("[Jail Debug]: You're opening up a double chest."); if (pl.inDebug())
}else { event.getPlayer().sendMessage("[Jail Debug]: You're opening up a double chest.");
} else {
//it is not a double chest, so we won't be allowing it. //it is not a double chest, so we won't be allowing it.
event.setCancelled(true); event.setCancelled(true);
return;
} }
}else { } else {
//the config has opening chests disabled //the config has opening chests disabled
event.setCancelled(true); event.setCancelled(true);
return;
} }
}else { } else {
//The prisoner is not in a cell, so let's not allow it. IF we get feedback from people who //The prisoner is not in a cell, so let's not allow it. IF we get feedback from people who
//use the plugin, this might get removed or permission node might be added. //use the plugin, this might get removed or permission node might be added.
event.setCancelled(true); event.setCancelled(true);
return;
} }
} }
} }
} }
@EventHandler(ignoreCancelled=true, priority = EventPriority.LOWEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
public void cropTramplingProtection(PlayerInteractEvent event) { public void cropTramplingProtection(PlayerInteractEvent event) {
//First thing is first, let's be sure the player we're dealing with is in jail //First thing is first, let's be sure the player we're dealing with is in jail
if(pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) { if (pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) {
//Next, check if crap trampling protection is enabled //Next, check if crap trampling protection is enabled
if(pl.getConfig().getBoolean(Settings.CROPTRAMPLINGPROTECTION.getPath())) { if (pl.getConfig().getBoolean(Settings.CROPTRAMPLINGPROTECTION.getPath())) {
if(event.getAction() == Action.PHYSICAL && event.getClickedBlock().getType() == Material.FARMLAND) { if (event.getAction() == Action.PHYSICAL && event.getClickedBlock().getType() == Material.FARMLAND) {
if(pl.getJailManager().getJailFromLocation(event.getClickedBlock().getLocation()) != null) { if (pl.getJailManager().getJailFromLocation(event.getClickedBlock().getLocation()) != null) {
try { try {
long add = Util.getTime(pl.getConfig().getString(Settings.CROPTRAMPLINGPENALTY.getPath())); long add = Util.getTime(pl.getConfig().getString(Settings.CROPTRAMPLINGPENALTY.getPath()));
pl.getJailManager().getPrisoner(event.getPlayer().getUniqueId()).addTime(add); pl.getJailManager().getPrisoner(event.getPlayer().getUniqueId()).addTime(add);
String msg = ""; String msg;
if(add == 0L) { if (add == 0L) {
//Generate the protection message, provide the method with one argument //Generate the protection message, provide the method with one argument
//which is the thing we are protecting against //which is the thing we are protecting against
msg = Lang.PROTECTIONMESSAGENOPENALTY.get(Lang.CROPTRAMPLING); msg = Lang.PROTECTIONMESSAGENOPENALTY.get(Lang.CROPTRAMPLING);
}else { } else {
//Generate the protection message, provide the method with two arguments //Generate the protection message, provide the method with two arguments
//First is the time in minutes and second is the thing we are protecting against //First is the time in minutes and second is the thing we are protecting against
msg = Lang.PROTECTIONMESSAGE.get(new String[] { String.valueOf(TimeUnit.MINUTES.convert(add, TimeUnit.MILLISECONDS)), Lang.CROPTRAMPLING.get() }); msg = Lang.PROTECTIONMESSAGE.get(String.valueOf(TimeUnit.MINUTES.convert(add, TimeUnit.MILLISECONDS)), Lang.CROPTRAMPLING.get());
} }
//Send the message //Send the message
event.getPlayer().sendMessage(msg); event.getPlayer().sendMessage(msg);
}catch (Exception e) { } catch (Exception e) {
pl.getLogger().severe("Crop Trampling penalty's time is in the wrong format, please fix."); pl.getLogger().severe("Crop Trampling penalty's time is in the wrong format, please fix.");
} }
@ -253,66 +250,66 @@ public class ProtectionListener implements Listener {
} }
} }
@EventHandler(ignoreCancelled=true) @EventHandler(ignoreCancelled = true)
public void interactionProtection(PlayerInteractEvent event) { public void interactionProtection(PlayerInteractEvent event) {
//As the old version didn't do anything with Physical interactions, we won't either //As the old version didn't do anything with Physical interactions, we won't either
if (event.getAction() != Action.PHYSICAL) { if (event.getAction() != Action.PHYSICAL) {
//First thing is first, let's be sure the player we're dealing with is in jail //First thing is first, let's be sure the player we're dealing with is in jail
if(pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) { if (pl.getJailManager().isPlayerJailed(event.getPlayer().getUniqueId())) {
//Let's check if they've interacted with a block //Let's check if they've interacted with a block
if (event.getClickedBlock() != null) { if (event.getClickedBlock() != null) {
//Get the interaction blacklist, check if the current block is in there //Get the interaction blacklist, check if the current block is in there
//if it is, then let's take action //if it is, then let's take action
if(Util.isStringInsideList(event.getClickedBlock().getType().toString().toLowerCase(), if (Util.isStringInsideList(event.getClickedBlock().getType().toString().toLowerCase(),
pl.getConfig().getStringList(Settings.PREVENTINTERACTIONBLOCKS.getPath()))) { pl.getConfig().getStringList(Settings.PREVENTINTERACTIONBLOCKS.getPath()))) {
try { try {
long add = Util.getTime(pl.getConfig().getString(Settings.PREVENTINTERACTIONBLOCKSPENALTY.getPath())); long add = Util.getTime(pl.getConfig().getString(Settings.PREVENTINTERACTIONBLOCKSPENALTY.getPath()));
pl.getJailManager().getPrisoner(event.getPlayer().getUniqueId()).addTime(add); pl.getJailManager().getPrisoner(event.getPlayer().getUniqueId()).addTime(add);
String msg = ""; String msg;
if(add == 0L) { if (add == 0L) {
//Generate the protection message, provide the method with one argument //Generate the protection message, provide the method with one argument
//which is the thing we are protecting against //which is the thing we are protecting against
msg = Lang.PROTECTIONMESSAGENOPENALTY.get(Lang.INTERACTIONBLOCKS); msg = Lang.PROTECTIONMESSAGENOPENALTY.get(Lang.INTERACTIONBLOCKS);
}else { } else {
//Generate the protection message, provide the method with two arguments //Generate the protection message, provide the method with two arguments
//First is the time in minutes and second is the thing we are protecting against //First is the time in minutes and second is the thing we are protecting against
msg = Lang.PROTECTIONMESSAGE.get(new String[] { String.valueOf(TimeUnit.MINUTES.convert(add, TimeUnit.MILLISECONDS)), Lang.INTERACTIONBLOCKS.get() }); msg = Lang.PROTECTIONMESSAGE.get(String.valueOf(TimeUnit.MINUTES.convert(add, TimeUnit.MILLISECONDS)), Lang.INTERACTIONBLOCKS.get());
} }
//Send the message //Send the message
event.getPlayer().sendMessage(msg); event.getPlayer().sendMessage(msg);
}catch(Exception e) { } catch (Exception e) {
pl.getLogger().severe("Prevent Interaction with Blocks penalty's time is in the wrong format, please fix."); pl.getLogger().severe("Prevent Interaction with Blocks penalty's time is in the wrong format, please fix.");
} }
event.setCancelled(true); event.setCancelled(true);
} }
}else if (event.getPlayer().getInventory().getItemInMainHand() != null) { } else if (event.getPlayer().getInventory().getItemInMainHand() != null) {
//Otherwise let's check if they have something in hand //Otherwise let's check if they have something in hand
//Get the interaction blacklist, check if the current item is in there //Get the interaction blacklist, check if the current item is in there
//if it is, then let's take action //if it is, then let's take action
if(Util.isStringInsideList(event.getClickedBlock().getType().toString().toLowerCase(), if (Util.isStringInsideList(event.getClickedBlock().getType().toString().toLowerCase(),
pl.getConfig().getStringList(Settings.PREVENTINTERACTIONITEMS.getPath()))) { pl.getConfig().getStringList(Settings.PREVENTINTERACTIONITEMS.getPath()))) {
try { try {
long add = Util.getTime(pl.getConfig().getString(Settings.PREVENTINTERACTIONITEMSPENALTY.getPath())); long add = Util.getTime(pl.getConfig().getString(Settings.PREVENTINTERACTIONITEMSPENALTY.getPath()));
pl.getJailManager().getPrisoner(event.getPlayer().getUniqueId()).addTime(add); pl.getJailManager().getPrisoner(event.getPlayer().getUniqueId()).addTime(add);
String msg = ""; String msg;
if(add == 0L) { if (add == 0L) {
//Generate the protection message, provide the method with one argument //Generate the protection message, provide the method with one argument
//which is the thing we are protecting against //which is the thing we are protecting against
msg = Lang.PROTECTIONMESSAGENOPENALTY.get(Lang.INTERACTIONITEMS); msg = Lang.PROTECTIONMESSAGENOPENALTY.get(Lang.INTERACTIONITEMS);
}else { } else {
//Generate the protection message, provide the method with two arguments //Generate the protection message, provide the method with two arguments
//First is the time in minutes and second is the thing we are protecting against //First is the time in minutes and second is the thing we are protecting against
msg = Lang.PROTECTIONMESSAGE.get(new String[] { String.valueOf(TimeUnit.MINUTES.convert(add, TimeUnit.MILLISECONDS)), Lang.INTERACTIONITEMS.get() }); msg = Lang.PROTECTIONMESSAGE.get(String.valueOf(TimeUnit.MINUTES.convert(add, TimeUnit.MILLISECONDS)), Lang.INTERACTIONITEMS.get());
} }
//Send the message //Send the message
event.getPlayer().sendMessage(msg); event.getPlayer().sendMessage(msg);
}catch(Exception e) { } catch (Exception e) {
pl.getLogger().severe("Prevent Interaction with Items penalty's time is in the wrong format, please fix."); pl.getLogger().severe("Prevent Interaction with Items penalty's time is in the wrong format, please fix.");
} }

19
src/main/java/com/graywolf336/jail/listeners/WorldListener.java
View File

@ -1,30 +1,29 @@
package com.graywolf336.jail.listeners; package com.graywolf336.jail.listeners;
import com.graywolf336.jail.JailMain;
import com.graywolf336.jail.beans.Jail;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.world.WorldLoadEvent; import org.bukkit.event.world.WorldLoadEvent;
import org.bukkit.event.world.WorldUnloadEvent; import org.bukkit.event.world.WorldUnloadEvent;
import com.graywolf336.jail.JailMain;
import com.graywolf336.jail.beans.Jail;
public class WorldListener implements Listener { public class WorldListener implements Listener {
private JailMain pl; private final JailMain pl;
public WorldListener(JailMain plugin) { public WorldListener(JailMain plugin) {
this.pl = plugin; this.pl = plugin;
} }
@EventHandler(ignoreCancelled=true, priority = EventPriority.LOW) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOW)
public void worldLoaded(WorldLoadEvent event) { public void worldLoaded(WorldLoadEvent event) {
for(Jail j : pl.getJailManager().getJails()) for (Jail j : pl.getJailManager().getJails())
if(j.getWorldName().equalsIgnoreCase(event.getWorld().getName())) j.setEnabled(true); if (j.getWorldName().equalsIgnoreCase(event.getWorld().getName())) j.setEnabled(true);
} }
@EventHandler(ignoreCancelled=true, priority = EventPriority.LOW) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOW)
public void worldUnload(WorldUnloadEvent event) { public void worldUnload(WorldUnloadEvent event) {
for(Jail j : pl.getJailManager().getJails()) for (Jail j : pl.getJailManager().getJails())
if(j.getWorldName().equalsIgnoreCase(event.getWorld().getName())) j.setEnabled(false); if (j.getWorldName().equalsIgnoreCase(event.getWorld().getName())) j.setEnabled(false);
} }
} }

64
src/main/java/com/graywolf336/jail/steps/CellCreationSteps.java
View File

@ -1,15 +1,5 @@
package com.graywolf336.jail.steps; package com.graywolf336.jail.steps;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.Chest;
import org.bukkit.block.Sign;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.Vector;
import com.graywolf336.jail.JailManager; import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.Util; import com.graywolf336.jail.Util;
import com.graywolf336.jail.beans.Cell; import com.graywolf336.jail.beans.Cell;
@ -17,29 +7,41 @@ import com.graywolf336.jail.beans.CreationPlayer;
import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.beans.SimpleLocation; import com.graywolf336.jail.beans.SimpleLocation;
import com.graywolf336.jail.enums.Lang; import com.graywolf336.jail.enums.Lang;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Tag;
import org.bukkit.block.Block;
import org.bukkit.block.Chest;
import org.bukkit.block.Sign;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.Vector;
/** /**
* Class for stepping a player through the Cell creation process, instance is stored in {@link JailManager}. * Class for stepping a player through the Cell creation process, instance is stored in {@link JailManager}.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.0.1 * @version 1.0.1
* @since 3.0.0
*/ */
public class CellCreationSteps { public class CellCreationSteps {
/** Sends the Cell Creation message for starting out. */ /**
public void startStepping(Player player){ * Sends the Cell Creation message for starting out.
*/
public void startStepping(Player player) {
player.sendMessage(ChatColor.AQUA + "---------- Jail Cell Creation (tp) ----------"); player.sendMessage(ChatColor.AQUA + "---------- Jail Cell Creation (tp) ----------");
player.sendMessage(ChatColor.GREEN + "First, you must select a teleport point for the cell! Move to the teleport point and then click anywhere with your clay brick to set it."); player.sendMessage(ChatColor.GREEN + "First, you must select a teleport point for the cell! Move to the teleport point and then click anywhere with your clay brick to set it.");
player.sendMessage(ChatColor.AQUA + "----------------------------------------"); player.sendMessage(ChatColor.AQUA + "----------------------------------------");
ItemStack wand = Util.getWand(); ItemStack wand = Util.getWand();
if(player.getInventory().contains(wand)) { if (player.getInventory().contains(wand)) {
int i = player.getInventory().first(wand); int i = player.getInventory().first(wand);
if(i != -1) { if (i != -1) {
player.getInventory().setItem(i, player.getInventory().getItemInMainHand()); player.getInventory().setItem(i, player.getInventory().getItemInMainHand());
player.getInventory().setItemInMainHand(wand); player.getInventory().setItemInMainHand(wand);
} }
}else { } else {
player.getInventory().addItem(wand); player.getInventory().addItem(wand);
} }
} }
@ -54,7 +56,7 @@ public class CellCreationSteps {
*/ */
public void step(JailManager jm, Player player, CreationPlayer cp, Location location) { public void step(JailManager jm, Player player, CreationPlayer cp, Location location) {
jm.getPlugin().debug("Stepping into step #" + cp.getStep()); jm.getPlugin().debug("Stepping into step #" + cp.getStep());
switch(cp.getStep()) { switch (cp.getStep()) {
case 1: case 1:
firstStep(jm, cp, player); firstStep(jm, cp, player);
break; break;
@ -71,29 +73,33 @@ public class CellCreationSteps {
} }
} }
/** Applies the first step, which is setting the teleport in location. */ /**
* Applies the first step, which is setting the teleport in location.
*/
private void firstStep(JailManager jm, CreationPlayer cp, Player player) { private void firstStep(JailManager jm, CreationPlayer cp, Player player) {
Vector v1 = jm.getJail(cp.getJailName()).getMinPoint().toVector().clone(); Vector v1 = jm.getJail(cp.getJailName()).getMinPoint().toVector().clone();
Vector v2 = jm.getJail(cp.getJailName()).getMaxPoint().toVector().clone(); Vector v2 = jm.getJail(cp.getJailName()).getMaxPoint().toVector().clone();
Vector point = player.getLocation().toVector().clone(); Vector point = player.getLocation().toVector().clone();
if(Util.isInsideAB(point, v1, v2)) { if (Util.isInsideAB(point, v1, v2)) {
player.sendMessage(ChatColor.AQUA + "---------- Jail Cell Creation (signs) ----------"); player.sendMessage(ChatColor.AQUA + "---------- Jail Cell Creation (signs) ----------");
player.sendMessage(ChatColor.GREEN + "Teleport point selected. Now select signs associated with this cell. You may select multiple signs. After you are done with the sign selection, right click on any non-sign block."); player.sendMessage(ChatColor.GREEN + "Teleport point selected. Now select signs associated with this cell. You may select multiple signs. After you are done with the sign selection, right click on any non-sign block.");
player.sendMessage(ChatColor.AQUA + "----------------------------------------"); player.sendMessage(ChatColor.AQUA + "----------------------------------------");
cp.setTeleportIn(player.getLocation()); cp.setTeleportIn(player.getLocation());
cp.nextStep(); cp.nextStep();
}else { } else {
player.sendMessage(ChatColor.RED + "---------- Jail Cell Creation (tp) ----------"); player.sendMessage(ChatColor.RED + "---------- Jail Cell Creation (tp) ----------");
player.sendMessage(ChatColor.RED + "Teleport point NOT selected. Please make sure that you are setting the teleport point inside the Jail's corners."); player.sendMessage(ChatColor.RED + "Teleport point NOT selected. Please make sure that you are setting the teleport point inside the Jail's corners.");
player.sendMessage(ChatColor.RED + "----------------------------------------"); player.sendMessage(ChatColor.RED + "----------------------------------------");
} }
} }
/** Applies the second step, which is adding signs to the cell. */ /**
* Applies the second step, which is adding signs to the cell.
*/
private void secondStep(CreationPlayer cp, Player player, Block block) { private void secondStep(CreationPlayer cp, Player player, Block block) {
if (block.getType() == Material.SIGN || block.getType() == Material.WALL_SIGN) { if (Tag.SIGNS.isTagged(block.getType()) || Tag.WALL_SIGNS.isTagged(block.getType())) {
cp.addSign(new SimpleLocation(block.getLocation())); cp.addSign(new SimpleLocation(block.getLocation()));
//Set the sign's first text //Set the sign's first text
@ -105,7 +111,7 @@ public class CellCreationSteps {
sign.update(); sign.update();
player.sendMessage(ChatColor.GREEN + "Sign added, if you want to select another go ahead otherwise right click on any non-sign block."); player.sendMessage(ChatColor.GREEN + "Sign added, if you want to select another go ahead otherwise right click on any non-sign block.");
}else { } else {
player.sendMessage(ChatColor.AQUA + "---------- Jail Cell Creation (chest) ----------"); player.sendMessage(ChatColor.AQUA + "---------- Jail Cell Creation (chest) ----------");
player.sendMessage(ChatColor.GREEN + (cp.getSigns().size() != 0 ? "Sign selection completed. " : "") + "Now select a double chest associated with this cell. If there is no chest click on any non-chest block. (Please note that having no chest may result in players items being lost.)"); player.sendMessage(ChatColor.GREEN + (cp.getSigns().size() != 0 ? "Sign selection completed. " : "") + "Now select a double chest associated with this cell. If there is no chest click on any non-chest block. (Please note that having no chest may result in players items being lost.)");
player.sendMessage(ChatColor.AQUA + "----------------------------------------"); player.sendMessage(ChatColor.AQUA + "----------------------------------------");
@ -113,21 +119,23 @@ public class CellCreationSteps {
} }
} }
/** Applies the third step, which is adding a chest or select not to have a chest. */ /**
* Applies the third step, which is adding a chest or select not to have a chest.
*/
private void thirdStep(JailManager jm, CreationPlayer cp, Player player, Block block) { private void thirdStep(JailManager jm, CreationPlayer cp, Player player, Block block) {
if (block.getType() == Material.CHEST || block.getType() == Material.TRAPPED_CHEST) { if (block.getType() == Material.CHEST || block.getType() == Material.TRAPPED_CHEST) {
if(((Chest) block.getState()).getInventory().getSize() >= 40) { if (((Chest) block.getState()).getInventory().getSize() >= 40) {
cp.setChestLocation(new SimpleLocation(block.getLocation())); cp.setChestLocation(new SimpleLocation(block.getLocation()));
player.sendMessage(ChatColor.AQUA + "---------- Jail Cell Creation ----------"); player.sendMessage(ChatColor.AQUA + "---------- Jail Cell Creation ----------");
player.sendMessage(ChatColor.GREEN + "Chest selected."); player.sendMessage(ChatColor.GREEN + "Chest selected.");
player.sendMessage(ChatColor.AQUA + "----------------------------------------"); player.sendMessage(ChatColor.AQUA + "----------------------------------------");
}else { } else {
player.sendMessage(ChatColor.RED + "---------- Jail Cell Creation (chest) ----------"); player.sendMessage(ChatColor.RED + "---------- Jail Cell Creation (chest) ----------");
player.sendMessage(ChatColor.RED + "Chest must be a double chest, chest not selected"); player.sendMessage(ChatColor.RED + "Chest must be a double chest, chest not selected");
player.sendMessage(ChatColor.RED + "----------------------------------------"); player.sendMessage(ChatColor.RED + "----------------------------------------");
return; return;
} }
}else { } else {
player.sendMessage(ChatColor.AQUA + "---------- Jail Cell Creation ----------"); player.sendMessage(ChatColor.AQUA + "---------- Jail Cell Creation ----------");
player.sendMessage(ChatColor.RED + "No chest selected."); player.sendMessage(ChatColor.RED + "No chest selected.");
player.sendMessage(ChatColor.AQUA + "----------------------------------------"); player.sendMessage(ChatColor.AQUA + "----------------------------------------");
@ -143,7 +151,7 @@ public class CellCreationSteps {
c.addAllSigns(cp.getSigns()); c.addAllSigns(cp.getSigns());
c.setTeleport(cp.getTeleportInSL()); c.setTeleport(cp.getTeleportInSL());
if(cp.getChestLocation() != null) if (cp.getChestLocation() != null)
c.setChestLocation(cp.getChestLocation()); c.setChestLocation(cp.getChestLocation());
j.addCell(c, true); j.addCell(c, true);

41
src/main/java/com/graywolf336/jail/steps/JailCreationSteps.java
View File

@ -1,39 +1,40 @@
package com.graywolf336.jail.steps; package com.graywolf336.jail.steps;
import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.Util;
import com.graywolf336.jail.beans.CreationPlayer;
import com.graywolf336.jail.beans.Jail;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.Util;
import com.graywolf336.jail.beans.CreationPlayer;
import com.graywolf336.jail.beans.Jail;
/** /**
* Class for stepping a player through the Jail creation process, instance is stored in {@link JailManager}. * Class for stepping a player through the Jail creation process, instance is stored in {@link JailManager}.
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0
* @version 1.1.1 * @version 1.1.1
* @since 3.0.0
*/ */
public class JailCreationSteps { public class JailCreationSteps {
/** Sends the Jail Creation message for starting out. */ /**
* Sends the Jail Creation message for starting out.
*/
public void startStepping(Player player) { public void startStepping(Player player) {
player.sendMessage(ChatColor.AQUA + "----------Jail Zone Creation----------"); player.sendMessage(ChatColor.AQUA + "----------Jail Zone Creation----------");
player.sendMessage(ChatColor.GREEN + "First, you must select jail cuboid. Select the first point of the cuboid by right clicking on the block with your clay brick. DO NOT FORGET TO MARK THE FLOOR AND CEILING TOO!"); player.sendMessage(ChatColor.GREEN + "First, you must select jail cuboid. Select the first point of the cuboid by right clicking on the block with your clay brick. DO NOT FORGET TO MARK THE FLOOR AND CEILING TOO!");
player.sendMessage(ChatColor.AQUA + "--------------------------------------"); player.sendMessage(ChatColor.AQUA + "--------------------------------------");
ItemStack wand = Util.getWand(); ItemStack wand = Util.getWand();
if(player.getInventory().contains(wand)) { if (player.getInventory().contains(wand)) {
int i = player.getInventory().first(wand); int i = player.getInventory().first(wand);
if(i != -1) { if (i != -1) {
player.getInventory().setItem(i, player.getInventory().getItemInMainHand()); player.getInventory().setItem(i, player.getInventory().getItemInMainHand());
player.getInventory().setItemInMainHand(wand); player.getInventory().setItemInMainHand(wand);
} }
}else { } else {
player.getInventory().addItem(wand); player.getInventory().addItem(wand);
} }
} }
@ -48,7 +49,7 @@ public class JailCreationSteps {
*/ */
public void step(JailManager jm, Player player, CreationPlayer cp, Location location) { public void step(JailManager jm, Player player, CreationPlayer cp, Location location) {
jm.getPlugin().debug("Stepping into step #" + cp.getStep()); jm.getPlugin().debug("Stepping into step #" + cp.getStep());
switch(cp.getStep()) { switch (cp.getStep()) {
case 1: case 1:
firstStep(cp, player, location); firstStep(cp, player, location);
break; break;
@ -68,7 +69,9 @@ public class JailCreationSteps {
} }
} }
/** Applies the first step, which is setting the first corner. */ /**
* Applies the first step, which is setting the first corner.
*/
private void firstStep(CreationPlayer cp, Player p, Location location) { private void firstStep(CreationPlayer cp, Player p, Location location) {
p.sendMessage(ChatColor.AQUA + "---------- Jail Zone Creation----------"); p.sendMessage(ChatColor.AQUA + "---------- Jail Zone Creation----------");
p.sendMessage(ChatColor.GREEN + "First point selected. Now select the second point."); p.sendMessage(ChatColor.GREEN + "First point selected. Now select the second point.");
@ -78,7 +81,9 @@ public class JailCreationSteps {
cp.nextStep(); cp.nextStep();
} }
/** Applies the second step, which is setting the second corner. */ /**
* Applies the second step, which is setting the second corner.
*/
private void secondStep(CreationPlayer cp, Player p, Location location) { private void secondStep(CreationPlayer cp, Player p, Location location) {
p.sendMessage(ChatColor.AQUA + "---------- Jail Zone Creation ----------"); p.sendMessage(ChatColor.AQUA + "---------- Jail Zone Creation ----------");
p.sendMessage(ChatColor.GREEN + "Second point selected. Now go inside the jail and right click anywhere to select your current position as the teleport location for the jail."); p.sendMessage(ChatColor.GREEN + "Second point selected. Now go inside the jail and right click anywhere to select your current position as the teleport location for the jail.");
@ -88,7 +93,9 @@ public class JailCreationSteps {
cp.nextStep(); cp.nextStep();
} }
/** Applies the third step, which is setting the teleport in location. */ /**
* Applies the third step, which is setting the teleport in location.
*/
private void thirdStep(CreationPlayer cp, Player p) { private void thirdStep(CreationPlayer cp, Player p) {
int[] p1 = cp.getCornerOne(); int[] p1 = cp.getCornerOne();
@ -97,7 +104,7 @@ public class JailCreationSteps {
Vector v2 = new Vector(p2[0], p2[1], p2[2]); Vector v2 = new Vector(p2[0], p2[1], p2[2]);
Vector point = p.getLocation().toVector().clone(); Vector point = p.getLocation().toVector().clone();
if(Util.isInsideAB(point, v1, v2)) { if (Util.isInsideAB(point, v1, v2)) {
p.sendMessage(ChatColor.AQUA + "---------- Jail Zone Creation ----------"); p.sendMessage(ChatColor.AQUA + "---------- Jail Zone Creation ----------");
p.sendMessage(ChatColor.GREEN + "Teleport point selected. Now go outside of the jail and right click anywhere to select your current position as the location where people will be teleported after they are released from this jail."); p.sendMessage(ChatColor.GREEN + "Teleport point selected. Now go outside of the jail and right click anywhere to select your current position as the location where people will be teleported after they are released from this jail.");
p.sendMessage(ChatColor.AQUA + "----------------------------------------"); p.sendMessage(ChatColor.AQUA + "----------------------------------------");
@ -118,11 +125,11 @@ public class JailCreationSteps {
Vector v2 = new Vector(p2[0], p2[1], p2[2]); Vector v2 = new Vector(p2[0], p2[1], p2[2]);
Vector point = p.getLocation().toVector().clone(); Vector point = p.getLocation().toVector().clone();
if(Util.isInsideAB(point, v1, v2)) { if (Util.isInsideAB(point, v1, v2)) {
p.sendMessage(ChatColor.RED + "---------- Jail Zone Creation ----------"); p.sendMessage(ChatColor.RED + "---------- Jail Zone Creation ----------");
p.sendMessage(ChatColor.RED + "Teleport out point NOT selected. Go outside of the jail and right click anywhere to select your current position as the location where people will be teleported after they are released from this jail."); p.sendMessage(ChatColor.RED + "Teleport out point NOT selected. Go outside of the jail and right click anywhere to select your current position as the location where people will be teleported after they are released from this jail.");
p.sendMessage(ChatColor.RED + "----------------------------------------"); p.sendMessage(ChatColor.RED + "----------------------------------------");
}else { } else {
cp.setTeleportFree(p.getLocation()); cp.setTeleportFree(p.getLocation());
finalStep(jm, cp, p); finalStep(jm, cp, p);

4
src/main/resources/plugin.yml
View File

@ -6,7 +6,7 @@ authors: [graywolf336]
website: dev.bukkit.org/server-mods/jail/ website: dev.bukkit.org/server-mods/jail/
softdepend: [WorldEdit, Vault, Multiverse-Core] softdepend: [WorldEdit, Vault, Multiverse-Core]
load: POSTWORLD load: POSTWORLD
api-version: 1.13 api-version: 1.17
commands: commands:
jail: jail:
@ -153,8 +153,6 @@ permissions:
default: op default: op
jail.command.jailversion: jail.command.jailversion:
default: op default: op
jail.usercmd.jailvote:
default: op
jail.vote.start: jail.vote.start:
default: op default: op
jail.see.broadcast: jail.see.broadcast:

90
src/test/java/test/java/com/graywolf336/jail/BenchmarkTest.java
View File

@ -1,90 +0,0 @@
package test.java.com.graywolf336.jail;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.Random;
import java.util.UUID;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerMoveEvent;
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.carrotsearch.junitbenchmarks.AbstractBenchmark;
import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
import com.graywolf336.jail.JailMain;
import com.graywolf336.jail.beans.CachePrisoner;
import com.graywolf336.jail.beans.Prisoner;
@RunWith(PowerMockRunner.class)
@PrepareForTest({ JailMain.class, PluginDescriptionFile.class })
public class BenchmarkTest extends AbstractBenchmark {
private static TestInstanceCreator creator;
private static JailMain main;
private static UUID use;
private static Random r;
@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("testingJail"));
assertFalse("There are no jails.", main.getJailManager().getJails().isEmpty());
for(int i = 0; i < 1000; i++) {
if(i == 555)
use = UUID.randomUUID();
main.getPrisonerManager().prepareJail(main.getJailManager().getJail("testingJail"), null, null, new Prisoner(i == 555 ? use.toString() : UUID.randomUUID().toString(), "mockPlayer" + i, true, 100000L, "testJailer", "Test jailing " + i));
}
//This puts the cache object into the cache for the move event and others to use (move in this test)
main.getJailManager().addCacheObject(new CachePrisoner(main.getJailManager().getJailPlayerIsIn(use), main.getJailManager().getPrisoner(use)));
r = new Random();
}
@AfterClass
public static void tearDown() throws Exception {
creator.tearDown();
main = null;
}
@BenchmarkOptions(benchmarkRounds = 1000, warmupRounds = 0)
@Test
public void testPrisonerSizeAndJailed() {
assertEquals("Prisoners not jailed?", 1000, main.getJailManager().getAllPrisoners().size());
assertTrue("Prisoner 555 is not jailed", main.getJailManager().isPlayerJailed(use));
}
@SuppressWarnings("deprecation")
@BenchmarkOptions(benchmarkRounds = 5000, warmupRounds = 0)
@Test
public void testPlayerMoveEvent() {
Player p = mock(Player.class);
when(p.getUniqueId()).thenReturn(use);
when(p.getName()).thenReturn("mockPlayer555");
when(p.teleport(any(Location.class))).thenReturn(true);
Location from = new Location(main.getServer().getWorld("world"), 15, 64, -239);
Location to = new Location(main.getServer().getWorld("world"), r.nextInt(), r.nextInt(), r.nextInt());
PlayerMoveEvent e = new PlayerMoveEvent(p, from, to);
main.getPlayerMoveListener().moveProtection(e);
}
}

99
src/test/java/test/java/com/graywolf336/jail/TestJailAPI.java
View File

@ -1,99 +0,0 @@
package test.java.com.graywolf336.jail;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import java.util.UUID;
import org.bukkit.Location;
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.JailsAPI;
@RunWith(PowerMockRunner.class)
@PrepareForTest({ JailMain.class, PluginDescriptionFile.class })
public class TestJailAPI {
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("TestJailAPI"));
}
@AfterClass
public static void tearDown() throws Exception {
creator.tearDown();
main = null;
}
@Test
public void testManagersAreThere() {
assertNotNull(main.getHandCuffManager());
assertNotNull(main.getJailManager());
assertNotNull(main.getPrisonerManager());
assertNotNull(main.getJailVoteManager());
}
@Test
public void verifyManagersAreTheSame() {
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 Prisoner Manager references are different.", JailsAPI.getPrisonerManager(), is(main.getPrisonerManager()));
assertThat("The Jail Stick Manager references are different.", JailsAPI.getJailStickManager(), is(main.getJailStickManager()));
assertThat("The Jail Vote Manager references are different.", JailsAPI.getJailVoteManager(), is(main.getJailVoteManager()));
}
@Test
public void testHandCuffManagerAPI() {
UUID id = UUID.randomUUID();
Location loc = new Location(main.getServer().getWorld("world"), 11.469868464778077, 65.0, -239.27944647045672, Float.valueOf("38.499817"), Float.valueOf("2.0000453"));
assertFalse("The test id of someone is already handcuffed.", JailsAPI.getHandCuffManager().isHandCuffed(id));
JailsAPI.getHandCuffManager().addHandCuffs(id, loc);
assertTrue(JailsAPI.getHandCuffManager().isHandCuffed(id));
assertThat(JailsAPI.getHandCuffManager().getLocation(id), is(loc));
JailsAPI.getHandCuffManager().removeHandCuffs(id);
assertFalse(JailsAPI.getHandCuffManager().isHandCuffed(id));
assertNull(JailsAPI.getHandCuffManager().getLocation(id));
}
@Test
public void testJailManagerAPI() {
assertThat("The Jail Manager reference to the plugin is different.", JailsAPI.getJailManager().getPlugin(), is(main));
assertNotNull("The getJails method returned a null value.", JailsAPI.getJailManager().getJails());
assertEquals("There isn't a Jail in the returned Jails.", 1, JailsAPI.getJailManager().getJails().size());
assertThat("Jail Names aren't equal..", new String[] { "TestJailAPI" }, is(JailsAPI.getJailManager().getJailNames()));
assertTrue("The adding of a new jail, furtherTesting, wasn't successful.", creator.addJail("furtherTesting"));
assertTrue("The added jail, furtherTesting, doesn't exist.", JailsAPI.getJailManager().isValidJail("furtherTesting"));
JailsAPI.getJailManager().removeJail("furtherTesting");
assertFalse("The jail furtherTesting wasn't successfully removed.", JailsAPI.getJailManager().isValidJail("furtherTesting"));
assertNull("The jail furtherTesting is not null.", JailsAPI.getJailManager().getJail("furtherTesting"));
assertNotNull("The jail TestJailAPI is null.", JailsAPI.getJailManager().getJail("TestJailAPI"));
assertNotNull("An empty string returned a null value even though there is one jail.", JailsAPI.getJailManager().getJail(""));
assertNotNull("The first jail is null from the console sender.", JailsAPI.getJailManager().getNearestJail(creator.getCommandSender()));
assertNotNull("The nearest jail from the player sender is null.", JailsAPI.getJailManager().getNearestJail(creator.getPlayerCommandSender()));
assertNotNull("The cells object returned is null.", JailsAPI.getJailManager().getAllCells());
assertTrue("There are some cells even though there shouldn't be.", JailsAPI.getJailManager().getAllCells().isEmpty());
}
}

Some files were not shown because too many files have changed in this diff Show More