v3.2.6 - Fix settings usage.

Author: Explv

resources-archive.zip

@@ -6,10 +6,8 @@
 import org.osbot.rs07.event.Event;
 import org.osbot.rs07.script.MethodProvider;
 import util.Sleep;
+import util.event.ConfigureClientEvent;
 import util.event.DisableAudioEvent;
-import util.event.EnableFixedModeEvent;
-import util.event.ToggleRoofsHiddenEvent;
-import util.event.ToggleShiftDropEvent;
 import util.widget.CachedWidget;
 
 import java.util.Arrays;
@@ -52,7 +50,7 @@ static UsernameCheckStatus getUsernameCheckStatus(Configs configs) {
     private final CachedWidget creationScreenWidget = new CachedWidget("Head");
     private final CachedWidget experienceWidget = new CachedWidget("What's your experience with Old School Runescape?");
 
-    private boolean isAudioDisabled;
+    private boolean isConfigured;
 
     public RuneScapeGuideSection() {
         super("Gielinor Guide");
@@ -85,14 +83,8 @@ public final void onLoop() throws InterruptedException {
                 getTabs().open(Tab.SETTINGS);
                 break;
             case 10:
-                if (!EnableFixedModeEvent.isFixedModeEnabled(this)) {
-                    execute(new EnableFixedModeEvent());
-                } else if (!isAudioDisabled) {
-                    isAudioDisabled = disableAudio();
-                } else if (!getSettings().areRoofsEnabled()) {
-                    toggleRoofsHidden();
-                } else if (!getSettings().isShiftDropActive()) {
-                    toggleShiftDrop();
+                if (!isConfigured) {
+                    execute(new ConfigureClientEvent());
                 } else if (getObjects().closest("Door").interact("Open")) {
                     Sleep.sleepUntil(() -> getProgress() != 10, 5000, 600);
                 }
@@ -180,22 +172,4 @@ private void clickRandomTimes(final RS2Widget widget) throws InterruptedExceptio
             }
         }
     }
-
-    private boolean disableAudio() {
-        Event disableAudioEvent = new DisableAudioEvent();
-        execute(disableAudioEvent);
-        return disableAudioEvent.hasFinished();
-    }
-
-    private boolean toggleRoofsHidden() {
-        Event toggleRoofsHiddenEvent = new ToggleRoofsHiddenEvent();
-        execute(toggleRoofsHiddenEvent);
-        return toggleRoofsHiddenEvent.hasFinished();
-    }
-
-    private boolean toggleShiftDrop() {
-        Event toggleShiftDrop = new ToggleShiftDropEvent();
-        execute(toggleShiftDrop);
-        return toggleShiftDrop.hasFinished();
-    }
 }

src/main/java/activities/tutorial_island/RuneScapeGuideSection.java

@@ -14,9 +14,7 @@
 import tasks.TutorialIslandTask;
 import tasks.task_executor.TaskExecutor;
 import util.SkillTracker;
-import util.event.EnableFixedModeEvent;
-import util.event.ToggleRoofsHiddenEvent;
-import util.event.ToggleShiftDropEvent;
+import util.event.ConfigureClientEvent;
 
 import java.awt.*;
 import java.io.File;
@@ -28,7 +26,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.2.5";
+    public static final String VERSION = "v3.2.6";
 
     private Gui gui;
     private Paint paint;
@@ -166,16 +164,7 @@ private boolean osrsClientIsConfigurable() {
     }
 
     private boolean configureOSRSClient() {
-        if (!EnableFixedModeEvent.isFixedModeEnabled(getBot().getMethods())) {
-            execute(new EnableFixedModeEvent());
-        } else if (!getSettings().areRoofsEnabled()) {
-            execute(new ToggleRoofsHiddenEvent());
-        } else if (!getSettings().isShiftDropActive()) {
-            execute(new ToggleShiftDropEvent());
-        } else {
-            return true;
-        }
-        return false;
+        return execute(new ConfigureClientEvent()).hasFinished();
     }
 
     @Override

src/main/java/script/AIO.java

@@ -0,0 +1,31 @@
+package util.event;
+
+import org.osbot.rs07.api.Display;
+import org.osbot.rs07.api.Settings;
+import org.osbot.rs07.event.Event;
+
+public class ConfigureClientEvent extends Event {
+
+    private boolean isAudioDisabled = false;
+
+    @Override
+    public int execute() throws InterruptedException {
+        if (getDisplay().isResizableMode()) {
+            getDisplay().setDisplayMode(Display.DisplayMode.FIXED);
+        } if (!getSettings().areRoofsEnabled()) {
+            getSettings().setSetting(Settings.AllSettingsTab.DISPLAY, "Hide roofs", true);
+        } else if (!getSettings().isShiftDropActive()) {
+            getSettings().setSetting(Settings.AllSettingsTab.CONTROLS, "Shift click to drop items", true);
+        } else if (getSettings().isAllSettingsWidgetVisible()){
+            getWidgets().closeOpenInterface();
+        } else if (!isAudioDisabled) {
+            execute(new DisableAudioEvent());
+            isAudioDisabled = true;
+        } else {
+            setFinished();
+        }
+        return 600;
+    }
+
+
+}

src/main/java/util/event/ConfigureClientEvent.java

@@ -14,11 +14,13 @@ public final class DisableAudioEvent extends Event {
     private final CachedWidget soundSettingsWidget = new CachedWidget(new WidgetActionFilter("Audio"));
     private final CachedWidget musicVolumeWidget = new CachedWidget(new WidgetActionFilter("Adjust Music Volume"));
     private final CachedWidget soundEffectVolumeWidget = new CachedWidget(new WidgetActionFilter("Adjust Sound Effect Volume"));
-    private final CachedWidget areaSoundEffectVolumeWidget = new CachedWidget(new WidgetActionFilter("Adjust Area Sound Effect Volume"));
+    private final CachedWidget areaSoundEffectVolumeWidget = new CachedWidget(new WidgetActionFilter("Adjust Area Sound Volume"));
 
     @Override
     public final int execute() throws InterruptedException {
-        if (Tab.SETTINGS.isDisabled(getBot())) {
+        if (isVolumeDisabled(musicVolumeConfig) && isVolumeDisabled(soundEffectVolumeConfig) && isVolumeDisabled(areaSoundEffectVolumeConfig)) {
+            setFinished();
+        } else if (Tab.SETTINGS.isDisabled(getBot())) {
             setFailed();
         } else if (getTabs().getOpen() != Tab.SETTINGS) {
             getTabs().open(Tab.SETTINGS);
@@ -30,10 +32,8 @@ public final int execute() throws InterruptedException {
             soundEffectVolumeWidget.interact(getWidgets());
         } else if (!isVolumeDisabled(areaSoundEffectVolumeConfig)) {
             areaSoundEffectVolumeWidget.interact(getWidgets());
-        } else {
-            setFinished();
         }
-        return 200;
+        return 600;
     }
 
     private boolean isVolumeDisabled(final int config) {