Updates and rework to use CScript

fisher/fisher.gradle.kts

@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-version = "0.0.1"
+version = "1.0.0"
 
 project.extra["PluginName"] = "Chaos Fisher" // This is the name that is used in the external plugin manager panel
 project.extra["PluginDescription"] = "Frantically fishes fish" // This is the description that is used in the external plugin manager panel

fisher/src/main/java/io/reisub/openosrs/fisher/Config.java

@@ -25,13 +25,12 @@
 package io.reisub.openosrs.fisher;
 
 import net.runelite.client.config.Button;
-import net.runelite.client.config.Config;
 import net.runelite.client.config.ConfigGroup;
 import net.runelite.client.config.ConfigItem;
 
-@ConfigGroup("ChaosFisherConfig")
+@ConfigGroup("chaosfisher")
 
-public interface FisherConfig extends Config {
+public interface Config extends net.runelite.client.config.Config {
     @ConfigItem(
             keyName = "startButton",
             name = "Start/Stop",

fisher/src/main/java/io/reisub/openosrs/fisher/Fisher.java

@@ -3,23 +3,15 @@ package io.reisub.openosrs.fisher;
 import com.google.inject.Provides;
 import io.reisub.openosrs.fisher.tasks.Drop;
 import io.reisub.openosrs.fisher.tasks.Fish;
-import io.reisub.openosrs.util.Task;
+import io.reisub.openosrs.util.CScript;
 import io.reisub.openosrs.util.Util;
-import io.reisub.openosrs.util.tasks.KittenTask;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.events.ChatMessage;
-import net.runelite.api.events.ConfigButtonClicked;
 import net.runelite.client.config.ConfigManager;
-import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.PluginDependency;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.iutils.iUtils;
-import net.runelite.client.plugins.iutils.scripts.iScript;
 import org.pf4j.Extension;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Extension
 @PluginDependency(Util.class)
 @PluginDependency(iUtils.class)
@@ -29,62 +21,17 @@ import java.util.List;
 	enabledByDefault = false
 )
 @Slf4j
-public class FisherPlugin extends iScript {
-	private List<Task> tasks;
-
-	private KittenTask kittenTask;
-
+public class Fisher extends CScript {
 	@Provides
-	FisherConfig provideConfig(ConfigManager configManager) {
-		return configManager.getConfig(FisherConfig.class);
-	}
-
-	@Override
-	protected void loop() {
-		for (Task t : tasks) {
-			if (t.validate()) {
-				log.info(t.getStatus());
-				t.execute();
-				break;
-			}
-		}
-
-		game.sleepDelay();
+	Config provideConfig(ConfigManager configManager) {
+		return configManager.getConfig(Config.class);
 	}
 
 	@Override
 	protected void onStart() {
-		log.info("Starting Chaos Fisher");
+		super.onStart();
 
-		kittenTask = KittenTask.getInstance(injector);
-
-		tasks = new ArrayList<>();
-		tasks.add(kittenTask);
-		tasks.add(injector.getInstance(Drop.class));
-		tasks.add(injector.getInstance(Fish.class));
-	}
-
-	@Override
-	protected void onStop() {
-		log.info("Stopping Chaos Fisher");
-		if (tasks != null) {
-			tasks.clear();
-		}
-
-		KittenTask.handleKitten = false;
-	}
-
-	@Subscribe
-	private void onConfigButtonPressed(ConfigButtonClicked configButtonClicked) {
-		if (configButtonClicked.getKey().equals("startButton")) {
-			execute();
-		}
-	}
-
-	@Subscribe
-	private void onChatMessage(ChatMessage chatMessage) {
-		if (kittenTask != null) {
-			kittenTask.onChatMessage(chatMessage);
-		}
+		addTask(Drop.class);
+		addTask(Fish.class);
 	}
 }

fisher/src/main/java/io/reisub/openosrs/fisher/tasks/HandleBank.java

@@ -3,11 +3,8 @@ package io.reisub.openosrs.fisher.tasks;
 import io.reisub.openosrs.util.Task;
 import net.runelite.client.plugins.iutils.game.iNPC;
 import net.runelite.client.plugins.iutils.scene.Position;
-import net.runelite.client.plugins.iutils.ui.Bank;
 
-import javax.inject.Inject;
-
-public class DoBank extends Task {
+public class HandleBank extends Task {
     @Override
     public String getStatus() {
         return "Banking";