From 690ac3ce6f5d8f5afc7a17ee771f6c96aebe6131 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sun, 24 Nov 2024 14:07:16 -0800
Subject: [PATCH] Update to fix config for sounds and trees not generating.

---
 .../twerk/listeners/TreeGrowListener.java     | 23 ++++++++++++++-----
 src/main/resources/config.yml                 |  8 +++----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/main/java/world/bentobox/twerk/listeners/TreeGrowListener.java b/src/main/java/world/bentobox/twerk/listeners/TreeGrowListener.java
index 5755b43..343261d 100644
--- a/src/main/java/world/bentobox/twerk/listeners/TreeGrowListener.java
+++ b/src/main/java/world/bentobox/twerk/listeners/TreeGrowListener.java
@@ -9,6 +9,7 @@
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import org.bukkit.Bukkit;
@@ -20,6 +21,7 @@
 import org.bukkit.World.Environment;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -32,6 +34,7 @@
 
 import com.google.common.base.Enums;
 
+import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.lists.Flags;
 import world.bentobox.bentobox.util.Util;
@@ -132,18 +135,16 @@ protected void growTree(Block b) {
         }
         if (SAPLING_TO_TREE_TYPE.containsKey(t)) {
             TreeType type = SAPLING_TO_TREE_TYPE.getOrDefault(b.getType(), TreeType.TREE);
+            BentoBox.getInstance().logDebug("Setting " + b + " mat " + t + " to air");
             b.setType(Material.AIR);
-
-            if (b.getWorld().generateTree(b.getLocation(), RAND, type,
-                    bs -> bs.getType() != Material.DIRT
-                            && (Flags.TREES_GROWING_OUTSIDE_RANGE.isSetForWorld(bs.getWorld())
-                                    || addon.getIslands().getProtectedIslandAt(bs.getLocation()).isPresent()))) {
+            if (b.getWorld().generateTree(b.getLocation(), RAND, type, (Predicate<BlockState>) this::checkPlace)) {
                 if (addon.getSettings().isEffectsEnabled()) {
                     showSparkles(b);
                 }
                 if (addon.getSettings().isSoundsEnabled()) {
                     b.getWorld().playSound(b.getLocation(), addon.getSettings().getSoundsGrowingSmallTreeSound(),
-                            (float)addon.getSettings().getSoundsGrowingSmallTreeVolume(), (float)addon.getSettings().getSoundsGrowingSmallTreePitch());
+                            (float) addon.getSettings().getSoundsGrowingSmallTreeVolume(),
+                            (float) addon.getSettings().getSoundsGrowingSmallTreePitch());
                 }
             } else {
                 // Tree generation failed, so reset block
@@ -152,6 +153,16 @@ protected void growTree(Block b) {
         }
     }
 
+    private Boolean checkPlace(BlockState bs) {
+        System.out.println("Not Dirt " + (bs.getType() != Material.DIRT));
+        System.out.println("Outside range flag set? " + Flags.TREES_GROWING_OUTSIDE_RANGE.isSetForWorld(bs.getWorld()));
+        System.out.println("Inside island? " + addon.getIslands().getProtectedIslandAt(bs.getLocation()).isPresent());
+        System.out.println("Overall = " + (bs.getType() != Material.DIRT && (Flags.TREES_GROWING_OUTSIDE_RANGE.isSetForWorld(bs.getWorld())
+                || addon.getIslands().getProtectedIslandAt(bs.getLocation()).isPresent())));
+        return bs.getType() != Material.DIRT && (Flags.TREES_GROWING_OUTSIDE_RANGE.isSetForWorld(bs.getWorld())
+                || addon.getIslands().getProtectedIslandAt(bs.getLocation()).isPresent());
+    }
+
     protected boolean bigTreeSaplings(Block b) {
         Material treeType = b.getType();
         TreeType type = SAPLING_TO_BIG_TREE_TYPE.get(treeType);
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 78ebee4..0a85c0a 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,5 +1,5 @@
 # TwerkingForTrees configuration file. {$version}
-# 
+#
 # How many times the player must twerk before the tree start growing faster.
 # If the player has not twerked enough, then the tree will not grow faster.
 minimum-twerks: 4
@@ -17,21 +17,21 @@ sounds:
     # Sound that plays when the player twerked enough for the sapling to start growing faster.
     # Available sounds are the following:
     #    https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Sound.html
-    sound: BLOCK_NOTE_BLOCK_BASS
+    sound: block.note_block.bass
     volume: 1.0
     pitch: 2.0
   growing-small-tree:
     # Sound that plays when a small tree (1x1) grows.
     # Available sounds are the following:
     #    https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Sound.html
-    sound: BLOCK_BUBBLE_COLUMN_UPWARDS_AMBIENT
+    sound: block.bubble_column.upwards_ambient
     volume: 1.0
     pitch: 1.0
   growing-big-tree:
     # Sound that plays when a big tree (2x2) grows.
     # Available sounds are the following:
     #    https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Sound.html
-    sound: BLOCK_BUBBLE_COLUMN_UPWARDS_AMBIENT
+    sound: block.bubble_column.upwards_ambient
     volume: 1.0
     pitch: 1.0
 effects: