Fix ItemReqBanking not withdrawing when min quantity of item req in inventory

Explv · Explv · commit 35d03ec59e9f · 2019-02-02T22:29:05.000Z
Fix ItemReqBanking not depositing when more than target amount in inventory
Restructuring GETaskPanel
Fix RSUnitField validation
diff --git a/AIO/src/org/aio/activities/banking/ItemReqBanking.java b/AIO/src/org/aio/activities/banking/ItemReqBanking.java
@@ -139,7 +139,7 @@ public int execute() throws InterruptedException {
                     } else {
                         ItemReq itemReq = equipableItemReqQueue.peek();
                         if (!itemReq.hasRequirement(getInventory(), getEquipment())) {
-                            if (!getItemReq(itemReq)) {
+                            if (!withdrawItemReq(itemReq)) {
                                 setFailed();
                             }
                         } else {
@@ -195,36 +195,51 @@ public int execute() throws InterruptedException {
                 } else {
                     ItemReq itemReq = nonEquipableItemReqs.peek();
 
-                    if (!itemReq.hasRequirement(getInventory(), getEquipment())) {
-                        if (!getItemReq(itemReq)) {
+                    int targetAmount = reqTargetAmountMap.get(itemReq);
+                    long amountOnPlayer = itemReq.getAmount(getInventory(), getEquipment());
+
+                    if (amountOnPlayer > targetAmount && targetAmount != ItemReq.QUANTITY_ALL) {
+                        depositExcess(itemReq);
+                    } else if (!itemReq.hasRequirement(getInventory(), getEquipment())) {
+                        if (!withdrawItemReq(itemReq)) {
                             setFailed();
                         }
+                    } else if (amountOnPlayer < targetAmount && getBank().contains(itemReq.getName())) {
+                        withdrawItemReq(itemReq);
                     } else {
                         nonEquipableItemReqs.poll();
                     }
                 }
                 return 600;
             }
         });
+
         if (withdrawNonEquipableEvent.hasFailed()) {
             setFailed();
         }
     }
 
-    private boolean getItemReq(final ItemReq itemReq) {
+    private boolean depositExcess(final ItemReq itemReq) {
         int amountOnPlayer = (int) getAmountOnPlayer(itemReq);
-        int targetAmount = reqTargetAmountMap.get(itemReq);
 
+        int excessAmount = amountOnPlayer - reqTargetAmountMap.get(itemReq);
+        if (getBank().deposit(itemReq.getName(), excessAmount)) {
+            Sleep.sleepUntil(() -> getAmountOnPlayer(itemReq) < amountOnPlayer, 1200, 600);
+            return true;
+        }
+
+        return false;
+    }
+
+    private boolean withdrawItemReq(final ItemReq itemReq) {
         if (itemReq.isNoted() && getBank().getWithdrawMode() != org.osbot.rs07.api.Bank.BankMode.WITHDRAW_NOTE) {
             getBank().enableMode(org.osbot.rs07.api.Bank.BankMode.WITHDRAW_NOTE);
         } else if (!itemReq.isNoted() && getBank().getWithdrawMode() != org.osbot.rs07.api.Bank.BankMode.WITHDRAW_ITEM) {
             getBank().enableMode(org.osbot.rs07.api.Bank.BankMode.WITHDRAW_ITEM);
-        } else if (targetAmount != ItemReq.QUANTITY_ALL && amountOnPlayer > targetAmount) {
-            int excessAmount = amountOnPlayer - reqTargetAmountMap.get(itemReq);
-            if (getBank().deposit(itemReq.getName(), excessAmount)) {
-                Sleep.sleepUntil(() -> getAmountOnPlayer(itemReq) < amountOnPlayer, 1200, 600);
-            }
-        } else if (targetAmount == ItemReq.QUANTITY_ALL || amountOnPlayer < reqTargetAmountMap.get(itemReq)) {
+        } else {
+            int amountOnPlayer = (int) getAmountOnPlayer(itemReq);
+            int targetAmount = reqTargetAmountMap.get(itemReq);
+
             if (amountOnPlayer < itemReq.getMinQuantity()) {
                 int requiredAmountForMinQuantity = Math.max(0, itemReq.getMinQuantity() - amountOnPlayer);
                 int bankAmount = (int) itemReq.getAmount(getBank());
diff --git a/AIO/src/org/aio/gui/fields/RSUnitField.java b/AIO/src/org/aio/gui/fields/RSUnitField.java
@@ -1,6 +1,7 @@
 package org.aio.gui.fields;
 
 
+import org.aio.gui.utils.ColourScheme;
 import org.aio.util.RSUnits;
 
 import javax.swing.*;
@@ -33,18 +34,18 @@ public long getValue() {
 
     private boolean validateField() {
         if (getText().trim().isEmpty()) {
-            setBorder(BorderFactory.createLineBorder(Color.RED));
+            setForeground(Color.RED);
             return false;
         }
 
         String text = getText().trim();
 
         if (!RSUnits.UNIT_PATTERN.matcher(text).matches()) {
-            setBorder(BorderFactory.createLineBorder(Color.RED));
+            setForeground(Color.RED);
             return false;
         }
 
-        setBorder(BorderFactory.createLineBorder(Color.BLACK));
+        setForeground(ColourScheme.WHITE);
         return true;
     }
 }
diff --git a/AIO/src/org/aio/gui/styled_components/StyledJComboBox.java b/AIO/src/org/aio/gui/styled_components/StyledJComboBox.java
@@ -1,12 +1,9 @@
 package org.aio.gui.styled_components;
 
-import org.aio.gui.IconButton;
 import org.aio.gui.utils.ColourScheme;
-import org.aio.util.ResourceManager;
 
 import javax.swing.*;
 import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.basic.BasicArrowButton;
 import javax.swing.plaf.basic.BasicComboBoxUI;
 
 public class StyledJComboBox<E> extends JComboBox<E> {
diff --git a/AIO/src/org/aio/gui/task_panels/GETaskPanel.java b/AIO/src/org/aio/gui/task_panels/GETaskPanel.java
@@ -38,21 +38,26 @@ public class GETaskPanel extends TaskPanel {
     GETaskPanel() {
         super(TaskType.GRAND_EXCHANGE);
 
-        JPanel contentPanel = new StyledJPanel(new BorderLayout());
+        JPanel contentPanel = new StyledJPanel();
+        contentPanel.setLayout(new BoxLayout(contentPanel, BoxLayout.Y_AXIS));
 
-        JPanel controls = new StyledJPanel(new FlowLayout(FlowLayout.LEFT, 5, 5));
+        JPanel typePanel = new StyledJPanel(new FlowLayout(FlowLayout.LEFT, 5, 5));
 
-        controls.add(new StyledJLabel("Type:"));
+        typePanel.add(new StyledJLabel("Type:"));
 
-        typeSelector = new StyledJComboBox<>();
+        typeSelector = new StyledJComboBox<>(GEMode.values());
         typeSelector.addActionListener(e -> {
             if (itemNameField.validateItemNameField()) {
                 updatePriceField();
             }
         });
-        controls.add(typeSelector);
+        typePanel.add(typeSelector);
 
-        controls.add(new StyledJLabel("Item Name:"));
+        contentPanel.add(typePanel);
+
+        JPanel itemPanel = new StyledJPanel(new FlowLayout(FlowLayout.LEFT));
+
+        itemPanel.add(new StyledJLabel("Item Name:"));
 
         itemNameField = new ItemField();
         itemNameField.addKeyListener(new KeyAdapter() {
@@ -63,27 +68,33 @@ public void keyReleased(final KeyEvent e) {
                 }
             }
         });
-        controls.add(itemNameField);
+        itemPanel.add(itemNameField);
+
+        contentPanel.add(itemPanel);
+
+        JPanel priceQuantityPanel = new StyledJPanel(new FlowLayout(FlowLayout.LEFT));
 
-        controls.add(new StyledJLabel("Quantity:"));
+        priceQuantityPanel.add(new StyledJLabel("Quantity:"));
 
         itemQuantityField = new RSUnitField();
         itemQuantityField.setColumns(10);
-        controls.add(itemQuantityField);
+        priceQuantityPanel.add(itemQuantityField);
 
-        controls.add(new StyledJLabel("Price:"));
+        priceQuantityPanel.add(new StyledJLabel("Price:"));
 
         itemPriceField = new RSUnitField();
         itemPriceField.setColumns(10);
-        controls.add(itemPriceField);
+        priceQuantityPanel.add(itemPriceField);
+
+        contentPanel.add(priceQuantityPanel);
+
+        JPanel waitCompletionPanel = new StyledJPanel(new FlowLayout(FlowLayout.LEFT));
 
         waitForCompletion = new StyledJCheckBox("Wait for completion");
         waitForCompletion.setSelected(true);
-        controls.add(waitForCompletion);
-
-        contentPanel.add(controls, BorderLayout.CENTER);
+        waitCompletionPanel.add(waitForCompletion);
 
-        typeSelector.setModel(new DefaultComboBoxModel<>(GEMode.values()));
+        contentPanel.add(waitCompletionPanel);
 
         setContentPanel(contentPanel);
     }
diff --git a/AIO/src/org/aio/script/AIO.java b/AIO/src/org/aio/script/AIO.java
@@ -30,7 +30,7 @@
 @ScriptManifest(author = "Explv", name = "Explv's AIO " + AIO.VERSION, info = "AIO", version = 0, logo = "http://i.imgur.com/58Zz0fb.png")
 public class AIO extends Script {
 
-    static final String VERSION = "v2.3.0";
+    static final String VERSION = "v2.3.1";
 
     private Gui gui;
     private Paint paint;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package org.aio.gui.fields;`
`2`	`2`
`3`	`3`
	`4`	`+import org.aio.gui.utils.ColourScheme;`
`4`	`5`	`import org.aio.util.RSUnits;`
`5`	`6`
`6`	`7`	`import javax.swing.*;`
`@@ -33,18 +34,18 @@ public long getValue() {`
`33`	`34`
`34`	`35`	`private boolean validateField() {`
`35`	`36`	`if (getText().trim().isEmpty()) {`
`36`		`- setBorder(BorderFactory.createLineBorder(Color.RED));`
	`37`	`+ setForeground(Color.RED);`
`37`	`38`	`return false;`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`String text = getText().trim();`
`41`	`42`
`42`	`43`	`if (!RSUnits.UNIT_PATTERN.matcher(text).matches()) {`
`43`		`- setBorder(BorderFactory.createLineBorder(Color.RED));`
	`44`	`+ setForeground(Color.RED);`
`44`	`45`	`return false;`
`45`	`46`	`}`
`46`	`47`
`47`		`- setBorder(BorderFactory.createLineBorder(Color.BLACK));`
	`48`	`+ setForeground(ColourScheme.WHITE);`
`48`	`49`	`return true;`
`49`	`50`	`}`
`50`	`51`	`}`