Upstream
/
Greenhouses
mirror of https://github.com/BentoBoxWorld/Greenhouses.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove some code smells.

This commit is contained in:
tastybento 2022-03-20 15:09:45 +00:00
parent 6f6745e849
commit 8af2b2057d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/world/bentobox/greenhouses/Greenhouses.java
View File

@ -92,8 +92,8 @@ public class Greenhouses extends Addon {
*/ */
@Override @Override
public void onDisable() { public void onDisable() {
if (manager != null) { if (manager != null && manager.getEcoMgr() != null) {
if (manager.getEcoMgr() != null) manager.getEcoMgr().cancel(); manager.getEcoMgr().cancel();
} }
} }

6
src/main/java/world/bentobox/greenhouses/greenhouse/BiomeRecipe.java
View File

@ -419,7 +419,7 @@ public class BiomeRecipe implements Comparable<BiomeRecipe> {
* @return a list of blocks that are required for this recipe * @return a list of blocks that are required for this recipe
*/ */
public List<String> getRecipeBlocks() { public List<String> getRecipeBlocks() {
return requiredBlocks.entrySet().stream().map(en -> Util.prettifyText(en.getKey().toString()) + " x " + en.getValue()).collect(Collectors.toList()); return requiredBlocks.entrySet().stream().map(en -> Util.prettifyText(en.getKey().toString()) + " x " + en.getValue()).toList();
} }
/** /**
@ -471,10 +471,10 @@ public class BiomeRecipe implements Comparable<BiomeRecipe> {
private boolean canGrowOn(GrowthBlock block, GreenhousePlant p) { private boolean canGrowOn(GrowthBlock block, GreenhousePlant p) {
// Ceiling plants can only grow on ceiling blocks // Ceiling plants can only grow on ceiling blocks
if (CEILING_PLANTS.contains(p.plantMaterial()) && block.floor()) { if (CEILING_PLANTS.contains(p.plantMaterial()) && Boolean.TRUE.equals(block.floor())) {
return false; return false;
} }
return p.plantGrownOn().equals(block.block().getRelative(block.floor() ? BlockFace.DOWN : BlockFace.UP).getType()); return p.plantGrownOn().equals(block.block().getRelative(Boolean.TRUE.equals(block.floor()) ? BlockFace.DOWN : BlockFace.UP).getType());
} }
/** /**

4
src/main/java/world/bentobox/greenhouses/listeners/SnowTracker.java
View File

@ -5,6 +5,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
@ -24,7 +25,6 @@ import org.bukkit.scheduler.BukkitTask;
import org.bukkit.util.BoundingBox; import org.bukkit.util.BoundingBox;
import com.google.common.base.Enums; import com.google.common.base.Enums;
import com.google.common.base.Optional;
import world.bentobox.bentobox.util.Util; import world.bentobox.bentobox.util.Util;
import world.bentobox.greenhouses.Greenhouses; import world.bentobox.greenhouses.Greenhouses;
@ -100,7 +100,7 @@ public class SnowTracker implements Listener {
} }
private boolean placeSnow(Block b) { private boolean placeSnow(Block b) {
Optional<Material> snowCauldron = Enums.getIfPresent(Material.class, "POWDER_SNOW_CAULDRON"); Optional<Material> snowCauldron = Enums.getIfPresent(Material.class, "POWDER_SNOW_CAULDRON").toJavaUtil();
if (snowCauldron.isPresent()) { if (snowCauldron.isPresent()) {
if (b.getType().equals(Material.CAULDRON)) { if (b.getType().equals(Material.CAULDRON)) {
b.setType(snowCauldron.get()); b.setType(snowCauldron.get());