Compare commits
43 Commits
Author | SHA1 | Date |
---|---|---|
tastybento | 93e3152efc | |
tastybento | 0fc5857a4a | |
tastybento | d1e771bad6 | |
tastybento | 04a519ad51 | |
tastybento | 3fc14f5cd8 | |
tastybento | 8ce5cc0e3c | |
tastybento | 15c2cea475 | |
tastybento | 4084876c4b | |
tastybento | a7eeef7edc | |
tastybento | ca4f1a3f43 | |
tastybento | 6bc1c5e4bc | |
tastybento | 53cb40e7c4 | |
tastybento | e05e2806fe | |
tastybento | 02c2135501 | |
tastybento | 605144e9f9 | |
tastybento | 3f4647b547 | |
tastybento | e75780e710 | |
tastybento | 7e4f0764e6 | |
tastybento | 398c8e91d5 | |
tastybento | 2eed3dcd56 | |
tastybento | 3dd950459f | |
tastybento | cce4a655c6 | |
tastybento | a2c2975329 | |
tastybento | e6a1cd17bb | |
BONNe | 5fd9cbfd36 | |
BONNe | db5ef4d5da | |
tastybento | ac1d6e6638 | |
BONNe | 3740268dfc | |
tastybento | 308dc225cd | |
tastybento | 95474d6c53 | |
tastybento | d2801dcd75 | |
tastybento | e4bbb70acb | |
tastybento | a4fc49689b | |
tastybento | 66270cf3e7 | |
tastybento | 4351247de2 | |
tastybento | 9e407e659e | |
tastybento | d6df904fbc | |
tastybento | 9af8816995 | |
tastybento | ce0eeae546 | |
tastybento | cf276bbb24 | |
tastybento | de6a939bb9 | |
tastybento | 10a1d63778 | |
tastybento | bba0b33133 |
|
@ -11,21 +11,22 @@ jobs:
|
|||
name: Build
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v1
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: 'adopt'
|
||||
java-version: 17
|
||||
- name: Cache SonarCloud packages
|
||||
uses: actions/cache@v1
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ~/.sonar/cache
|
||||
key: ${{ runner.os }}-sonar
|
||||
restore-keys: ${{ runner.os }}-sonar
|
||||
- name: Cache Maven packages
|
||||
uses: actions/cache@v1
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ~/.m2
|
||||
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
|
||||
|
|
13
README.md
13
README.md
|
@ -1,8 +1,9 @@
|
|||
# Greenhouses - an add-on for BentoBox
|
||||
|
||||
## Note for 1.15.x + servers
|
||||
|
||||
Biomes have changed so that they take up a 4x4 area and so greenhouse biomes now can bleed outside of the greenhouse. Unfortunately, this cannot be mitigated (as far as I know). If you have a good imagination, you can say that the biome of the greenhouse influences the surroundings a bit and it is natural! So it's a feature, not a bug!
|
||||
[![Build Status](https://ci.codemc.org/buildStatus/icon?job=BentoBoxWorld/Greenhouses)](https://ci.codemc.org/job/BentoBoxWorld/job/Greenhouses/)[
|
||||
![Bugs](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_Greenhouses&metric=bugs)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_Greenhouses)
|
||||
[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_Greenhouses&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_Greenhouses)
|
||||
[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_Greenhouses&metric=ncloc)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_Greenhouses)
|
||||
|
||||
## About
|
||||
|
||||
|
@ -14,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**)
|
||||
|
@ -26,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.
|
||||
|
@ -41,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.
|
||||
|
|
28
pom.xml
28
pom.xml
|
@ -46,12 +46,12 @@
|
|||
<java.version>17</java.version>
|
||||
<powermock.version>2.0.9</powermock.version>
|
||||
<!-- More visible way how to change dependency versions -->
|
||||
<spigot.version>1.19.3-R0.1-SNAPSHOT</spigot.version>
|
||||
<bentobox.version>1.21.0</bentobox.version>
|
||||
<spigot.version>1.20.4-R0.1-SNAPSHOT</spigot.version>
|
||||
<bentobox.version>2.0.0-SNAPSHOT</bentobox.version>
|
||||
<!-- Revision variable removes warning about dynamic version -->
|
||||
<revision>${build.version}-SNAPSHOT</revision>
|
||||
<!-- This allows to change between versions and snapshots. -->
|
||||
<build.version>1.7.1</build.version>
|
||||
<build.version>1.8.0</build.version>
|
||||
<build.number>-LOCAL</build.number>
|
||||
<sonar.projectKey>BentoBoxWorld_Greenhouses</sonar.projectKey>
|
||||
<sonar.organization>bentobox-world</sonar.organization>
|
||||
|
@ -116,12 +116,6 @@
|
|||
<version>${spigot.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.spigotmc</groupId>
|
||||
<artifactId>plugin-annotations</artifactId>
|
||||
<version>1.2.3-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>world.bentobox</groupId>
|
||||
<artifactId>bentobox</artifactId>
|
||||
|
@ -197,9 +191,10 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>3.0.0-M5</version>
|
||||
<version>3.1.0</version>
|
||||
<configuration>
|
||||
<argLine>
|
||||
${argLine}
|
||||
--add-opens java.base/java.lang=ALL-UNNAMED
|
||||
--add-opens java.base/java.util=ALL-UNNAMED
|
||||
--add-opens java.base/java.util.concurrent=ALL-UNNAMED
|
||||
|
@ -257,27 +252,34 @@
|
|||
<plugin>
|
||||
<groupId>org.jacoco</groupId>
|
||||
<artifactId>jacoco-maven-plugin</artifactId>
|
||||
<version>0.8.3</version>
|
||||
<version>0.8.10</version>
|
||||
<configuration>
|
||||
<append>true</append>
|
||||
<excludes>
|
||||
<!-- This is required to prevent Jacoco from adding
|
||||
synthetic fields to a JavaBean class (causes errors in testing) -->
|
||||
<exclude>**/*Names*</exclude>
|
||||
<!-- Prevents the Material is too large to mock error -->
|
||||
<exclude>org/bukkit/Material*</exclude>
|
||||
</excludes>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>pre-unit-test</id>
|
||||
<id>prepare-agent</id>
|
||||
<goals>
|
||||
<goal>prepare-agent</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>post-unit-test</id>
|
||||
<id>report</id>
|
||||
<goals>
|
||||
<goal>report</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<formats>
|
||||
<format>XML</format>
|
||||
</formats>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
|
|
@ -11,6 +11,7 @@ import world.bentobox.bentobox.api.configuration.Config;
|
|||
import world.bentobox.bentobox.api.flags.Flag;
|
||||
import world.bentobox.bentobox.api.flags.Flag.Mode;
|
||||
import world.bentobox.bentobox.api.flags.Flag.Type;
|
||||
import world.bentobox.greenhouses.greenhouse.Walls;
|
||||
import world.bentobox.greenhouses.managers.GreenhouseManager;
|
||||
import world.bentobox.greenhouses.managers.RecipeManager;
|
||||
import world.bentobox.greenhouses.ui.user.UserCommand;
|
||||
|
@ -28,19 +29,13 @@ public class Greenhouses extends Addon {
|
|||
public static final Flag GREENHOUSES = new Flag.Builder("GREENHOUSE", Material.GREEN_STAINED_GLASS)
|
||||
.mode(Mode.BASIC)
|
||||
.type(Type.PROTECTION).build();
|
||||
private static Greenhouses instance;
|
||||
private final Config<Settings> config;
|
||||
|
||||
public static Greenhouses getInstance() {
|
||||
return instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
public Greenhouses() {
|
||||
super();
|
||||
instance = this;
|
||||
config = new Config<>(this, Settings.class);
|
||||
}
|
||||
|
||||
|
@ -122,4 +117,15 @@ public class Greenhouses extends Addon {
|
|||
return activeWorlds;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if material is a wall material
|
||||
* @param m - material
|
||||
* @return true if wall material
|
||||
*/
|
||||
public boolean wallBlocks(Material m) {
|
||||
return Walls.WALL_BLOCKS.contains(m)
|
||||
|| (m.equals(Material.GLOWSTONE) && getSettings().isAllowGlowstone())
|
||||
|| (m.name().endsWith("GLASS_PANE") && getSettings().isAllowPanes());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,10 +1,6 @@
|
|||
package world.bentobox.greenhouses;
|
||||
|
||||
|
||||
import org.bukkit.plugin.java.annotation.dependency.Dependency;
|
||||
import org.bukkit.plugin.java.annotation.plugin.ApiVersion;
|
||||
import org.bukkit.plugin.java.annotation.plugin.Plugin;
|
||||
|
||||
import world.bentobox.bentobox.api.addons.Addon;
|
||||
import world.bentobox.bentobox.api.addons.Pladdon;
|
||||
|
||||
|
@ -12,9 +8,6 @@ import world.bentobox.bentobox.api.addons.Pladdon;
|
|||
/**
|
||||
* @author tastybento
|
||||
*/
|
||||
@Plugin(name = "Pladdon", version = "1.0")
|
||||
@ApiVersion(ApiVersion.Target.v1_18)
|
||||
@Dependency(value = "BentoBox")
|
||||
public class GreenhousesPladdon extends Pladdon
|
||||
{
|
||||
@Override
|
||||
|
|
|
@ -220,7 +220,7 @@ public class Greenhouse implements DataObject {
|
|||
* @return true if inside the greenhouse
|
||||
*/
|
||||
public boolean contains(Location location2) {
|
||||
return getLocation().getWorld() != null
|
||||
return getLocation() != null && getLocation().getWorld() != null
|
||||
&& getLocation().getWorld().equals(location2.getWorld())
|
||||
&& getBoundingBox().contains(location2.toVector());
|
||||
}
|
||||
|
|
|
@ -26,6 +26,7 @@ import org.bukkit.block.BlockFace;
|
|||
import org.bukkit.block.data.Bisected;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.block.data.Waterlogged;
|
||||
import org.bukkit.block.data.type.Cocoa;
|
||||
import org.bukkit.block.data.type.GlowLichen;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.EntityType;
|
||||
|
@ -37,7 +38,6 @@ import com.google.common.base.Enums;
|
|||
import com.google.common.collect.ArrayListMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import world.bentobox.bentobox.BentoBox;
|
||||
import world.bentobox.bentobox.util.Util;
|
||||
import world.bentobox.greenhouses.Greenhouses;
|
||||
import world.bentobox.greenhouses.data.Greenhouse;
|
||||
|
@ -64,6 +64,7 @@ public class BiomeRecipe implements Comparable<BiomeRecipe> {
|
|||
}
|
||||
|
||||
private static final List<BlockFace> ADJ_BLOCKS = Arrays.asList( BlockFace.DOWN, BlockFace.EAST, BlockFace.NORTH, BlockFace.SOUTH, BlockFace.UP, BlockFace.WEST);
|
||||
private static final List<BlockFace> SIDE_BLOCKS = Arrays.asList( BlockFace.EAST, BlockFace.NORTH, BlockFace.SOUTH, BlockFace.WEST);
|
||||
private static final List<Material> UNDERWATER_PLANTS;
|
||||
static {
|
||||
List<Material> m = new ArrayList<>();
|
||||
|
@ -100,6 +101,7 @@ public class BiomeRecipe implements Comparable<BiomeRecipe> {
|
|||
|
||||
private String permission = "";
|
||||
private final Random random = new Random();
|
||||
private int maxMob;
|
||||
|
||||
|
||||
/**
|
||||
|
@ -207,24 +209,30 @@ public class BiomeRecipe implements Comparable<BiomeRecipe> {
|
|||
* @return set of results from the check
|
||||
*/
|
||||
private Set<GreenhouseResult> checkRecipeAsync(CompletableFuture<Set<GreenhouseResult>> r, Greenhouse gh) {
|
||||
AsyncWorldCache cache = new AsyncWorldCache(gh.getWorld());
|
||||
Set<GreenhouseResult> result = new HashSet<>();
|
||||
AsyncWorldCache cache = new AsyncWorldCache(addon, gh.getWorld());
|
||||
long area = gh.getArea();
|
||||
Map<Material, Integer> blockCount = new EnumMap<>(Material.class);
|
||||
|
||||
// Look through the greenhouse and count what is in there
|
||||
for (int y = gh.getFloorHeight(); y< gh.getCeilingHeight();y++) {
|
||||
for (int x = (int) (gh.getBoundingBox().getMinX()+1); x < gh.getBoundingBox().getMaxX(); x++) {
|
||||
for (int z = (int) (gh.getBoundingBox().getMinZ()+1); z < gh.getBoundingBox().getMaxZ(); z++) {
|
||||
Material t = cache.getBlockType(x, y, z);
|
||||
if (!t.equals(Material.AIR)) {
|
||||
blockCount.putIfAbsent(t, 0);
|
||||
blockCount.merge(t, 1, Integer::sum);
|
||||
}
|
||||
}
|
||||
}
|
||||
Map<Material, Integer> blockCount = countBlocks(gh, cache);
|
||||
|
||||
// Calculate % water, ice and lava ratios and check them
|
||||
Set<GreenhouseResult> result = checkRatios(blockCount, area);
|
||||
|
||||
// Compare to the required blocks
|
||||
Map<Material, Integer> missingBlocks = requiredBlocks.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue() - blockCount.getOrDefault(e.getKey(), 0)));
|
||||
// Remove any entries that are 0 or less
|
||||
missingBlocks.values().removeIf(v -> v <= 0);
|
||||
if (!missingBlocks.isEmpty()) {
|
||||
result.add(GreenhouseResult.FAIL_INSUFFICIENT_BLOCKS);
|
||||
gh.setMissingBlocks(missingBlocks);
|
||||
}
|
||||
// Calculate % water, ice and lava ratios
|
||||
// Return to main thread to complete
|
||||
Bukkit.getScheduler().runTask(addon.getPlugin(), () -> r.complete(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
private Set<GreenhouseResult> checkRatios(Map<Material, Integer> blockCount, long area) {
|
||||
Set<GreenhouseResult> result = new HashSet<>();
|
||||
double waterRatio = (double)blockCount.getOrDefault(Material.WATER, 0)/area * 100;
|
||||
double lavaRatio = (double)blockCount.getOrDefault(Material.LAVA, 0)/area * 100;
|
||||
int ice = blockCount.entrySet().stream().filter(en -> en.getKey().equals(Material.ICE)
|
||||
|
@ -252,47 +260,57 @@ public class BiomeRecipe implements Comparable<BiomeRecipe> {
|
|||
if (iceCoverage > 0 && iceRatio < iceCoverage) {
|
||||
result.add(GreenhouseResult.FAIL_INSUFFICIENT_ICE);
|
||||
}
|
||||
// Compare to the required blocks
|
||||
Map<Material, Integer> missingBlocks = requiredBlocks.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue() - blockCount.getOrDefault(e.getKey(), 0)));
|
||||
// Remove any entries that are 0 or less
|
||||
missingBlocks.values().removeIf(v -> v <= 0);
|
||||
if (!missingBlocks.isEmpty()) {
|
||||
result.add(GreenhouseResult.FAIL_INSUFFICIENT_BLOCKS);
|
||||
gh.setMissingBlocks(missingBlocks);
|
||||
}
|
||||
// Return to main thread to complete
|
||||
Bukkit.getScheduler().runTask(addon.getPlugin(), () -> r.complete(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
private Map<Material, Integer> countBlocks(Greenhouse gh, AsyncWorldCache cache) {
|
||||
Map<Material, Integer> blockCount = new EnumMap<>(Material.class);
|
||||
for (int y = gh.getFloorHeight(); y< gh.getCeilingHeight();y++) {
|
||||
for (int x = (int) (gh.getBoundingBox().getMinX()+1); x < gh.getBoundingBox().getMaxX(); x++) {
|
||||
for (int z = (int) (gh.getBoundingBox().getMinZ()+1); z < gh.getBoundingBox().getMaxZ(); z++) {
|
||||
Material t = cache.getBlockType(x, y, z);
|
||||
if (!t.equals(Material.AIR)) {
|
||||
blockCount.putIfAbsent(t, 0);
|
||||
blockCount.merge(t, 1, Integer::sum);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return blockCount;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if block should be converted
|
||||
* @param b - block to check
|
||||
*/
|
||||
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)) {
|
||||
|
||||
// Roll the dice before bothering with checking the surrounding block as I think it's more common for greenhouses to be filled with convertable blocks and thus this dice roll wont be "wasted"
|
||||
if(ThreadLocalRandom.current().nextDouble() < conversion_option.probability()) {
|
||||
// Check if any of the adjacent blocks matches the required LocalMaterial, if there are any required LocalMaterials
|
||||
if(conversion_option.localMaterial() != null) {
|
||||
for(BlockFace adjacent_block : ADJ_BLOCKS) {
|
||||
if(b.getRelative(adjacent_block).getType() == conversion_option.localMaterial()) {
|
||||
b.setType(conversion_option.newMaterial());
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
b.setType(conversion_option.newMaterial());
|
||||
}
|
||||
}
|
||||
for(GreenhouseBlockConversions conversionOption : conversionBlocks.get(bType)) {
|
||||
rollTheDice(b, conversionOption);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void rollTheDice(Block b, GreenhouseBlockConversions conversion_option) {
|
||||
// Roll the dice before bothering with checking the surrounding block as I think it's more common for greenhouses to be filled with convertable blocks and thus this dice roll wont be "wasted"
|
||||
if(ThreadLocalRandom.current().nextDouble() < conversion_option.probability()) {
|
||||
// Check if any of the adjacent blocks matches the required LocalMaterial, if there are any required LocalMaterials
|
||||
if(conversion_option.localMaterial() != null) {
|
||||
for(BlockFace adjacent_block : ADJ_BLOCKS) {
|
||||
if(b.getRelative(adjacent_block).getType() == conversion_option.localMaterial()) {
|
||||
b.setType(conversion_option.newMaterial());
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
b.setType(conversion_option.newMaterial());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the type
|
||||
*/
|
||||
|
@ -394,7 +412,6 @@ public class BiomeRecipe implements Comparable<BiomeRecipe> {
|
|||
return true;
|
||||
}).orElse(false);
|
||||
}).orElse(false);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -433,7 +450,10 @@ public class BiomeRecipe implements Comparable<BiomeRecipe> {
|
|||
// Grow a random plant that can grow
|
||||
double r = random.nextDouble();
|
||||
Double key = underwater ? underwaterPlants.ceilingKey(r) : plantTree.ceilingKey(r);
|
||||
return key == null ? Optional.empty() : Optional.ofNullable(underwater ? underwaterPlants.get(key) : plantTree.get(key));
|
||||
if (key == null) {
|
||||
return Optional.empty();
|
||||
}
|
||||
return Optional.ofNullable(underwater ? underwaterPlants.get(key) : plantTree.get(key));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -459,11 +479,9 @@ public class BiomeRecipe implements Comparable<BiomeRecipe> {
|
|||
public boolean growPlant(GrowthBlock block, boolean underwater) {
|
||||
Block bl = block.block();
|
||||
return getRandomPlant(underwater).map(p -> {
|
||||
if (bl.getY() != 0 && canGrowOn(block, p)) {
|
||||
if (plantIt(bl, p)) {
|
||||
bl.getWorld().spawnParticle(Particle.SNOWBALL, bl.getLocation(), 10, 2, 2, 2);
|
||||
return true;
|
||||
}
|
||||
if (bl.getY() != 0 && canGrowOn(block, p) && plantIt(bl, p)) {
|
||||
bl.getWorld().spawnParticle(Particle.SNOWBALL, bl.getLocation(), 10, 2, 2, 2);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}).orElse(false);
|
||||
|
@ -492,6 +510,8 @@ public class BiomeRecipe implements Comparable<BiomeRecipe> {
|
|||
}
|
||||
} else if (p.plantMaterial().equals(Material.GLOW_LICHEN)) {
|
||||
return placeLichen(bl);
|
||||
} else if (p.plantMaterial().equals(Material.COCOA)) {
|
||||
return placeCocoa(bl);
|
||||
} else {
|
||||
if (dataBottom instanceof Waterlogged wl) {
|
||||
wl.setWaterlogged(underwater);
|
||||
|
@ -504,6 +524,37 @@ public class BiomeRecipe implements Comparable<BiomeRecipe> {
|
|||
return true;
|
||||
}
|
||||
|
||||
private boolean placeCocoa(Block bl) {
|
||||
// Get the source block below this one
|
||||
Block b = bl.getRelative(BlockFace.DOWN);
|
||||
if (!b.getType().equals(Material.JUNGLE_LOG)) {
|
||||
return false;
|
||||
}
|
||||
// Find a spot for cocoa
|
||||
BlockFace d = null;
|
||||
for (BlockFace adj : SIDE_BLOCKS) {
|
||||
if (b.getRelative(adj).getType().equals(Material.AIR)) {
|
||||
d = adj;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (d == null) {
|
||||
return false;
|
||||
}
|
||||
Block bb = b.getRelative(d);
|
||||
bb.setType(Material.COCOA);
|
||||
BlockFace opp = d.getOppositeFace();
|
||||
|
||||
if(bb.getBlockData() instanceof Cocoa v){
|
||||
v.setFacing(opp);
|
||||
bb.setBlockData(v);
|
||||
bb.getState().setBlockData(v);
|
||||
bb.getState().update(true);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles the placing of Glow Lichen. This needs to stick to a block rather than grow on it.
|
||||
* If the block is set to Glow Lichen then it appears as an air block with 6 sides of lichen so
|
||||
|
@ -519,14 +570,12 @@ public class BiomeRecipe implements Comparable<BiomeRecipe> {
|
|||
BlockFace d = null;
|
||||
boolean waterLogged = false;
|
||||
for (BlockFace adj : ADJ_BLOCKS) {
|
||||
if (b.getRelative(adj).getType().equals(Material.AIR)) {
|
||||
Material type = b.getRelative(adj).getType();
|
||||
if (type.equals(Material.AIR) || type.equals(Material.WATER)) {
|
||||
d = adj;
|
||||
break;
|
||||
}
|
||||
// Lichen can grow under water too
|
||||
if (b.getRelative(adj).getType().equals(Material.WATER)) {
|
||||
d = adj;
|
||||
waterLogged = true;
|
||||
if (type.equals(Material.WATER)) {
|
||||
waterLogged = true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -564,11 +613,9 @@ public class BiomeRecipe implements Comparable<BiomeRecipe> {
|
|||
}
|
||||
// Underwater plants can only be placed in water and regular plants cannot be placed in water
|
||||
if (block.block().getType().equals(Material.WATER)) {
|
||||
BentoBox.getInstance().logDebug("Water block");
|
||||
if (!UNDERWATER_PLANTS.contains(p.plantMaterial())) {
|
||||
return false;
|
||||
}
|
||||
BentoBox.getInstance().logDebug("Water plant");
|
||||
} else if (UNDERWATER_PLANTS.contains(p.plantMaterial())) {
|
||||
return false;
|
||||
}
|
||||
|
@ -682,5 +729,20 @@ public class BiomeRecipe implements Comparable<BiomeRecipe> {
|
|||
return mobTree.values().stream().map(GreenhouseMob::mobType).collect(Collectors.toSet());
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the maximum number of mobs in a greenhouse
|
||||
* @param maxMob maximum
|
||||
*/
|
||||
public void setMaxMob(int maxMob) {
|
||||
this.maxMob = maxMob;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the maxMob
|
||||
*/
|
||||
public int getMaxMob() {
|
||||
return maxMob;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -23,33 +23,17 @@ import world.bentobox.greenhouses.world.AsyncWorldCache;
|
|||
* @author tastybento
|
||||
*
|
||||
*/
|
||||
@SuppressWarnings("deprecation")
|
||||
public class Roof extends MinMaxXZ {
|
||||
private static final List<Material> ROOF_BLOCKS;
|
||||
static {
|
||||
// Roof blocks
|
||||
ROOF_BLOCKS = Arrays.stream(Material.values())
|
||||
.filter(m -> !m.isLegacy())
|
||||
.filter(Material::isBlock) // Blocks only, no items
|
||||
.filter(m -> Tag.TRAPDOORS.isTagged(m) // All trapdoors
|
||||
|| (m.name().contains("GLASS") && !m.name().contains("GLASS_PANE")) // All glass blocks
|
||||
|| m.equals(Material.HOPPER)).toList();
|
||||
}
|
||||
/**
|
||||
* Check if material is a roof material
|
||||
* @param m - material
|
||||
* @return true if roof material
|
||||
*/
|
||||
public static boolean roofBlocks(@NonNull Material m) {
|
||||
return ROOF_BLOCKS.contains(Objects.requireNonNull(m))
|
||||
|| (m.equals(Material.GLOWSTONE) && Greenhouses.getInstance().getSettings().isAllowGlowstone())
|
||||
|| (m.name().endsWith("GLASS_PANE") && Greenhouses.getInstance().getSettings().isAllowPanes());
|
||||
}
|
||||
private static final List<Material> ROOF_BLOCKS = Arrays.stream(Material.values())
|
||||
.filter(Material::isBlock) // Blocks only, no items
|
||||
.filter(m -> Tag.TRAPDOORS.isTagged(m) // All trapdoors
|
||||
|| (m.name().contains("GLASS") && !m.name().contains("GLASS_PANE")) // All glass blocks
|
||||
|| m.equals(Material.HOPPER)).toList();
|
||||
private final AsyncWorldCache cache;
|
||||
private int height;
|
||||
private final Location location;
|
||||
private boolean roofFound;
|
||||
|
||||
private final Greenhouses addon;
|
||||
private final World world;
|
||||
|
||||
|
||||
|
@ -58,13 +42,23 @@ public class Roof extends MinMaxXZ {
|
|||
* @param cache async world cache
|
||||
* @param loc - starting location
|
||||
*/
|
||||
public Roof(AsyncWorldCache cache, Location loc) {
|
||||
public Roof(AsyncWorldCache cache, Location loc, Greenhouses addon) {
|
||||
this.cache = cache;
|
||||
this.location = loc;
|
||||
this.addon = addon;
|
||||
this.world = loc.getWorld();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Check if material is a roof material
|
||||
* @param m - material
|
||||
* @return true if roof material
|
||||
*/
|
||||
public boolean roofBlocks(@NonNull Material m) {
|
||||
return ROOF_BLOCKS.contains(Objects.requireNonNull(m))
|
||||
|| (m.equals(Material.GLOWSTONE) && addon.getSettings().isAllowGlowstone())
|
||||
|| (m.name().endsWith("GLASS_PANE") && addon.getSettings().isAllowPanes());
|
||||
}
|
||||
|
||||
/**
|
||||
* This takes any location and tries to go as far as possible in NWSE directions finding contiguous roof blocks
|
||||
|
@ -124,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++) {
|
||||
|
@ -136,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) {
|
||||
|
@ -205,13 +199,13 @@ 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
|
||||
*/
|
||||
private Optional<Vector> checkVertically(final int x, final int startY, final int z) {
|
||||
if (!Walls.wallBlocks(cache.getBlockType(x, startY, z))) {
|
||||
if (!addon.wallBlocks(cache.getBlockType(x, startY, z))) {
|
||||
// Look up
|
||||
for (int y = startY; y < world.getMaxHeight() && !roofFound; y++) {
|
||||
if (roofBlocks(cache.getBlockType(x,y,z))) {
|
||||
|
|
|
@ -9,25 +9,17 @@ import org.bukkit.Location;
|
|||
import org.bukkit.Material;
|
||||
|
||||
import world.bentobox.bentobox.BentoBox;
|
||||
import world.bentobox.greenhouses.Greenhouses;
|
||||
import world.bentobox.greenhouses.world.AsyncWorldCache;
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public class Walls extends MinMaxXZ {
|
||||
private static final List<Material> WALL_BLOCKS;
|
||||
static {
|
||||
// Hoppers
|
||||
WALL_BLOCKS = Arrays.stream(Material.values())
|
||||
.filter(Material::isBlock) // Blocks only, no items
|
||||
.filter(m -> !m.isLegacy())
|
||||
.filter(m -> !m.name().contains("TRAPDOOR")) // No trap doors
|
||||
.filter(m -> m.name().contains("DOOR") // All doors
|
||||
|| (m.name().contains("GLASS") && !m.name().contains("GLASS_PANE")) // All glass blocks
|
||||
|| m.equals(Material.HOPPER)).toList();
|
||||
}
|
||||
public static final List<Material> WALL_BLOCKS = Arrays.stream(Material.values())
|
||||
.filter(Material::isBlock) // Blocks only, no items
|
||||
.filter(m -> !m.name().contains("TRAPDOOR")) // No trap doors
|
||||
.filter(m -> m.name().contains("DOOR") // All doors
|
||||
|| (m.name().contains("GLASS") && !m.name().contains("GLASS_PANE")) // All glass blocks
|
||||
|| m.equals(Material.HOPPER)).toList();
|
||||
|
||||
private int floor;
|
||||
|
||||
private final AsyncWorldCache cache;
|
||||
|
||||
static class WallFinder {
|
||||
|
@ -177,17 +169,6 @@ public class Walls extends MinMaxXZ {
|
|||
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if material is a wall material
|
||||
* @param m - material
|
||||
* @return true if wall material
|
||||
*/
|
||||
public static boolean wallBlocks(Material m) {
|
||||
return WALL_BLOCKS.contains(m)
|
||||
|| (m.equals(Material.GLOWSTONE) && Greenhouses.getInstance().getSettings().isAllowGlowstone())
|
||||
|| (m.name().endsWith("GLASS_PANE") && Greenhouses.getInstance().getSettings().isAllowPanes());
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the floor
|
||||
*/
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -9,6 +9,7 @@ import java.util.Objects;
|
|||
import java.util.Random;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Tag;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.BlockFace;
|
||||
|
@ -94,17 +95,17 @@ public class EcoSystemManager {
|
|||
return;
|
||||
}
|
||||
final BoundingBox ibb = gh.getInternalBoundingBox();
|
||||
int gh_min_x = NumberConversions.floor(ibb.getMinX());
|
||||
int gh_max_x = NumberConversions.floor(ibb.getMaxX());
|
||||
int gh_min_y = NumberConversions.floor(gh.getBoundingBox().getMinY()); // Note: this gets the floor
|
||||
int gh_max_y = NumberConversions.floor(ibb.getMaxY());
|
||||
int gh_min_z = NumberConversions.floor(ibb.getMinZ());
|
||||
int gh_max_z = NumberConversions.floor(ibb.getMaxZ());
|
||||
int ghMinX = NumberConversions.floor(ibb.getMinX());
|
||||
int ghMaxX = NumberConversions.floor(ibb.getMaxX());
|
||||
int ghMinY = NumberConversions.floor(gh.getBoundingBox().getMinY()); // Note: this gets the floor
|
||||
int ghMaxY = NumberConversions.floor(ibb.getMaxY());
|
||||
int ghMinZ = NumberConversions.floor(ibb.getMinZ());
|
||||
int ghMaxZ = NumberConversions.floor(ibb.getMaxZ());
|
||||
BiomeRecipe biomeRecipe = gh.getBiomeRecipe();
|
||||
|
||||
for (int x = gh_min_x; x < gh_max_x; x++) {
|
||||
for (int z = gh_min_z; z < gh_max_z; z++) {
|
||||
for (int y = gh_min_y; y < gh_max_y; y++) {
|
||||
for (int x = ghMinX; x < ghMaxX; x++) {
|
||||
for (int z = ghMinZ; z < ghMaxZ; z++) {
|
||||
for (int y = ghMinY; y < ghMaxY; y++) {
|
||||
Block b = world.getBlockAt(x, y, z);
|
||||
|
||||
if(!b.isEmpty()) {
|
||||
|
@ -131,15 +132,21 @@ public class EcoSystemManager {
|
|||
|
||||
}
|
||||
|
||||
private void addMobs(Greenhouse gh) {
|
||||
/**
|
||||
* Try to spawn mobs in a greenhouse
|
||||
* @param gh greenhouse
|
||||
* @return true if mobs were spawned, false if not
|
||||
*/
|
||||
boolean addMobs(Greenhouse gh) {
|
||||
final BoundingBox bb = gh.getBoundingBox();
|
||||
if(gh.getLocation() == null || gh.getLocation().getWorld() == null || gh.getWorld() == null
|
||||
|| !gh.getLocation().getWorld().isChunkLoaded(((int) bb.getMaxX()) >> 4, ((int) bb.getMaxZ()) >> 4) || !gh.getLocation().getWorld().isChunkLoaded(((int) bb.getMinX()) >> 4, ((int) bb.getMinZ()) >> 4)){
|
||||
|| !gh.getLocation().getWorld().isChunkLoaded(((int) bb.getMaxX()) >> 4, ((int) bb.getMaxZ()) >> 4)
|
||||
|| !gh.getLocation().getWorld().isChunkLoaded(((int) bb.getMinX()) >> 4, ((int) bb.getMinZ()) >> 4)){
|
||||
// Skipping addmobs for unloaded greenhouse
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
if (gh.getBiomeRecipe().noMobs()) {
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
// Check greenhouse chunks are loaded
|
||||
for (double blockX = bb.getMinX(); blockX < bb.getMaxX(); blockX+=16) {
|
||||
|
@ -147,7 +154,7 @@ public class EcoSystemManager {
|
|||
int chunkX = (int)(blockX / 16);
|
||||
int chunkZ = (int)(blockZ / 16);
|
||||
if (!gh.getWorld().isChunkLoaded(chunkX, chunkZ)) {
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -160,6 +167,9 @@ public class EcoSystemManager {
|
|||
Collections.shuffle(list, new Random(System.currentTimeMillis()));
|
||||
Iterator<GrowthBlock> it = list.iterator();
|
||||
// Check if the greenhouse is full
|
||||
if (gh.getBiomeRecipe().getMaxMob() > -1 && sum >= gh.getBiomeRecipe().getMaxMob()) {
|
||||
return false;
|
||||
}
|
||||
while (it.hasNext() && (sum == 0 || gh.getArea() / sum >= gh.getBiomeRecipe().getMobLimit())) {
|
||||
// Spawn something if chance says so
|
||||
if (gh.getBiomeRecipe().spawnMob(it.next().block())) {
|
||||
|
@ -167,6 +177,7 @@ public class EcoSystemManager {
|
|||
sum++;
|
||||
}
|
||||
}
|
||||
return sum > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -216,7 +227,7 @@ public class EcoSystemManager {
|
|||
|
||||
/**
|
||||
* Get a list of the lowest level blocks inside the greenhouse. May be air, liquid or plants.
|
||||
* These blocks sit just above solid blocks
|
||||
* These blocks sit just above solid blocks. Leaves are ignored too.
|
||||
* @param gh - greenhouse
|
||||
* @param ignoreLiquid - true if liquid blocks should be treated like air blocks
|
||||
* @return List of blocks
|
||||
|
@ -230,31 +241,39 @@ public class EcoSystemManager {
|
|||
for (double z = ibb.getMinZ(); z < ibb.getMaxZ(); z++) {
|
||||
for (double y = ibb.getMaxY() - 1; y >= bb.getMinY(); y--) {
|
||||
Block b = gh.getWorld().getBlockAt(NumberConversions.floor(x), NumberConversions.floor(y), NumberConversions.floor(z));
|
||||
|
||||
// Check floor blocks
|
||||
if (!ignoreLiquid) {
|
||||
// Check ceiling blocks
|
||||
if (b.isEmpty() && !b.getRelative(BlockFace.UP).isEmpty()) {
|
||||
result.add(new GrowthBlock(b, false));
|
||||
}
|
||||
if (!b.isEmpty() && (b.getRelative(BlockFace.UP).isEmpty() || b.getRelative(BlockFace.UP).isPassable())) {
|
||||
result.add(new GrowthBlock(b.getRelative(BlockFace.UP), true));
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
if (!b.isEmpty() && !b.isLiquid() && b.getRelative(BlockFace.UP).isLiquid()) {
|
||||
result.add(new GrowthBlock(b.getRelative(BlockFace.UP), true));
|
||||
break;
|
||||
}
|
||||
if (checkBlock(result, b, ignoreLiquid)) {
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
private boolean checkBlock(List<GrowthBlock> result, Block b, boolean ignoreLiquid) {
|
||||
// Check floor blocks
|
||||
if (!ignoreLiquid) {
|
||||
// Check ceiling blocks
|
||||
if (b.isEmpty() && !b.getRelative(BlockFace.UP).isEmpty()) {
|
||||
result.add(new GrowthBlock(b, false));
|
||||
}
|
||||
if (!b.isEmpty() && !Tag.LEAVES.isTagged(b.getType())
|
||||
&& (b.getRelative(BlockFace.UP).isEmpty()
|
||||
|| b.getRelative(BlockFace.UP).isPassable()
|
||||
|| Tag.LEAVES.isTagged(b.getRelative(BlockFace.UP).getType())
|
||||
)
|
||||
) {
|
||||
result.add(new GrowthBlock(b.getRelative(BlockFace.UP), true));
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
if (!b.isEmpty() && !b.isLiquid() && b.getRelative(BlockFace.UP).isLiquid()) {
|
||||
result.add(new GrowthBlock(b.getRelative(BlockFace.UP), true));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private int getBoneMeal(Greenhouse gh) {
|
||||
Hopper hopper = getHopper(gh);
|
||||
|
|
|
@ -12,6 +12,7 @@ import org.bukkit.Tag;
|
|||
import org.bukkit.util.Vector;
|
||||
|
||||
import world.bentobox.bentobox.BentoBox;
|
||||
import world.bentobox.greenhouses.Greenhouses;
|
||||
import world.bentobox.greenhouses.data.Greenhouse;
|
||||
import world.bentobox.greenhouses.greenhouse.Roof;
|
||||
import world.bentobox.greenhouses.greenhouse.Walls;
|
||||
|
@ -28,10 +29,11 @@ public class GreenhouseFinder {
|
|||
// If this is the bottom layer, the player has most likely uneven walls
|
||||
private int otherBlockLayer = -1;
|
||||
private int wallBlockCount;
|
||||
private final Greenhouses addon;
|
||||
/**
|
||||
* This is the count of the various items
|
||||
*/
|
||||
private CounterCheck cc = new CounterCheck();
|
||||
private CounterCheck counterCheck = new CounterCheck();
|
||||
|
||||
static class CounterCheck {
|
||||
int doorCount;
|
||||
|
@ -40,6 +42,13 @@ public class GreenhouseFinder {
|
|||
boolean otherBlock;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param addon Addon
|
||||
*/
|
||||
public GreenhouseFinder(Greenhouses addon) {
|
||||
this.addon = addon;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find out if there is a greenhouse here
|
||||
* @param location - start location
|
||||
|
@ -51,9 +60,9 @@ public class GreenhouseFinder {
|
|||
redGlass.clear();
|
||||
|
||||
// Get a world cache
|
||||
AsyncWorldCache cache = new AsyncWorldCache(location.getWorld());
|
||||
AsyncWorldCache cache = new AsyncWorldCache(addon, location.getWorld());
|
||||
// Find the roof
|
||||
Roof roof = new Roof(cache, location);
|
||||
Roof roof = new Roof(cache, location, addon);
|
||||
roof.findRoof().thenAccept(found -> {
|
||||
if (Boolean.FALSE.equals(found)) {
|
||||
result.add(GreenhouseResult.FAIL_NO_ROOF);
|
||||
|
@ -87,30 +96,26 @@ public class GreenhouseFinder {
|
|||
*/
|
||||
CompletableFuture<Set<GreenhouseResult>> checkGreenhouse(AsyncWorldCache cache, Roof roof, Walls walls) {
|
||||
CompletableFuture<Set<GreenhouseResult>> r = new CompletableFuture<>();
|
||||
Bukkit.getScheduler().runTaskAsynchronously(BentoBox.getInstance(), () -> checkGHAsync(r, cache, roof, walls));
|
||||
Bukkit.getScheduler().runTaskAsynchronously(BentoBox.getInstance(), () -> checkGreenhouseAsync(r, cache, roof, walls));
|
||||
return r;
|
||||
}
|
||||
|
||||
private Set<GreenhouseResult> checkGHAsync(CompletableFuture<Set<GreenhouseResult>> r, AsyncWorldCache cache,
|
||||
private Set<GreenhouseResult> checkGreenhouseAsync(CompletableFuture<Set<GreenhouseResult>> r, AsyncWorldCache cache,
|
||||
Roof roof, Walls walls) {
|
||||
cc = new CounterCheck();
|
||||
counterCheck = new CounterCheck();
|
||||
int y;
|
||||
for (y = roof.getHeight(); y > walls.getFloor(); y--) {
|
||||
wallBlockCount = 0;
|
||||
for (int x = walls.getMinX(); x <= walls.getMaxX(); x++) {
|
||||
for (int z = walls.getMinZ(); z <= walls.getMaxZ(); z++) {
|
||||
checkBlock(cc, cache.getBlockType(x,y,z), roof, walls, new Vector(x, y, z));
|
||||
checkBlock(counterCheck, cache.getBlockType(x,y,z), roof, walls, new Vector(x, y, z));
|
||||
}
|
||||
}
|
||||
if (wallBlockCount == 0 && y < roof.getHeight()) {
|
||||
// This is the floor
|
||||
break;
|
||||
} else {
|
||||
if (cc.otherBlock) {
|
||||
if (otherBlockLayer < 0) {
|
||||
otherBlockLayer = y;
|
||||
}
|
||||
}
|
||||
} else if (counterCheck.otherBlock && otherBlockLayer < 0) {
|
||||
otherBlockLayer = y;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -138,7 +143,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) {
|
||||
|
@ -166,7 +171,8 @@ public class GreenhouseFinder {
|
|||
// Check wall blocks only
|
||||
if (y == roof.getHeight() || x == walls.getMinX() || x == walls.getMaxX() || z == walls.getMinZ() || z== walls.getMaxZ()) {
|
||||
// Check for non-wall blocks or non-roof blocks at the top of walls
|
||||
if ((y != roof.getHeight() && !Walls.wallBlocks(m)) || (y == roof.getHeight() && !Roof.roofBlocks(m))) {
|
||||
if ((y != roof.getHeight() && !addon.wallBlocks(m))
|
||||
|| (y == roof.getHeight() && !roof.roofBlocks(m))) {
|
||||
if (m.equals(Material.AIR)) {
|
||||
// Air hole found
|
||||
cc.airHole = true;
|
||||
|
@ -241,28 +247,28 @@ public class GreenhouseFinder {
|
|||
* @return the wallDoors
|
||||
*/
|
||||
int getWallDoors() {
|
||||
return cc.doorCount;
|
||||
return counterCheck.doorCount;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the ghHopper
|
||||
*/
|
||||
int getGhHopper() {
|
||||
return cc.hopperCount;
|
||||
return counterCheck.hopperCount;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the airHoles
|
||||
*/
|
||||
boolean isAirHoles() {
|
||||
return cc.airHole;
|
||||
return counterCheck.airHole;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the otherBlocks
|
||||
*/
|
||||
boolean isOtherBlocks() {
|
||||
return cc.otherBlock;
|
||||
return counterCheck.otherBlock;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -315,21 +321,21 @@ public class GreenhouseFinder {
|
|||
}
|
||||
|
||||
public void setGhHopper(int i) {
|
||||
cc.hopperCount = i;
|
||||
counterCheck.hopperCount = i;
|
||||
}
|
||||
|
||||
public void setWallDoors(int i) {
|
||||
cc.doorCount = i;
|
||||
counterCheck.doorCount = i;
|
||||
|
||||
}
|
||||
|
||||
public void setAirHoles(boolean b) {
|
||||
cc.airHole = b;
|
||||
counterCheck.airHole = b;
|
||||
|
||||
}
|
||||
|
||||
public void setOtherBlocks(boolean b) {
|
||||
cc.otherBlock = b;
|
||||
counterCheck.otherBlock = b;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -96,19 +96,19 @@ public class GreenhouseManager implements Listener {
|
|||
handler.loadObjects().forEach(g -> {
|
||||
GreenhouseResult result = map.addGreenhouse(g);
|
||||
switch (result) {
|
||||
case FAIL_NO_ISLAND ->
|
||||
// Delete the failed greenhouse
|
||||
toBeRemoved.add(g);
|
||||
case FAIL_OVERLAPPING -> addon.logError("Greenhouse overlaps with another greenhouse. Skipping...");
|
||||
case NULL -> addon.logError("Null location of greenhouse. Cannot load. Skipping...");
|
||||
case SUCCESS -> activateGreenhouse(g);
|
||||
case FAIL_NO_WORLD -> addon.logError("Database contains greenhouse for a non-loaded world. Skipping...");
|
||||
case FAIL_UNKNOWN_RECIPE -> {
|
||||
addon.logError("Greenhouse uses a recipe that does not exist in the biomes.yml. Skipping...");
|
||||
addon.logError("Greenhouse Id " + g.getUniqueId());
|
||||
}
|
||||
default -> {
|
||||
}
|
||||
case FAIL_NO_ISLAND ->
|
||||
// Delete the failed greenhouse
|
||||
toBeRemoved.add(g);
|
||||
case FAIL_OVERLAPPING -> addon.logError("Greenhouse overlaps with another greenhouse. Skipping...");
|
||||
case NULL -> addon.logError("Null location of greenhouse. Cannot load. Skipping...");
|
||||
case SUCCESS -> activateGreenhouse(g);
|
||||
case FAIL_NO_WORLD -> addon.logError("Database contains greenhouse for a non-loaded world. Skipping...");
|
||||
case FAIL_UNKNOWN_RECIPE -> {
|
||||
addon.logError("Greenhouse uses a recipe that does not exist in the biomes.yml. Skipping...");
|
||||
addon.logError("Greenhouse Id " + g.getUniqueId());
|
||||
}
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
});
|
||||
addon.log("Loaded " + map.getSize() + " greenhouses.");
|
||||
|
@ -153,7 +153,7 @@ public class GreenhouseManager implements Listener {
|
|||
*/
|
||||
public CompletableFuture<GhResult> tryToMakeGreenhouse(Location location, BiomeRecipe greenhouseRecipe) {
|
||||
CompletableFuture<GhResult> r = new CompletableFuture<>();
|
||||
GreenhouseFinder finder = new GreenhouseFinder();
|
||||
GreenhouseFinder finder = new GreenhouseFinder(addon);
|
||||
finder.find(location).thenAccept(resultSet -> {
|
||||
if (!resultSet.isEmpty()) {
|
||||
// Failure!
|
||||
|
|
|
@ -6,7 +6,6 @@ import java.util.HashMap;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.bukkit.Location;
|
||||
|
||||
|
@ -138,7 +137,7 @@ public class GreenhouseMap {
|
|||
* @return a list of all the Greenhouses
|
||||
*/
|
||||
public List<Greenhouse> getGreenhouses() {
|
||||
return greenhouses.values().stream().flatMap(List::stream).collect(Collectors.toList());
|
||||
return greenhouses.values().stream().flatMap(List::stream).toList();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -30,6 +30,7 @@ public class RecipeManager {
|
|||
private static final int MAXIMUM_INVENTORY_SIZE = 49;
|
||||
private final Greenhouses addon;
|
||||
private static final List<BiomeRecipe> biomeRecipes = new ArrayList<>();
|
||||
private static final String COULD_NOT_PARSE = "Could not parse ";
|
||||
|
||||
public RecipeManager(Greenhouses addon) {
|
||||
this.addon = addon;
|
||||
|
@ -155,6 +156,7 @@ public class RecipeManager {
|
|||
b.setLavacoverage(biomeRecipeConfig.getInt("lavacoverage",-1));
|
||||
b.setIcecoverage(biomeRecipeConfig.getInt("icecoverage",-1));
|
||||
b.setMobLimit(biomeRecipeConfig.getInt("moblimit", 9));
|
||||
b.setMaxMob(biomeRecipeConfig.getInt("maxmobs", -1));
|
||||
return b;
|
||||
}
|
||||
|
||||
|
@ -178,45 +180,54 @@ public class RecipeManager {
|
|||
ConfigurationSection conversionSec = biomeRecipeConfig.getConfigurationSection("conversions");
|
||||
if (conversionSec != null) {
|
||||
for (String oldMat : conversionSec.getKeys(false)) {
|
||||
try {
|
||||
Material oldMaterial = Material.valueOf(oldMat.toUpperCase(Locale.ENGLISH));
|
||||
String conversions = conversionSec.getString(oldMat);
|
||||
if (!Objects.requireNonNull(conversions).isEmpty()) {
|
||||
String[] split = conversions.split(":");
|
||||
double convChance = Double.parseDouble(split[0]);
|
||||
Material newMaterial = Material.valueOf(split[1]);
|
||||
Material localMaterial = null;
|
||||
if(split.length > 2) {
|
||||
localMaterial = Material.valueOf(split[2]);
|
||||
}
|
||||
b.addConvBlocks(oldMaterial, newMaterial, convChance, localMaterial);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
addon.logError("Could not parse " + oldMat);
|
||||
}
|
||||
|
||||
parseConversions(oldMat, conversionSec, b);
|
||||
}
|
||||
}
|
||||
// Get the list of conversions
|
||||
for (String oldMat : biomeRecipeConfig.getStringList("conversion-list")) {
|
||||
try {
|
||||
// Split the string
|
||||
String[] split = oldMat.split(":");
|
||||
Material oldMaterial = Material.valueOf(split[0].toUpperCase());
|
||||
double convChance = Double.parseDouble(split[1]);
|
||||
Material newMaterial = Material.valueOf(split[2]);
|
||||
Material localMaterial = null;
|
||||
if(split.length > 3) {
|
||||
localMaterial = Material.valueOf(split[3]);
|
||||
}
|
||||
b.addConvBlocks(oldMaterial, newMaterial, convChance, localMaterial);
|
||||
} catch (Exception e) {
|
||||
addon.logError("Could not parse " + oldMat);
|
||||
}
|
||||
parseConversionList(oldMat, b);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private void parseConversionList(String oldMat, BiomeRecipe b) {
|
||||
try {
|
||||
// Split the string
|
||||
String[] split = oldMat.split(":");
|
||||
Material oldMaterial = Material.valueOf(split[0].toUpperCase());
|
||||
double convChance = Double.parseDouble(split[1]);
|
||||
Material newMaterial = Material.valueOf(split[2]);
|
||||
Material localMaterial = null;
|
||||
if(split.length > 3) {
|
||||
localMaterial = Material.valueOf(split[3]);
|
||||
}
|
||||
b.addConvBlocks(oldMaterial, newMaterial, convChance, localMaterial);
|
||||
} catch (Exception e) {
|
||||
addon.logError(COULD_NOT_PARSE + oldMat);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void parseConversions(String oldMat, ConfigurationSection conversionSec, BiomeRecipe b) {
|
||||
try {
|
||||
Material oldMaterial = Material.valueOf(oldMat.toUpperCase(Locale.ENGLISH));
|
||||
String conversions = conversionSec.getString(oldMat);
|
||||
if (!Objects.requireNonNull(conversions).isEmpty()) {
|
||||
String[] split = conversions.split(":");
|
||||
double convChance = Double.parseDouble(split[0]);
|
||||
Material newMaterial = Material.valueOf(split[1]);
|
||||
Material localMaterial = null;
|
||||
if(split.length > 2) {
|
||||
localMaterial = Material.valueOf(split[2]);
|
||||
}
|
||||
b.addConvBlocks(oldMaterial, newMaterial, convChance, localMaterial);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
addon.logError(COULD_NOT_PARSE + oldMat);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void loadMobs(ConfigurationSection biomeRecipeConfig, BiomeRecipe b) {
|
||||
ConfigurationSection temp = biomeRecipeConfig.getConfigurationSection("mobs");
|
||||
// Mob EntityType: Probability:Spawn on Material
|
||||
|
@ -234,7 +245,7 @@ public class RecipeManager {
|
|||
Material mobSpawnOn = Material.valueOf(split[1]);
|
||||
b.addMobs(mobType, mobProbability, mobSpawnOn);
|
||||
} catch (Exception e) {
|
||||
addon.logError("Could not parse " + s.getKey());
|
||||
addon.logError(COULD_NOT_PARSE + s.getKey());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -43,10 +43,6 @@ public class PanelClick implements ClickHandler {
|
|||
}
|
||||
|
||||
private boolean makeGreenhouse(User user, BiomeRecipe br) {
|
||||
if (user.getLocation() == null) {
|
||||
addon.logError("User has no location : " + user.getName());
|
||||
return false;
|
||||
}
|
||||
// Check flag
|
||||
if (!addon.getIslands().getIslandAt(user.getLocation()).map(i -> i.isAllowed(user, Greenhouses.GREENHOUSES)).orElse(false)) {
|
||||
user.sendMessage("greenhouses.errors.no-rank");
|
||||
|
|
|
@ -92,10 +92,6 @@ class MakeCommand extends CompositeCommand {
|
|||
* @return true if successful
|
||||
*/
|
||||
private boolean makeGreenhouse(User user, BiomeRecipe br) {
|
||||
if (user.getLocation() == null) {
|
||||
getAddon().logError("User had no location");
|
||||
return false;
|
||||
}
|
||||
// Check flag
|
||||
if (!getIslands().getIslandAt(user.getLocation()).map(i -> i.isAllowed(user, Greenhouses.GREENHOUSES)).orElse(false)) {
|
||||
user.sendMessage("greenhouses.errors.no-rank");
|
||||
|
|
|
@ -35,10 +35,6 @@ class RemoveCommand extends CompositeCommand {
|
|||
*/
|
||||
@Override
|
||||
public boolean execute(User user, String label, List<String> args) {
|
||||
if (user.getLocation() == null) {
|
||||
getAddon().logError("User had no location");
|
||||
return false;
|
||||
}
|
||||
// Check flag
|
||||
if (!getIslands().getIslandAt(user.getLocation()).map(i -> i.isAllowed(user, Greenhouses.GREENHOUSES)).orElse(false)) {
|
||||
user.sendMessage("greenhouses.errors.no-rank");
|
||||
|
|
|
@ -30,8 +30,7 @@ public class UserCommand extends CompositeCommand {
|
|||
public void setup() {
|
||||
this.setPermission("greenhouses.player");
|
||||
this.setOnlyPlayer(true);
|
||||
this.setParametersHelp("greenhouses.command.parameters");
|
||||
this.setDescription("greenhouses.command.description");
|
||||
this.setDescription("greenhouses.commands.user.description");
|
||||
|
||||
//new InfoCommand(this);
|
||||
//new ListCommand(this);
|
||||
|
|
|
@ -27,14 +27,16 @@ public class AsyncWorldCache {
|
|||
|
||||
private final World world;
|
||||
private final Map<Pair<Integer, Integer>, ChunkSnapshot> cache;
|
||||
private final Greenhouses addon;
|
||||
|
||||
/**
|
||||
* Chunk cache. This class is designed to be run async and blocks futures
|
||||
* @param world - world to cache
|
||||
*/
|
||||
public AsyncWorldCache(World world) {
|
||||
public AsyncWorldCache(Greenhouses addon, World world) {
|
||||
this.world = world;
|
||||
cache = new HashMap<>();
|
||||
this.addon = addon;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -59,7 +61,7 @@ public class AsyncWorldCache {
|
|||
*/
|
||||
private CompletableFuture<ChunkSnapshot> getAChunk(int x, int z) {
|
||||
CompletableFuture<ChunkSnapshot> r = new CompletableFuture<>();
|
||||
Bukkit.getScheduler().runTask(Greenhouses.getInstance().getPlugin(), () ->
|
||||
Bukkit.getScheduler().runTask(addon.getPlugin(), () ->
|
||||
Util.getChunkAtAsync(world, x, z).thenAccept(chunk -> r.complete(chunk.getChunkSnapshot())));
|
||||
return r;
|
||||
}
|
||||
|
@ -104,7 +106,7 @@ public class AsyncWorldCache {
|
|||
try {
|
||||
return Objects.requireNonNull(getSnap(x, z)).getBlockType(xx, y, zz);
|
||||
} catch (InterruptedException | ExecutionException e) {
|
||||
Greenhouses.getInstance().logError("Chunk could not be obtained async! " + e);
|
||||
addon.logError("Chunk could not be obtained async! " + e);
|
||||
// Restore interrupted state...
|
||||
Thread.currentThread().interrupt();
|
||||
return Material.AIR;
|
||||
|
|
|
@ -35,11 +35,17 @@ 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
|
||||
# greenhouse area is 18 blocks
|
||||
# greenhouse area is 18 blocks. This enables bigger greenhouses to spawn more.
|
||||
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: 5
|
||||
Snowy_beach:
|
||||
friendlyname: "Snowy beach"
|
||||
biome: SNOWY_BEACH
|
||||
|
@ -49,6 +55,9 @@ 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.
|
||||
|
@ -63,8 +72,14 @@ biomes:
|
|||
plants:
|
||||
TALL_GRASS: 10:GRASS_BLOCK
|
||||
mobs:
|
||||
WOLF: 10:SNOW
|
||||
WOLF: 15:SNOW
|
||||
FOX: 15:GRASS_BLOCK
|
||||
RABBIT: 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.
|
||||
# If this value is not given, there is no maximum.
|
||||
maxmobs: 5
|
||||
Cold_Rabbit:
|
||||
friendlyname: "Cold Taiga Forest"
|
||||
biome: OLD_GROWTH_SPRUCE_TAIGA
|
||||
|
@ -79,7 +94,12 @@ 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.
|
||||
# If this value is not given, there is no maximum.
|
||||
maxmobs: 20
|
||||
DESERT:
|
||||
friendlyname: "Desert"
|
||||
biome: DESERT
|
||||
|
@ -103,6 +123,14 @@ 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
|
||||
|
@ -117,6 +145,17 @@ 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
|
||||
|
@ -134,6 +173,10 @@ biomes:
|
|||
STRIDER: 10:LAVA
|
||||
ENDERMAN: 5:NETHERRACK
|
||||
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: 50
|
||||
permission: greenhouses.biome.nether
|
||||
SOUL_SAND_VALLEY:
|
||||
friendlyname: "&cSoul Sand Valley"
|
||||
|
@ -148,7 +191,14 @@ 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.
|
||||
# If this value is not given, there is no maximum.
|
||||
maxmobs: 50
|
||||
permission: greenhouses.biome.nether
|
||||
# Conversion list - in this case, an adjacent block is required to convert
|
||||
# Format is:
|
||||
|
@ -173,6 +223,10 @@ biomes:
|
|||
PIGLIN: 10:CRIMSON_NYLIUM
|
||||
HOGLIN: 10:CRIMSON_NYLIUM
|
||||
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: 50
|
||||
permission: greenhouses.biome.nether
|
||||
WARPED_FOREST:
|
||||
friendlyname: "&cWarped Forest"
|
||||
|
@ -190,6 +244,10 @@ biomes:
|
|||
STRIDER: 10:LAVA
|
||||
ENDERMAN: 20:WARPED_NYLIUM
|
||||
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: 50
|
||||
permission: greenhouses.biome.nether
|
||||
JUNGLE:
|
||||
biome: JUNGLE
|
||||
|
@ -205,6 +263,11 @@ biomes:
|
|||
ROSE_BUSH: 20:GRASS_BLOCK
|
||||
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
|
||||
|
@ -220,6 +283,10 @@ biomes:
|
|||
mobs:
|
||||
MUSHROOM_COW: 10:MYCELIUM
|
||||
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
|
||||
OCEAN:
|
||||
biome: OCEAN
|
||||
icon: WATER_BUCKET
|
||||
|
@ -228,7 +295,13 @@ 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
|
||||
|
@ -239,8 +312,17 @@ biomes:
|
|||
plants:
|
||||
TALL_GRASS: 10:GRASS_BLOCK
|
||||
mobs:
|
||||
HORSE: 10:GRASS_BLOCK
|
||||
HORSE: 18: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
|
||||
RIVER:
|
||||
friendlyname: "Clay river"
|
||||
biome: RIVER
|
||||
|
@ -256,6 +338,15 @@ 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
|
||||
|
@ -266,6 +357,18 @@ 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
|
||||
|
@ -284,8 +387,13 @@ biomes:
|
|||
LILY_PAD: 5:WATER
|
||||
mobs:
|
||||
SLIME: 5:WATER
|
||||
FROG: 20:WATER
|
||||
moblimit: 3
|
||||
DRIPSTONE_CAVES:
|
||||
# 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
|
||||
dripstone_caves:
|
||||
friendlyname: "&6Drippy Drops"
|
||||
biome: dripstone_caves
|
||||
icon: DRIPSTONE_BLOCK
|
||||
|
@ -293,7 +401,7 @@ biomes:
|
|||
contents:
|
||||
STONE: 8
|
||||
CLAY: 8
|
||||
# 50% water cove rage required
|
||||
# 50% water coverage required
|
||||
watercoverage: 25
|
||||
conversions:
|
||||
CLAY: 50:DRIPSTONE_BLOCK:WATER
|
||||
|
@ -303,4 +411,9 @@ biomes:
|
|||
mobs:
|
||||
skeleton: 5:STONE
|
||||
glow_squid: 5:WATER
|
||||
moblimit: 5
|
||||
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
|
|
@ -38,9 +38,10 @@ greenhouses:
|
|||
minimumblockstitle: "[Minimum blocks required]"
|
||||
nootherblocks: "No other blocks required."
|
||||
missing: "Greenhouse is missing"
|
||||
|
||||
|
||||
commands:
|
||||
user:
|
||||
description: "Opens the Greenhouse selection GUI"
|
||||
remove:
|
||||
description: "Removes a greenhouse that you are standing in if you are the owner"
|
||||
make:
|
||||
|
@ -52,15 +53,18 @@ 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! Red glass blocks should show the problem."
|
||||
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_WALL: "&c There is a hole in the wall!"
|
||||
FAIL_NO_ROOF: "&c There seems to be no roof!"
|
||||
FAIL_NO_ROOF: "&c There seems to be no roof! Make sure you are inside the greenhouse to make it."
|
||||
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"
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
name: BentoBox-Greenhouses
|
||||
main: world.bentobox.greenhouses.GreenhousesPladdon
|
||||
version: ${project.version}${build.number}
|
||||
api-version: "1.19"
|
||||
|
||||
authors: [tastybento]
|
||||
contributors: ["The BentoBoxWorld Community"]
|
||||
website: https://bentobox.world
|
||||
description: ${project.description}
|
|
@ -5,7 +5,6 @@ import static org.junit.Assert.assertFalse;
|
|||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
|
@ -61,7 +60,7 @@ public class GreenhouseTest {
|
|||
// RecipeManager
|
||||
PowerMockito.mockStatic(RecipeManager.class);
|
||||
when(br.getName()).thenReturn("test");
|
||||
when(RecipeManager.getBiomeRecipies(eq("test"))).thenReturn(Optional.of(br));
|
||||
when(RecipeManager.getBiomeRecipies("test")).thenReturn(Optional.of(br));
|
||||
// Walls
|
||||
when(walls.getMinX()).thenReturn(MINX);
|
||||
when(walls.getMinZ()).thenReturn(MINZ);
|
||||
|
|
|
@ -151,7 +151,7 @@ public class BiomeRecipeTest {
|
|||
double convChance = 100D;
|
||||
Material localMaterial = Material.WATER;
|
||||
br.addConvBlocks(oldMaterial, newMaterial, convChance, localMaterial);
|
||||
verify(addon).log(eq(" 100.0% chance for Sand to convert to Clay"));
|
||||
verify(addon).log(" 100.0% chance for Sand to convert to Clay");
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -163,7 +163,7 @@ public class BiomeRecipeTest {
|
|||
int mobProbability = 50;
|
||||
Material mobSpawnOn = Material.GRASS_BLOCK;
|
||||
br.addMobs(mobType, mobProbability, mobSpawnOn);
|
||||
verify(addon).log(eq(" 50.0% chance for Cat to spawn on Grass Block."));
|
||||
verify(addon).log(" 50.0% chance for Cat to spawn on Grass Block.");
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -177,7 +177,7 @@ public class BiomeRecipeTest {
|
|||
br.addMobs(mobType, mobProbability, mobSpawnOn);
|
||||
br.addMobs(mobType, mobProbability, mobSpawnOn);
|
||||
br.addMobs(mobType, mobProbability, mobSpawnOn);
|
||||
verify(addon).logError(eq("Mob chances add up to > 100% in BADLANDS biome recipe! Skipping CAT"));
|
||||
verify(addon).logError("Mob chances add up to > 100% in BADLANDS biome recipe! Skipping CAT");
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -190,7 +190,7 @@ public class BiomeRecipeTest {
|
|||
Material mobSpawnOn = Material.GRASS_BLOCK;
|
||||
br.addMobs(mobType, mobProbability, mobSpawnOn);
|
||||
br.addMobs(mobType, mobProbability, mobSpawnOn);
|
||||
verify(addon).logError(eq("Mob chances add up to > 100% in BADLANDS biome recipe! Skipping CAT"));
|
||||
verify(addon).logError("Mob chances add up to > 100% in BADLANDS biome recipe! Skipping CAT");
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -202,7 +202,7 @@ public class BiomeRecipeTest {
|
|||
int plantProbability = 20;
|
||||
Material plantGrowOn = Material.DIRT;
|
||||
br.addPlants(plantMaterial, plantProbability, plantGrowOn);
|
||||
verify(addon).log(eq(" 20.0% chance for Jungle Sapling to grow on Dirt"));
|
||||
verify(addon).log(" 20.0% chance for Jungle Sapling to grow on Dirt");
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -215,7 +215,7 @@ public class BiomeRecipeTest {
|
|||
Material plantGrowOn = Material.DIRT;
|
||||
br.addPlants(plantMaterial, plantProbability, plantGrowOn);
|
||||
br.addPlants(plantMaterial, plantProbability, plantGrowOn);
|
||||
verify(addon).logError(eq("Plant chances add up to > 100% in BADLANDS biome recipe! Skipping JUNGLE_SAPLING"));
|
||||
verify(addon).logError("Plant chances add up to > 100% in BADLANDS biome recipe! Skipping JUNGLE_SAPLING");
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -226,7 +226,7 @@ public class BiomeRecipeTest {
|
|||
Material blockMaterial = Material.BLACK_CONCRETE;
|
||||
int blockQty = 30;
|
||||
br.addReqBlocks(blockMaterial, blockQty);
|
||||
verify(addon).log(eq(" BLACK_CONCRETE x 30"));
|
||||
verify(addon).log(" BLACK_CONCRETE x 30");
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -451,7 +451,7 @@ public class BiomeRecipeTest {
|
|||
|
||||
br.addMobs(mobType, mobProbability, mobSpawnOn);
|
||||
assertFalse(br.spawnMob(block));
|
||||
verify(world).spawnEntity(eq(location), eq(EntityType.CAT));
|
||||
verify(world).spawnEntity(location, EntityType.CAT);
|
||||
verify(location).add(any(Vector.class));
|
||||
}
|
||||
|
||||
|
@ -477,7 +477,7 @@ public class BiomeRecipeTest {
|
|||
|
||||
br.addMobs(mobType, mobProbability, mobSpawnOn);
|
||||
assertTrue(br.spawnMob(block));
|
||||
verify(world).spawnEntity(eq(location), eq(EntityType.CAT));
|
||||
verify(world).spawnEntity(location, EntityType.CAT);
|
||||
verify(location).add(any(Vector.class));
|
||||
}
|
||||
|
||||
|
@ -504,7 +504,7 @@ public class BiomeRecipeTest {
|
|||
|
||||
br.addMobs(mobType, mobProbability, mobSpawnOn);
|
||||
assertTrue(br.spawnMob(block));
|
||||
verify(world).spawnEntity(eq(location), eq(EntityType.HOGLIN));
|
||||
verify(world).spawnEntity(location, EntityType.HOGLIN);
|
||||
verify(location).add(any(Vector.class));
|
||||
verify(hoglin).setImmuneToZombification(true);
|
||||
}
|
||||
|
@ -532,7 +532,7 @@ public class BiomeRecipeTest {
|
|||
|
||||
br.addMobs(mobType, mobProbability, mobSpawnOn);
|
||||
assertTrue(br.spawnMob(block));
|
||||
verify(world).spawnEntity(eq(location), eq(EntityType.PIGLIN));
|
||||
verify(world).spawnEntity(location, EntityType.PIGLIN);
|
||||
verify(location).add(any(Vector.class));
|
||||
verify(piglin).setImmuneToZombification(true);
|
||||
}
|
||||
|
@ -562,7 +562,7 @@ public class BiomeRecipeTest {
|
|||
|
||||
br.addMobs(mobType, mobProbability, mobSpawnOn);
|
||||
assertTrue(br.spawnMob(block));
|
||||
verify(world).spawnEntity(eq(location), eq(EntityType.PIGLIN));
|
||||
verify(world).spawnEntity(location, EntityType.PIGLIN);
|
||||
verify(location).add(any(Vector.class));
|
||||
verify(piglin, never()).setImmuneToZombification(true);
|
||||
}
|
||||
|
@ -586,7 +586,7 @@ public class BiomeRecipeTest {
|
|||
|
||||
br.addMobs(mobType, mobProbability, mobSpawnOn);
|
||||
assertFalse(br.spawnMob(block));
|
||||
verify(world, never()).spawnEntity(eq(location), eq(EntityType.CAT));
|
||||
verify(world, never()).spawnEntity(location, EntityType.CAT);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -706,8 +706,8 @@ public class BiomeRecipeTest {
|
|||
assertTrue(br.addPlants(Material.SUNFLOWER, 100, Material.GRASS_BLOCK));
|
||||
assertTrue(br.growPlant(new GrowthBlock(block, true), false));
|
||||
verify(world).spawnParticle(eq(Particle.SNOWBALL), any(Location.class), anyInt(), anyDouble(), anyDouble(), anyDouble());
|
||||
verify(bisected).setHalf(eq(Half.BOTTOM));
|
||||
verify(bisected).setHalf(eq(Half.TOP));
|
||||
verify(bisected).setHalf(Half.BOTTOM);
|
||||
verify(bisected).setHalf(Half.TOP);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -722,8 +722,8 @@ public class BiomeRecipeTest {
|
|||
when(block.isEmpty()).thenReturn(true);
|
||||
Block ob = mock(Block.class);
|
||||
when(ob.getType()).thenReturn(Material.GRASS_BLOCK);
|
||||
when(block.getRelative(eq(BlockFace.DOWN))).thenReturn(ob);
|
||||
when(block.getRelative(eq(BlockFace.UP))).thenReturn(ob);
|
||||
when(block.getRelative(BlockFace.DOWN)).thenReturn(ob);
|
||||
when(block.getRelative(BlockFace.UP)).thenReturn(ob);
|
||||
assertTrue(br.addPlants(Material.SUNFLOWER, 100, Material.GRASS_BLOCK));
|
||||
assertFalse(br.growPlant(new GrowthBlock(block, true), false));
|
||||
}
|
||||
|
|
|
@ -50,8 +50,6 @@ public class RoofTest {
|
|||
public void setUp() {
|
||||
PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS);
|
||||
when(Tag.TRAPDOORS.isTagged(Material.BIRCH_TRAPDOOR)).thenReturn(true);
|
||||
PowerMockito.mockStatic(Greenhouses.class, Mockito.RETURNS_MOCKS);
|
||||
when(Greenhouses.getInstance()).thenReturn(addon);
|
||||
s = new Settings();
|
||||
when(addon.getSettings()).thenReturn(s);
|
||||
|
||||
|
@ -89,14 +87,14 @@ public class RoofTest {
|
|||
when(location.clone()).thenReturn(location);
|
||||
|
||||
// Test
|
||||
roof = new Roof(cache, location);
|
||||
roof = new Roof(cache, location, addon);
|
||||
assertTrue(roof.findRoof(new Vector(10,10,10)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNoGlass() {
|
||||
when(cache.getBlockType(anyInt(), anyInt(), anyInt())).thenReturn(Material.AIR);
|
||||
roof = new Roof(cache, location);
|
||||
roof = new Roof(cache, location, addon);
|
||||
assertFalse(roof.findRoof(new Vector(10,10,10)));
|
||||
}
|
||||
|
||||
|
@ -169,13 +167,13 @@ public class RoofTest {
|
|||
*/
|
||||
@Test
|
||||
public void testWallBlocks() {
|
||||
assertFalse(Roof.roofBlocks(Material.ACACIA_BOAT));
|
||||
assertTrue(Roof.roofBlocks(Material.GLASS));
|
||||
assertTrue(Roof.roofBlocks(Material.GLOWSTONE));
|
||||
assertFalse(Roof.roofBlocks(Material.ACACIA_DOOR));
|
||||
assertTrue(Roof.roofBlocks(Material.HOPPER));
|
||||
assertTrue(Roof.roofBlocks(Material.PURPLE_STAINED_GLASS_PANE));
|
||||
assertTrue(Roof.roofBlocks(Material.BIRCH_TRAPDOOR));
|
||||
assertFalse(roof.roofBlocks(Material.ACACIA_BOAT));
|
||||
assertTrue(roof.roofBlocks(Material.GLASS));
|
||||
assertTrue(roof.roofBlocks(Material.GLOWSTONE));
|
||||
assertFalse(roof.roofBlocks(Material.ACACIA_DOOR));
|
||||
assertTrue(roof.roofBlocks(Material.HOPPER));
|
||||
assertTrue(roof.roofBlocks(Material.PURPLE_STAINED_GLASS_PANE));
|
||||
assertTrue(roof.roofBlocks(Material.BIRCH_TRAPDOOR));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -185,12 +183,12 @@ public class RoofTest {
|
|||
public void testWallBlocksNoGlowStoneNoPanes() {
|
||||
s.setAllowGlowstone(false);
|
||||
s.setAllowPanes(false);
|
||||
assertFalse(Roof.roofBlocks(Material.ACACIA_BOAT));
|
||||
assertTrue(Roof.roofBlocks(Material.GLASS));
|
||||
assertFalse(Roof.roofBlocks(Material.GLOWSTONE));
|
||||
assertFalse(Roof.roofBlocks(Material.ACACIA_DOOR));
|
||||
assertTrue(Roof.roofBlocks(Material.HOPPER));
|
||||
assertFalse(Roof.roofBlocks(Material.PURPLE_STAINED_GLASS_PANE));
|
||||
assertTrue(Roof.roofBlocks(Material.BIRCH_TRAPDOOR));
|
||||
assertFalse(roof.roofBlocks(Material.ACACIA_BOAT));
|
||||
assertTrue(roof.roofBlocks(Material.GLASS));
|
||||
assertFalse(roof.roofBlocks(Material.GLOWSTONE));
|
||||
assertFalse(roof.roofBlocks(Material.ACACIA_DOOR));
|
||||
assertTrue(roof.roofBlocks(Material.HOPPER));
|
||||
assertFalse(roof.roofBlocks(Material.PURPLE_STAINED_GLASS_PANE));
|
||||
assertTrue(roof.roofBlocks(Material.BIRCH_TRAPDOOR));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -64,12 +64,10 @@ public class WallsTest {
|
|||
when(Tag.TRAPDOORS.isTagged(Material.BIRCH_TRAPDOOR)).thenReturn(true);
|
||||
// Declare mock after mocking Bukkit
|
||||
roof = mock(Roof.class);
|
||||
PowerMockito.mockStatic(Greenhouses.class, Mockito.RETURNS_MOCKS);
|
||||
when(Greenhouses.getInstance()).thenReturn(addon);
|
||||
s = new Settings();
|
||||
when(addon.getSettings()).thenReturn(s);
|
||||
when(addon.getPlugin()).thenReturn(plugin);
|
||||
|
||||
when(addon.wallBlocks(any())).thenCallRealMethod();
|
||||
walls = new Walls(cache);
|
||||
when(world.getMaxHeight()).thenReturn(255);
|
||||
when(location.getWorld()).thenReturn(world);
|
||||
|
@ -201,13 +199,13 @@ public class WallsTest {
|
|||
*/
|
||||
@Test
|
||||
public void testWallBlocks() {
|
||||
assertFalse(Walls.wallBlocks(Material.ACACIA_BOAT));
|
||||
assertTrue(Walls.wallBlocks(Material.GLASS));
|
||||
assertTrue(Walls.wallBlocks(Material.GLOWSTONE));
|
||||
assertTrue(Walls.wallBlocks(Material.ACACIA_DOOR));
|
||||
assertTrue(Walls.wallBlocks(Material.HOPPER));
|
||||
assertTrue(Walls.wallBlocks(Material.PURPLE_STAINED_GLASS_PANE));
|
||||
assertFalse(Walls.wallBlocks(Material.BIRCH_TRAPDOOR));
|
||||
assertFalse(addon.wallBlocks(Material.ACACIA_BOAT));
|
||||
assertTrue(addon.wallBlocks(Material.GLASS));
|
||||
assertTrue(addon.wallBlocks(Material.GLOWSTONE));
|
||||
assertTrue(addon.wallBlocks(Material.ACACIA_DOOR));
|
||||
assertTrue(addon.wallBlocks(Material.HOPPER));
|
||||
assertTrue(addon.wallBlocks(Material.PURPLE_STAINED_GLASS_PANE));
|
||||
assertFalse(addon.wallBlocks(Material.BIRCH_TRAPDOOR));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -217,13 +215,13 @@ public class WallsTest {
|
|||
public void testWallBlocksNoGlowStoneNoPanes() {
|
||||
s.setAllowGlowstone(false);
|
||||
s.setAllowPanes(false);
|
||||
assertFalse(Walls.wallBlocks(Material.ACACIA_BOAT));
|
||||
assertTrue(Walls.wallBlocks(Material.GLASS));
|
||||
assertFalse(Walls.wallBlocks(Material.GLOWSTONE));
|
||||
assertTrue(Walls.wallBlocks(Material.ACACIA_DOOR));
|
||||
assertTrue(Walls.wallBlocks(Material.HOPPER));
|
||||
assertFalse(Walls.wallBlocks(Material.PURPLE_STAINED_GLASS_PANE));
|
||||
assertFalse(Walls.wallBlocks(Material.BIRCH_TRAPDOOR));
|
||||
assertFalse(addon.wallBlocks(Material.ACACIA_BOAT));
|
||||
assertTrue(addon.wallBlocks(Material.GLASS));
|
||||
assertFalse(addon.wallBlocks(Material.GLOWSTONE));
|
||||
assertTrue(addon.wallBlocks(Material.ACACIA_DOOR));
|
||||
assertTrue(addon.wallBlocks(Material.HOPPER));
|
||||
assertFalse(addon.wallBlocks(Material.PURPLE_STAINED_GLASS_PANE));
|
||||
assertFalse(addon.wallBlocks(Material.BIRCH_TRAPDOOR));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -27,6 +27,7 @@ import org.bukkit.event.player.PlayerBucketEmptyEvent;
|
|||
import org.bukkit.event.player.PlayerMoveEvent;
|
||||
import org.bukkit.event.player.PlayerTeleportEvent;
|
||||
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
|
||||
import org.bukkit.inventory.EquipmentSlot;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.PlayerInventory;
|
||||
import org.junit.Before;
|
||||
|
@ -137,7 +138,7 @@ public class GreenhouseEventsTest {
|
|||
when(nextBlock.getLocation()).thenReturn(location);
|
||||
ItemStack item = mock(ItemStack.class);
|
||||
when(item.getType()).thenReturn(Material.WATER_BUCKET);
|
||||
PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, nextBlock, clickedBlock, BlockFace.UP, Material.WATER_BUCKET, item);
|
||||
PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, nextBlock, clickedBlock, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
|
||||
ghe.onPlayerInteractInNether(e);
|
||||
verify(nextBlock).setType(Material.WATER);
|
||||
}
|
||||
|
@ -154,7 +155,7 @@ public class GreenhouseEventsTest {
|
|||
when(nextBlock.getLocation()).thenReturn(mock(Location.class));
|
||||
ItemStack item = mock(ItemStack.class);
|
||||
when(item.getType()).thenReturn(Material.WATER_BUCKET);
|
||||
PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, nextBlock, clickedBlock, BlockFace.UP, Material.WATER_BUCKET, item);
|
||||
PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, nextBlock, clickedBlock, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
|
||||
ghe.onPlayerInteractInNether(e);
|
||||
verify(nextBlock, never()).setType(Material.WATER);
|
||||
}
|
||||
|
@ -170,7 +171,7 @@ public class GreenhouseEventsTest {
|
|||
when(clickedBlock.getRelative(any())).thenReturn(nextBlock);
|
||||
ItemStack item = mock(ItemStack.class);
|
||||
when(item.getType()).thenReturn(Material.WATER_BUCKET);
|
||||
PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, nextBlock, clickedBlock, BlockFace.UP, Material.WATER_BUCKET, item);
|
||||
PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, nextBlock, clickedBlock, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
|
||||
ghe.onPlayerInteractInNether(e);
|
||||
verify(nextBlock, never()).setType(Material.WATER);
|
||||
}
|
||||
|
@ -189,7 +190,7 @@ public class GreenhouseEventsTest {
|
|||
when(nextBlock.getWorld()).thenReturn(world);
|
||||
ItemStack item = mock(ItemStack.class);
|
||||
when(item.getType()).thenReturn(Material.WATER_BUCKET);
|
||||
PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, nextBlock, clickedBlock, BlockFace.UP, Material.WATER_BUCKET, item);
|
||||
PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, nextBlock, clickedBlock, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
|
||||
ghe.onPlayerInteractInNether(e);
|
||||
verify(nextBlock, never()).setType(Material.WATER);
|
||||
}
|
||||
|
@ -205,7 +206,7 @@ public class GreenhouseEventsTest {
|
|||
when(clickedBlock.getRelative(any())).thenReturn(nextBlock);
|
||||
ItemStack item = mock(ItemStack.class);
|
||||
when(item.getType()).thenReturn(Material.ACACIA_BOAT);
|
||||
PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, nextBlock, clickedBlock, BlockFace.UP, Material.WATER, item);
|
||||
PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, nextBlock, clickedBlock, BlockFace.UP, Material.WATER, item, EquipmentSlot.HAND);
|
||||
ghe.onPlayerInteractInNether(e);
|
||||
verify(nextBlock, never()).setType(Material.WATER);
|
||||
}
|
||||
|
@ -222,7 +223,7 @@ public class GreenhouseEventsTest {
|
|||
when(clickedBlock.getRelative(any())).thenReturn(nextBlock);
|
||||
ItemStack item = mock(ItemStack.class);
|
||||
when(item.getType()).thenReturn(Material.WATER_BUCKET);
|
||||
PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, nextBlock, clickedBlock, BlockFace.UP, Material.WATER_BUCKET, item);
|
||||
PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, nextBlock, clickedBlock, BlockFace.UP, Material.WATER_BUCKET, item, EquipmentSlot.HAND);
|
||||
ghe.onPlayerInteractInNether(e);
|
||||
verify(nextBlock, never()).setType(Material.WATER);
|
||||
}
|
||||
|
|
|
@ -1,14 +1,22 @@
|
|||
package world.bentobox.greenhouses.managers;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Keyed;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Tag;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.BlockFace;
|
||||
|
@ -18,11 +26,14 @@ import org.junit.Before;
|
|||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Mockito;
|
||||
import org.powermock.api.mockito.PowerMockito;
|
||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||
import org.powermock.modules.junit4.PowerMockRunner;
|
||||
|
||||
import world.bentobox.bentobox.BentoBox;
|
||||
import world.bentobox.greenhouses.data.Greenhouse;
|
||||
import world.bentobox.greenhouses.greenhouse.BiomeRecipe;
|
||||
import world.bentobox.greenhouses.managers.EcoSystemManager.GrowthBlock;
|
||||
|
||||
/**
|
||||
|
@ -30,7 +41,7 @@ import world.bentobox.greenhouses.managers.EcoSystemManager.GrowthBlock;
|
|||
*
|
||||
*/
|
||||
@RunWith(PowerMockRunner.class)
|
||||
@PrepareForTest({Bukkit.class, BentoBox.class})
|
||||
@PrepareForTest({Bukkit.class, BentoBox.class, Tag.class, RecipeManager.class})
|
||||
public class EcoSystemManagerTest {
|
||||
|
||||
private Greenhouse gh;
|
||||
|
@ -44,6 +55,8 @@ public class EcoSystemManagerTest {
|
|||
private Block liquid;
|
||||
@Mock
|
||||
private Block plant;
|
||||
@Mock
|
||||
private BiomeRecipe recipe;
|
||||
|
||||
// CUT
|
||||
private EcoSystemManager eco;
|
||||
|
@ -51,6 +64,12 @@ public class EcoSystemManagerTest {
|
|||
*/
|
||||
@Before
|
||||
public void setUp() {
|
||||
PowerMockito.mockStatic(Tag.class, Mockito.RETURNS_MOCKS);
|
||||
PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS);
|
||||
@SuppressWarnings("unchecked")
|
||||
Tag<Keyed> tag = mock(Tag.class);
|
||||
when(Bukkit.getTag(anyString(), any(), any())).thenReturn(tag);
|
||||
|
||||
gh = new Greenhouse();
|
||||
// 4x4x4 greenhouse
|
||||
BoundingBox bb = BoundingBox.of(new Vector(0,0,0), new Vector(6,5,6));
|
||||
|
@ -64,22 +83,28 @@ public class EcoSystemManagerTest {
|
|||
// Liquid false
|
||||
when(air.isEmpty()).thenReturn(true);
|
||||
when(air.isPassable()).thenReturn(true);
|
||||
when(air.getRelative(eq(BlockFace.UP))).thenReturn(air);
|
||||
when(air.getRelative(BlockFace.UP)).thenReturn(air);
|
||||
// Plant
|
||||
// Empty false
|
||||
// Liquid false
|
||||
when(plant.isPassable()).thenReturn(true);
|
||||
when(plant.getRelative(eq(BlockFace.UP))).thenReturn(air);
|
||||
when(plant.getRelative(BlockFace.UP)).thenReturn(air);
|
||||
// Liquid
|
||||
// Empty false
|
||||
when(liquid.isLiquid()).thenReturn(true);
|
||||
when(liquid.isPassable()).thenReturn(true);
|
||||
when(liquid.getRelative(eq(BlockFace.UP))).thenReturn(air);
|
||||
when(liquid.getRelative(BlockFace.UP)).thenReturn(air);
|
||||
// Default for block
|
||||
// Empty false
|
||||
// Passable false
|
||||
// Liquid false
|
||||
when(block.getRelative(eq(BlockFace.UP))).thenReturn(air);
|
||||
when(block.getRelative(BlockFace.UP)).thenReturn(air);
|
||||
|
||||
// Recipe
|
||||
when(recipe.noMobs()).thenReturn(true);
|
||||
PowerMockito.mockStatic(RecipeManager.class, Mockito.RETURNS_MOCKS);
|
||||
when(RecipeManager.getBiomeRecipies(any())).thenReturn(Optional.of(recipe));
|
||||
|
||||
|
||||
eco = new EcoSystemManager(null, null);
|
||||
}
|
||||
|
@ -195,4 +220,57 @@ public class EcoSystemManagerTest {
|
|||
assertEquals(liquid, value.block());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.greenhouses.managers.EcoSystemManager#addMobs(Greenhouse)}.
|
||||
*/
|
||||
@Test
|
||||
public void testAddMobsChunkNotLoaded() {
|
||||
assertFalse(eco.addMobs(gh));
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.greenhouses.managers.EcoSystemManager#addMobs(Greenhouse)}.
|
||||
*/
|
||||
@Test
|
||||
public void testAddMobsChunkLoadedNoMobs() {
|
||||
when(world.isChunkLoaded(anyInt(), anyInt())).thenReturn(true);
|
||||
assertFalse(eco.addMobs(gh));
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.greenhouses.managers.EcoSystemManager#addMobs(Greenhouse)}.
|
||||
*/
|
||||
@Test
|
||||
public void testAddMobsChunkLoadedWithMobsInRecipeMaxMobsZero() {
|
||||
when(world.isChunkLoaded(anyInt(), anyInt())).thenReturn(true);
|
||||
when(recipe.noMobs()).thenReturn(false);
|
||||
assertFalse(eco.addMobs(gh));
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.greenhouses.managers.EcoSystemManager#addMobs(Greenhouse)}.
|
||||
*/
|
||||
@Test
|
||||
public void testAddMobsChunkLoadedWithMobsInRecipeMaxMobsNotZero() {
|
||||
// Nothing spawned here
|
||||
when(world.isChunkLoaded(anyInt(), anyInt())).thenReturn(true);
|
||||
when(recipe.noMobs()).thenReturn(false);
|
||||
when(recipe.getMaxMob()).thenReturn(10);
|
||||
assertFalse(eco.addMobs(gh));
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.greenhouses.managers.EcoSystemManager#addMobs(Greenhouse)}.
|
||||
*/
|
||||
@Test
|
||||
public void testAddMobsSpawnMob() {
|
||||
// Nothing spawned here
|
||||
when(world.isChunkLoaded(anyInt(), anyInt())).thenReturn(true);
|
||||
when(recipe.noMobs()).thenReturn(false);
|
||||
when(recipe.getMaxMob()).thenReturn(10);
|
||||
when(recipe.spawnMob(any())).thenReturn(true);
|
||||
assertTrue(eco.addMobs(gh));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -71,12 +71,14 @@ public class GreenhouseFinderTest {
|
|||
when(Tag.TRAPDOORS.isTagged(Material.BIRCH_TRAPDOOR)).thenReturn(true);
|
||||
// Declare mock after mocking Bukkit
|
||||
roof = mock(Roof.class);
|
||||
when(roof.roofBlocks(any())).thenCallRealMethod();
|
||||
// Location
|
||||
when(location.getBlockX()).thenReturn(5);
|
||||
when(location.getBlockY()).thenReturn(14);
|
||||
when(location.getBlockZ()).thenReturn(25);
|
||||
when(location.getWorld()).thenReturn(world);
|
||||
|
||||
// Addon
|
||||
when(addon.wallBlocks(any())).thenCallRealMethod();
|
||||
// Block
|
||||
when(cache.getBlockType(any())).thenReturn(Material.GLASS);
|
||||
when(cache.getBlockType(anyInt(), anyInt(), anyInt())).thenReturn(Material.GLASS);
|
||||
|
@ -94,7 +96,7 @@ public class GreenhouseFinderTest {
|
|||
when(cache.getMaxHeight()).thenReturn(30);
|
||||
|
||||
|
||||
gf = new GreenhouseFinder();
|
||||
gf = new GreenhouseFinder(addon);
|
||||
cc = new CounterCheck();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue