From d0305e3d7e4efb14b6756dcb9e526dc19ea91376 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 13 Jan 2019 18:51:46 -0800 Subject: [PATCH] Updated to 1.1-SNAPSHOT Removed deprecated command classes. --- pom.xml | 4 +- .../bentobox/level/commands/AdminLevel.java | 51 ------------- .../bentobox/level/commands/AdminTop.java | 73 ------------------- .../bentobox/level/commands/IslandLevel.java | 54 -------------- .../bentobox/level/commands/IslandTop.java | 34 --------- .../level/commands/admin/AdminTopCommand.java | 18 ++--- 6 files changed, 11 insertions(+), 223 deletions(-) delete mode 100644 src/main/java/world/bentobox/level/commands/AdminLevel.java delete mode 100644 src/main/java/world/bentobox/level/commands/AdminTop.java delete mode 100644 src/main/java/world/bentobox/level/commands/IslandLevel.java delete mode 100644 src/main/java/world/bentobox/level/commands/IslandTop.java diff --git a/pom.xml b/pom.xml index b758783..e9f2590 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ world.bentobox level - 0.4.0-SNAPSHOT + 1.1-SNAPSHOT Level Level is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like SkyBlock or AcidIsland. @@ -86,7 +86,7 @@ world.bentobox bentobox - 0.18.0-SNAPSHOT + 1.1-SNAPSHOT provided diff --git a/src/main/java/world/bentobox/level/commands/AdminLevel.java b/src/main/java/world/bentobox/level/commands/AdminLevel.java deleted file mode 100644 index c4b252e..0000000 --- a/src/main/java/world/bentobox/level/commands/AdminLevel.java +++ /dev/null @@ -1,51 +0,0 @@ -package world.bentobox.level.commands; - -import java.util.List; -import java.util.UUID; - -import world.bentobox.level.Level; -import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.user.User; - -/** - * @deprecated Renamed and moved to {@link world.bentobox.level.commands.admin.AdminLevelCommand}. - */ -@Deprecated -public class AdminLevel extends CompositeCommand { - - private final Level levelPlugin; - - public AdminLevel(Level levelPlugin, CompositeCommand parent) { - super(parent, "level"); - this.levelPlugin = levelPlugin; - } - - @Override - public boolean execute(User user, String label, List args) { - if (args.size() == 1) { - // Asking for another player's level? - // Convert name to a UUID - final UUID playerUUID = getPlugin().getPlayers().getUUID(args.get(0)); - if (playerUUID == null) { - user.sendMessage("general.errors.unknown-player"); - return true; - } else { - levelPlugin.calculateIslandLevel(getWorld(), user, playerUUID); - } - return true; - } else { - showHelp(this, user); - return false; - } - } - - @Override - public void setup() { - this.setPermission("admin.level"); - this.setOnlyPlayer(false); - this.setParametersHelp("admin.level.parameters"); - this.setDescription("admin.level.description"); - - } - -} diff --git a/src/main/java/world/bentobox/level/commands/AdminTop.java b/src/main/java/world/bentobox/level/commands/AdminTop.java deleted file mode 100644 index 3a39b4a..0000000 --- a/src/main/java/world/bentobox/level/commands/AdminTop.java +++ /dev/null @@ -1,73 +0,0 @@ -package world.bentobox.level.commands; - -import java.util.List; -import java.util.Map.Entry; -import java.util.UUID; - -import org.bukkit.World; - -import world.bentobox.level.Level; -import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; - -/** - * @deprecated Renamed and moved to {@link world.bentobox.level.commands.admin.AdminTopCommand}. - */ -@Deprecated -public class AdminTop extends CompositeCommand { - - private final Level levelPlugin; - - public AdminTop(Level levelPlugin, CompositeCommand parent) { - super(parent, "top", "topten"); - this.levelPlugin = levelPlugin; - } - - @Override - public boolean execute(User user, String label, List args) { - // Get world - World world; - if (args.isEmpty()) { - if (getPlugin().getIWM().getOverWorlds().size() == 1) { - world = getPlugin().getIWM().getOverWorlds().get(0); - } else { - showHelp(this, user); - return false; - } - } else { - if (getPlugin().getIWM().isOverWorld(args.get(0))) { - world = getPlugin().getIWM().getIslandWorld(args.get(0)); - } else { - user.sendMessage("commands.admin.top.unknown-world"); - return false; - } - - } - int rank = 0; - for (Entry topTen : levelPlugin.getTopTen().getTopTenList(world).getTopTen().entrySet()) { - Island island = getPlugin().getIslands().getIsland(world, topTen.getKey()); - if (island != null) { - rank++; - String item = user.getTranslation("admin.topten", - "[rank]", - "[name]", - "[level]", - String.valueOf(rank), - this.getPlugin().getPlayers().getUser(island.getOwner()).getName(), - String.valueOf(topTen.getValue())); - user.sendRawMessage(item); - } - } - - return true; - } - - @Override - public void setup() { - this.setPermission("admin.top"); - this.setOnlyPlayer(false); - this.setDescription("admin.top.description"); - } - -} diff --git a/src/main/java/world/bentobox/level/commands/IslandLevel.java b/src/main/java/world/bentobox/level/commands/IslandLevel.java deleted file mode 100644 index 8ca414c..0000000 --- a/src/main/java/world/bentobox/level/commands/IslandLevel.java +++ /dev/null @@ -1,54 +0,0 @@ -package world.bentobox.level.commands; - -import java.util.List; -import java.util.UUID; - -import world.bentobox.level.Level; -import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.user.User; - -/** - * @deprecated Renamed and moved to {@link world.bentobox.level.commands.island.IslandLevelCommand}. - */ -@Deprecated -public class IslandLevel extends CompositeCommand { - - private final Level levelPlugin; - - public IslandLevel(Level levelPlugin, CompositeCommand parent) { - super(parent, "level"); - this.levelPlugin = levelPlugin; - } - - @Override - public boolean execute(User user, String label, List args) { - if (!args.isEmpty()) { - // Asking for another player's level? - // Convert name to a UUID - final UUID playerUUID = getPlugin().getPlayers().getUUID(args.get(0)); - if (playerUUID == null) { - user.sendMessage("general.errors.unknown-player"); - return true; - } else if (user.getUniqueId().equals(playerUUID) ) { - // Self level request - levelPlugin.calculateIslandLevel(getWorld(), user, user.getUniqueId()); - } else { - user.sendMessage("island.level.island-level-is", "[level]", String.valueOf(levelPlugin.getIslandLevel(getWorld(), playerUUID))); - return true; - } - } else { - // Self level request - levelPlugin.calculateIslandLevel(getWorld(), user, user.getUniqueId()); - } - return false; - } - - @Override - public void setup() { - this.setPermission("island.level"); - this.setParametersHelp("island.level.parameters"); - this.setDescription("island.level.description"); - this.setOnlyPlayer(true); - } - -} diff --git a/src/main/java/world/bentobox/level/commands/IslandTop.java b/src/main/java/world/bentobox/level/commands/IslandTop.java deleted file mode 100644 index eba1397..0000000 --- a/src/main/java/world/bentobox/level/commands/IslandTop.java +++ /dev/null @@ -1,34 +0,0 @@ -package world.bentobox.level.commands; - -import java.util.List; - -import world.bentobox.level.Level; -import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.user.User; - -/** - * @deprecated Renamed and moved to {@link world.bentobox.level.commands.island.IslandTopCommand}. - */ -@Deprecated -public class IslandTop extends CompositeCommand { - - private final Level plugin; - - public IslandTop(Level plugin, CompositeCommand parent) { - super(parent, "top", "topten"); - this.plugin = plugin; - } - - @Override - public void setup() { - setPermission("island.top"); - setDescription("island.top.description"); - setOnlyPlayer(true); - } - - @Override - public boolean execute(User user, String label, List list) { - plugin.getTopTen().getGUI(getWorld(), user, getPermissionPrefix()); - return true; - } -} diff --git a/src/main/java/world/bentobox/level/commands/admin/AdminTopCommand.java b/src/main/java/world/bentobox/level/commands/admin/AdminTopCommand.java index 3277841..5970e88 100644 --- a/src/main/java/world/bentobox/level/commands/admin/AdminTopCommand.java +++ b/src/main/java/world/bentobox/level/commands/admin/AdminTopCommand.java @@ -1,15 +1,16 @@ package world.bentobox.level.commands.admin; -import org.bukkit.World; -import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.level.Level; - import java.util.List; import java.util.Map; import java.util.UUID; +import org.bukkit.World; + +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.level.Level; + public class AdminTopCommand extends CompositeCommand { private final Level levelPlugin; @@ -38,9 +39,8 @@ public class AdminTopCommand extends CompositeCommand { return false; } } else { - if (getPlugin().getIWM().isOverWorld(args.get(0))) { - world = getPlugin().getIWM().getIslandWorld(args.get(0)); - } else { + world = getPlugin().getIWM().getIslandWorld(args.get(0)); + if (world == null) { user.sendMessage("commands.admin.top.unknown-world"); return false; }