1.3 - Fix Veinmining

Author: Setloth

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.setloth</groupId>
     <artifactId>ModificationMaster</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
     <packaging>jar</packaging>
 
     <name>ModificationMaster</name>

src/main/java/me/setloth/modificationMaster/ModificationMaster.java

@@ -2,6 +2,7 @@
 
 import me.setloth.modificationMaster.commands.Sort;
 import me.setloth.modificationMaster.listeners.BlockBreaking;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.Objects;
@@ -10,20 +11,29 @@
 @SuppressWarnings("unused")
 public final class ModificationMaster extends JavaPlugin {
 
+  static ModificationMaster INSTANCE;
+  public static Plugin instance() {
+    return INSTANCE;
+  }
+
   @Override
   public void onEnable() {
+    INSTANCE = this;
     // Plugin startup logic
-    Logger.getLogger("MM").info("Registering Events");
+    log("Registering Events");
     getServer().getPluginManager().registerEvents(new BlockBreaking(), this);
-    Logger.getLogger("MM").info("Registering Commands");
+    log("Registering Commands");
     Objects.requireNonNull(getServer().getPluginCommand("sort")).setExecutor(new Sort());
 
   }
 
   @Override
   public void onDisable() {
     // Plugin shutdown logic
-    Logger.getLogger("MM").info("Goodbye :(");
+    log("Goodbye :(");
+  }
 
+  public static void log(String msg) {
+    Logger.getLogger("MM").info(msg);
   }
 }

src/main/java/me/setloth/modificationMaster/util/Utility.java

@@ -3,12 +3,12 @@
 import java.util.*;
 
 import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
 
 public class Utility {
 
@@ -24,52 +24,45 @@ public static boolean isVeinBlock(Material m) {
   }
 
 
-  public static void destroyBranch(Player p, Block startBlock, boolean down) {
-    Material blockType = startBlock.getType();  // Type of block to match
-    Set<Block> visited = new HashSet<>();  // Tracks blocks we've already processed
-    Deque<Block> toVisit = new ArrayDeque<>();  // BFS queue to process blocks layer by layer (ArrayDeque is used for efficiency)
-
-    // Initialize with the starting block
-    toVisit.add(startBlock);
-    visited.add(startBlock);
+  public static void destroyBranch(Player p, Block b, boolean down) {
+    Material branchType = b.getType();
+    final Queue<Block> blocksToDestroy = new LinkedList<>();
+    final Set<Block> processedBlocks = new HashSet<>();
+    blocksToDestroy.add(b);
 
-    while (!toVisit.isEmpty()) {
-      Block currentBlock = toVisit.poll();  // Remove and process the current block
+    while (!blocksToDestroy.isEmpty()) {
+      Block currentBlock = blocksToDestroy.remove();
+      Material currentBlockType = currentBlock.getType();
 
-      // Ensure the block type still matches
-      if (!currentBlock.getType().equals(blockType)) continue;
+      if (processedBlocks.contains(currentBlock) || currentBlockType != branchType) continue;
 
-      // Try to break the block
-      boolean broken = p.breakBlock(currentBlock);
-      if (!broken) continue;  // If the block couldn't be broken, skip it
+      processedBlocks.add(currentBlock);
 
-      // Check all adjacent blocks within a 3x3x3 cube around the current block
       for (int x = -1; x <= 1; x++) {
-        for (int y = (down ? -1 : 0); y <= 1; y++) {  // If 'down' is true, check below
-          for (int z = -1; z <= 1; z++) {
-            // Skip the current block itself (x == 0, y == 0, z == 0)
-            if (x == 0 && y == 0 && z == 0) continue;
-
+        for (int z = -1; z <= 1; z++) {
+          for (int y = (down ? -1 : 0); y <= 1; y++) {
             Block neighbor = currentBlock.getRelative(x, y, z);
-
-            // If the neighbor is the same block type and hasn't been visited, add it to the deque
-            if (!visited.contains(neighbor) && neighbor.getType().equals(blockType)) {
-              toVisit.add(neighbor);  // Add to the end of the deque
-              visited.add(neighbor);  // Mark it as visited immediately to avoid re-adding it
+            if (neighbor.getType() == branchType) {
+              blocksToDestroy.add(neighbor);
             }
           }
         }
       }
+
+      currentBlock.breakNaturally(p.getInventory().getItemInMainHand());
+
     }
   }
 
+
   /**
    * Sorts and combines an array of ItemStacks.
    *
    * @param items      the ItemStack array to sort and combine
    * @return the sorted and combined ItemStack array
    */
-  @SuppressWarnings("all")
+
+@SuppressWarnings("all")
   public static ItemStack[] sortAndCombine(ItemStack[] items) {
     // Map to store item counts with metadata as the key
     Map<ItemStack, Integer> itemCount = new HashMap<>();

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: ModificationMaster
-version: 1.2
+version: 1.3
 main: me.setloth.modificationMaster.ModificationMaster
 api-version: '1.21'
 authors: [ Setloth ]