Merge branch 'Norbit4:master' into ver/1.0

Author: Biquaternions

README.md

@@ -28,7 +28,8 @@
   **Cut down trees in a more realistic way! 🪓🌳**    
 
   <a href="https://github.com/Norbit4/TreeCuter/" target="_blank" rel="noreferrer"> 
-  <img src="https://github.com/Norbit4/TreeCuter/assets/46154743/8f97482e-d239-427c-8398-c61ba2c815ed" width=50" alt="logo"/></a>
+  <img src="https://github.com/user-attachments/assets/69402d75-9b03-4b39-9845-4f19c1de8509" width=300" alt="logo"/></a>
+
                                                                                                                 
   ⚠️**DEAFULT**: You need use **SHIFT** key to cut tree!
 </div> 

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'pl.norbit'
-version = 'v2.2.0'
+version = 'v2.3.1'
 
 repositories {
     mavenCentral()

src/main/java/pl/norbit/treecuter/config/Settings.java

@@ -49,6 +49,8 @@ public class Settings {
     @Getter
     private static boolean shiftMining;
     @Getter
+    private static boolean checkNaturalTree;
+    @Getter
     private static boolean applyMiningEffect;
     @Getter
     private static boolean hideMiningEffect;
@@ -202,6 +204,7 @@ public static void loadConfig(boolean reload) {
 
         maxBlocks = config.getInt("max-blocks");
         minBlocks = config.getInt("min-blocks");
+        checkNaturalTree = config.getBoolean("check-natural-tree");
 
         shiftMining = config.getBoolean("shift-mining");
 

src/main/java/pl/norbit/treecuter/service/LeafDecayService.java

@@ -1,11 +1,8 @@
 package pl.norbit.treecuter.service;
 
-import com.nexomc.nexo.api.NexoBlocks;
-import com.nexomc.nexo.mechanics.custom_block.CustomBlockMechanic;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.type.Leaves;
-import org.codehaus.plexus.util.cli.StreamFeeder;
 import pl.norbit.treecuter.config.Settings;
 import pl.norbit.treecuter.config.model.CutShape;
 import pl.norbit.treecuter.utils.item.ItemsAdderUtils;
@@ -87,7 +84,7 @@ public static void scanLeaves(List<Block> blocks, CutShape cutShape) {
             Set<String> woodBlocks = new HashSet<>(cutShape.getAcceptBlocks());
 
             for (Block leaf : leaves) {
-                if (isLeafDecaying(leaf, woodBlocks)) {
+                if (checkBlock(leaf, woodBlocks)) {
                     decayLeaves.add(leaf);
                 }
             }
@@ -98,7 +95,7 @@ public static void scanLeaves(List<Block> blocks, CutShape cutShape) {
         });
     }
 
-    private static boolean isLeafDecaying(Block b, Set<String> woodBlocks) {
+    private static boolean checkBlock(Block b, Set<String> woodBlocks) {
         if (b.getBlockData() instanceof Leaves leaves) {
 
             if (leaves.isPersistent()) {
@@ -113,6 +110,14 @@ private static boolean isLeafDecaying(Block b, Set<String> woodBlocks) {
         return false;
     }
 
+    public static boolean isLeaves(Block b) {
+        if (b.getBlockData() instanceof Leaves leaves) {
+
+            return !leaves.isPersistent();
+
+        } else return Settings.isAcceptedCustomLeavesBlock(b);
+    }
+
     private static boolean hasNearby(Block block, Set<String> materials, int[][] offsets){
         for (int[] off : offsets) {
 

src/main/java/pl/norbit/treecuter/service/TreeCutService.java

@@ -1,7 +1,5 @@
 package pl.norbit.treecuter.service;
 
-import com.nexomc.nexo.api.NexoBlocks;
-import com.nexomc.nexo.mechanics.custom_block.CustomBlockMechanic;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -103,6 +101,10 @@ public static void selectTreeByBlock(Block b, Player p, CutShape shape, ItemStac
 
         List<Block> blocks = BlockUtils.getWoodBlocksAround(new ArrayList<>(), b, maxBlock, shape);
 
+        if(blocks == null){
+            return;
+        }
+
         if(blocks.size() < Settings.getMinBlocks()){
             selectedMap.remove(p.getUniqueId());
             return;
@@ -219,7 +221,6 @@ private static void breakBlock(Player p, Block b){
     }
 
     private static void updateItem(Player p, int durabilityDamage){
-
         PlayerInventory inventory = p.getInventory();
 
         ItemStack item = inventory.getItemInMainHand();

src/main/java/pl/norbit/treecuter/utils/BlockUtils.java

@@ -4,6 +4,7 @@
 import org.bukkit.block.BlockFace;
 import pl.norbit.treecuter.config.Settings;
 import pl.norbit.treecuter.config.model.CutShape;
+import pl.norbit.treecuter.service.LeafDecayService;
 
 import java.util.*;
 
@@ -49,7 +50,7 @@ public static List<Block> getWoodBlocksAround(List<Block> blocks, Block start, i
                 getDiagonalBlocks(blocks, queue, visited, relative, max, woodBlocks);
             }
         }
-        return blocks;
+        return hasLeavesOnTop(blocks) ? blocks : null;
     }
 
     private static void getDiagonalBlocks(List<Block> blocks,
@@ -76,6 +77,43 @@ private static void getDiagonalBlocks(List<Block> blocks,
         }
     }
 
+    private static boolean hasLeavesOnTop(List<Block> woodBlocks) {
+        if (!Settings.isCheckNaturalTree()) {
+            return true;
+        }
+
+        int maxY = woodBlocks.stream()
+                .mapToInt(Block::getY)
+                .max()
+                .orElse(Integer.MIN_VALUE);
+
+        for (Block wood : woodBlocks) {
+            if (wood.getY() >= maxY - 2 && hasNearbyLeaves(wood)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean hasNearbyLeaves(Block block) {
+        for (int x = -2; x <= 2; x++) {
+            for (int y = -1; y <= 2; y++) {
+                for (int z = -2; z <= 2; z++) {
+
+                    if (x == 0 && y == 0 && z == 0) {
+                        continue;
+                    }
+
+                    if (LeafDecayService.isLeaves(block.getRelative(x, y, z))) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
     private static void checkBlock(List<Block> blocks,
                                    Deque<Block> queue,
                                    Set<Block> visited,

src/main/java/pl/norbit/treecuter/utils/CoreProtectUtils.java

@@ -7,13 +7,19 @@
 
 public class CoreProtectUtils {
 
-    private CoreProtectUtils() {
-        throw new IllegalStateException("This class cannot be instantiated");
-    }
+    private CoreProtectUtils() {}
 
     public static CoreProtectAPI getCoreProtect() {
         Plugin plugin = TreeCuter.getInstance().getServer().getPluginManager().getPlugin("CoreProtect");
 
+        if(plugin == null){
+            return null;
+        }
+
+        if(!plugin.isEnabled()){
+            return null;
+        }
+
         // Check that CoreProtect is loaded
         if (!(plugin instanceof CoreProtect)) {
             return null;

src/main/resources/config.yml

@@ -50,6 +50,11 @@ max-blocks: 150
 # min blocks to cut at once
 min-blocks: 4
 
+# Beta feature - may not work correctly.
+# Checks if leaves are present near the top part of the detected tree.
+# Prevents cutting player-built log structures.
+check-natural-tree: true
+
 # if true, the player must hold shift to cut down trees
 shift-mining: true # true <- recommended