From c50fabe827274b9ae8590f74b60074ca91ae1a82 Mon Sep 17 00:00:00 2001 From: Poslovitch Date: Sun, 21 May 2017 10:28:22 +0200 Subject: [PATCH] Split Level from core plugin --- .../bskyblock/commands/IslandCommand.java | 82 ------------------- .../bskyblock/config/BSBLocale.java | 4 - .../bskyblock/database/IslandsManager.java | 27 ------ .../bskyblock/database/objects/Island.java | 32 -------- .../bskyblock/database/objects/Players.java | 1 - 5 files changed, 146 deletions(-) diff --git a/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java b/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java index 209998c19..c8cca3672 100755 --- a/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java @@ -279,34 +279,6 @@ public class IslandCommand extends BSBCommand{ } }); - /* /is level [player] - Calculate and display island level */ - registerArgument(new String[] {"level"}, new CommandArgumentHandler() { - - @Override - public boolean canExecute(CommandSender sender, String label, String[] args) { - // TODO Auto-generated method stub - return false; - } - - @Override - public void onExecute(CommandSender sender, String label, String[] args) { - // TODO Auto-generated method stub - - } - - @Override - public List onTabComplete(CommandSender sender, String label, String[] args) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String[] getHelp(CommandSender sender, String label){ - return new String[] {null, plugin.getLocale(sender).islandHelpLevel, - "[player]", plugin.getLocale(sender).islandHelpLevelOther}; - } - }); - /* /is name - Set island display name */ registerArgument(new String[] {"name"}, new CommandArgumentHandler() { @@ -421,60 +393,6 @@ public class IslandCommand extends BSBCommand{ } }); - /* /is topten - Display top ten */ - registerArgument(new String[] {"topten", "top"}, new CommandArgumentHandler() { - - @Override - public boolean canExecute(CommandSender sender, String label, String[] args) { - // TODO Auto-generated method stub - return false; - } - - @Override - public void onExecute(CommandSender sender, String label, String[] args) { - // TODO Auto-generated method stub - - } - - @Override - public List onTabComplete(CommandSender sender, String label, String[] args) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String[] getHelp(CommandSender sender, String label){ - return new String[] {null, plugin.getLocale(sender).islandHelpTopTen}; - } - }); - - /* /is value - Show the value of the block in hand */ - registerArgument(new String[] {"value"}, new CommandArgumentHandler() { - - @Override - public boolean canExecute(CommandSender sender, String label, String[] args) { - // TODO Auto-generated method stub - return false; - } - - @Override - public void onExecute(CommandSender sender, String label, String[] args) { - // TODO Auto-generated method stub - - } - - @Override - public List onTabComplete(CommandSender sender, String label, String[] args) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String[] getHelp(CommandSender sender, String label){ - return new String[] {null, plugin.getLocale(sender).islandHelpValue}; - } - }); - /* /is limits - Show the (tile) entities limits */ registerArgument(new String[] {"limits"}, new CommandArgumentHandler() { diff --git a/src/main/java/us/tastybento/bskyblock/config/BSBLocale.java b/src/main/java/us/tastybento/bskyblock/config/BSBLocale.java index 0609207f7..c06493003 100644 --- a/src/main/java/us/tastybento/bskyblock/config/BSBLocale.java +++ b/src/main/java/us/tastybento/bskyblock/config/BSBLocale.java @@ -136,12 +136,8 @@ public class BSBLocale { public String islandHelpControlPanel; public String islandHelpReset; public String islandHelpSetHome; - public String islandHelpLevel; - public String islandHelpLevelOther; public String islandHelpName; public String islandHelpResetName; - public String islandHelpTopTen; - public String islandHelpValue; public String islandHelpLimits; public String islandHelpTeam; public String islandHelpInvite; diff --git a/src/main/java/us/tastybento/bskyblock/database/IslandsManager.java b/src/main/java/us/tastybento/bskyblock/database/IslandsManager.java index 1b767676a..b2e183665 100755 --- a/src/main/java/us/tastybento/bskyblock/database/IslandsManager.java +++ b/src/main/java/us/tastybento/bskyblock/database/IslandsManager.java @@ -139,33 +139,6 @@ public class IslandsManager { } } - /** - * Get the island level - * @param playerUUID - * @return Level of island, or null if unknown - */ - public Integer getIslandLevel(UUID playerUUID) { - if (islandsByUUID.containsKey(playerUUID)) - return islandsByUUID.get(playerUUID).getLevel(); - return null; - } - - /** - * Set the island level for this player - * @param playerUUID - * @param islandLevel - * @return true if successful, false if not - */ - public boolean setIslandLevel(UUID playerUUID, int islandLevel) { - if (islandsByUUID.containsKey(playerUUID)) { - islandsByUUID.get(playerUUID).setLevel(islandLevel); - // TODO - //plugin.getChatListener().setPlayerLevel(playerUUID, islandLevel); - return true; - } - return false; - } - /** * Puts a player in a team. Removes them from their old island if required. * @param playerUUID diff --git a/src/main/java/us/tastybento/bskyblock/database/objects/Island.java b/src/main/java/us/tastybento/bskyblock/database/objects/Island.java index 9134c7aea..e9a796093 100755 --- a/src/main/java/us/tastybento/bskyblock/database/objects/Island.java +++ b/src/main/java/us/tastybento/bskyblock/database/objects/Island.java @@ -65,10 +65,6 @@ public class Island { private boolean isSpawn = false; private boolean purgeProtected = false; - //// Rating //// - private int level; - private int levelHandicap; - //// Protection //// private HashMap flags = new HashMap(); @@ -294,34 +290,6 @@ public class Island { this.purgeProtected = purgeProtected; } - /** - * @return the island level - */ - public int getLevel(){ - return level; - } - - /** - * @param level - the island level to set - */ - public void setLevel(int level){ - this.level = level; - } - - /** - * @return the island level handicap - */ - public int getLevelHandicap(){ - return levelHandicap; - } - - /** - * @param levelHandicap - the island level handicap to set - */ - public void setLevelHandicap(int levelHandicap){ - this.levelHandicap = levelHandicap; - } - /** * Island Guard Settings flags * Covers island, spawn and system settings diff --git a/src/main/java/us/tastybento/bskyblock/database/objects/Players.java b/src/main/java/us/tastybento/bskyblock/database/objects/Players.java index f34e2d047..1571cd520 100755 --- a/src/main/java/us/tastybento/bskyblock/database/objects/Players.java +++ b/src/main/java/us/tastybento/bskyblock/database/objects/Players.java @@ -26,7 +26,6 @@ public class Players { private int deaths; private HashMap kickedList; - /** * @param uuid * Constructor - initializes the state variables