Combine load and unload

Author: TylerS1066

src/main/java/io/github/cccm5/CargoMain.java

@@ -46,6 +46,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 public class CargoMain extends JavaPlugin implements Listener {
     private static Economy economy;
@@ -167,8 +168,18 @@ public void unload(@NotNull Player player){
             return;
         }
 
-        TradableGUIItem finalItem = NPCUtil.getUnloadItem(nearbyMerchants, player.getInventory().getItemInMainHand().clone(), dtlTradersPlugin);
-        if (finalItem == null || finalItem.getTradePrice() == 0.0) {
+        Set<TradableGUIItem> items = NPCUtil.getItems(nearbyMerchants, player.getInventory().getItemInMainHand(), dtlTradersPlugin, "sell");
+        TradableGUIItem finalItem = null;
+        for (TradableGUIItem item : items) {
+            if (finalItem == null) {
+                finalItem = item;
+                continue;
+            }
+
+            if (item.getTradePrice() > finalItem.getTradePrice())
+                finalItem = item;
+        }
+        if (finalItem == null || finalItem.getTradePrice() <= 0.0) {
             player.sendMessage(Config.ERROR_TAG + "You need to be holding a cargo item to do that!");
             return;
         }
@@ -213,14 +224,23 @@ public void load(@NotNull Player player){
             return;
         }
 
-        TradableGUIItem finalItem = NPCUtil.getLoadItem(nearbyMerchants, player.getInventory().getItemInMainHand(), dtlTradersPlugin);
-        if (finalItem == null || finalItem.getTradePrice() == 0.0) {
+        Set<TradableGUIItem> items = NPCUtil.getItems(nearbyMerchants, player.getInventory().getItemInMainHand(), dtlTradersPlugin, "buy");
+        TradableGUIItem finalItem = null;
+        for (TradableGUIItem item : items) {
+            if (finalItem == null) {
+                finalItem = item;
+                continue;
+            }
+
+            if (item.getTradePrice() < finalItem.getTradePrice())
+                finalItem = item;
+        }
+        if (finalItem == null || finalItem.getTradePrice() <= 0.0) {
             player.sendMessage(Config.ERROR_TAG + "You need to be holding a cargo item to do that!");
             return;
         }
 
-        final ItemMeta meta = finalItem.getMainItem().getItemMeta();
-        String itemName = meta.getDisplayName() != null && meta.getDisplayName().length() > 0 ? meta.getDisplayName() : finalItem.getMainItem().getType().name().toLowerCase();
+        String itemName = finalItem.getMainItem().getItemMeta().getDisplayName() != null && finalItem.getMainItem().getItemMeta().getDisplayName().length() > 0 ? finalItem.getMainItem().getItemMeta().getDisplayName() : finalItem.getMainItem().getType().name().toLowerCase();
         if(!economy.has(player,finalItem.getTradePrice()*(1+Config.loadTax))){
             player.sendMessage(Config.ERROR_TAG + "You don't have enough money to buy any " + itemName + "!");
             return;

src/main/java/io/github/cccm5/util/NPCUtil.java

@@ -20,7 +20,9 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class NPCUtil {
     @NotNull
@@ -63,64 +65,28 @@ public static List<NPC> getNPCsInRange(MovecraftLocation center) {
         return result;
     }
 
-    @Nullable
-    public static TradableGUIItem getUnloadItem(@NotNull List<NPC> nearbyMerchants, ItemStack compareItem, Main dtlTradersPlugin) {
-        TradableGUIItem result = null;
-        for (NPC cargoMerchant : nearbyMerchants) {
-            if (result != null)
-                break;
-            String guiName = cargoMerchant.getTrait(TraderTrait.class).getGUIName();
-            AGUI gui = dtlTradersPlugin.getGuiListService().getGUI(guiName);
-            TradeGUI tradeGUI = (TradeGUI) gui;
-            result = null;
-            for (TradeGUIPage page : tradeGUI.getPages()) {
-                if (page == null) continue;
-                for (AGUIItem tempItem : page.getItems("sell")) {
-                    if (!(tempItem instanceof TradableGUIItem)) continue;
-                    if (tempItem.getMainItem().isSimilar(compareItem)) {
-                        if (tempItem.getMainItem().getAmount() > 1)
-                            continue;
-                        result = (TradableGUIItem) tempItem;
-                        break;
-                    }
-                }
-                if (result == null || result.getTradePrice() == 0.0) {
-                    return null;
-                }
-            }
-        }
-        return result;
-    }
-
-    @Nullable
-    public static TradableGUIItem getLoadItem(@NotNull List<NPC> nearbyMerchants, ItemStack compareItem, Main dtlTradersPlugin) {
-        TradableGUIItem result = null;
-        for (NPC cargoMerchant : nearbyMerchants) {
-            String guiName = cargoMerchant.getTrait(TraderTrait.class).getGUIName();
+    @NotNull
+    public static Set<TradableGUIItem> getItems(@NotNull List<NPC> merchants, ItemStack item, Main dtlTradersPlugin, String shopMode) {
+        Set<TradableGUIItem> result = new HashSet<>();
+        for (NPC merchant : merchants) {
+            String guiName = merchant.getTrait(TraderTrait.class).getGUIName();
             AGUI gui = dtlTradersPlugin.getGuiListService().getGUI(guiName);
-            TradeGUI tradeGUI = (TradeGUI) gui;
-            for (TradeGUIPage page : tradeGUI.getPages()) {
-                if (page == null)
-                    continue;
+            if (!(gui instanceof TradeGUI))
+                continue;
 
-                for (AGUIItem tempItem : page.getItems("buy")) {
-                    if (!(tempItem instanceof TradableGUIItem))
+            for (TradeGUIPage page : ((TradeGUI) gui).getPages()) {
+                for (AGUIItem guiItem : page.getItems(shopMode)) {
+                    if (!(guiItem instanceof TradableGUIItem tradableItem))
+                        continue;
+                    if (!guiItem.getMainItem().isSimilar(item) || guiItem.getMainItem().getAmount() > 1)
                         continue;
 
-                    TradableGUIItem tradeItem = (TradableGUIItem) tempItem;
-                    if (tradeItem.getMainItem().isSimilar(compareItem)) {
-                        if (tempItem.getMainItem().getAmount() > 1)
-                            continue;
-
-                        result = tradeItem;
-                        break;
+                    result.add(tradableItem);
+                    if (Config.debug) {
+                        CargoMain.getInstance().getLogger().info("Found for $" + tradableItem.getTradePrice() + " in " + merchant.getId() + "/" + page.getPageName());
                     }
                 }
-                if (result != null)
-                    break;
             }
-            if (result != null)
-                break;
         }
         return result;
     }