Removed admin commands

BentoBoxWorld · Jan 17, 2021 · 01a5548 · 01a5548
1 parent 0397f8f
commit 01a5548
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 216 deletions.
diff --git 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.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 void onEnable() {
         .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
@@ -55,7 +55,7 @@ public CompletableFuture<Set<GreenhouseResult>> find(Location location) {
         // 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 CompletableFuture<Set<GreenhouseResult>> find(Location location) {
                 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 CompletableFuture<Set<GreenhouseResult>> find(Location location) {
      * @param walls - walls object
      * @return future set of Greenhouse Results
      */
-    CompletableFuture<Set<GreenhouseResult>> checkGreenhouse(AsyncWorldCache cache, Greenhouse gh2, Roof roof, Walls walls) {
+    CompletableFuture<Set<GreenhouseResult>> checkGreenhouse(AsyncWorldCache cache, Roof roof, Walls walls) {
         CompletableFuture<Set<GreenhouseResult>> 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<GreenhouseResult> checkGHAsync(CompletableFuture<Set<GreenhouseResult>> r, AsyncWorldCache cache, Greenhouse gh2,
+    private Set<GreenhouseResult> checkGHAsync(CompletableFuture<Set<GreenhouseResult>> r, AsyncWorldCache cache,
             Roof roof, Walls walls) {
         Set<GreenhouseResult> 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
diff --git a/src/main/java/world/bentobox/greenhouses/ui/admin/GreenhousesAdminInfoCommand.java b/src/main/java/world/bentobox/greenhouses/ui/admin/GreenhousesAdminInfoCommand.java
diff --git a/src/main/java/world/bentobox/greenhouses/ui/admin/GreenhousesAdminReloadCommand.java b/src/main/java/world/bentobox/greenhouses/ui/admin/GreenhousesAdminReloadCommand.java
diff --git 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 void setUp() throws Exception {
      */
     @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());