Merge pull request #22 from MrButtersDEV/v3_Pickup_System

V3 pickup system

Author: MrButtersDEV

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>us.thezircon.play</groupId>
     <artifactId>AutoPickup</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>AutoPickup</name>

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

@@ -1,5 +1,7 @@
 package us.thezircon.play.autopickup;
 
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -10,15 +12,16 @@
 import us.thezircon.play.autopickup.commands.AutoPickup.Auto;
 import us.thezircon.play.autopickup.commands.AutoSmelt;
 import us.thezircon.play.autopickup.listeners.*;
-import us.thezircon.play.autopickup.utils.Messages;
-import us.thezircon.play.autopickup.utils.Metrics;
-import us.thezircon.play.autopickup.utils.TallCrops;
-import us.thezircon.play.autopickup.utils.VersionChk;
+import us.thezircon.play.autopickup.utils.*;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.UnknownHostException;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 
 public final class AutoPickup extends JavaPlugin {
@@ -35,6 +38,10 @@ public final class AutoPickup extends JavaPlugin {
     public static boolean usingBentoBox = false; // BentoBox - AOneBlock Patch
     public static ArrayList<String> worldsBlacklist = null;
 
+    // Custom Items Patch
+    public static HashMap<String, PickupObjective> customItemPatch = new HashMap<>();
+    public static ArrayList<String> customItemPatchKeys = new ArrayList<>();
+
     @Override
     public void onEnable() {
         // Plugin startup logic
@@ -66,6 +73,7 @@ public void onEnable() {
         getServer().getPluginManager().registerEvents(new BlockBreakEventListener(), this);
         getServer().getPluginManager().registerEvents(new EntityDeathEventListener(), this);
         getServer().getPluginManager().registerEvents(new PlayerInteractEventListener(), this);
+        getServer().getPluginManager().registerEvents(new ItemSpawnEventListener(), this);
 
         // Commands
         getCommand("autopickup").setExecutor(new Auto());
@@ -97,6 +105,24 @@ public void run() {
         if (getBlacklistConf().contains("BlacklistedWorlds")) {
             worldsBlacklist = (ArrayList<String>) getBlacklistConf().getList("BlacklistedWorlds");
         }
+
+        // Pickup Objective Cleaner
+        Bukkit.getScheduler().scheduleSyncRepeatingTask(this, new Runnable() {
+            @Override
+            public void run() {
+
+                for (String key : customItemPatchKeys) {
+                    if (customItemPatch.containsKey(key)) {
+                        PickupObjective po = customItemPatch.get(key);
+                        if (Duration.between(Instant.now(), po.getCreatedAt()).getSeconds() < -15) {
+                            customItemPatch.remove(key);
+                            customItemPatchKeys.remove(key);
+                        }
+                    }
+                }
+
+            }
+        }, 0L, 300L); // 15 sec
     }
 
     @Override

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

@@ -1,6 +1,7 @@
 package us.thezircon.play.autopickup.listeners;
 
 import me.crafter.mc.lockettepro.LocketteProAPI;
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
@@ -20,10 +21,12 @@
 import org.bukkit.scheduler.BukkitRunnable;
 import us.thezircon.play.autopickup.AutoPickup;
 import us.thezircon.play.autopickup.utils.Mendable;
+import us.thezircon.play.autopickup.utils.PickupObjective;
 import us.thezircon.play.autopickup.utils.TallCrops;
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.database.objects.Island;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -38,6 +41,7 @@ public void onBreak(BlockBreakEvent e) {
         Location loc = e.getBlock().getLocation();
         boolean doFullInvMSG = PLUGIN.getConfig().getBoolean("doFullInvMSG");
         boolean doBlacklist = PLUGIN.getBlacklistConf().getBoolean("doBlacklisted");
+
         List<String> blacklist = PLUGIN.getBlacklistConf().getStringList("Blacklisted");
 
         if (AutoPickup.worldsBlacklist!=null && AutoPickup.worldsBlacklist.contains(loc.getWorld().getName())) {
@@ -54,6 +58,19 @@ public void onBreak(BlockBreakEvent e) {
             return;
         }
 
+        // Check if inv is full title
+        if (PLUGIN.getConfig().contains("titlebar")) {
+            boolean doFullInvMSGTitleBar = PLUGIN.getConfig().getBoolean("titlebar.doTitleBar");
+            String titleLine1 = ChatColor.translateAlternateColorCodes('&', PLUGIN.getConfig().getString("titlebar.line1"));
+            String titleLine2 = ChatColor.translateAlternateColorCodes('&', PLUGIN.getConfig().getString("titlebar.line2"));
+            if (player.getInventory().firstEmpty() == -1) { // Checks for inventory space
+                //Player has no space
+                if (doFullInvMSGTitleBar) {
+                    player.sendTitle(titleLine1, titleLine2, 1, 20, 1);
+                }
+            }
+        }
+
         // LockettePro Patch
         if (AutoPickup.usingLocketteProByBrunyman) {
             if (LocketteProAPI.isLocked(block)) {
@@ -106,6 +123,12 @@ public void run() {
         }
         e.setExpToDrop(0); // Remove default XP
 
+        ///////////////////////////////////// Custom items \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
+        String key = loc.getBlockX()+";"+loc.getBlockY()+";"+loc.getBlockZ()+";"+loc.getWorld();
+        AutoPickup.customItemPatch.put(key, new PickupObjective(loc, player, Instant.now()));
+        ///////////////////////////////////////////////////////////////////////////////////////
+
+
         // Deal with Containers
         if (block.getState() instanceof Container) {
 
@@ -115,7 +138,7 @@ public void run() {
 
             // Upgradable Hoppers Patch
             if (block.getState() instanceof Hopper && AutoPickup.usingUpgradableHoppers) {
-                NamespacedKey upgHoppers = new NamespacedKey(PLUGIN.getServer().getPluginManager().getPlugin("UpgradeableHoppers"), "upgradeablehoppers");
+                NamespacedKey upgHoppers = new NamespacedKey(PLUGIN.getServer().getPluginManager().getPlugin("UpgradeableHoppers"), "upgradeablehoppers:o");
                 Container con = (Container) block.getState();
                 if (con.getPersistentDataContainer().getKeys().contains(upgHoppers)) {
                     return;

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

@@ -0,0 +1,39 @@
+package us.thezircon.play.autopickup.listeners;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.ItemSpawnEvent;
+import org.bukkit.inventory.ItemStack;
+import us.thezircon.play.autopickup.AutoPickup;
+import us.thezircon.play.autopickup.utils.AutoSmelt;
+import us.thezircon.play.autopickup.utils.PickupObjective;
+
+public class ItemSpawnEventListener implements Listener {
+
+    private static final AutoPickup PLUGIN = AutoPickup.getPlugin(AutoPickup.class);
+
+    ///////////////////////////////////// Custom items \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
+
+    @EventHandler
+    public void onSpawn(ItemSpawnEvent e) {
+        Location loc = e.getLocation();
+        String key = loc.getBlockX()+";"+loc.getBlockY()+";"+loc.getBlockZ()+";"+loc.getWorld();
+        if (AutoPickup.customItemPatch.containsKey(key)) {
+            PickupObjective po = AutoPickup.customItemPatch.get(key);
+            ItemStack item = e.getEntity().getItemStack();
+            Player player = po.getPlayer();
+            boolean doSmelt = PLUGIN.auto_smelt_blocks.contains(player);
+            if (player.getInventory().firstEmpty()!=-1) {
+                e.getEntity().remove();
+                if (doSmelt) {
+                    player.getInventory().addItem(AutoSmelt.smelt(item, player));
+                } else {
+                    player.getInventory().addItem(item);
+                }
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,31 @@
+package us.thezircon.play.autopickup.utils;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+import java.time.Instant;
+
+public class PickupObjective {
+
+    private Location location;
+    private Player player;
+    private Instant createdAt;
+
+    public PickupObjective(Location location, Player player, Instant instant) {
+        this.location = location;
+        this.player = player;
+        this.createdAt = instant;
+    }
+
+    public Location getLocation() {
+        return location;
+    }
+
+    public Player getPlayer() {
+        return player;
+    }
+
+    public Instant getCreatedAt() {
+        return createdAt;
+    }
+}

src/main/resources/config.yml

@@ -40,6 +40,10 @@ msgReload: "&cReloaded Config"
 #Fully Inventory Message
 msgFullInv: "&7Your inventory is full!"
 doFullInvMSG: true
+titlebar:
+  doTitleBar: false
+  line1: "&cWarning"
+  line2: "&7Inventory is full!"
 
 #This is most useful for prison servers! -- This setting is not normally recommended
 #This feature voids any extra blocks broken when /auto is enabled and the inventory is full!

target/classes/config.yml

@@ -40,6 +40,10 @@ msgReload: "&cReloaded Config"
 #Fully Inventory Message
 msgFullInv: "&7Your inventory is full!"
 doFullInvMSG: true
+titlebar:
+  doTitleBar: false
+  line1: "&cWarning"
+  line2: "&7Inventory is full!"
 
 #This is most useful for prison servers! -- This setting is not normally recommended
 #This feature voids any extra blocks broken when /auto is enabled and the inventory is full!

target/classes/plugin.yml

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