From 8a3e0eb4030ff663c20f830dc2b91ba092d06609 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 18 Sep 2021 10:33:48 -0700 Subject: [PATCH] Conde clean up from IntelliJ --- .../bentobox/greenhouses/data/Greenhouse.java | 4 +-- .../greenhouses/greenhouse/BiomeRecipe.java | 31 +++++++++---------- .../greenhouses/greenhouse/Walls.java | 2 +- .../listeners/GreenhouseEvents.java | 12 +++---- .../greenhouses/listeners/SnowTracker.java | 9 ++---- .../managers/GreenhouseFinder.java | 2 +- .../managers/GreenhouseManager.java | 9 ++---- .../greenhouses/managers/RecipeManager.java | 13 +++----- .../greenhouse/BiomeRecipeTest.java | 19 ------------ .../greenhouses/greenhouse/WallsTest.java | 10 +++--- .../managers/GreenhouseFinderTest.java | 4 +-- 11 files changed, 42 insertions(+), 73 deletions(-) diff --git a/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java b/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java index 158ab9c..27501af 100644 --- a/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java +++ b/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java @@ -220,7 +220,7 @@ public class Greenhouse implements DataObject { * @return true if inside the greenhouse */ public boolean contains(Location location2) { - return location.getWorld().equals(location2.getWorld()) && boundingBox.contains(location2.toVector()); + return location.getWorld() != null && location.getWorld().equals(location2.getWorld()) && boundingBox.contains(location2.toVector()); } /** @@ -253,7 +253,7 @@ public class Greenhouse implements DataObject { */ @NonNull public Map getMissingBlocks() { - return Objects.requireNonNullElseGet(missingBlocks, () -> new HashMap<>()); + return Objects.requireNonNullElseGet(missingBlocks, HashMap::new); } /** diff --git a/src/main/java/world/bentobox/greenhouses/greenhouse/BiomeRecipe.java b/src/main/java/world/bentobox/greenhouses/greenhouse/BiomeRecipe.java index 8ef8010..fb7abb3 100644 --- a/src/main/java/world/bentobox/greenhouses/greenhouse/BiomeRecipe.java +++ b/src/main/java/world/bentobox/greenhouses/greenhouse/BiomeRecipe.java @@ -362,22 +362,19 @@ public class BiomeRecipe implements Comparable { // If spawn occurs, check if it can fit inside greenhouse .map(m -> { Entity entity = b.getWorld().spawnEntity(spawnLoc, m.mobType()); - if (entity != null) { - preventZombie(entity); - return addon - .getManager() - .getMap() - .getGreenhouse(b.getLocation()).map(gh -> { - BoundingBox interior = gh.getBoundingBox().clone(); - interior.expand(-1, -1, -1); - if (!interior.contains(entity.getBoundingBox())) { - entity.remove(); - return false; - } - return true; - }).orElse(false); - } - return false; + preventZombie(entity); + return addon + .getManager() + .getMap() + .getGreenhouse(b.getLocation()).map(gh -> { + BoundingBox interior = gh.getBoundingBox().clone(); + interior.expand(-1, -1, -1); + if (!interior.contains(entity.getBoundingBox())) { + entity.remove(); + return false; + } + return true; + }).orElse(false); }).orElse(false); } @@ -437,7 +434,7 @@ public class BiomeRecipe implements Comparable { /** * Plants a plant on block bl if it makes sense. - * @param bl - block that can have growth + * @param block - block that can have growth * @return true if successful */ public boolean growPlant(GrowthBlock block) { diff --git a/src/main/java/world/bentobox/greenhouses/greenhouse/Walls.java b/src/main/java/world/bentobox/greenhouses/greenhouse/Walls.java index 534e0b0..5ddf479 100644 --- a/src/main/java/world/bentobox/greenhouses/greenhouse/Walls.java +++ b/src/main/java/world/bentobox/greenhouses/greenhouse/Walls.java @@ -28,7 +28,7 @@ public class Walls extends MinMaxXZ { private final AsyncWorldCache cache; - class WallFinder { + static class WallFinder { int radiusMinX; int radiusMaxX; int radiusMinZ; diff --git a/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseEvents.java b/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseEvents.java index 1c77055..c3b55c8 100644 --- a/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseEvents.java +++ b/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseEvents.java @@ -132,15 +132,13 @@ public class GreenhouseEvents implements Listener { return; } // from is a greenhouse - if (from.isPresent() && to.isEmpty()) { + if (from.isPresent()) { // Exiting user.sendMessage("greenhouses.event.leaving", BIOME, from.get().getBiomeRecipe().getFriendlyName()); return; } - if (from.isEmpty()) { - // Entering - user.sendMessage("greenhouses.event.entering", BIOME, to.get().getBiomeRecipe().getFriendlyName()); - } + // Entering + user.sendMessage("greenhouses.event.entering", BIOME, to.get().getBiomeRecipe().getFriendlyName()); } @@ -164,7 +162,9 @@ public class GreenhouseEvents implements Listener { addon.getManager().getMap().getGreenhouse(e.getBlock().getLocation()) .filter(g -> g.isRoofOrWallBlock(e.getBlock().getLocation())) .ifPresent(g -> { - user.sendMessage("greenhouses.event.broke", BIOME, Util.prettifyText(g.getOriginalBiome().name())); + if (g.getOriginalBiome() != null) { + user.sendMessage("greenhouses.event.broke", BIOME, Util.prettifyText(g.getOriginalBiome().name())); + } addon.getManager().removeGreenhouse(g); }); } diff --git a/src/main/java/world/bentobox/greenhouses/listeners/SnowTracker.java b/src/main/java/world/bentobox/greenhouses/listeners/SnowTracker.java index 932fc71..888be40 100644 --- a/src/main/java/world/bentobox/greenhouses/listeners/SnowTracker.java +++ b/src/main/java/world/bentobox/greenhouses/listeners/SnowTracker.java @@ -1,9 +1,6 @@ package world.bentobox.greenhouses.listeners; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -55,7 +52,7 @@ public class SnowTracker implements Listener { for (int x = (int)gh.getBoundingBox().getMinX() + 1; x < (int)gh.getBoundingBox().getMaxX() -1; x++) { for (int z = (int)gh.getBoundingBox().getMinZ() + 1; z < (int)gh.getBoundingBox().getMaxZ() - 1; z++) { for (int y = (int)gh.getBoundingBox().getMaxY() - 2; y >= (int)gh.getBoundingBox().getMinY(); y--) { - Block b = gh.getLocation().getWorld().getBlockAt(x, y, z); + Block b = Objects.requireNonNull(gh.getLocation().getWorld()).getBlockAt(x, y, z); Material type = b.getType(); if (type.equals(Material.AIR) || type.equals(Material.SNOW)) { b.getWorld().spawnParticle(Particle.SNOWBALL, b.getLocation(), 5); @@ -125,7 +122,7 @@ public class SnowTracker implements Listener { private void shakeGlobes(World world) { addon.getManager().getMap().getGreenhouses().stream().filter(g -> g.getBiomeRecipe().getIceCoverage() > 0) - .filter(g -> (g.getLocation().getWorld().isChunkLoaded(((int) g.getBoundingBox().getMaxX()) >> 4, ((int) g.getBoundingBox().getMaxZ()) >> 4) && g.getLocation().getWorld().isChunkLoaded(((int) g.getBoundingBox().getMinX()) >> 4, ((int) g.getBoundingBox().getMinZ()) >> 4))) + .filter(g -> (Objects.requireNonNull(Objects.requireNonNull(g.getLocation()).getWorld()).isChunkLoaded(((int) g.getBoundingBox().getMaxX()) >> 4, ((int) g.getBoundingBox().getMaxZ()) >> 4) && g.getLocation().getWorld().isChunkLoaded(((int) g.getBoundingBox().getMinX()) >> 4, ((int) g.getBoundingBox().getMinZ()) >> 4))) .filter(g -> g.getLocation().getWorld().equals(world)) .filter(g -> !g.isBroken()) .filter(g -> g.getRoofHopperLocation() != null) diff --git a/src/main/java/world/bentobox/greenhouses/managers/GreenhouseFinder.java b/src/main/java/world/bentobox/greenhouses/managers/GreenhouseFinder.java index 2be42a6..e7b29f5 100644 --- a/src/main/java/world/bentobox/greenhouses/managers/GreenhouseFinder.java +++ b/src/main/java/world/bentobox/greenhouses/managers/GreenhouseFinder.java @@ -33,7 +33,7 @@ public class GreenhouseFinder { */ private CounterCheck cc = new CounterCheck(); - class CounterCheck { + static class CounterCheck { int doorCount; int hopperCount; boolean airHole; diff --git a/src/main/java/world/bentobox/greenhouses/managers/GreenhouseManager.java b/src/main/java/world/bentobox/greenhouses/managers/GreenhouseManager.java index e6ec6cd..ab1c8ce 100644 --- a/src/main/java/world/bentobox/greenhouses/managers/GreenhouseManager.java +++ b/src/main/java/world/bentobox/greenhouses/managers/GreenhouseManager.java @@ -1,9 +1,6 @@ package world.bentobox.greenhouses.managers; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; @@ -252,7 +249,7 @@ public class GreenhouseManager implements Listener { for (int x = (int)gh.getBoundingBox().getMinX(); x < gh.getBoundingBox().getMaxX(); x+=4) { for (int z = (int)gh.getBoundingBox().getMinZ(); z < gh.getBoundingBox().getMaxZ(); z+=4) { for (int y = (int)gh.getBoundingBox().getMinY(); y < gh.getBoundingBox().getMaxY(); y+=4) { - gh.getWorld().setBiome(x, y, z, ghBiome); + Objects.requireNonNull(gh.getWorld()).setBiome(x, y, z, ghBiome); } } } @@ -262,7 +259,7 @@ public class GreenhouseManager implements Listener { * Result of the greenhouse make effort * */ - public class GhResult { + public static class GhResult { private Set results; private GreenhouseFinder finder; diff --git a/src/main/java/world/bentobox/greenhouses/managers/RecipeManager.java b/src/main/java/world/bentobox/greenhouses/managers/RecipeManager.java index 8287504..7791648 100644 --- a/src/main/java/world/bentobox/greenhouses/managers/RecipeManager.java +++ b/src/main/java/world/bentobox/greenhouses/managers/RecipeManager.java @@ -1,13 +1,8 @@ package world.bentobox.greenhouses.managers; import java.io.File; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; +import java.util.*; import java.util.Map.Entry; -import java.util.Optional; import java.util.stream.Collectors; import org.bukkit.ChatColor; @@ -68,6 +63,7 @@ public class RecipeManager { } ConfigurationSection biomeSection = biomeConfig.getConfigurationSection("biomes"); // Loop through all the entries + assert biomeSection != null; for (String type: biomeSection.getValues(false).keySet()) { processEntries(type, biomeSection); // Check maximum number @@ -82,6 +78,7 @@ public class RecipeManager { private void processEntries(String biomeType, ConfigurationSection biomeSection) { try { ConfigurationSection biomeRecipeConfig = biomeSection.getConfigurationSection(biomeType); + assert biomeRecipeConfig != null; Biome thisBiome = loadBiome(biomeType, biomeRecipeConfig); if (thisBiome == null) return; int priority = biomeRecipeConfig.getInt("priority", 0); @@ -124,7 +121,7 @@ public class RecipeManager { addon.logError("No biome defined in the biome reciepe " + biomeType + ". Skipping..."); return null; } - String name = biomeRecipeConfig.getString("biome").toUpperCase(Locale.ENGLISH); + String name = Objects.requireNonNull(biomeRecipeConfig.getString("biome")).toUpperCase(Locale.ENGLISH); if (Enums.getIfPresent(Biome.class, name).isPresent()) { return Biome.valueOf(name); } @@ -178,7 +175,7 @@ public class RecipeManager { try { Material oldMaterial = Material.valueOf(oldMat.toUpperCase(Locale.ENGLISH)); String conversions = conversionSec.getString(oldMat); - if (!conversions.isEmpty()) { + if (!Objects.requireNonNull(conversions).isEmpty()) { String[] split = conversions.split(":"); double convChance = Double.parseDouble(split[0]); Material newMaterial = Material.valueOf(split[1]); diff --git a/src/test/java/world/bentobox/greenhouses/greenhouse/BiomeRecipeTest.java b/src/test/java/world/bentobox/greenhouses/greenhouse/BiomeRecipeTest.java index 7ba591c..113ed97 100644 --- a/src/test/java/world/bentobox/greenhouses/greenhouse/BiomeRecipeTest.java +++ b/src/test/java/world/bentobox/greenhouses/greenhouse/BiomeRecipeTest.java @@ -587,25 +587,6 @@ public class BiomeRecipeTest { verify(world, never()).spawnEntity(eq(location), eq(EntityType.CAT)); } - /** - * Test method for {@link world.bentobox.greenhouses.greenhouse.BiomeRecipe#spawnMob(org.bukkit.block.Block)}. - */ - @Test - public void testSpawnMobFailToSpawn() { - when(block.getY()).thenReturn(10); - when(block.getType()).thenReturn(Material.GRASS_BLOCK); - when(block.getRelative(any())).thenReturn(block); - - EntityType mobType = EntityType.CAT; - int mobProbability = 100; - Material mobSpawnOn = Material.GRASS_BLOCK; - - br.addMobs(mobType, mobProbability, mobSpawnOn); - assertFalse(br.spawnMob(block)); - verify(world).spawnEntity(eq(location), eq(EntityType.CAT)); - } - - /** * Test method for {@link world.bentobox.greenhouses.greenhouse.BiomeRecipe#getRecipeBlocks()}. */ diff --git a/src/test/java/world/bentobox/greenhouses/greenhouse/WallsTest.java b/src/test/java/world/bentobox/greenhouses/greenhouse/WallsTest.java index bc78f0c..29821e1 100644 --- a/src/test/java/world/bentobox/greenhouses/greenhouse/WallsTest.java +++ b/src/test/java/world/bentobox/greenhouses/greenhouse/WallsTest.java @@ -99,7 +99,7 @@ public class WallsTest { */ @Test public void testLookAround() { - WallFinder wf = walls.new WallFinder(); + WallFinder wf = new WallFinder(); walls.lookAround(location, wf, roof); assertTrue(wf.stopMaxX); assertTrue(wf.stopMaxZ); @@ -116,7 +116,7 @@ public class WallsTest { */ @Test public void testAnalyzeFindings() { - WallFinder wf = walls.new WallFinder(); + WallFinder wf = new WallFinder(); walls.analyzeFindings(wf, roof); assertFalse(wf.stopMaxX); assertFalse(wf.stopMaxZ); @@ -137,7 +137,7 @@ public class WallsTest { walls.maxX = 1; walls.minZ = -1; walls.maxZ = 1; - WallFinder wf = walls.new WallFinder(); + WallFinder wf = new WallFinder(); walls.analyzeFindings(wf, roof); assertTrue(wf.stopMaxX); assertTrue(wf.stopMaxZ); @@ -154,7 +154,7 @@ public class WallsTest { */ @Test public void testLookAtBlockFaces() { - WallFinder wf = walls.new WallFinder(); + WallFinder wf = new WallFinder(); walls.lookAtBlockFaces(wf, 0, 5, -1); assertTrue(wf.stopMaxX); assertTrue(wf.stopMaxZ); @@ -168,7 +168,7 @@ public class WallsTest { @Test public void testLookAtBlockFacesNoGlass() { when(cache.getBlockType(anyInt(), anyInt(), anyInt())).thenReturn(Material.AIR); - WallFinder wf = walls.new WallFinder(); + WallFinder wf = new WallFinder(); walls.lookAtBlockFaces(wf, 0, 5, -1); assertFalse(wf.stopMaxX); assertFalse(wf.stopMaxZ); diff --git a/src/test/java/world/bentobox/greenhouses/managers/GreenhouseFinderTest.java b/src/test/java/world/bentobox/greenhouses/managers/GreenhouseFinderTest.java index 0fc1822..ca8139f 100644 --- a/src/test/java/world/bentobox/greenhouses/managers/GreenhouseFinderTest.java +++ b/src/test/java/world/bentobox/greenhouses/managers/GreenhouseFinderTest.java @@ -95,7 +95,7 @@ public class GreenhouseFinderTest { gf = new GreenhouseFinder(); - cc = gf.new CounterCheck(); + cc = new CounterCheck(); } /** @@ -232,7 +232,7 @@ public class GreenhouseFinderTest { // Set the greenhouse so the world is known gf.setGh(gh); when(Tag.DOORS.isTagged(any(Material.class))).thenReturn(false); - CounterCheck cc = gf.new CounterCheck(); + CounterCheck cc = new CounterCheck(); assertTrue(gf.checkDoorsHoppers(cc, Material.HOPPER, new Vector(5,14,25))); assertTrue(gf.getRedGlass().isEmpty()); assertEquals(5, gf.getGh().getRoofHopperLocation().getBlockX());