diff --git a/.github/ISSUE_TEMPLATE/bug_report.md.txt b/.github/ISSUE_TEMPLATE/bug_report.md similarity index 100% rename from .github/ISSUE_TEMPLATE/bug_report.md.txt rename to .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/contributor-request.md.txt b/.github/ISSUE_TEMPLATE/contributor-request.md similarity index 100% rename from .github/ISSUE_TEMPLATE/contributor-request.md.txt rename to .github/ISSUE_TEMPLATE/contributor-request.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md.txt b/.github/ISSUE_TEMPLATE/feature_request.md similarity index 100% rename from .github/ISSUE_TEMPLATE/feature_request.md.txt rename to .github/ISSUE_TEMPLATE/feature_request.md diff --git a/pom.xml b/pom.xml index f7d061d..c01cbfb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ world.bentobox caveblock - 0.1.0-SNAPSHOT + 0.1.0 CaveBlock CaveBlock is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like SkyBlock or AcidIsland. diff --git a/src/main/java/world/bentobox/caveblock/generators/ChunkGeneratorWorld.java b/src/main/java/world/bentobox/caveblock/generators/ChunkGeneratorWorld.java index c3740ac..63916ae 100644 --- a/src/main/java/world/bentobox/caveblock/generators/ChunkGeneratorWorld.java +++ b/src/main/java/world/bentobox/caveblock/generators/ChunkGeneratorWorld.java @@ -47,7 +47,6 @@ public class ChunkGeneratorWorld extends ChunkGenerator // --------------------------------------------------------------------- - /** * This method sets if given coordinates can be set as spawn location */ @@ -217,6 +216,4 @@ public class ChunkGeneratorWorld extends ChunkGenerator * This list contains block populators that will be applied after chunk is generated. */ private List blockPopulators; - - } diff --git a/src/main/java/world/bentobox/caveblock/generators/populators/EntitiesPopulator.java b/src/main/java/world/bentobox/caveblock/generators/populators/EntitiesPopulator.java index ab2420e..c09a57c 100644 --- a/src/main/java/world/bentobox/caveblock/generators/populators/EntitiesPopulator.java +++ b/src/main/java/world/bentobox/caveblock/generators/populators/EntitiesPopulator.java @@ -37,11 +37,14 @@ public class EntitiesPopulator extends BlockPopulator public EntitiesPopulator(CaveBlock addon) { this.addon = addon; - loadSettings(); + this.loadSettings(); } - public void loadSettings() { + /** + * This method load chances per environment. + */ + private void loadSettings() { // Set up chances chances = new HashMap<>(); // Normal @@ -157,6 +160,38 @@ public class EntitiesPopulator extends BlockPopulator } + // --------------------------------------------------------------------- + // Section: Private Classes + // --------------------------------------------------------------------- + + + /** + * Chances class to store chances for environments and main material + */ + private class Chances + { + /** + * @param entityChanceMap - contains chances for each entity. + * @param mainMaterial - material on which entity can replace. + */ + Chances(Map> entityChanceMap, Material mainMaterial) + { + this.entityChanceMap = entityChanceMap; + this.mainMaterial = mainMaterial; + } + + + /** + * Map that contains chances for entity to spawn. + */ + final Map> entityChanceMap; + + /** + * Main material that can be replaced. + */ + final Material mainMaterial; + } + // --------------------------------------------------------------------- // Section: Variables @@ -167,10 +202,19 @@ public class EntitiesPopulator extends BlockPopulator */ private CaveBlock addon; + /** + * Map that contains chances for spawning per environment. + */ private Map chances; + /** + * World height + */ private int worldHeight; + /** + * Water entities + */ private final static List WATER_ENTITIES = Arrays.asList(EntityType.GUARDIAN, EntityType.SQUID, EntityType.COD, @@ -179,22 +223,4 @@ public class EntitiesPopulator extends BlockPopulator EntityType.TROPICAL_FISH, EntityType.DROWNED, EntityType.DOLPHIN); - - /** - * Chances class to store chances for environments and main material - * - */ - private class Chances { - final Map> entityChanceMap; - final Material mainMaterial; - - /** - * @param materialChanceMap - * @param mainMaterial - */ - public Chances(Map> entityChanceMap, Material mainMaterial) { - this.entityChanceMap = entityChanceMap; - this.mainMaterial = mainMaterial; - } - } } diff --git a/src/main/java/world/bentobox/caveblock/generators/populators/MaterialPopulator.java b/src/main/java/world/bentobox/caveblock/generators/populators/MaterialPopulator.java index 9757455..c8bb8a5 100644 --- a/src/main/java/world/bentobox/caveblock/generators/populators/MaterialPopulator.java +++ b/src/main/java/world/bentobox/caveblock/generators/populators/MaterialPopulator.java @@ -32,14 +32,14 @@ public class MaterialPopulator extends BlockPopulator { this.addon = addon; // Load settings - loadSettings(); + this.loadSettings(); } /** * Loads chances for Material Populator */ - public void loadSettings() { + private void loadSettings() { // Set up chances chances = new HashMap<>(); // Normal @@ -158,6 +158,39 @@ public class MaterialPopulator extends BlockPopulator } + // --------------------------------------------------------------------- + // Section: Private Classes + // --------------------------------------------------------------------- + + + /** + * Chances class to store chances for environments and main material + */ + private class Chances + { + /** + * @param materialChanceMap - contains chances for each material. + * @param mainMaterial - material on which material can replace. + */ + Chances(Map> materialChanceMap, Material mainMaterial) + { + this.materialChanceMap = materialChanceMap; + this.mainMaterial = mainMaterial; + } + + + /** + * Map that contains chances for entity to spawn. + */ + final Map> materialChanceMap; + + /** + * Main material that can be replaced. + */ + final Material mainMaterial; + } + + // --------------------------------------------------------------------- // Section: Variables // --------------------------------------------------------------------- @@ -168,25 +201,13 @@ public class MaterialPopulator extends BlockPopulator */ private CaveBlock addon; + /** + * Map that contains chances for spawning per environment. + */ private Map chances; - private int worldHeight; - /** - * Chances class to store chances for environments and main material - * + * World height */ - private class Chances { - final Map> materialChanceMap; - final Material mainMaterial; - - /** - * @param materialChanceMap - * @param mainMaterial - */ - public Chances(Map> materialChanceMap, Material mainMaterial) { - this.materialChanceMap = materialChanceMap; - this.mainMaterial = mainMaterial; - } - } + private int worldHeight; } diff --git a/src/main/resources/schems/island b/src/main/resources/schems/island index b6e74d0..bd72b67 100644 --- a/src/main/resources/schems/island +++ b/src/main/resources/schems/island @@ -578,7 +578,7 @@ blocks: '24': ==: org.bukkit.inventory.ItemStack v: 1631 - type: beetroot_seeds + type: BEETROOT_SEEDS '26': ==: org.bukkit.inventory.ItemStack v: 1631