Autosmelt optimizations

Author: MrButtersDEV

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

@@ -1,10 +1,13 @@
 package us.thezircon.play.autopickup;
 
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.FurnaceRecipe;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 import us.thezircon.play.autopickup.commands.AutoDrops;
@@ -49,8 +52,11 @@ public final class AutoPickup extends JavaPlugin {
     public static HashMap<String, PickupObjective> customItemPatch = new HashMap<>();
     public static HashSet<UUID> droppedItems = new HashSet<>();
 
+    // Cache smeling recipie list
+    public static final Map<Material, FurnaceRecipe> smeltRecipeCache = new HashMap<>();
+
     // Notification Cooldown
-    public static HashMap<UUID, Long> lastInvFullNotification = new HashMap<>();
+    public static WeakHashMap<UUID, Long> lastInvFullNotification = new WeakHashMap<>();
 
     private static AutoPickup instance;
 
@@ -179,12 +185,17 @@ public void run() {
             @Override
             public void run() {
                 try {
-                    droppedItems.removeIf(uuid -> (Bukkit.getEntity(uuid))==null);
-                    droppedItems.removeIf(uuid -> (Bukkit.getEntity(uuid)).isDead()); ///////
+                    droppedItems.removeIf(uuid -> {
+                        Entity entity = Bukkit.getEntity(uuid);
+                        return entity == null || entity.isDead();
+                    });
                 } catch (NullPointerException ignored) {}
             }
         }.runTaskTimer(this, 6000L, 6000L); // 5 min
 
+        // Load auto smelt cache
+        AutoSmeltUtils.loadFurnaceRecipes(smeltRecipeCache);
+
     }
 
 

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

@@ -10,7 +10,7 @@
 import org.bukkit.event.block.BlockDropItemEvent;
 import org.bukkit.inventory.ItemStack;
 import us.thezircon.play.autopickup.AutoPickup;
-import us.thezircon.play.autopickup.utils.AutoSmelt;
+import us.thezircon.play.autopickup.utils.AutoSmeltUtils;
 import us.thezircon.play.autopickup.utils.HexFormat;
 
 import java.util.HashMap;
@@ -64,7 +64,7 @@ public void onDrop(BlockDropItemEvent e) {
             }
 
             if (doSmelt) {
-                drop = AutoSmelt.smelt(drop, player);
+                drop = AutoSmeltUtils.smelt(drop, player);
             }
 
             HashMap<Integer, ItemStack> leftOver = player.getInventory().addItem(drop);

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

@@ -11,6 +11,7 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 import us.thezircon.play.autopickup.AutoPickup;
 import us.thezircon.play.autopickup.utils.PickupPlayer;
 import us.thezircon.play.autopickup.utils.VersionChk;
@@ -84,4 +85,16 @@ public void onJoin(PlayerJoinEvent e) {
         }
     }
 
+    @EventHandler
+    public void onQuit(PlayerQuitEvent e) {
+
+        Player player = e.getPlayer();
+
+        PLUGIN.autopickup_list.remove(player);
+        PLUGIN.auto_smelt_blocks.remove(player);
+        PLUGIN.autopickup_list_mobs.remove(player);
+        AutoPickup.lastInvFullNotification.remove(player.getUniqueId());
+
+    }
+
 }

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

@@ -0,0 +1,64 @@
+package us.thezircon.play.autopickup.utils;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.Tag;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.*;
+import us.thezircon.play.autopickup.AutoPickup;
+
+import java.util.*;
+
+import static us.thezircon.play.autopickup.AutoPickup.smeltRecipeCache;
+
+public class AutoSmeltUtils {
+
+    private static final AutoPickup PLUGIN = AutoPickup.getPlugin(AutoPickup.class);
+
+    public boolean isAutoSmeltEnabled = false;
+    public static Material[] ignore = {Material.COAL_ORE, Material.REDSTONE_ORE, Material.DIAMOND_ORE, Material.EMERALD_ORE, Material.LAPIS_ORE, Material.NETHER_QUARTZ_ORE};
+    public static List<Material> ignoreMaterials = Collections.unmodifiableList(Arrays.asList(ignore));
+
+    public boolean isEnabled() {
+        return isAutoSmeltEnabled;
+    }
+
+    public static void loadFurnaceRecipes(Map<Material, FurnaceRecipe> smeltRecipeCache) {
+        Iterator<Recipe> iter = Bukkit.recipeIterator();
+        while (iter.hasNext()) {
+            Recipe recipe = iter.next();
+            if (recipe instanceof FurnaceRecipe) {
+                FurnaceRecipe furnaceRecipe = (FurnaceRecipe) recipe;
+                Material inputType = furnaceRecipe.getInput().getType();
+                // Only cache the first found recipe per material
+                smeltRecipeCache.putIfAbsent(inputType, furnaceRecipe);
+            }
+        }
+    }
+
+
+    public static ItemStack smelt(ItemStack itemStack, Player player) {
+        List<String> blacklist = PLUGIN.getBlacklistConf().getStringList("AutoSmeltBlacklist");
+
+        if (ignoreMaterials.contains(itemStack.getType()) || blacklist.contains(itemStack.getType().toString())) {
+            return itemStack;
+        }
+
+        // Special case: logs into charcoal
+        if (Tag.LOGS_THAT_BURN.isTagged(itemStack.getType())) {
+            player.giveExp(0); // Adjust XP if needed
+            return new ItemStack(Material.CHARCOAL, itemStack.getAmount());
+        }
+
+        FurnaceRecipe recipe = smeltRecipeCache.get(itemStack.getType());
+        if (recipe != null) {
+            ItemStack result = recipe.getResult().clone();
+            result.setAmount(itemStack.getAmount());
+            player.giveExp((int) (recipe.getExperience() * itemStack.getAmount()));
+            return result;
+        }
+
+        return itemStack;
+    }
+
+}