cut repeat code

Author: TUsama

src/main/java/com/robertx22/mine_and_slash/capability/player/data/Backpacks.java

@@ -96,26 +96,31 @@ public BackpackInventory getInv(BackpackType type) {
     }
 
 
-    public void tryAutoPickup(Player p, ItemStack stack) {
+    public boolean tryAutoPickup(Player p, ItemStack stack, boolean shouldPlaySound) {
 
         if (p.getInventory().countItem(SlashItems.MASTER_BAG.get()) < 1) {
-            return;
+            return false;
         }
-
+        boolean result = false;
         for (BackpackType type : BackpackType.values()) {
             if (type.isValid(stack)) {
                 var bag = getInv(type);
 
                 if (bag.canAddItem(stack)) {
                     bag.addItem(stack.copy());
                     stack.shrink(stack.getCount() + 10); // just in case
-                    SoundUtils.playSound(this.player, SoundEvents.ITEM_PICKUP);
-                    return;
+                    if (shouldPlaySound) SoundUtils.playSound(this.player, SoundEvents.ITEM_PICKUP);
+                    result =  true;
                 }
             }
         }
 
+        return result;
+
+    }
 
+    public boolean tryAutoPickup(Player p, ItemStack stack){
+        return tryAutoPickup(p, stack, true);
     }
     // todo every time before you open backpack, it will replace locked slots with blocked slots that cant be clicked on and throw out/give items back
 

src/main/java/com/robertx22/mine_and_slash/capability/player/data/PlayerConfigData.java

@@ -124,26 +124,7 @@ public boolean trySalvageOnPickup(Player player, ItemStack stack) {
                     stack.shrink(stack.getCount() + 100);
                     data.getSalvageResult(ex).forEach(e -> {
                         Backpacks backpacks = Load.backpacks(player).getBackpacks();
-                        //copy tryAutoPickup() but without playing sound
-                        if (player.getInventory().countItem(SlashItems.MASTER_BAG.get()) >= 1) {
-                            for (Backpacks.BackpackType type : Backpacks.BackpackType.values()) {
-                                if (type.isValid(e)) {
-                                    var bag = backpacks.getInv(type);
-
-                                    if (bag.canAddItem(e)) {
-                                        bag.addItem(e.copy());
-                                        e.shrink(e.getCount() + 10);
-                                    } else {
-                                        PlayerUtils.giveItem(e, player);
-                                    }
-                                }
-                            }
-
-                        } else {
-                            PlayerUtils.giveItem(e, player);
-                        }
-                        //idk why I retained this but this seems redundant already, considering the stack was shrunk by stack.getCount() + 100.
-                        //backpacks.tryAutoPickup(player, stack);
+                        if (!backpacks.tryAutoPickup(player, e, false)) PlayerUtils.giveItem(e, player);
                     });
                     return true;
                 }