Merge pull request #70 from yL3oft/feature/autofish

MrButtersDEV · web-flow · commit 70d99a292609 · 2025-08-08T22:55:34.000-04:00
Add auto fishing (/auto fishing)
diff --git a/src/main/java/us/thezircon/play/autopickup/AutoPickup.java b/src/main/java/us/thezircon/play/autopickup/AutoPickup.java
@@ -11,6 +11,7 @@
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 import us.thezircon.play.autopickup.commands.AutoDrops;
+import us.thezircon.play.autopickup.commands.AutoFishingDrops;
 import us.thezircon.play.autopickup.commands.AutoPickup.Auto;
 import us.thezircon.play.autopickup.commands.AutoSmelt;
 import us.thezircon.play.autopickup.listeners.*;
@@ -28,6 +29,7 @@ public final class AutoPickup extends JavaPlugin {
 
     public HashSet<Player> autopickup_list = new HashSet<>(); // Blocks
     public HashSet<Player> autopickup_list_mobs = new HashSet<>(); // Mobs
+    public HashSet<Player> autopickup_list_fishing = new HashSet<>(); // Fish
     public HashSet<Player> auto_smelt_blocks = new HashSet<>(); // AutoSmelt - Blocks
     public Messages messages = null;
     public boolean UP2Date = true;
@@ -133,6 +135,7 @@ public void onEnable() {
         getServer().getPluginManager().registerEvents(new EntityDeathEventListener(), this);
         getServer().getPluginManager().registerEvents(new PlayerInteractEventListener(), this);
         getServer().getPluginManager().registerEvents(new PlayerDropItemEventListener(), this);
+        getServer().getPluginManager().registerEvents(new PlayerFishEventListener(), this);
         getServer().getPluginManager().registerEvents(new ItemSpawnEventListener(), this);
         getServer().getPluginManager().registerEvents(new EntityDropItemEventListener(), this);
 
@@ -144,6 +147,7 @@ public void onEnable() {
         // Commands
         getCommand("autopickup").setExecutor(new Auto());
         getCommand("autodrops").setExecutor(new AutoDrops());
+        getCommand("autofishingdrops").setExecutor(new AutoFishingDrops());
         getCommand("autosmelt").setExecutor(new AutoSmelt());
 
         // Crops by version
diff --git a/src/main/java/us/thezircon/play/autopickup/commands/AutoFishingDrops.java b/src/main/java/us/thezircon/play/autopickup/commands/AutoFishingDrops.java
@@ -0,0 +1,43 @@
+package us.thezircon.play.autopickup.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import us.thezircon.play.autopickup.AutoPickup;
+import us.thezircon.play.autopickup.utils.PickupPlayer;
+
+public class AutoFishingDrops implements CommandExecutor {
+
+    private static final AutoPickup PLUGIN = AutoPickup.getPlugin(AutoPickup.class);
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        boolean requirePermsAUTO = PLUGIN.getConfig().getBoolean("requirePerms.autopickup");
+
+        if (sender instanceof Player) {
+            Player player = (Player) sender;
+            if (player.hasPermission("autopickup.pickup.fishing") || (!requirePermsAUTO)) {
+                toggle(player);
+            } else {
+                player.sendMessage(PLUGIN.getMsg().getPrefix() + " " + PLUGIN.getMsg().getNoPerms());
+            }
+        }
+
+        return false;
+
+    }
+
+    public static void toggle(Player player) {
+        PickupPlayer PP = new PickupPlayer(player);
+        if (PLUGIN.autopickup_list_fishing.contains(player)) {
+            PLUGIN.autopickup_list_fishing.remove(player);
+            player.sendMessage(PLUGIN.getMsg().getPrefix() + " " + PLUGIN.getMsg().getMsgAutoFishingdropsDisable());
+            PP.setEnabledFishing(false);
+        } else if (!PLUGIN.autopickup_list_fishing.contains(player)) {
+            PLUGIN.autopickup_list_fishing.add(player);
+            player.sendMessage(PLUGIN.getMsg().getPrefix() + " " + PLUGIN.getMsg().getMsgAutoFishingdropsEnable());
+            PP.setEnabledFishing(true);
+        }
+    }
+}
diff --git a/src/main/java/us/thezircon/play/autopickup/commands/AutoPickup/Auto.java b/src/main/java/us/thezircon/play/autopickup/commands/AutoPickup/Auto.java
@@ -7,6 +7,7 @@
 import org.bukkit.entity.Player;
 import us.thezircon.play.autopickup.AutoPickup;
 import us.thezircon.play.autopickup.commands.AutoPickup.subcommands.drops;
+import us.thezircon.play.autopickup.commands.AutoPickup.subcommands.fishingdrops;
 import us.thezircon.play.autopickup.commands.AutoPickup.subcommands.reload;
 import us.thezircon.play.autopickup.commands.AutoPickup.subcommands.smelt;
 import us.thezircon.play.autopickup.commands.CMDManager;
@@ -24,6 +25,7 @@ public class Auto implements TabExecutor{
     public Auto(){
         subcommands.add(new reload());
         subcommands.add(new drops());
+        subcommands.add(new fishingdrops());
         subcommands.add(new smelt());
     }
 
diff --git a/src/main/java/us/thezircon/play/autopickup/commands/AutoPickup/subcommands/fishingdrops.java b/src/main/java/us/thezircon/play/autopickup/commands/AutoPickup/subcommands/fishingdrops.java
@@ -0,0 +1,58 @@
+package us.thezircon.play.autopickup.commands.AutoPickup.subcommands;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import us.thezircon.play.autopickup.AutoPickup;
+import us.thezircon.play.autopickup.commands.AutoFishingDrops;
+import us.thezircon.play.autopickup.commands.CMDManager;
+
+import java.util.List;
+
+public class fishingdrops extends CMDManager {
+
+    private static final AutoPickup PLUGIN = AutoPickup.getPlugin(AutoPickup.class);
+
+    @Override
+    public String getName() {
+        return "fishingdrops";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Picks up fishing drops";
+    }
+
+    @Override
+    public String getSyntax() {
+        return "/auto fishingdrops";
+    }
+
+    @Override
+    public void perform(CommandSender sender, String[] args) {
+        boolean requirePermsAUTO = PLUGIN.getConfig().getBoolean("requirePerms.autopickup");
+
+        if (sender instanceof Player) {
+            Player player = (Player) sender;
+            if (player.hasPermission("autopickup.pickup.fishing") || !requirePermsAUTO) {
+                AutoFishingDrops.toggle(player);
+            } else {
+                sender.sendMessage(PLUGIN.getMsg().getPrefix() + " " + PLUGIN.getMsg().getNoPerms());
+            }
+        }
+    }
+
+    @Override
+    public List<String> arg1(Player player, String[] args) {
+        return null;
+    }
+
+    @Override
+    public List<String> arg2(Player player, String[] args) {
+        return null;
+    }
+
+    @Override
+    public List<String> arg3(Player player, String[] args) {
+        return null;
+    }
+}
diff --git a/src/main/java/us/thezircon/play/autopickup/listeners/PlayerFishEventListener.java b/src/main/java/us/thezircon/play/autopickup/listeners/PlayerFishEventListener.java
@@ -0,0 +1,82 @@
+package us.thezircon.play.autopickup.listeners;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerFishEvent;
+import org.bukkit.inventory.ItemStack;
+import us.thezircon.play.autopickup.AutoPickup;
+
+import java.util.HashMap;
+import java.util.List;
+
+public class PlayerFishEventListener implements Listener {
+
+    private static final AutoPickup PLUGIN = AutoPickup.getPlugin(AutoPickup.class);
+
+    @EventHandler
+    public void onFish(PlayerFishEvent e) {
+        Player player = e.getPlayer();
+        if(!(e.getState().equals(PlayerFishEvent.State.CAUGHT_FISH))) return;
+        if(!(e.getCaught() instanceof Item)) return;
+
+        if (!PLUGIN.autopickup_list_fishing.contains(player)) return;
+
+        Bukkit.getScheduler().runTaskAsynchronously(PLUGIN, new Runnable() {
+            @Override
+            public void run() {
+                boolean requirePermsAUTO = PLUGIN.getConfig().getBoolean("requirePerms.autopickup");
+                if (!requirePermsAUTO) {
+                    return;
+                }
+                if (!player.hasPermission("autopickup.pickup.fishing") && !player.hasPermission("autopickup.pickup.fishing.autoenabled")) {
+                    PLUGIN.autopickup_list_fishing.remove(player);
+                }
+            }
+        });
+
+        boolean doFullInvMSG = PLUGIN.getConfig().getBoolean("doFullInvMSG");
+
+        Location loc = e.getPlayer().getLocation();
+        if (AutoPickup.worldsBlacklist!=null && AutoPickup.worldsBlacklist.contains(loc.getWorld().getName())) {
+            return;
+        }
+
+        Bukkit.getScheduler().runTask(PLUGIN, () -> {
+            Item caught = (Item) e.getCaught();
+
+            if (PLUGIN.getBlacklistConf().contains("BlacklistedFishing", true)) {
+                boolean doBlacklist = PLUGIN.getBlacklistConf().getBoolean("BlacklistedFishing");
+                List<String> blacklist = PLUGIN.getBlacklistConf().getStringList("BlacklistedFishing");
+
+                if (doBlacklist && blacklist.contains(caught.getItemStack().getType().toString())) {
+                    return;
+                }
+            }
+
+            HashMap<Integer, ItemStack> leftOver = player.getInventory().addItem(caught.getItemStack());
+            caught.remove();
+            if (!leftOver.isEmpty()) {
+                for (ItemStack item : leftOver.values()) {
+                    player.getWorld().dropItemNaturally(loc, item);
+                }
+                if (doFullInvMSG) {
+                    long secondsLeft;
+                    long cooldown = 15000; // 15 sec
+                    if (AutoPickup.lastInvFullNotification.containsKey(player.getUniqueId())) {
+                        secondsLeft = (AutoPickup.lastInvFullNotification.get(player.getUniqueId()) / 1000) + cooldown / 1000 - (System.currentTimeMillis() / 1000);
+                    } else {
+                        secondsLeft = 0;
+                    }
+                    if (secondsLeft <= 0) {
+                        player.sendMessage(PLUGIN.getMsg().getPrefix() + " " + PLUGIN.getMsg().getFullInventory());
+                        AutoPickup.lastInvFullNotification.put(player.getUniqueId(), System.currentTimeMillis());
+                    }
+                }
+            }
+        });
+    }
+}
diff --git a/src/main/java/us/thezircon/play/autopickup/listeners/PlayerJoinEventListener.java b/src/main/java/us/thezircon/play/autopickup/listeners/PlayerJoinEventListener.java
@@ -59,6 +59,13 @@ public void onJoin(PlayerJoinEvent e) {
             }
         }
 
+        if (player.hasPermission("autopickup.pickup.fishing.autoenabled")) {
+            if (!PLUGIN.autopickup_list_fishing.contains(player)) {
+                PLUGIN.autopickup_list_fishing.add(player);
+                //if (doAutoEnableMSG) {player.sendMessage(PLUGIN.getMsg().getPrefix() + " " + PLUGIN.getMsg().getAutoEnabled());}
+            }
+        }
+
         if (player.hasPermission("autopickup.pickup.mined.autosmelt.autoenabled")) {
             if (!PLUGIN.auto_smelt_blocks.contains(player)) {
                 PLUGIN.auto_smelt_blocks.add(player);
@@ -83,6 +90,11 @@ public void onJoin(PlayerJoinEvent e) {
                 PLUGIN.autopickup_list_mobs.add(player);
             }
         }
+        if (PP.getFishDropsToggle() && player.hasPermission("autopickup.pickup.fishing")) {
+            if (!PLUGIN.autopickup_list_fishing.contains(player)) {
+                PLUGIN.autopickup_list_fishing.add(player);
+            }
+        }
     }
 
     @EventHandler
diff --git a/src/main/java/us/thezircon/play/autopickup/utils/Messages.java b/src/main/java/us/thezircon/play/autopickup/utils/Messages.java
@@ -23,6 +23,14 @@ public String getMsgAutoDropsDisable() {
         return msgAutoDropsDisable;
     }
 
+    public String getMsgAutoFishingdropsEnable() {
+        return msgAutoFishingDropsEnable;
+    }
+
+    public String getMsgAutoFishingdropsDisable() {
+        return msgAutoFishingDropsDisable;
+    }
+
     public String getMsgAutoSmeltEnable() {
         return msgAutoSmeltEnable;
     }
@@ -33,6 +41,8 @@ public String getMsgAutoSmeltDisable() {
 
     private String msgAutoDropsEnable;
     private String msgAutoDropsDisable;
+    private String msgAutoFishingDropsEnable;
+    private String msgAutoFishingDropsDisable;
     private String msgAutoSmeltEnable;
     private String msgAutoSmeltDisable;
 
@@ -81,6 +91,8 @@ public Messages() {
         try {
             this.msgAutoDropsEnable = HexFormat.format(PLUGIN.getConfig().getString("msgAutoMobDropsEnable"));
             this.msgAutoDropsDisable = HexFormat.format(PLUGIN.getConfig().getString("msgAutoMobDropsDisable"));
+            this.msgAutoFishingDropsEnable = HexFormat.format(PLUGIN.getConfig().getString("msgAutoFishingDropsEnable"));
+            this.msgAutoFishingDropsDisable = HexFormat.format(PLUGIN.getConfig().getString("msgAutoFishingDropsDisable"));
             this.msgAutoSmeltEnable = HexFormat.format(PLUGIN.getConfig().getString("msgAutoSmeltEnable"));
             this.msgAutoSmeltDisable = HexFormat.format(PLUGIN.getConfig().getString("msgAutoSmeltDisable"));
         } catch (NullPointerException e) {
diff --git a/src/main/java/us/thezircon/play/autopickup/utils/PickupPlayer.java b/src/main/java/us/thezircon/play/autopickup/utils/PickupPlayer.java
@@ -90,6 +90,26 @@ public void run() {
         }.runTaskLater(plugin, 1);
     }
 
+    public void setEnabledFishing(boolean e) {
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                if (!fileExists()) {createFile();}
+
+                File playerFile = new File(plugin.getDataFolder()+File.separator+"PlayerData"+File.separator+uuid+".yml");
+                FileConfiguration data = YamlConfiguration.loadConfiguration(playerFile);
+
+                data.set("enabled_fishing_drops", e);
+
+                try {
+                    data.save(playerFile);
+                } catch (IOException err){
+                    log.warning("[AutoPickup] Unable to update "+uuid+"'s data file.");
+                }
+            }
+        }.runTaskLater(plugin, 1);
+    }
+
     public void setEnabledAutoSmelt(boolean e) {
         new BukkitRunnable() {
             @Override
@@ -126,6 +146,16 @@ public boolean getMobDropsToggle(){
         }
     }
 
+    public boolean getFishDropsToggle(){
+        if (!fileExists()) {createFile();}
+        FileConfiguration data = YamlConfiguration.loadConfiguration(playerData);
+        try {
+            return data.getBoolean("enabled_fishing_drops");
+        } catch (NullPointerException e) {
+            return false;
+        }
+    }
+
     public boolean getAutoSmeltToggle(){
         if (!fileExists()) {createFile();}
         FileConfiguration data = YamlConfiguration.loadConfiguration(playerData);
diff --git a/src/main/resources/blacklist.yml b/src/main/resources/blacklist.yml
@@ -27,6 +27,8 @@ Blacklisted:
 BlacklistedEntities:
   - PLAYER
 
+BlacklistedFishing: []
+
 BlacklistedWorlds:
   - example
 
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -28,6 +28,10 @@ msgAutoSmeltDisable: "&7You have&c disabled &7auto smelt."
 msgAutoMobDropsEnable: "&7You have&a enabled &7auto drops."
 msgAutoMobDropsDisable: "&7You have&c disabled &7auto drops."
 
+#Toggle Message - /fishingdrops
+msgAutoFishingDropsEnable: "&7You have&a enabled &7auto fishing drops."
+msgAutoFishingDropsDisable: "&7You have&c disabled &7auto fishing drops."
+
 #Aditional toggling messages
 msgAutoEnable: "&7Auto pickup has been automatically&a enabled&7."
 doAutoEnableMSG: true
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -14,6 +14,9 @@ commands:
   autodrops:
     description: Toggles the ability to automaticly pickup drops from killed entities.
     aliases: [drops, autod]
+  autofishingdrops:
+    description: Toggles the ability to automaticly pickup drops from fishing.
+    aliases: [fishingdrops, autofd]
   autosmelt:
     description: Toggles the ability to automaticly smelt mined blocks.
     aliases: [asmelt]
@@ -22,5 +25,7 @@ permissions:
     default: false
   autopickup.pickup.entities.autoenabled:
     default: false
+  autopickup.pickup.fishing.autoenabled:
+    default: false
   autopickup.pickup.mined.autosmelt.autoenabled:
     default: false

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,13 @@ public void onJoin(PlayerJoinEvent e) {`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ if (player.hasPermission("autopickup.pickup.fishing.autoenabled")) {`
	`63`	`+ if (!PLUGIN.autopickup_list_fishing.contains(player)) {`
	`64`	`+ PLUGIN.autopickup_list_fishing.add(player);`
	`65`	`+ //if (doAutoEnableMSG) {player.sendMessage(PLUGIN.getMsg().getPrefix() + " " + PLUGIN.getMsg().getAutoEnabled());}`
	`66`	`+ }`
	`67`	`+ }`
	`68`	`+`
`62`	`69`	`if (player.hasPermission("autopickup.pickup.mined.autosmelt.autoenabled")) {`
`63`	`70`	`if (!PLUGIN.auto_smelt_blocks.contains(player)) {`
`64`	`71`	`PLUGIN.auto_smelt_blocks.add(player);`
`@@ -83,6 +90,11 @@ public void onJoin(PlayerJoinEvent e) {`
`83`	`90`	`PLUGIN.autopickup_list_mobs.add(player);`
`84`	`91`	`}`
`85`	`92`	`}`
	`93`	`+ if (PP.getFishDropsToggle() && player.hasPermission("autopickup.pickup.fishing")) {`
	`94`	`+ if (!PLUGIN.autopickup_list_fishing.contains(player)) {`
	`95`	`+ PLUGIN.autopickup_list_fishing.add(player);`
	`96`	`+ }`
	`97`	`+ }`
`86`	`98`	`}`
`87`	`99`
`88`	`100`	`@EventHandler`