Release 1.7.5 (#110)

* Version 1.7.3

* Add ${argLine} to get jacoco coverage

* Updated Jacoco POM entry

* Address bugs reported by SonarCloud

* Updated ReadMe

* Add max mobs option #99

* Use updated Bucket event

* Added tests to cover #99

* Fixes help text for user command.

Fixes #105

* Fixed maxmobs typo instead of maxmob

* Remove unused imports

* Update to new Bukkit Loader

* Remove debug

* Create plugin.yml (#106)

* Create plugin.yml

* Update pom.xml

* Update GreenhousesPladdon.java

* Removed static getInstance usage

* Version 1.7.4

* Refactored to reduce complexity

* Update surefire plugin

* Refactored to reduce complexity

* Minor typos and grammar fixes

* Reduced complexity

* Refactor to reduce complexity

* Refactor to reduce complexity

* Update Github Action build script

* Added distribution required for Github Action

* Update pom.xml

* Fixes mob spawning when no maxmob value given.

Found while doing #108

* Code clean up.

* BentoBox 2.0.0

* Update pom.xml 1.7.5

* Update to latest Spigot API

---------

Co-authored-by: BONNe <bonne@bonne.id.lv>

pom.xml

@@ -51,7 +51,7 @@
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- This allows to change between versions and snapshots. -->
-        <build.version>1.8.0</build.version>
+        <build.version>1.7.5</build.version>
         <build.number>-LOCAL</build.number>
         <sonar.projectKey>BentoBoxWorld_Greenhouses</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>

src/main/java/world/bentobox/greenhouses/GreenhousesPladdon.java

@@ -10,13 +10,9 @@ import world.bentobox.bentobox.api.addons.Pladdon;
  */
 public class GreenhousesPladdon extends Pladdon
 {
-    private Addon addon;
     @Override
     public Addon getAddon()
     {
-        if (addon == null) {
-            addon = new Greenhouses();
-        }
-        return addon;
+        return new Greenhouses();
     }
 }

src/main/resources/biomes.yml

@@ -35,8 +35,6 @@ biomes:
     # Entity name: % chance:Block on which the mob will spawn
     mobs:
       SQUID: 10:WATER
-      GLOW_SQUID: 5:WATER
-      TURTLE: 10:SAND
     # The minimum number of blocks each mob requires.
     # Mobs will not spawn if there is more than 1 per this number of
     # blocks in the greenhouse. e.g., in this case only 2 mobs will spawn if the
@@ -46,30 +44,6 @@ biomes:
     # the greenhouse at once. Spawning will stop when this limit is reached. 
     # If this value is not given, there is no maximum.
     maxmobs: 5
-  MANGROVE_SWAMP:
-    # Credit: angelknight89
-    friendlyname: "Mangrove Swamp"
-    biome: MANGROVE_SWAMP
-    icon: LILY_PAD
-    priority: 19
-    contents:
-      GRASS_BLOCK: 4
-      MANGROVE_ROOTS: 3
-      MANGROVE_LEAVES: 4
-    # 50% water coverage required
-    watercoverage: 50
-    conversions:
-      GRASS_BLOCK: 50:MUD:GRASS_BLOCK
-    plants:
-      MOSS_CARPET: 5:GRASS_BLOCK
-      LILY_PAD: 5:WATER
-    mobs:
-      FROG: 5:MUD
-    moblimit: 5
-     # Maxmobs - this is the maximum number of greenhouse-spawed mobs allowed in 
-    # the greenhouse at once. Spawning will stop when this limit is reached. 
-    # If this value is not given, there is no maximum.
-    maxmobs: 10
   Snowy_beach:
     friendlyname: "Snowy beach"
     biome: SNOWY_BEACH
@@ -79,9 +53,6 @@ biomes:
       SAND: 1
     watercoverage: 50
     icecoverage: 10
-    mobs:
-      SQUID: 10:WATER
-      GLOW_SQUID: 10:WATER
   ThreeWolfMoon:
     friendlyname: "Three Wolf Moon Forest"
     # Could do with more wolves, but the magic works with 3.
@@ -96,9 +67,7 @@ biomes:
     plants:
       TALL_GRASS: 10:GRASS_BLOCK
     mobs:
-      WOLF: 15:SNOW
-      FOX: 15:GRASS_BLOCK
-      RABBIT: 7:GRASS_BLOCK
+      WOLF: 10:SNOW
     moblimit: 9
     # Maxmobs - this is the maximum number of greenhouse-spawed mobs allowed in 
     # the greenhouse at once. Spawning will stop when this limit is reached. 
@@ -118,7 +87,6 @@ biomes:
       TALL_GRASS: 10:GRASS_BLOCK
     mobs:
       RABBIT: 10:SNOW
-      FOX: 7:GRASS_BLOCK
     moblimit: 9
     # Maxmobs - this is the maximum number of greenhouse-spawed mobs allowed in 
     # the greenhouse at once. Spawning will stop when this limit is reached. 
@@ -147,14 +115,6 @@ biomes:
     - DIRT:30:SAND:SAND
     - GRASS_BLOCK:30:SAND:SAND
     - COARSE_DIRT:30:GRAVEL:SAND
-    mobs:
-      RABBIT: 10:SAND
-      HUSK: 10:SAND
-    moblimit: 9
-    # Maxmobs - this is the maximum number of greenhouse-spawed mobs allowed in 
-    # the greenhouse at once. Spawning will stop when this limit is reached. 
-    # If this value is not given, there is no maximum.
-    maxmobs: 20
   FOREST:
     friendlyname: "Flowery forest"
     biome: FLOWER_FOREST
@@ -169,17 +129,6 @@ biomes:
       ORANGE_TULIP: 2:GRASS_BLOCK
       SUNFLOWER: 4:GRASS_BLOCK
       TALL_GRASS: 20:GRASS_BLOCK
-    mobs:
-      SHEEP: 10:GRASS_BLOCK
-      CHICKEN: 7:GRASS_BLOCK
-      PIG: 10:GRASS_BLOCK
-      COW: 10:GRASS_BLOCK
-      WOLF: 5:GRASS_BLOCK
-    moblimit: 9
-    # Maxmobs - this is the maximum number of greenhouse-spawed mobs allowed in 
-    # the greenhouse at once. Spawning will stop when this limit is reached. 
-    # If this value is not given, there is no maximum.
-    maxmobs: 20
   NETHER:
     friendlyname: "&cNether"
     biome: NETHER_WASTES
@@ -215,9 +164,6 @@ biomes:
     watercoverage: 0
     mobs:
       SKELETON: 10:SOUL_SAND
-      GHAST: 10:SOUL_SAND
-      ENDERMAN: 1:SOUL_SAND
-      STRIDER: 20:LAVA
     moblimit: 9
     # Maxmobs - this is the maximum number of greenhouse-spawed mobs allowed in 
     # the greenhouse at once. Spawning will stop when this limit is reached. 
@@ -288,10 +234,6 @@ biomes:
       FERN: 20:GRASS_BLOCK
       TALL_GRASS: 20:GRASS_BLOCK
       COCOA: 10:JUNGLE_LOG
-    mobs:
-      PARROT: 30:GRASS_BLOCK
-      CHICKEN: 20:GRASS_BLOCK
-      PANDA: 1:GRASS_BLOCK
   MUSHROOM_FIELDS:
     friendlyname: "Mushroom Fields"
     biome: MUSHROOM_FIELDS
@@ -319,13 +261,7 @@ biomes:
     watercoverage: 95
     mobs:
       SQUID: 10:WATER
-      DROWNED: 1:WATER
-      COD: 40:WATER
-      DOLPHIN: 20:WATER
-      SQUID: 20:WATER
-      GLOW_SQUID: 10:WATER
     moblimit: 9
-    maxmobs: 20
   PLAINS:
     friendlyname: "Horse Plains"
     biome: PLAINS
@@ -336,12 +272,7 @@ biomes:
     plants:
       TALL_GRASS: 10:GRASS_BLOCK
     mobs:
-      HORSE: 18:GRASS_BLOCK
-      DONKEY: 2:GRASS_BLOCK
-      COW: 20:GRASS_BLOCK
-      CHICKEN: 25:GRASS_BLOCK
-      PIG: 25:GRASS_BLOCK
-      SHEEP: 25:GRASS_BLOCK
+      HORSE: 10:GRASS_BLOCK
     moblimit: 1
     # Maxmobs - this is the maximum number of greenhouse-spawed mobs allowed in 
     # the greenhouse at once. Spawning will stop when this limit is reached. 
@@ -362,15 +293,6 @@ biomes:
     # So, for below, dirt has a 50% chance of changing into clay if it is next to water!
     conversion-list:
     - DIRT:50:CLAY:WATER
-    mobs:
-      SALMON: 10:WATER
-      SQUID: 10:WATER
-      GLOW_SQUID: 5:WATER
-    moblimit: 1
-    # Maxmobs - this is the maximum number of greenhouse-spawed mobs allowed in 
-    # the greenhouse at once. Spawning will stop when this limit is reached. 
-    # If this value is not given, there is no maximum.
-    maxmobs: 10
   SAVANNA:
     biome: SAVANNA
     icon: ACACIA_LEAVES
@@ -381,18 +303,6 @@ biomes:
       GRASS_BLOCK: 4
     plants:
       TALL_GRASS: 10:GRASS_BLOCK
-    mobs:
-      HORSE: 2:GRASS_BLOCK
-      DONKEY: 2:GRASS_BLOCK
-      COW: 20:GRASS_BLOCK
-      CHICKEN: 25:GRASS_BLOCK
-      PIG: 25:GRASS_BLOCK
-      SHEEP: 25:GRASS_BLOCK
-    moblimit: 1
-    # Maxmobs - this is the maximum number of greenhouse-spawed mobs allowed in 
-    # the greenhouse at once. Spawning will stop when this limit is reached. 
-    # If this value is not given, there is no maximum.
-    maxmobs: 10
   SWAMP:
     friendlyname: "&2Slimy Swamp"
     biome: SWAMP
@@ -411,7 +321,6 @@ biomes:
       LILY_PAD: 5:WATER
     mobs:
       SLIME: 5:WATER
-      FROG: 20:WATER
     moblimit: 3
      # Maxmobs - this is the maximum number of greenhouse-spawed mobs allowed in 
     # the greenhouse at once. Spawning will stop when this limit is reached. 
@@ -435,9 +344,8 @@ biomes:
     mobs:
       skeleton: 5:STONE
       glow_squid: 5:WATER
-      BAT: 10:STONE
     moblimit: 5
     # Maxmobs - this is the maximum number of greenhouse-spawed mobs allowed in 
     # the greenhouse at once. Spawning will stop when this limit is reached. 
     # If this value is not given, there is no maximum.
-    maxmobs: 25
+    maxmobs: 25

src/main/resources/locales/en-US.yml

@@ -53,12 +53,9 @@ greenhouses:
           FAIL_BAD_WALL_BLOCKS: "&c Wall contains disallowed blocks!"
           FAIL_BELOW: "&c You must be inside the greenhouse to try to make it"
           FAIL_BLOCKS_ABOVE: "&c There can be no blocks above the greenhouse! Red glass blocks should show the problem blocks."
-          FAIL_HOLE_IN_ROOF: |
-            &c There is a hole in the roof or it is not flat!
-            &c Red glass blocks should show the problem.
-            &c Make sure you are inside your greenhouse to make it.
+          FAIL_HOLE_IN_ROOF: "&c There is a hole in the roof or it is not flat! Red glass blocks should show the problem."
           FAIL_HOLE_IN_WALL: "&c There is a hole in the wall!"
-          FAIL_NO_ROOF: "&c There seems to be no roof! Make sure you are inside the greenhouse to make it."
+          FAIL_NO_ROOF: "&c There seems to be no roof!"
           FAIL_TOO_MANY_DOORS: "&c You cannot have more than 4 doors in the greenhouse!"
           FAIL_TOO_MANY_HOPPERS: "&c Only one hopper is allowed in the walls or roof."
           FAIL_UNEVEN_WALLS: "&c The walls are uneven. Red glass blocks should show the problem blocks."