diff --git a/README.md b/README.md index ec4dd9b..a1220a4 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,19 @@ This plugins adds Jail to your Minecraft server. Admins can define several jails Translating === -If you would like to help translate this project, please shoot me an email `graywolf336`@`craftyn.com` and saying which language(s) you would like to contribute to and I will add you. +If you would like to help translate this project, please shoot me an email `graywolf336`@`craftyn.com` and let me know which language(s) you would like to contribute to and I will add you. Developing/Building === -If you want to make some changes, build, and run the unit tests you will notice we require CraftBukkit 1.8 with maven and it isn't hosted anywhere publically for legal reasons. You will need to build CraftBukkit 1.8 yourself and then put it locally for maven with the following command: +If you want to make some changes, build, and run the unit tests you will notice we require CraftBukkit 1.8 with maven and it isn't hosted anywhere publicly for legal reasons. You will need to build CraftBukkit 1.8 yourself and then put it locally for maven with the following command: `mvn install:install-file -Dfile=craftbukkit-1.9-R0.1.jar -DgroupId=org.bukkit -DartifactId=craftbukkit -Dversion=1.9-R0.1-SNAPSHOT -Dpackaging=jar` +Beta 6 Changes +=== +*Changes since Beta 5* +* Plugin now requires Java 1.8 + Beta 5 Changes === *Changes since Beta 4* diff --git a/pom.xml b/pom.xml index 91123e2..4dc4c35 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ vault-repo - http://nexus.theyeticave.net/content/repositories/pub_releases + http://nexus.hc.to/content/repositories/pub_releases/ @@ -203,8 +203,8 @@ maven-compiler-plugin 2.3.2 - 1.6 - 1.6 + 1.8 + 1.8 diff --git a/src/main/java/com/graywolf336/jail/ScoreBoardManager.java b/src/main/java/com/graywolf336/jail/ScoreBoardManager.java index b594557..44014ff 100644 --- a/src/main/java/com/graywolf336/jail/ScoreBoardManager.java +++ b/src/main/java/com/graywolf336/jail/ScoreBoardManager.java @@ -20,6 +20,7 @@ public class ScoreBoardManager { private HashMap boards; private OfflinePlayer time; + @SuppressWarnings("deprecation") protected ScoreBoardManager(JailMain plugin) { this.pl = plugin; this.man = plugin.getServer().getScoreboardManager(); @@ -42,6 +43,7 @@ public class ScoreBoardManager { * @param player of whom to add the scoreboard to. * @param pris data for the provided prisoner */ + @SuppressWarnings("deprecation") public void addScoreBoard(Player player, Prisoner pris) { if(!boards.containsKey(player.getUniqueId())) { boards.put(player.getUniqueId(), man.getNewScoreboard()); @@ -98,6 +100,7 @@ public class ScoreBoardManager { * @param player of whom to update the scoreboard for. * @param pris data for the player */ + @SuppressWarnings("deprecation") private void updatePrisonersBoard(Player player, Prisoner pris) { boards.get(player.getUniqueId()).getObjective("test").getScore(time).setScore(pris.getRemainingTimeInMinutesInt()); } diff --git a/src/main/java/com/graywolf336/jail/command/commands/HandCuffCommand.java b/src/main/java/com/graywolf336/jail/command/commands/HandCuffCommand.java index e679970..3475f39 100644 --- a/src/main/java/com/graywolf336/jail/command/commands/HandCuffCommand.java +++ b/src/main/java/com/graywolf336/jail/command/commands/HandCuffCommand.java @@ -22,6 +22,7 @@ import com.graywolf336.jail.enums.Lang; usage = "/handcuff [player]" ) public class HandCuffCommand implements Command { + @SuppressWarnings("deprecation") public boolean execute(JailManager jm, CommandSender sender, String... args) { Player player = jm.getPlugin().getServer().getPlayer(args[0]); diff --git a/src/main/java/com/graywolf336/jail/command/commands/UnHandCuffCommand.java b/src/main/java/com/graywolf336/jail/command/commands/UnHandCuffCommand.java index d96464a..6d9844e 100644 --- a/src/main/java/com/graywolf336/jail/command/commands/UnHandCuffCommand.java +++ b/src/main/java/com/graywolf336/jail/command/commands/UnHandCuffCommand.java @@ -22,6 +22,7 @@ import com.graywolf336.jail.enums.Lang; usage = "/unhandcuff [player]" ) public class UnHandCuffCommand implements Command { + @SuppressWarnings("deprecation") public boolean execute(JailManager jm, CommandSender sender, String... args) { Player player = jm.getPlugin().getServer().getPlayerExact(args[0]); diff --git a/src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java b/src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java index 0f90eb9..c58b7d1 100644 --- a/src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java +++ b/src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java @@ -52,6 +52,7 @@ public class JailCommand implements Command { * - If the cell is not empty then checks to be sure that cell exists * - If the prisoner is online or not. */ + @SuppressWarnings("deprecation") public boolean execute(JailManager jm, CommandSender sender, String... args) { if(jm.getJails().isEmpty()) { sender.sendMessage(Lang.NOJAILS.get()); diff --git a/src/main/java/com/graywolf336/jail/command/subcommands/JailRecordCommand.java b/src/main/java/com/graywolf336/jail/command/subcommands/JailRecordCommand.java index a22c20f..3228c12 100644 --- a/src/main/java/com/graywolf336/jail/command/subcommands/JailRecordCommand.java +++ b/src/main/java/com/graywolf336/jail/command/subcommands/JailRecordCommand.java @@ -19,6 +19,7 @@ import com.graywolf336.jail.enums.Lang; usage = "/jail record [name] (display)" ) public class JailRecordCommand implements Command { + @SuppressWarnings("deprecation") public boolean execute(JailManager jm, CommandSender sender, String... args) { if(args.length == 2) { // /jail record diff --git a/src/main/java/com/graywolf336/jail/command/subcommands/JailTeleInCommand.java b/src/main/java/com/graywolf336/jail/command/subcommands/JailTeleInCommand.java index 3a1cdb0..5acde7b 100644 --- a/src/main/java/com/graywolf336/jail/command/subcommands/JailTeleInCommand.java +++ b/src/main/java/com/graywolf336/jail/command/subcommands/JailTeleInCommand.java @@ -23,6 +23,7 @@ import com.graywolf336.jail.enums.Lang; usage = "/jail telein [jail] (name)" ) public class JailTeleInCommand implements Command { + @SuppressWarnings("deprecation") public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception { Jail j = jm.getJail(args[1]); diff --git a/src/main/java/com/graywolf336/jail/command/subcommands/JailTeleOutCommand.java b/src/main/java/com/graywolf336/jail/command/subcommands/JailTeleOutCommand.java index e9f3c0b..fbf0c80 100644 --- a/src/main/java/com/graywolf336/jail/command/subcommands/JailTeleOutCommand.java +++ b/src/main/java/com/graywolf336/jail/command/subcommands/JailTeleOutCommand.java @@ -23,6 +23,7 @@ import com.graywolf336.jail.enums.Lang; usage = "/jail teleout [jail] (name)" ) public class JailTeleOutCommand implements Command { + @SuppressWarnings("deprecation") public boolean execute(JailManager jm, CommandSender sender, String... args) throws Exception { Jail j = jm.getJail(args[1]); diff --git a/src/main/java/com/graywolf336/jail/command/subcommands/JailVoteCommand.java b/src/main/java/com/graywolf336/jail/command/subcommands/JailVoteCommand.java index f627ab0..6ab22a9 100644 --- a/src/main/java/com/graywolf336/jail/command/subcommands/JailVoteCommand.java +++ b/src/main/java/com/graywolf336/jail/command/subcommands/JailVoteCommand.java @@ -27,6 +27,7 @@ import com.graywolf336.jail.enums.Settings; public class JailVoteCommand implements Command { private static final String[] options = new String[] { "yes", "no" }; + @SuppressWarnings("deprecation") public boolean execute(JailManager jm, CommandSender sender, String... args) { if(jm.getPlugin().getConfig().getBoolean(Settings.JAILVOTEENABLED.getPath()) && jm.getPlugin().getJailVoteManager() != null && !jm.getJails().isEmpty()) { Player p = (Player) sender; diff --git a/src/main/java/com/graywolf336/jail/legacy/OldInputOutput.java b/src/main/java/com/graywolf336/jail/legacy/OldInputOutput.java index b6c60fb..1bd198c 100644 --- a/src/main/java/com/graywolf336/jail/legacy/OldInputOutput.java +++ b/src/main/java/com/graywolf336/jail/legacy/OldInputOutput.java @@ -103,6 +103,7 @@ public class OldInputOutput { ps.close(); } + @SuppressWarnings("deprecation") public void LoadPrisoners() throws SQLException { if(pl.getJailManager().getJails().size() != 0) { PreparedStatement ps = getConnection().prepareStatement("SELECT * FROM jail_prisoners");