diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java index e49e8b1512..207616cfd8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.inventorysetups; import java.util.ArrayList; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; @@ -33,7 +34,7 @@ import lombok.Getter; public class InventorySetup { @Getter - private ArrayList inventory; + private List inventory; @Getter - private ArrayList equipment; + private List equipment; } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java index 940dbb0a7d..f7d8cba390 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java @@ -33,6 +33,7 @@ import java.awt.image.BufferedImage; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; import javax.inject.Inject; @@ -205,8 +206,8 @@ public class InventorySetupPlugin extends Plugin clientThread.invoke(() -> { - ArrayList inv = getNormalizedContainer(InventoryID.INVENTORY); - ArrayList eqp = getNormalizedContainer(InventoryID.EQUIPMENT); + List inv = getNormalizedContainer(InventoryID.INVENTORY); + List eqp = getNormalizedContainer(InventoryID.EQUIPMENT); final InventorySetup invSetup = new InventorySetup(inv, eqp); SwingUtilities.invokeLater(() -> @@ -333,13 +334,13 @@ public class InventorySetupPlugin extends Plugin if (container == client.getItemContainer(InventoryID.INVENTORY)) { - ArrayList normContainer = getNormalizedContainer(InventoryID.INVENTORY); + List normContainer = getNormalizedContainer(InventoryID.INVENTORY); final InventorySetup setup = inventorySetups.get(selectedInventorySetup); panel.highlightDifferences(normContainer, setup, InventoryID.INVENTORY); } else if (container == client.getItemContainer(InventoryID.EQUIPMENT)) { - ArrayList normContainer = getNormalizedContainer(InventoryID.EQUIPMENT); + List normContainer = getNormalizedContainer(InventoryID.EQUIPMENT); final InventorySetup setup = inventorySetups.get(selectedInventorySetup); panel.highlightDifferences(normContainer, setup, InventoryID.EQUIPMENT); } @@ -371,13 +372,13 @@ public class InventorySetupPlugin extends Plugin } } - public ArrayList getNormalizedContainer(final InventoryID id) + public List getNormalizedContainer(final InventoryID id) { assert id == InventoryID.INVENTORY || id == InventoryID.EQUIPMENT : "invalid inventory ID"; final ItemContainer container = client.getItemContainer(id); - ArrayList newContainer = new ArrayList<>(); + List newContainer = new ArrayList<>(); Item[] items = null; if (container != null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java index 6798d679f2..43935a3927 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.inventorysetups.ui; import java.awt.BorderLayout; import java.awt.Color; import java.util.ArrayList; +import java.util.List; import javax.inject.Singleton; import javax.swing.JLabel; import javax.swing.JPanel; @@ -73,7 +74,7 @@ abstract class InventorySetupContainerPanel extends JPanel void setContainerSlot(int index, final InventorySetupSlot containerSlot, - final ArrayList items) + final List items) { if (index >= items.size() || items.get(index).getId() == -1) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java index 2ca6687660..5bd5cbf323 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java @@ -28,6 +28,8 @@ package net.runelite.client.plugins.inventorysetups.ui; import java.awt.GridLayout; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.inject.Singleton; import javax.swing.JPanel; import net.runelite.api.EquipmentInventorySlot; @@ -40,7 +42,7 @@ import net.runelite.client.ui.ColorScheme; @Singleton public class InventorySetupEquipmentPanel extends InventorySetupContainerPanel { - private HashMap equipmentSlots; + private Map equipmentSlots; InventorySetupEquipmentPanel(final ItemManager itemManager, final InventorySetupPlugin plugin) { @@ -80,7 +82,7 @@ public class InventorySetupEquipmentPanel extends InventorySetupContainerPanel void setEquipmentSetupSlots(final InventorySetup setup) { - final ArrayList equipment = setup.getEquipment(); + final List equipment = setup.getEquipment(); for (final EquipmentInventorySlot slot : EquipmentInventorySlot.values()) { @@ -93,9 +95,9 @@ public class InventorySetupEquipmentPanel extends InventorySetupContainerPanel } - void highlightDifferences(final ArrayList currEquipment, final InventorySetup inventorySetup) + void highlightDifferences(final List currEquipment, final InventorySetup inventorySetup) { - final ArrayList equipToCheck = inventorySetup.getEquipment(); + final List equipToCheck = inventorySetup.getEquipment(); assert currEquipment.size() == equipToCheck.size() : "size mismatch"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java index 3310b2f25c..fecaf28ce5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.inventorysetups.ui; import java.awt.GridLayout; import java.util.ArrayList; +import java.util.List; import javax.inject.Singleton; import javax.swing.JPanel; import net.runelite.client.game.ItemManager; @@ -40,7 +41,7 @@ public class InventorySetupInventoryPanel extends InventorySetupContainerPanel private static final int ITEMS_PER_ROW = 4; private static final int NUM_INVENTORY_ITEMS = 28; - private ArrayList inventorySlots; + private List inventorySlots; InventorySetupInventoryPanel(final ItemManager itemManager, final InventorySetupPlugin plugin) { @@ -67,7 +68,7 @@ public class InventorySetupInventoryPanel extends InventorySetupContainerPanel void setInventorySetupSlots(final InventorySetup setup) { - ArrayList inventory = setup.getInventory(); + List inventory = setup.getInventory(); for (int i = 0; i < NUM_INVENTORY_ITEMS; i++) { @@ -79,10 +80,10 @@ public class InventorySetupInventoryPanel extends InventorySetupContainerPanel } - void highlightDifferentSlots(final ArrayList currInventory, final InventorySetup inventorySetup) + void highlightDifferentSlots(final List currInventory, final InventorySetup inventorySetup) { - final ArrayList inventoryToCheck = inventorySetup.getInventory(); + final List inventoryToCheck = inventorySetup.getInventory(); assert currInventory.size() == inventoryToCheck.size() : "size mismatch"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java index 75e5719f83..33ef53a442 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java @@ -34,6 +34,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.util.ArrayList; +import java.util.List; import javax.inject.Singleton; import javax.swing.Box; import javax.swing.BoxLayout; @@ -254,8 +255,8 @@ public class InventorySetupPluginPanel extends PluginPanel if (plugin.getHighlightDifference()) { - final ArrayList normInv = plugin.getNormalizedContainer(InventoryID.INVENTORY); - final ArrayList normEqp = plugin.getNormalizedContainer(InventoryID.EQUIPMENT); + final List normInv = plugin.getNormalizedContainer(InventoryID.INVENTORY); + final List normEqp = plugin.getNormalizedContainer(InventoryID.EQUIPMENT); highlightDifferences(normInv, inventorySetup, InventoryID.INVENTORY); highlightDifferences(normEqp, inventorySetup, InventoryID.EQUIPMENT); @@ -287,7 +288,7 @@ public class InventorySetupPluginPanel extends PluginPanel repaint(); } - public void highlightDifferences(final ArrayList container, + public void highlightDifferences(final List container, final InventorySetup setupToCheck, final InventoryID type) {