- Replace deprecated Entity::isOnScreen references.

Explv · Explv · commit 3a30c18b9796 · 2021-05-15T09:54:14.000+01:00
- Implement custom settings handler as OSBot deprecated theirs.
- Fix tool banking when members items in bank but player is in F2P world.

v3.4.0
diff --git a/resources-archive.zip b/resources-archive.zip
diff --git a/src/main/java/activities/banking/ToolUpgradeBanking.java b/src/main/java/activities/banking/ToolUpgradeBanking.java
@@ -30,6 +30,7 @@ public T getCurrentTool() {
     public void onStart() throws InterruptedException {
         super.onStart();
         currentTool = Stream.of(toolClass.getEnumConstants())
+                .filter(tool -> !tool.isMembersOnly() || getWorlds().isMembersWorld())
                 .filter(tool -> tool.canUse(getSkills()))
                 .filter(tool -> getInventory().contains(tool.getName()) ||
                         getEquipment().isWearingItem(EquipmentSlot.WEAPON, tool.getName()))
@@ -49,6 +50,10 @@ public boolean toolUpgradeAvailable() {
     protected void bank(final BankType currentBankType) {
         if (toolsInBank.isEmpty()) {
             for (T tool : toolClass.getEnumConstants()) {
+                if (!getWorlds().isMembersWorld() && tool.isMembersOnly()) {
+                    log(String.format("Skipping tool '%s' as not in members world", tool.getName()));
+                    continue;
+                }
                 if (getBank().contains(tool.getName())) {
                     log(String.format("Found tool '%s' in the bank", tool.getName()));
                     toolsInBank.add(tool);
@@ -98,6 +103,8 @@ private boolean bankContainsBetterTool() {
     private Optional<T> getBestUsableTool() {
         return toolsInBank.stream()
                 .filter(tool -> tool.canUse(getSkills()))
-                .max(Comparator.comparingInt(Tool::getLevelRequired));
+                // NOTE: Do not replace this with a method reference Tool::getLevelRequired
+                // There is a bug in the Java compiler which causes the code to crash.
+                .max(Comparator.comparingInt(tool -> tool.getLevelRequired()));
     }
 }
diff --git a/src/main/java/activities/quests/DialogueCompleter.java b/src/main/java/activities/quests/DialogueCompleter.java
@@ -40,14 +40,14 @@ private String[] buildDialogueOptions(final String[] dialogueOptions) {
     public void run() throws InterruptedException {
         NPC npc = getNpcs().closest(npcName);
 
-        if (npc == null || !npc.isOnScreen()) {
+        if (npc == null || !npc.isVisible()) {
             if (area != null && !area.contains(myPosition())) {
                 WebWalkEvent webWalkEvent = new WebWalkEvent(area);
                 webWalkEvent.setBreakCondition(new Condition() {
                     @Override
                     public boolean evaluate() {
                         NPC npc = getNpcs().closest(npcName);
-                        return npc != null && npc.isOnScreen() && getMap().canReach(npc);
+                        return npc != null && npc.isVisible() && getMap().canReach(npc);
                     }
                 });
                 execute(webWalkEvent);
diff --git a/src/main/java/activities/skills/fishing/FishingActivity.java b/src/main/java/activities/skills/fishing/FishingActivity.java
@@ -64,7 +64,7 @@ public void runActivity() throws InterruptedException {
     private void fish() {
         currentFishingSpot = getFishingSpot();
         if (currentFishingSpot != null) {
-            if (!currentFishingSpot.isOnScreen()) {
+            if (!currentFishingSpot.isVisible()) {
                 getWalking().walk(currentFishingSpot);
             }
             if (currentFishingSpot.interact(fish.fishingMethod.action)) {
diff --git a/src/main/java/activities/skills/mining/Pickaxe.java b/src/main/java/activities/skills/mining/Pickaxe.java
@@ -17,19 +17,25 @@ public enum Pickaxe implements Tool {
     MITHRIL("Mithril pickaxe", 21, 20),
     ADAMANT("Adamant pickaxe", 31, 30),
     RUNE("Rune pickaxe", 41, 40),
-    DRAGON("Dragon pickaxe", 61, 60),
-    INFERNAL("Infernal pickaxe", 61, 60);
+    DRAGON("Dragon pickaxe", 61, 60, true),
+    INFERNAL("Infernal pickaxe", 61, 60, true);
 
     String name;
     int miningLevelRequired;
     int attackLevelRequired;
+    boolean membersOnly;
 
     Pickaxe(final String name, final int miningLevelRequired, final int attackLevelRequired) {
         this.name = name;
         this.miningLevelRequired = miningLevelRequired;
         this.attackLevelRequired = attackLevelRequired;
     }
 
+    Pickaxe(final String name, final int miningLevelRequired, final int attackLevelRequired, final boolean membersOnly) {
+        this(name, miningLevelRequired, attackLevelRequired);
+        this.membersOnly = membersOnly;
+    }
+
     public static List<String> getNames() {
         return Arrays.stream(values()).map(Pickaxe::toString).collect(Collectors.toList());
     }
@@ -39,6 +45,11 @@ public String getName() {
         return name;
     }
 
+    @Override
+    public boolean isMembersOnly() {
+        return membersOnly;
+    }
+
     @Override
     public int getLevelRequired() {
         return miningLevelRequired;
diff --git a/src/main/java/activities/skills/woodcutting/Axe.java b/src/main/java/activities/skills/woodcutting/Axe.java
@@ -14,24 +14,35 @@ public enum Axe implements Tool {
     MITHRIL("Mithril axe", 21, 20),
     ADAMANT("Adamant axe", 31, 30),
     RUNE("Rune axe", 41, 40),
-    DRAGON("Dragon axe", 61, 60),
-    INFERNAL("Infernal axe", 61, 60);
+    DRAGON("Dragon axe", 61, 60, true),
+    INFERNAL("Infernal axe", 61, 60, true);
 
     String name;
     int wcLevelRequired;
     int attLevelRequired;
+    boolean membersOnly;
 
     Axe(final String name, final int wcLevelRequired, final int attLevelRequired) {
         this.name = name;
         this.wcLevelRequired = wcLevelRequired;
         this.attLevelRequired = attLevelRequired;
     }
 
+    Axe(final String name, final int wcLevelRequired, final int attLevelRequired, final boolean membersOnly) {
+        this(name, wcLevelRequired, attLevelRequired);
+        this.membersOnly = membersOnly;
+    }
+
     @Override
     public String getName() {
         return name;
     }
 
+    @Override
+    public boolean isMembersOnly() {
+        return membersOnly;
+    }
+
     @Override
     public int getLevelRequired() {
         return wcLevelRequired;
diff --git a/src/main/java/activities/tutorial_island/RuneScapeGuideSection.java b/src/main/java/activities/tutorial_island/RuneScapeGuideSection.java
@@ -86,7 +86,8 @@ public final void run() throws InterruptedException {
                 break;
             case 10:
                 if (!isConfigured) {
-                    isConfigured = execute(new ConfigureClientEvent()).hasFinished();
+                   execute(new ConfigureClientEvent());
+                   isConfigured = true;
                 } else if (getObjects().closest("Door").interact("Open")) {
                     Sleep.sleepUntil(() -> getProgress() != 10, 5000, 600);
                 }
diff --git a/src/main/java/activities/tutorial_island/TutorialIsland.java b/src/main/java/activities/tutorial_island/TutorialIsland.java
@@ -21,7 +21,7 @@ public TutorialIsland() {
 
     @Override
     public void onStart() throws InterruptedException {
-        Sleep.sleepUntil(() -> getClient().isLoggedIn() && myPlayer().isVisible() && myPlayer().isOnScreen(), 6000, 500);
+        Sleep.sleepUntil(() -> getClient().isLoggedIn() && myPlayer().isVisible(), 6000, 500);
     }
 
     @Override
diff --git a/src/main/java/script/AIO.java b/src/main/java/script/AIO.java
@@ -27,7 +27,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 {
 
-    public static final String VERSION = "v3.3.0";
+    public static final String VERSION = "v3.4.0";
 
     private Gui gui;
     private Paint paint;
@@ -141,7 +141,8 @@ public int onLoop() throws InterruptedException {
         if (!getClient().isLoggedIn()) {
             return random(1200, 1800);
         } else if (!osrsClientIsConfigured && osrsClientIsConfigurable()) {
-            osrsClientIsConfigured = configureOSRSClient();
+            configureOSRSClient();
+            osrsClientIsConfigured = true;
         } else if (taskExecutor.isComplete()) {
             stop(true);
         } else {
@@ -159,8 +160,8 @@ private boolean osrsClientIsConfigurable() {
                 getNpcs().closest("Lumbridge Guide") == null;
     }
 
-    private boolean configureOSRSClient() {
-        return execute(new ConfigureClientEvent()).hasFinished();
+    private void configureOSRSClient() throws InterruptedException {
+        customMethodProvider.execute(new ConfigureClientEvent());
     }
 
     @Override
diff --git a/src/main/java/util/Tool.java b/src/main/java/util/Tool.java
@@ -5,6 +5,8 @@
 public interface Tool {
     String getName();
 
+    boolean isMembersOnly();
+
     int getLevelRequired();
 
     boolean canUse(final Skills skills);
diff --git a/src/main/java/util/custom_method_provider/CustomMethodProvider.java b/src/main/java/util/custom_method_provider/CustomMethodProvider.java
@@ -19,19 +19,21 @@ public class CustomMethodProvider extends MethodProvider {
     private SkillTracker skillTracker;
     private ExecutableUtil executableUtil;
     private ExtendedInventory extendedInventory;
+    private ExtendedSettings extendedSettings;
     private MakeAllInterface makeAllInterface;
     private boolean hasContext;
 
     public void init(final Bot bot) {
         super.exchangeContext(bot);
         this.extendedGroundItems = new ExtendedGroundItems();
-        this.extendedCamera = new ExtendedCamera();
+        this.extendedCamera = new ExtendedCamera(this);
         this.interactionHelper = new InteractionHelper();
         this.extendedNPCS = new ExtendedNPCS();
         this.graphics = new Graphics();
         this.skillTracker = new SkillTracker();
         this.executableUtil = new ExecutableUtil();
         this.extendedInventory = new ExtendedInventory();
+        this.extendedSettings = new ExtendedSettings();
         this.makeAllInterface = new MakeAllInterface();
         extendedGroundItems.exchangeContext(bot);
         extendedCamera.exchangeContext(bot);
@@ -41,6 +43,7 @@ public void init(final Bot bot) {
         skillTracker.exchangeContext(bot);
         executableUtil.exchangeContext(bot, this);
         extendedInventory.exchangeContext(bot);
+        extendedSettings.exchangeContext(bot);
         makeAllInterface.exchangeContext(bot, this);
         hasContext = true;
     }
@@ -62,6 +65,7 @@ public CustomMethodProvider exchangeContext(final Bot bot, final CustomMethodPro
         this.skillTracker = methodProvider.skillTracker;
         this.executableUtil = methodProvider.executableUtil;
         this.extendedInventory = methodProvider.extendedInventory;
+        this.extendedSettings = methodProvider.extendedSettings;
         this.makeAllInterface = methodProvider.makeAllInterface;
         super.exchangeContext(bot);
         hasContext = true;
@@ -98,6 +102,11 @@ public ExtendedInventory getInventory() {
         return extendedInventory;
     }
 
+    @Override
+    public ExtendedSettings getSettings() {
+        return extendedSettings;
+    }
+
     public MakeAllInterface getMakeAllInterface() { return makeAllInterface; }
 
     public ExecutableUtil getExecutableUtil() { return executableUtil; }
diff --git a/src/main/java/util/custom_method_provider/ExtendedCamera.java b/src/main/java/util/custom_method_provider/ExtendedCamera.java
@@ -1,19 +1,24 @@
 package util.custom_method_provider;
 
+import org.osbot.CON;
 import org.osbot.rs07.api.Camera;
 import org.osbot.rs07.api.Settings;
 import org.osbot.rs07.api.model.Entity;
 import org.osbot.rs07.api.ui.RS2Widget;
 import org.osbot.rs07.api.ui.Tab;
 import org.osbot.rs07.event.Event;
-import org.osbot.rs07.script.MethodProvider;
 
 import java.util.function.Supplier;
 
 public class ExtendedCamera extends Camera {
 
     private static final int MAX_PITCH_ANGLE = 67;
     private static final int MAX_ZOOM_OUT_SCALE = 181;
+    private final CustomMethodProvider customMethodProvider;
+
+    public ExtendedCamera(final CustomMethodProvider customMethodProvider) {
+        this.customMethodProvider = customMethodProvider;
+    }
 
     public boolean isAtTop() {
         return getCamera().getPitchAngle() >= MAX_PITCH_ANGLE;
@@ -59,9 +64,8 @@ public int execute() {
                     setFinished();
                 } else if (getTabs().getOpen() != Tab.SETTINGS) {
                     getTabs().open(Tab.SETTINGS);
-                } else if (getSettings().getCurrentBasicSettingsTab() != Settings.BasicSettingsTab.CONTROLS) {
-                    log("Opening tab");
-                    getSettings().open(Settings.BasicSettingsTab.CONTROLS);
+                } else if (!customMethodProvider.getSettings().isBasicSettingsTabOpen(ExtendedSettings.BasicSettingsTab.CONTROLS)) {
+                    customMethodProvider.getSettings().openBasicSettingsTab(ExtendedSettings.BasicSettingsTab.CONTROLS);
                 } else {
                     RS2Widget maxZoomOutWidget = getWidgets().get(116, 51);
                     if (maxZoomOutWidget != null) {
diff --git a/src/main/java/util/custom_method_provider/ExtendedSettings.java b/src/main/java/util/custom_method_provider/ExtendedSettings.java
diff --git a/src/main/java/util/event/ConfigureClientEvent.java b/src/main/java/util/event/ConfigureClientEvent.java

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public void runActivity() throws InterruptedException {`
`64`	`64`	`private void fish() {`
`65`	`65`	`currentFishingSpot = getFishingSpot();`
`66`	`66`	`if (currentFishingSpot != null) {`
`67`		`- if (!currentFishingSpot.isOnScreen()) {`
	`67`	`+ if (!currentFishingSpot.isVisible()) {`
`68`	`68`	`getWalking().walk(currentFishingSpot);`
`69`	`69`	`}`
`70`	`70`	`if (currentFishingSpot.interact(fish.fishingMethod.action)) {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public TutorialIsland() {`
`21`	`21`
`22`	`22`	`@Override`
`23`	`23`	`public void onStart() throws InterruptedException {`
`24`		`- Sleep.sleepUntil(() -> getClient().isLoggedIn() && myPlayer().isVisible() && myPlayer().isOnScreen(), 6000, 500);`
	`24`	`+ Sleep.sleepUntil(() -> getClient().isLoggedIn() && myPlayer().isVisible(), 6000, 500);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@Override`