Updated Enums

Author: MrButtersDEV

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>us.thezircon.play</groupId>
     <artifactId>AutoPickup</artifactId>
-    <version>1.4.6-SNAPSHOT</version>
+    <version>1.4.7-DEVBUILD.1</version>
     <packaging>jar</packaging>
 
     <name>AutoPickup</name>
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.20-R0.1-SNAPSHOT</version>
+            <version>1.21.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/us/thezircon/play/autopickup/api/AutoAPI.java

@@ -1,19 +1,43 @@
 package us.thezircon.play.autopickup.api;
 
+import org.bukkit.Location;
 import org.bukkit.entity.Item;
+import org.bukkit.entity.Player;
 import us.thezircon.play.autopickup.AutoPickup;
+import us.thezircon.play.autopickup.utils.PickupObjective;
 
+import java.time.Instant;
 import java.util.UUID;
 
 public class AutoAPI {
 
+    /**
+     * @deprecated Experimental API; This api has not been tested & officially supported / may be removed.
+     * @param itemEntity The Item Entity that should be ignored by AutoPickup
+     */
     public static void addIgnoredDrop(Item itemEntity) {
         UUID uuid = itemEntity.getUniqueId();
         addIgnoredDrop(uuid);
     }
 
+    /**
+     * @deprecated Experimental API; This api has not been tested & officially supported / may be removed.
+     * @param itemEntityUUID UUID of an item entity that should be ignored by AutoPickup
+     */
     public static void addIgnoredDrop(UUID itemEntityUUID) {
         AutoPickup.droppedItems.add(itemEntityUUID);
     }
 
+    /**
+     * @param location The location that should be watched for possible custom drops.
+     * @param player The player who broke said block.
+     * @deprecated Experimental API; This api has not been tested & officially supported / may be removed.
+     *
+     * Blocks broken by players are already tagged for custom drops; this should be used for adjacent blocks that should be watched for additional custom drops.
+     */
+    public static void tagCustomDropLocation(Location location, Player player) {
+        String key = location.getBlockX()+";"+location.getBlockY()+";"+location.getBlockZ()+";"+location.getWorld();
+        AutoPickup.customItemPatch.put(key, new PickupObjective(location, player, Instant.now()));
+    }
+
 }

src/main/java/us/thezircon/play/autopickup/commands/AutoPickup/Auto.java

@@ -30,7 +30,6 @@ public Auto(){
     public ArrayList<CMDManager> getSubCommands(){
         return subcommands;
     }
-
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         boolean requirePermsAUTO = PLUGIN.getConfig().getBoolean("requirePerms.autopickup");

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

@@ -324,7 +324,7 @@ public void run() {
         }
 
         //deal with sugarcane
-        if (e.getBlock().getType() == Material.SUGAR_CANE || e.getBlock().getType() == Material.GRASS || e.getBlock().getType() == Material.SAND) {
+        if (e.getBlock().getType() == Material.SUGAR_CANE || e.getBlock().getType() == Material.GRASS_BLOCK || e.getBlock().getType() == Material.SAND) {
             Location lnew = l.clone();
             do {
                 lnew.setY(lnew.getY() + 1);

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

@@ -44,7 +44,7 @@ public void onClick(PlayerInteractEvent e) {
                     @Override
                     public void run() {
                         for (Entity entity : loc.getWorld().getNearbyEntities(loc, 1, 1, 1)) {
-                            if (entity.getType().equals(EntityType.DROPPED_ITEM)) {
+                            if (entity.getType().equals(EntityType.ITEM)) {
                                 Item item = (Item) entity;
                                 ItemStack items = item.getItemStack();
                                 if (items.getType().equals(Material.SWEET_BERRIES)) {

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

@@ -6,6 +6,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.*;
 import us.thezircon.play.autopickup.AutoPickup;
+import us.thezircon.play.autopickup.api.AutoAPI;
 
 import java.util.*;
 

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

@@ -64,5 +64,6 @@ public enum Mendable {
     NETHERITE_HELMET,
     NETHERITE_CHESTPLATE,
     NETHERITE_LEGGINGS,
-    NETHERITE_BOOTS
+    NETHERITE_BOOTS,
+    MACE
 }