From 9ec09e42d5e1d52200f5362530592a36465dbf90 Mon Sep 17 00:00:00 2001
From: Yuri Moens <yuri.moens@gmail.com>
Date: Thu, 20 Jan 2022 01:27:04 +0100
Subject: [PATCH] Add option for seaweed spore pickup

---
 .../java/io/reisub/openosrs/glassblower/Config.java |  8 ++++++++
 .../io/reisub/openosrs/glassblower/tasks/Blow.java  |  4 ++--
 .../openosrs/glassblower/tasks/HandleBank.java      | 13 +++++--------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/glassblower/src/main/java/io/reisub/openosrs/glassblower/Config.java b/glassblower/src/main/java/io/reisub/openosrs/glassblower/Config.java
index e3f8928..4402cc0 100644
--- a/glassblower/src/main/java/io/reisub/openosrs/glassblower/Config.java
+++ b/glassblower/src/main/java/io/reisub/openosrs/glassblower/Config.java
@@ -39,6 +39,14 @@ public interface Config extends net.runelite.client.config.Config {
     )
     default Product targetProduct() { return Product.LANTERN_LENS; }
 
+    @ConfigItem(
+            keyName = "farmSeaweedSpores",
+            name = "Farm seaweed spores",
+            description = "Go underwater at the Fossil Island to farm seaweed spores.",
+            position = 1
+    )
+    default boolean farmSeaweedSpores() { return true; }
+
     @ConfigItem(
             keyName = "startButton",
             name = "Start/Stop",
diff --git a/glassblower/src/main/java/io/reisub/openosrs/glassblower/tasks/Blow.java b/glassblower/src/main/java/io/reisub/openosrs/glassblower/tasks/Blow.java
index ddee4a1..70ee9ee 100644
--- a/glassblower/src/main/java/io/reisub/openosrs/glassblower/tasks/Blow.java
+++ b/glassblower/src/main/java/io/reisub/openosrs/glassblower/tasks/Blow.java
@@ -32,7 +32,7 @@ public class Blow extends Task {
 
     @Override
     public void execute() {
-        if (game.localPlayer().position().regionID() == Glassblower.FOSSIL_ISLAND_SMALL_ISLAND_REGION) {
+        if (config.farmSeaweedSpores() && game.localPlayer().position().regionID() == Glassblower.FOSSIL_ISLAND_SMALL_ISLAND_REGION) {
             iObject rowboat = game.objects().withName("Rowboat").nearest();
             if (rowboat == null) return;
 
@@ -47,7 +47,7 @@ public class Blow extends Task {
             game.tick();
         }
 
-        if (game.groundItems().withId(ItemID.SEAWEED_SPORE).exists()) return;
+        if (config.farmSeaweedSpores() && game.groundItems().withId(ItemID.SEAWEED_SPORE).exists()) return;
 
         InventoryItem pipe = game.inventory().withId(ItemID.GLASSBLOWING_PIPE).first();
         InventoryItem moltenGlass = game.inventory().withId(ItemID.MOLTEN_GLASS).first();
diff --git a/glassblower/src/main/java/io/reisub/openosrs/glassblower/tasks/HandleBank.java b/glassblower/src/main/java/io/reisub/openosrs/glassblower/tasks/HandleBank.java
index 1ccb9ee..e5d3b01 100644
--- a/glassblower/src/main/java/io/reisub/openosrs/glassblower/tasks/HandleBank.java
+++ b/glassblower/src/main/java/io/reisub/openosrs/glassblower/tasks/HandleBank.java
@@ -1,14 +1,17 @@
 package io.reisub.openosrs.glassblower.tasks;
 
+import io.reisub.openosrs.glassblower.Config;
 import io.reisub.openosrs.glassblower.Glassblower;
 import io.reisub.openosrs.util.Task;
+import io.reisub.openosrs.util.tasks.BankTask;
 import net.runelite.api.ItemID;
 import net.runelite.client.plugins.iutils.game.iObject;
 
+import javax.inject.Inject;
 import java.time.Duration;
 import java.time.Instant;
 
-public class HandleBank extends Task {
+public class HandleBank extends BankTask {
     private Instant lastBanking = Instant.EPOCH;
 
     @Override
@@ -39,13 +42,7 @@ public class HandleBank extends Task {
             game.tick();
         }
 
-        if (!bank.isOpen()) {
-            iObject bankObj = game.objects().withName("Bank chest", "Bank booth", "Bank Chest-wreck").nearest();
-            if (bankObj == null) return;
-
-            bankObj.interact(0);
-            game.waitUntil(() -> bank.isOpen(), 15);
-        }
+        openBank(5);
 
         bank.depositExcept(false, ItemID.GLASSBLOWING_PIPE, ItemID.SEAWEED_SPORE);
 //        bank.depositAll(false, ItemID.BEER_GLASS,