1.5 - Toggle for vein mining - workaround for no xp/player respective drops for items

/veintoggle command

Author: Setloth

pom.xml

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

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

@@ -3,12 +3,16 @@
 import me.setloth.modificationMaster.commands.Craft;
 import me.setloth.modificationMaster.commands.EndChest;
 import me.setloth.modificationMaster.commands.Sort;
+import me.setloth.modificationMaster.commands.VeinToggle;
 import me.setloth.modificationMaster.listeners.BlockBreaking;
 import me.setloth.modificationMaster.util.VersionChecker;
+import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.util.HashMap;
 import java.util.Objects;
+import java.util.UUID;
 import java.util.logging.Level;
 
 @SuppressWarnings("unused")
@@ -19,7 +23,29 @@ public static Plugin instance() {
     return INSTANCE;
   }
 
+  static HashMap<UUID, Boolean> veinToggled = new HashMap<>();
+  public static HashMap<UUID, Boolean> getVeinToggled() {
+    return veinToggled;
+  }
+
+  public static void toggleVeinPlayer(Player p) {
+    toggleVeinPlayer(p.getUniqueId());
+  }
+
+  public static void toggleVeinPlayer(UUID uuid) {
+    if (!veinToggled.containsKey(uuid)) {
+      veinToggled.put(uuid, true);
+    }
+
+    veinToggled.compute(uuid, (k, b) -> Boolean.FALSE.equals(b));
+  }
+
+  public static boolean isVeinToggled(Player p) {
+    return veinToggled.get(p.getUniqueId());
+  }
+
   @Override
+  @SuppressWarnings("all")
   public void onEnable() {
     INSTANCE = this;
     long start = System.currentTimeMillis();
@@ -44,6 +70,8 @@ public void onEnable() {
     Objects.requireNonNull(getServer().getPluginCommand("sort")).setTabCompleter(new Sort());
     Objects.requireNonNull(getServer().getPluginCommand("endchest")).setExecutor(new EndChest());
     Objects.requireNonNull(getServer().getPluginCommand("craft")).setExecutor(new Craft());
+    Objects.requireNonNull(getServer().getPluginCommand("veintoggle")).setExecutor(new VeinToggle());
+
 
     log("Done! Took: "+(System.currentTimeMillis()-start)+" ms");
 

src/main/java/me/setloth/modificationMaster/commands/VeinToggle.java

@@ -0,0 +1,21 @@
+package me.setloth.modificationMaster.commands;
+
+import me.setloth.modificationMaster.ModificationMaster;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public class VeinToggle implements CommandExecutor {
+  public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+    if (!(sender instanceof Player p)) return true;
+
+    ModificationMaster.toggleVeinPlayer(p);
+    boolean state = ModificationMaster.isVeinToggled(p);
+
+    p.sendMessage("Vein mining is now "+(state ? "enabled" : "disabled"));
+
+    return true;
+  }
+}

src/main/java/me/setloth/modificationMaster/listeners/BlockBreaking.java

@@ -1,5 +1,6 @@
 package me.setloth.modificationMaster.listeners;
 
+import me.setloth.modificationMaster.ModificationMaster;
 import me.setloth.modificationMaster.util.Utility;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -13,18 +14,26 @@ public class BlockBreaking implements Listener {
 
   @EventHandler
   public void onBlockBreak(BlockBreakEvent event) {
-    Block b = event.getBlock();
     Player p = event.getPlayer();
+
+    if (!ModificationMaster.isVeinToggled(p)) return;
+
+    Block b = event.getBlock();
+    ModificationMaster.toggleVeinPlayer(p);
+    ItemStack stack = p.getInventory().getItemInMainHand();
+
+    if (!b.isPreferredTool(stack)) return;
+
     if (Utility.isWood(b.getType())) {
-      ItemStack stack = p.getInventory().getItemInMainHand();
-      if (!b.isPreferredTool(stack)) return;
+      //if (!b.isPreferredTool(stack)) return;
       Utility.destroyBranch(p, b, false);
     }
     if (Utility.isVeinBlock(b.getType())) {
-      ItemStack stack = p.getInventory().getItemInMainHand();
-      if (!b.isPreferredTool(stack)) return;
+      //if (!b.isPreferredTool(stack)) return;
       Utility.destroyBranch(p, b, true);
     }
+
+    ModificationMaster.toggleVeinPlayer(p);
   }
 
 

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

@@ -25,6 +25,7 @@ public static boolean isVeinBlock(Material m) {
 
 
   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<>();
@@ -49,7 +50,8 @@ public static void destroyBranch(Player p, Block b, boolean down) {
         }
       }
 
-      currentBlock.breakNaturally(p.getInventory().getItemInMainHand());
+      p.breakBlock(currentBlock);
+      //currentBlock.breakNaturally(p.getInventory().getItemInMainHand());
 
     }
   }

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: ModificationMaster
-version: 1.4
+version: 1.5
 main: me.setloth.modificationMaster.ModificationMaster
 api-version: '1.21'
 authors: [ Setloth ]
@@ -15,3 +15,7 @@ commands:
     usage: /[craft(ing) | workbench]
     aliases: [crafting, workbench]
     description: Open a crafting table anywhere!
+  veintoggle:
+    usage: /veintoggle
+    aliases: [vt]
+