From 01a55481199a3e2b5fa22cd514208b38fb81bf2e Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 17 Jan 2021 11:42:54 -0800 Subject: [PATCH] Removed admin commands --- .../bentobox/greenhouses/Greenhouses.java | 2 - .../managers/GreenhouseFinder.java | 10 +- .../greenhouses/ui/admin/AdminCmd.java | 110 ------------------ .../ui/admin/GreenhousesAdminInfoCommand.java | 58 --------- .../admin/GreenhousesAdminReloadCommand.java | 39 ------- .../managers/GreenhouseFinderTest.java | 3 +- 6 files changed, 6 insertions(+), 216 deletions(-) delete mode 100644 src/main/java/world/bentobox/greenhouses/ui/admin/AdminCmd.java delete mode 100644 src/main/java/world/bentobox/greenhouses/ui/admin/GreenhousesAdminInfoCommand.java delete mode 100644 src/main/java/world/bentobox/greenhouses/ui/admin/GreenhousesAdminReloadCommand.java diff --git a/src/main/java/world/bentobox/greenhouses/Greenhouses.java b/src/main/java/world/bentobox/greenhouses/Greenhouses.java index 7e79497..ccfc8ec 100644 --- a/src/main/java/world/bentobox/greenhouses/Greenhouses.java +++ b/src/main/java/world/bentobox/greenhouses/Greenhouses.java @@ -13,7 +13,6 @@ import world.bentobox.bentobox.api.flags.Flag.Mode; import world.bentobox.bentobox.api.flags.Flag.Type; import world.bentobox.greenhouses.managers.GreenhouseManager; import world.bentobox.greenhouses.managers.RecipeManager; -import world.bentobox.greenhouses.ui.admin.AdminCmd; import world.bentobox.greenhouses.ui.user.UserCommand; /** @@ -72,7 +71,6 @@ public class Greenhouses extends Addon { .forEach(gm -> { // Register command gm.getPlayerCommand().ifPresent(playerCmd -> new UserCommand(this, playerCmd)); - gm.getAdminCommand().ifPresent(playerCmd -> new AdminCmd(this, playerCmd)); // Log this.log("Hooking into " + gm.getDescription().getName()); // Store active world diff --git a/src/main/java/world/bentobox/greenhouses/managers/GreenhouseFinder.java b/src/main/java/world/bentobox/greenhouses/managers/GreenhouseFinder.java index d64ae3e..abb3d05 100644 --- a/src/main/java/world/bentobox/greenhouses/managers/GreenhouseFinder.java +++ b/src/main/java/world/bentobox/greenhouses/managers/GreenhouseFinder.java @@ -55,7 +55,7 @@ public class GreenhouseFinder { // Find the roof Roof roof = new Roof(cache, location); roof.findRoof().thenAccept(found -> { - if (!found) { + if (Boolean.FALSE.equals(found)) { result.add(GreenhouseResult.FAIL_NO_ROOF); r.complete(result); return; @@ -68,7 +68,7 @@ public class GreenhouseFinder { gh.setOriginalBiome(location.getBlock().getBiome()); // Now check to see if the floor really is the floor and the walls follow the rules - checkGreenhouse(cache, gh, roof, walls).thenAccept(c -> { + checkGreenhouse(cache, roof, walls).thenAccept(c -> { result.addAll(c); r.complete(result); }); @@ -86,13 +86,13 @@ public class GreenhouseFinder { * @param walls - walls object * @return future set of Greenhouse Results */ - CompletableFuture> checkGreenhouse(AsyncWorldCache cache, Greenhouse gh2, Roof roof, Walls walls) { + CompletableFuture> checkGreenhouse(AsyncWorldCache cache, Roof roof, Walls walls) { CompletableFuture> r = new CompletableFuture<>(); - Bukkit.getScheduler().runTaskAsynchronously(BentoBox.getInstance(), () -> checkGHAsync(r, cache, gh2, roof, walls)); + Bukkit.getScheduler().runTaskAsynchronously(BentoBox.getInstance(), () -> checkGHAsync(r, cache, roof, walls)); return r; } - private Set checkGHAsync(CompletableFuture> r, AsyncWorldCache cache, Greenhouse gh2, + private Set checkGHAsync(CompletableFuture> r, AsyncWorldCache cache, Roof roof, Walls walls) { Set result = new HashSet<>(); cc = new CounterCheck(); diff --git a/src/main/java/world/bentobox/greenhouses/ui/admin/AdminCmd.java b/src/main/java/world/bentobox/greenhouses/ui/admin/AdminCmd.java deleted file mode 100644 index f297a15..0000000 --- a/src/main/java/world/bentobox/greenhouses/ui/admin/AdminCmd.java +++ /dev/null @@ -1,110 +0,0 @@ -package world.bentobox.greenhouses.ui.admin; - -import java.util.List; - -import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.user.User; -import world.bentobox.greenhouses.Greenhouses; - -/** - * This class handles commands for admins - * - */ -public class AdminCmd extends CompositeCommand { - - public AdminCmd(Greenhouses greenhouses, CompositeCommand parent) { - super(greenhouses, parent, "gadmin"); - } - - @Override - public void setup() { - this.setPermission("greenhouses.admin"); - this.setOnlyPlayer(false); - this.setParametersHelp("greenhouses.admin.parameters"); - this.setDescription("greenhouses.admin.description"); - - //new GreenhousesAdminReloadCommand(this); - new GreenhousesAdminInfoCommand(this); - } - - @Override - public boolean execute(User user, String label, List args) { - return false; - - } - - /* - case 1: - if (split[0].equalsIgnoreCase("reload")) { - plugin.reloadConfig(); - plugin.loadPluginConfig(); - plugin.loadBiomeRecipes(); - plugin.ecoTick(); - sender.sendMessage(ChatColor.YELLOW + Locale.reloadconfigReloaded); - return true; - } else if (split[0].equalsIgnoreCase("info")) { - if (!(sender instanceof Player)) { - sender.sendMessage(ChatColor.RED + Locale.admininfoerror); - return true; - } - Player player = (Player)sender; - Greenhouse greenhouse = players.getInGreenhouse(player); - if (greenhouse == null) { - sender.sendMessage(ChatColor.RED + Locale.admininfoerror2); - return true; - } - sender.sendMessage(ChatColor.GREEN + Locale.infoinfo); - sender.sendMessage(ChatColor.GREEN + Locale.generalowner + ":" + greenhouse.getPlayerName()); - sender.sendMessage(ChatColor.GREEN + Locale.admininfoflags); - for (String flag : greenhouse.getFlags().keySet()) { - sender.sendMessage(flag + ": " + greenhouse.getFlags().get(flag)); - } - return true; - } else { - sender.sendMessage(ChatColor.RED + Locale.errorunknownCommand); - return false; - } - case 2: - if (split[0].equalsIgnoreCase("info")) { - sender.sendMessage(ChatColor.GREEN + Locale.infoinfo); - int index = 0; - boolean found = false; - for (Greenhouse g : plugin.getGreenhouses()) { - if (g.getPlayerName().equalsIgnoreCase(split[1])) { - if (!found) - sender.sendMessage(ChatColor.GREEN + Locale.generalowner + ":" + g.getPlayerName()); - found = true; - sender.sendMessage("Greenhouse #" + (++index)); - sender.sendMessage("Biome: " + g.getBiome().name()); - sender.sendMessage("Recipe: " + g.getBiomeRecipe().getFriendlyName()); - sender.sendMessage(g.getWorld().getName()); - sender.sendMessage(g.getPos1().getBlockX() + ", " + g.getPos1().getBlockZ() + " to " + g.getPos2().getBlockX() + ", " + g.getPos2().getBlockZ()); - sender.sendMessage("Base at " + g.getPos1().getBlockY()); - sender.sendMessage("Height = " + g.getHeight()); - sender.sendMessage("Area = " + g.getArea()); - } - } - if (found) { - if (index == 0) { - sender.sendMessage("Player has no greenhouses."); - } else { - Player player = plugin.getServer().getPlayer(split[1]); - if (player != null) { - sender.sendMessage("Player has " + index + " greenhouses and is allowed to build " + plugin.getMaxGreenhouses(player)); - } else { - sender.sendMessage("Player has " + index + " greenhouses. Player is offline."); - } - } - } else { - sender.sendMessage(ChatColor.RED + "Cannot find that player. (May not have logged on recently)"); - } - return true; - } else { - sender.sendMessage(ChatColor.RED + Locale.errorunknownCommand); - return false; - } - default: - return false; - } - }*/ -} diff --git a/src/main/java/world/bentobox/greenhouses/ui/admin/GreenhousesAdminInfoCommand.java b/src/main/java/world/bentobox/greenhouses/ui/admin/GreenhousesAdminInfoCommand.java deleted file mode 100644 index 2a67943..0000000 --- a/src/main/java/world/bentobox/greenhouses/ui/admin/GreenhousesAdminInfoCommand.java +++ /dev/null @@ -1,58 +0,0 @@ -package world.bentobox.greenhouses.ui.admin; - -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.bukkit.Location; -import org.bukkit.Material; - -import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.user.User; -import world.bentobox.greenhouses.Greenhouses; - -/** - * @author tastybento - * - */ -class GreenhousesAdminInfoCommand extends CompositeCommand { - - private Greenhouses addon = Greenhouses.getInstance(); - private static final Set transparent = new HashSet<>(); - { - transparent.add(Material.AIR); - transparent.add(Material.GLASS); - } - /** - * @param parent - parent user command, e.g, /island - */ - public GreenhousesAdminInfoCommand(CompositeCommand parent) { - super(parent, "info"); - - } - - /* (non-Javadoc) - * @see world.bentobox.bentobox.api.commands.BentoBoxCommand#setup() - */ - @Override - public void setup() { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see world.bentobox.bentobox.api.commands.BentoBoxCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List) - */ - @Override - public boolean execute(User user, String label, List args) { - Location l = user.getPlayer().getLineOfSight(transparent, 5).get(0).getLocation(); - addon.getManager().getMap().getGreenhouse(l).ifPresent(gh -> - { - addon.log("There are " + addon.getManager().getEcoMgr().getAvailableBlocks(gh, false).size()); - addon.getManager().getEcoMgr().getAvailableBlocks(gh, false).forEach(b -> user.getPlayer().sendBlockChange(b.getLocation(), Material.CYAN_STAINED_GLASS.createBlockData())); - }); - return true; - } - - -} diff --git a/src/main/java/world/bentobox/greenhouses/ui/admin/GreenhousesAdminReloadCommand.java b/src/main/java/world/bentobox/greenhouses/ui/admin/GreenhousesAdminReloadCommand.java deleted file mode 100644 index 67ff6bc..0000000 --- a/src/main/java/world/bentobox/greenhouses/ui/admin/GreenhousesAdminReloadCommand.java +++ /dev/null @@ -1,39 +0,0 @@ -package world.bentobox.greenhouses.ui.admin; - -import java.util.List; - -import world.bentobox.bentobox.api.commands.CompositeCommand; -import world.bentobox.bentobox.api.user.User; - -/** - * @author tastybento - * - */ -class GreenhousesAdminReloadCommand extends CompositeCommand { - - /** - * @param parent - parent command - */ - public GreenhousesAdminReloadCommand(CompositeCommand parent) { - super(parent, "reload"); - } - - /* (non-Javadoc) - * @see world.bentobox.bentobox.api.commands.BentoBoxCommand#setup() - */ - @Override - public void setup() { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see world.bentobox.bentobox.api.commands.BentoBoxCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List) - */ - @Override - public boolean execute(User user, String label, List args) { - // TODO Auto-generated method stub - return false; - } - -} diff --git a/src/test/java/world/bentobox/greenhouses/managers/GreenhouseFinderTest.java b/src/test/java/world/bentobox/greenhouses/managers/GreenhouseFinderTest.java index 083e9fb..8dbd8dc 100644 --- a/src/test/java/world/bentobox/greenhouses/managers/GreenhouseFinderTest.java +++ b/src/test/java/world/bentobox/greenhouses/managers/GreenhouseFinderTest.java @@ -100,8 +100,7 @@ public class GreenhouseFinderTest { */ @Test public void testCheckGreenhouse() { - Greenhouse gh2 = new Greenhouse(world, walls, ROOF_HEIGHT); - gf.checkGreenhouse(cache, gh2, roof, walls).thenAccept(result -> { + gf.checkGreenhouse(cache, roof, walls).thenAccept(result -> { assertTrue(result.isEmpty()); // Success assertEquals(441, gf.getWallBlockCount()); assertEquals(0, gf.getWallDoors());