diff --git a/src/main/java/ParaScript/Main.java b/src/main/java/ParaScript/Main.java index 9f4a452..408f4da 100644 --- a/src/main/java/ParaScript/Main.java +++ b/src/main/java/ParaScript/Main.java @@ -3,13 +3,16 @@ package ParaScript; import ParaScript.data.Variables; import ParaScript.strategies.*; import ParaScript.ui.UI; +import org.parabot.core.ui.Logger; import org.parabot.environment.api.interfaces.Paintable; import org.parabot.environment.api.utils.Time; import org.parabot.environment.api.utils.Timer; +import org.parabot.environment.input.Keyboard; import org.parabot.environment.scripts.Script; import org.parabot.environment.scripts.framework.Strategy; import org.parabot.environment.scripts.Category; import org.parabot.environment.scripts.ScriptManifest; +import org.rev317.min.accessors.Client; import org.rev317.min.api.events.MessageEvent; import org.rev317.min.api.events.listeners.MessageListener; import org.rev317.min.api.methods.Skill; @@ -17,7 +20,7 @@ import org.rev317.min.api.methods.Skill; import java.awt.*; import java.util.ArrayList; -@ScriptManifest(author = "RedSparr0w & Dark98", category = Category.OTHER, description = "2006 AIO Script", name = "2006 AIO", servers = { "2006rebotted" }, version = 1) +@ScriptManifest(author = "RedSparr0w & Dark98", category = Category.OTHER, description = "2006 AIO Script", name = "2006 AIO", servers = { "2006rebotted" }, version = 1.2) public class Main extends Script implements MessageListener, Paintable { private final ArrayList strategies = new ArrayList(); @@ -66,6 +69,9 @@ public class Main extends Script implements MessageListener, Paintable { } strategies.add(new HandleLogin()); provide(strategies); + + Keyboard.getInstance().sendKeys("Training " + Variables.skill_to_train.getName() + ". Drop items? " + !Variables.shouldBankItems()); + return true; } diff --git a/src/main/java/ParaScript/strategies/Bank.java b/src/main/java/ParaScript/strategies/Bank.java index fd35005..f96f615 100644 --- a/src/main/java/ParaScript/strategies/Bank.java +++ b/src/main/java/ParaScript/strategies/Bank.java @@ -15,7 +15,7 @@ public class Bank implements Strategy { return Variables.running && Game.isLoggedIn() && Variables.shouldBankItems() - && (Variables.getStatus() == "none" || Variables.getStatus() == "banking items") + && (Variables.getStatus().equals("none") || Variables.getStatus().equals("banking items")) && Inventory.isFull(); } @@ -32,7 +32,13 @@ public class Bank implements Strategy { } public void depositItems() { - Keyboard.getInstance().sendKeys("::bank", true); + Npc banker = Npcs.getClosest(494); + if (banker != null) + { + banker.interact(Npcs.Option.BANK); + } else { + Keyboard.getInstance().sendKeys("I can't find the banker!"); + } Time.sleep(3000); if (Game.getOpenInterfaceId() == 5292) { if (Variables.skill_to_train == Skill.MINING) diff --git a/src/main/java/ParaScript/strategies/Mine.java b/src/main/java/ParaScript/strategies/Mine.java index 1d58ce8..608d6da 100644 --- a/src/main/java/ParaScript/strategies/Mine.java +++ b/src/main/java/ParaScript/strategies/Mine.java @@ -3,6 +3,7 @@ package ParaScript.strategies; import ParaScript.data.Variables; import ParaScript.data.variables.Ores; import org.parabot.environment.api.utils.Time; +import org.parabot.environment.input.Keyboard; import org.parabot.environment.scripts.framework.Strategy; import org.rev317.min.api.methods.Inventory; import org.rev317.min.api.methods.Items; @@ -18,7 +19,7 @@ public class Mine implements Strategy { ore = ore(); // set the local Variable if (Variables.running && ore != null - && (Variables.getStatus() == "none" || Variables.getStatus() == "mining") + && (Variables.getStatus().equals("none") || Variables.getStatus().equals("mining")) && Variables.VARROCK_EAST_MINE_ZONE.inTheZone() && !Players.getMyPlayer().isInCombat() && Players.getMyPlayer().getAnimation() == -1 @@ -42,6 +43,7 @@ public class Mine implements Strategy { } catch (Exception ಠ_ಠ){ System.out.println("Mining error: ¯\\_(ツ)_/¯"); } + Time.sleep(1000); } private SceneObject ore(){ @@ -53,4 +55,4 @@ public class Mine implements Strategy { } return null; } -} \ No newline at end of file +}