Removes twerking in Nether and End

Fixes #10
BentoBoxWorld · Mar 4, 2020 · 4779c2a · 4779c2a
1 parent 3e60a87
commit 4779c2a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -47,7 +47,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <powermock.version>1.7.4</powermock.version>
+        <powermock.version>2.0.4</powermock.version>
         <!-- More visible way how to change dependency versions -->
         <spigot.version>1.15-R0.1-SNAPSHOT</spigot.version>
         <bentobox.version>1.9.0</bentobox.version>
@@ -146,6 +146,25 @@
             <version>${bentobox.version}</version>
             <scope>provided</scope>
         </dependency>
+        <!-- Mockito (Unit testing) -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.0.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 

diff --git a/src/main/java/world/bentobox/twerk/TwerkingForTrees.java b/src/main/java/world/bentobox/twerk/TwerkingForTrees.java
@@ -4,7 +4,7 @@
 import world.bentobox.bentobox.api.configuration.Config;
 import world.bentobox.twerk.listeners.TreeGrowListener;
 
-public final class TwerkingForTrees extends Addon {
+public class TwerkingForTrees extends Addon {
 
     // Settings
     private Settings settings;

diff --git a/src/main/java/world/bentobox/twerk/listeners/TreeGrowListener.java b/src/main/java/world/bentobox/twerk/listeners/TreeGrowListener.java
@@ -15,6 +15,7 @@
 import org.bukkit.Material;
 import org.bukkit.Tag;
 import org.bukkit.TreeType;
+import org.bukkit.World.Environment;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.event.EventHandler;
@@ -77,7 +78,7 @@ public TreeGrowListener(@NonNull TwerkingForTrees addon) {
         runChecker();
     }
 
-    private void runChecker() {
+    protected void runChecker() {
         // Every two seconds
         Bukkit.getScheduler().runTaskTimer(addon.getPlugin(), () -> {
             isTwerking = twerkCount.entrySet().stream().filter(e -> e.getValue() > addon.getSettings().getMinimumTwerks()).map(Map.Entry::getKey).collect(Collectors.toSet());
@@ -96,7 +97,7 @@ private void runChecker() {
         , 10L, 400L);
     }
 
-    private void growTree(Block b) {
+    protected void growTree(Block b) {
         Material t = b.getType();
         if (!Tag.SAPLINGS.isTagged(t)) {
             return;
@@ -122,7 +123,7 @@ private void growTree(Block b) {
         }
     }
 
-    private boolean bigTreeSaplings(Block b) {
+    protected boolean bigTreeSaplings(Block b) {
         TreeType type = SAPLING_TO_BIG_TREE_TYPE.get(b.getType());
         for (List<BlockFace> q : QUADS) {
             if (q.stream().map(b::getRelative).allMatch(c -> c.getType().equals(b.getType()))) {
@@ -148,13 +149,14 @@ private boolean bigTreeSaplings(Block b) {
         return false;
     }
 
-    private void showSparkles(Block b) {
+    protected void showSparkles(Block b) {
         AROUND.stream().map(b::getRelative).map(Block::getLocation).forEach(x -> x.getWorld().playEffect(x, addon.getSettings().getEffectsTwerk(), 0));
     }
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onTreePlant(BlockPlaceEvent e) {
-        if (!addon.getPlugin().getIWM().inWorld(Util.getWorld(e.getBlock().getWorld()))
+        if (!e.getBlock().getWorld().getEnvironment().equals(Environment.NORMAL)
+                || !addon.getPlugin().getIWM().inWorld(Util.getWorld(e.getBlock().getWorld()))
                 || !Tag.SAPLINGS.isTagged(e.getBlock().getType())) {
             return;
         }
@@ -174,7 +176,8 @@ public void onTreeGrow(StructureGrowEvent e) {
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onTwerk(PlayerToggleSneakEvent e) {
-        if (!addon.getPlugin().getIWM().inWorld(Util.getWorld(e.getPlayer().getWorld()))
+        if (!e.getPlayer().getWorld().getEnvironment().equals(Environment.NORMAL)
+                || !addon.getPlugin().getIWM().inWorld(Util.getWorld(e.getPlayer().getWorld()))
                 || e.getPlayer().isFlying()) {
             return;
         }