Multiple leaves per log & removed leaves list config

Author: KartoffelChipss

src/main/java/com/zetaplugins/timberz/service/MaterialTypeChecks.java

@@ -14,8 +14,18 @@
 public final class MaterialTypeChecks {
     private MaterialTypeChecks() {}
 
+    /**
+     * Checks if a material is a leaf block based on the configuration
+     * @param material The material to check
+     * @param blocksConfig The blocks configuration
+     * @return True if the material is a leaf block, false otherwise
+     */
     public static boolean isLeafBlock(Material material, FileConfiguration blocksConfig) {
-        List<String> leafBlocks = blocksConfig.getStringList("leafBlocks");
+        List<String> leafBlocks = blocksConfig.getStringList("logToLeafMap").stream()
+                .filter(entry ->entry.contains(":"))
+                .map(entry -> entry.split(":")[1])
+                .filter(leaf -> !leaf.isEmpty())
+                .toList();
 
         for (String leafBlock : leafBlocks) {
             if (material.toString().equalsIgnoreCase(leafBlock)) {

src/main/java/com/zetaplugins/timberz/service/TreeDetectionService.java

@@ -17,7 +17,7 @@ public final class TreeDetectionService {
     private final int MIN_LOGS_REQUIRED;
 
     // Maps log types to their corresponding leaf types
-    private final Map<Material, Material> LOG_TO_LEAF_MAP = new HashMap<>();
+    private final Map<Material, List<Material>> LOG_TO_LEAF_MAP = new HashMap<>();
 
     public TreeDetectionService(TimberZ plugin) {
         this.plugin = plugin;
@@ -45,7 +45,9 @@ public void fetchLogToLeaveMap() {
 
             Material logType = Material.getMaterial(parts[0].toUpperCase());
             Material leafType = Material.getMaterial(parts[1].toUpperCase());
-            if (logType != null && leafType != null) LOG_TO_LEAF_MAP.put(logType, leafType);
+            if (logType != null && leafType != null) {
+                LOG_TO_LEAF_MAP.computeIfAbsent(logType, k -> new ArrayList<>()).add(leafType);
+            }
         }
     }
 
@@ -57,9 +59,9 @@ public void fetchLogToLeaveMap() {
      */
     public Set<Block> identifyTreeStructure(Block sourceBlock) {
         Material sourceType = sourceBlock.getType();
-        Material matchingLeafType = LOG_TO_LEAF_MAP.get(sourceType);
+        List<Material> matchingLeafTypes = LOG_TO_LEAF_MAP.get(sourceType);
 
-        if (matchingLeafType == null) {
+        if (matchingLeafTypes == null) {
             return Collections.emptySet(); // Not a valid log type
         }
 
@@ -95,7 +97,7 @@ public Set<Block> identifyTreeStructure(Block sourceBlock) {
         }
 
         // Verify the existence of matching leaf blocks
-        boolean hasLeaves = validateLeaves(connectedLogs, matchingLeafType);
+        boolean hasLeaves = validateLeaves(connectedLogs, matchingLeafTypes);
         if (!hasLeaves) {
             return Collections.emptySet(); // No leaves found, not a tree
         }
@@ -207,7 +209,7 @@ private boolean isDiagonalConnectionValid(Block block1, Block block2, Material l
     /**
      * Validate that the connected logs have appropriate leaf blocks nearby.
      */
-    private boolean validateLeaves(Set<Block> connectedLogs, Material leafType) {
+    private boolean validateLeaves(Set<Block> connectedLogs, List<Material> leafTypes) {
         int leafCount = 0;
         Set<Block> checkedBlocks = new HashSet<>();
 
@@ -217,18 +219,14 @@ private boolean validateLeaves(Set<Block> connectedLogs, Material leafType) {
                     for (int z = -MAX_SEARCH_RADIUS; z <= MAX_SEARCH_RADIUS; z++) {
                         // Skip blocks we already checked
                         Block checkBlock = log.getRelative(x, y, z);
-                        if (checkedBlocks.contains(checkBlock)) {
-                            continue;
-                        }
+                        if (checkedBlocks.contains(checkBlock)) continue;
 
                         checkedBlocks.add(checkBlock);
 
-                        if (checkBlock.getType() == leafType) {
+                        if (leafTypes.contains(checkBlock.getType())) {
                             leafCount++;
 
-                            if (leafCount >= MIN_LEAVES_REQUIRED) {
-                                return true;
-                            }
+                            if (leafCount >= MIN_LEAVES_REQUIRED) return true;
                         }
                     }
                 }
@@ -252,7 +250,7 @@ public boolean containsLog(Material blockType){
     /**
      * Get the corresponding leaf type for a log type
      */
-    public Material getLeafType(Material logType) {
+    public List<Material> getLeafTypes(Material logType) {
         return LOG_TO_LEAF_MAP.get(logType);
     }
 }

src/main/java/com/zetaplugins/timberz/service/TreeFellerService.java

@@ -7,8 +7,6 @@
 import org.bukkit.Particle;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.type.Leaves;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.Damageable;
@@ -38,13 +36,13 @@ public void fellTree(Player player, Block sourceBlock, Set<Block> treeBlocks, It
         Material logType = sourceBlock.getType();
 
         // Get corresponding leaf type
-        Material leafType = plugin.getTreeDetectionService().getLeafType(logType);
+        List<Material> leafTypes = plugin.getTreeDetectionService().getLeafTypes(logType);
 
         // Store information about tree type for replanting
         SaplingReplanter.TreeInfo treeInfo = saplingReplanter.analyzeTreeType(sourceBlock, treeBlocks);
 
         // Collect leaf blocks associated with the tree
-        Set<Block> leafBlocks = collectLeaves(treeBlocks, leafType);
+        Set<Block> leafBlocks = collectLeaves(treeBlocks, leafTypes);
 
         // Break logs with animation (one by one with delay)
         breakTreeWithAnimation(player, treeBlocks, tool, durabilityCost);
@@ -76,7 +74,7 @@ private double distanceBetween(Block block1, Block block2) {
     /**
      * Collects leaf blocks that most likely belong to the tree being cut down
      */
-    private Set<Block> collectLeaves(Set<Block> treeBlocks, Material leafType) {
+    private Set<Block> collectLeaves(Set<Block> treeBlocks, List<Material> leafType) {
         Set<Block> leafBlocks = new HashSet<>();
         Set<Block> checkedBlocks = new HashSet<>();
         Set<Block> otherTreeLogs = new HashSet<>();
@@ -99,7 +97,7 @@ private Set<Block> collectLeaves(Set<Block> treeBlocks, Material leafType) {
 
                         checkedBlocks.add(checkBlock);
 
-                        if (checkBlock.getType() == leafType) {
+                        if (leafType.contains(checkBlock.getType())) {
                             leafBlocks.add(checkBlock);
                         } else if (plugin.getTreeDetectionService().containsLog(checkBlock.getType()) && !treeBlocks.contains(checkBlock)) {
                             // This is a log block that's not part of our tree - potential other tree

src/main/resources/blocks.yml

@@ -36,16 +36,6 @@ logToSaplingMap:
   - "STRIPPED_CHERRY_LOG:CHERRY_SAPLING"
   - "PALE_OAK_LOG:PALE_OAK_SAPLING"
 
-leafBlocks:
-  - "OAK_LEAVES"
-  - "BIRCH_LEAVES"
-  - "SPRUCE_LEAVES"
-  - "JUNGLE_LEAVES"
-  - "ACACIA_LEAVES"
-  - "DARK_OAK_LEAVES"
-  - "MANGROVE_LEAVES"
-  - "CHERRY_LEAVES"
-
 axes:
   - "WOODEN_AXE"
   - "STONE_AXE"