From 398c8e91d52ad68115c4caf613dc889e74388eb1 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 4 Jun 2023 09:11:15 -0700 Subject: [PATCH] Minor typos and grammar fixes --- README.md | 6 +++--- .../world/bentobox/greenhouses/greenhouse/BiomeRecipe.java | 2 +- .../java/world/bentobox/greenhouses/greenhouse/Roof.java | 6 +++--- .../bentobox/greenhouses/listeners/GreenhouseGuard.java | 2 +- .../bentobox/greenhouses/managers/GreenhouseFinder.java | 4 ++-- src/main/resources/locales/en-US.yml | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 3dd4bd7..a679ad8 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Greenhouses are made out of glass and must contain the blocks found in the Biome * Craft your own self-contained biome greenhouse on an island (or elsewhere if you like) * Greenhouses can grow plants that cannot normally be grown, like sunflowers -* Friendly mobs can spawn if your greenhouse is well designed - need slimes? Build a swamp greenhouse! +* Friendly mobs can spawn if your greenhouse is well-designed - need slimes? Build a swamp greenhouse! * Blocks change in biomes over time - dirt becomes sand in a desert, dirt becomes clay in a river, for example. * Greenhouses can run in multiple worlds. * Easy to use GUI shows greenhouse recipes (e.g. **/is greenhouses**) @@ -27,7 +27,7 @@ This example is for when you are in the BSkyBlock world. For AcidIsland, just us 1. Make glass blocks and build a rectangular set of walls with a flat roof. 2. Put a hopper in the wall or roof. -3. Put a door in the wall so you can get in and out. +3. Put a door in the wall, so you can get in and out. 4. Type **/island greenhouses** and read the rules for the greenhouse you want. 5. Exit the GUI and place blocks, water, lava, and ice so that you make your desired biome. 6. Type **/island greenhouses** again and click on the biome to make it. @@ -42,7 +42,7 @@ This example is for when you are in the BSkyBlock world. For AcidIsland, just us ## FAQ -* Can I use stained glass? Yes, you can. It's pretty. +* Can I use stained-glass? Yes, you can. It's pretty. * Can I fill my greenhouse full of water? Yes. That's an ocean. * Will a squid spawn there? Maybe... okay, yes it will if it's a big enough ocean. * How do I place a door high up in the wall if the wall is all glass? Place it on a hopper. diff --git a/src/main/java/world/bentobox/greenhouses/greenhouse/BiomeRecipe.java b/src/main/java/world/bentobox/greenhouses/greenhouse/BiomeRecipe.java index 1f3f486..abf2b27 100644 --- a/src/main/java/world/bentobox/greenhouses/greenhouse/BiomeRecipe.java +++ b/src/main/java/world/bentobox/greenhouses/greenhouse/BiomeRecipe.java @@ -285,7 +285,7 @@ public class BiomeRecipe implements Comparable { */ public void convertBlock(Block b) { Material bType = b.getType(); - // Check if there is a block conversion for this block, as while the rest of the method wont do anything if .get() returns nothing anyway it still seems to be quite expensive + // Check if there is a block conversion for this block, as while the rest of the method won't do anything if .get() returns nothing anyway it still seems to be quite expensive if(conversionBlocks.keySet().contains(bType)) { for(GreenhouseBlockConversions conversion_option : conversionBlocks.get(bType)) { rollTheDice(b, conversion_option); diff --git a/src/main/java/world/bentobox/greenhouses/greenhouse/Roof.java b/src/main/java/world/bentobox/greenhouses/greenhouse/Roof.java index 474e16b..6720ba5 100644 --- a/src/main/java/world/bentobox/greenhouses/greenhouse/Roof.java +++ b/src/main/java/world/bentobox/greenhouses/greenhouse/Roof.java @@ -118,7 +118,7 @@ public class Roof extends MinMaxXZ { } boolean findRoof(Vector loc) { - // This does a ever-growing check around the player to find a wall block. It is possible for the player + // This does an ever-growing check around the player to find a wall block. It is possible for the player // to be outside the greenhouse in this situation, so a check is done later to make sure the player is inside int startY = loc.getBlockY(); for (int y = startY; y < world.getMaxHeight(); y++) { @@ -130,7 +130,7 @@ public class Roof extends MinMaxXZ { } } // If the roof was not found start going around in circles until something is found - // Expand in ever increasing squares around location until a wall block is found + // Expand in ever-increasing squares around location until a wall block is found if (!roofFound) { loc = spiralSearch(loc, startY); if (!roofFound) { @@ -199,7 +199,7 @@ public class Roof extends MinMaxXZ { } /** - * Get highest roof block + * Get the highest roof block * @param x - x coord of current search * @param startY - starting y coord * @param z - z coord of current search diff --git a/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseGuard.java b/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseGuard.java index 377f593..428b139 100644 --- a/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseGuard.java +++ b/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseGuard.java @@ -53,7 +53,7 @@ public class GreenhouseGuard implements Listener { if (from.isPresent() && addon.getSettings().isAllowFlowOut()) { return; } - // Otherwise cancel - the flow is not allowed + // Otherwise, cancel - the flow is not allowed e.setCancelled(true); } diff --git a/src/main/java/world/bentobox/greenhouses/managers/GreenhouseFinder.java b/src/main/java/world/bentobox/greenhouses/managers/GreenhouseFinder.java index 37257ed..3c0417e 100644 --- a/src/main/java/world/bentobox/greenhouses/managers/GreenhouseFinder.java +++ b/src/main/java/world/bentobox/greenhouses/managers/GreenhouseFinder.java @@ -44,7 +44,7 @@ public class GreenhouseFinder { } /** - * @param addon + * @param addon Addon */ public GreenhouseFinder(Greenhouses addon) { this.addon = addon; @@ -148,7 +148,7 @@ public class GreenhouseFinder { // Roof blocks must be glass, glowstone, doors or a hopper. result.add(GreenhouseResult.FAIL_BAD_ROOF_BLOCKS); } else if (isOtherBlocks()) { - // "Wall blocks must be glass, glowstone, doors or a hopper. + // Wall blocks must be glass, glowstone, doors or a hopper. result.add(GreenhouseResult.FAIL_BAD_WALL_BLOCKS); } if (this.getWallDoors() > 8) { diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index 894ab48..73c9816 100644 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -59,9 +59,9 @@ greenhouses: 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." - FAIL_INSUFFICIENT_ICE: "&c Insufficent ice to make this recipe" - FAIL_INSUFFICIENT_LAVA: "&c Insufficent lava to make this recipe" - FAIL_INSUFFICIENT_WATER: "&c Insufficent water to make this recipe" + FAIL_INSUFFICIENT_ICE: "&c Insufficient ice to make this recipe" + FAIL_INSUFFICIENT_LAVA: "&c Insufficient lava to make this recipe" + FAIL_INSUFFICIENT_WATER: "&c Insufficient water to make this recipe" FAIL_NO_ICE: "&c Ice is required to make this recipe" FAIL_NO_LAVA: "&c Lava is required to make this recipe" FAIL_NO_WATER: "&c Water is required to make this recipe"