Mcmmo herbalism

Author: MrButtersDEV

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>us.thezircon.play</groupId>
     <artifactId>AutoPickup</artifactId>
-    <version>1.3.13-SNAPSHOT</version>
+    <version>1.3.14-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>AutoPickup</name>
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>world.bentobox</groupId>
             <artifactId>bentobox</artifactId>
-            <version>1.16.1</version>
+            <version>1.21.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/us/thezircon/play/autopickup/listeners/BlockBreakEventListener.java

@@ -225,6 +225,53 @@ public void run() {
         ArrayList<Material> verticalReq = crops.getVerticalReq();
         ArrayList<Material> verticalReqDown = crops.getVerticalReqDown();
 
+        // TEST START
+        Location l = e.getBlock().getLocation();
+        //Deal with kelp
+
+        if(e.getBlock().getType() == Material.KELP_PLANT || e.getBlock().getType().equals(Material.KELP) || e.getBlock().getType() == Material.BAMBOO) {
+            Location lnew = l.clone();
+            do {
+                lnew.setY(lnew.getY()+1);
+                if(lnew.getBlock().getType() == Material.KELP_PLANT || lnew.getBlock().getType().equals(Material.KELP) || lnew.getBlock().getType() == Material.BAMBOO) {
+                    addLocation(lnew, e.getPlayer());
+                }
+                else {
+                    break;
+                }
+            } while (true);
+            addLocation(lnew, e.getPlayer());
+        }
+        //deal with cactus
+        if (e.getBlock().getType() == Material.CACTUS || e.getBlock().getType() == Material.SAND) {
+            Location lnew = l.clone();
+            do {
+                lnew.setY(lnew.getY() + 1);
+                if (lnew.getBlock().getType() == Material.CACTUS) {
+                    addLocation(lnew, e.getPlayer());
+                } else {
+                    break;
+                }
+            } while (true);
+            addLocation(lnew, e.getPlayer());
+        }
+
+        //deal with sugarcane
+        if (e.getBlock().getType() == Material.SUGAR_CANE || e.getBlock().getType() == Material.GRASS || e.getBlock().getType() == Material.SAND) {
+            Location lnew = l.clone();
+            do {
+                lnew.setY(lnew.getY() + 1);
+                if (lnew.getBlock().getType() == Material.SUGAR_CANE) {
+                    addLocation(lnew, e.getPlayer());
+                } else {
+                    break;
+                }
+            } while (true);
+            addLocation(lnew, e.getPlayer());
+        }
+
+        // TEST END
+
         if (verticalReq.contains(e.getBlock().getType()) || verticalReqDown.contains(e.getBlock().getType())) {
             e.setDropItems(false);
             vertBreak(player, e.getBlock().getLocation());
@@ -308,4 +355,9 @@ private static void vertBreak(Player player, Location loc) {
 
     }
 
+    private void addLocation(Location loc, Player player) {
+        String key = loc.getBlockX()+";"+loc.getBlockY()+";"+loc.getBlockZ()+";"+loc.getWorld();
+        AutoPickup.customItemPatch.put(key, new PickupObjective(loc, player, Instant.now()));
+    }
+
 }

src/main/java/us/thezircon/play/autopickup/utils/TallCrops.java

@@ -11,10 +11,10 @@ public class TallCrops {
     public ArrayList<Material> verticalReqDown = new ArrayList<>();
 
     public TallCrops () {
-        verticalReq.add(Material.SUGAR_CANE);
-        verticalReq.add(Material.CACTUS);
-        verticalReq.add(Material.KELP);
-        verticalReq.add(Material.KELP_PLANT);
+        //verticalReq.add(Material.SUGAR_CANE);
+        //verticalReq.add(Material.CACTUS);
+        //verticalReq.add(Material.KELP);
+        //verticalReq.add(Material.KELP_PLANT);
 
         if (Bukkit.getVersion().contains("1.18") || Bukkit.getVersion().contains("1.19")) {
             verticalReqDown.add(Material.WEEPING_VINES);

target/classes/plugin.yml

@@ -1,5 +1,5 @@
 name: AutoPickup
-version: 1.3.13-SNAPSHOT
+version: 1.3.14-SNAPSHOT
 main: us.thezircon.play.autopickup.AutoPickup
 prefix: AutoPickup
 authors: [BUTTERFIELD8]