Skip to content
This repository was archived by the owner on Feb 9, 2022. It is now read-only.

Commit 87b9db9

Browse files
author
Explv
committed
v3.2.6 - Fix settings usage.
1 parent 2650140 commit 87b9db9

8 files changed

Lines changed: 43 additions & 156 deletions

File tree

‎resources-archive.zip‎

0 Bytes
Binary file not shown.

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

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66
import org.osbot.rs07.event.Event;
77
import org.osbot.rs07.script.MethodProvider;
88
import util.Sleep;
9+
import util.event.ConfigureClientEvent;
910
import util.event.DisableAudioEvent;
10-
import util.event.EnableFixedModeEvent;
11-
import util.event.ToggleRoofsHiddenEvent;
12-
import util.event.ToggleShiftDropEvent;
1311
import util.widget.CachedWidget;
1412

1513
import java.util.Arrays;
@@ -52,7 +50,7 @@ static UsernameCheckStatus getUsernameCheckStatus(Configs configs) {
5250
private final CachedWidget creationScreenWidget = new CachedWidget("Head");
5351
private final CachedWidget experienceWidget = new CachedWidget("What's your experience with Old School Runescape?");
5452

55-
private boolean isAudioDisabled;
53+
private boolean isConfigured;
5654

5755
public RuneScapeGuideSection() {
5856
super("Gielinor Guide");
@@ -85,14 +83,8 @@ public final void onLoop() throws InterruptedException {
8583
getTabs().open(Tab.SETTINGS);
8684
break;
8785
case 10:
88-
if (!EnableFixedModeEvent.isFixedModeEnabled(this)) {
89-
execute(new EnableFixedModeEvent());
90-
} else if (!isAudioDisabled) {
91-
isAudioDisabled = disableAudio();
92-
} else if (!getSettings().areRoofsEnabled()) {
93-
toggleRoofsHidden();
94-
} else if (!getSettings().isShiftDropActive()) {
95-
toggleShiftDrop();
86+
if (!isConfigured) {
87+
execute(new ConfigureClientEvent());
9688
} else if (getObjects().closest("Door").interact("Open")) {
9789
Sleep.sleepUntil(() -> getProgress() != 10, 5000, 600);
9890
}
@@ -180,22 +172,4 @@ private void clickRandomTimes(final RS2Widget widget) throws InterruptedExceptio
180172
}
181173
}
182174
}
183-
184-
private boolean disableAudio() {
185-
Event disableAudioEvent = new DisableAudioEvent();
186-
execute(disableAudioEvent);
187-
return disableAudioEvent.hasFinished();
188-
}
189-
190-
private boolean toggleRoofsHidden() {
191-
Event toggleRoofsHiddenEvent = new ToggleRoofsHiddenEvent();
192-
execute(toggleRoofsHiddenEvent);
193-
return toggleRoofsHiddenEvent.hasFinished();
194-
}
195-
196-
private boolean toggleShiftDrop() {
197-
Event toggleShiftDrop = new ToggleShiftDropEvent();
198-
execute(toggleShiftDrop);
199-
return toggleShiftDrop.hasFinished();
200-
}
201175
}

‎src/main/java/script/AIO.java‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
import tasks.TutorialIslandTask;
1515
import tasks.task_executor.TaskExecutor;
1616
import util.SkillTracker;
17-
import util.event.EnableFixedModeEvent;
18-
import util.event.ToggleRoofsHiddenEvent;
19-
import util.event.ToggleShiftDropEvent;
17+
import util.event.ConfigureClientEvent;
2018

2119
import java.awt.*;
2220
import java.io.File;
@@ -28,7 +26,7 @@
2826
@ScriptManifest(author = "Explv", name = "Explv's AIO " + AIO.VERSION, info = "AIO", version = 0, logo = "http://i.imgur.com/58Zz0fb.png")
2927
public class AIO extends Script {
3028

31-
public static final String VERSION = "v3.2.5";
29+
public static final String VERSION = "v3.2.6";
3230

3331
private Gui gui;
3432
private Paint paint;
@@ -166,16 +164,7 @@ private boolean osrsClientIsConfigurable() {
166164
}
167165

168166
private boolean configureOSRSClient() {
169-
if (!EnableFixedModeEvent.isFixedModeEnabled(getBot().getMethods())) {
170-
execute(new EnableFixedModeEvent());
171-
} else if (!getSettings().areRoofsEnabled()) {
172-
execute(new ToggleRoofsHiddenEvent());
173-
} else if (!getSettings().isShiftDropActive()) {
174-
execute(new ToggleShiftDropEvent());
175-
} else {
176-
return true;
177-
}
178-
return false;
167+
return execute(new ConfigureClientEvent()).hasFinished();
179168
}
180169

181170
@Override

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package util.event;
2+
3+
import org.osbot.rs07.api.Display;
4+
import org.osbot.rs07.api.Settings;
5+
import org.osbot.rs07.event.Event;
6+
7+
public class ConfigureClientEvent extends Event {
8+
9+
private boolean isAudioDisabled = false;
10+
11+
@Override
12+
public int execute() throws InterruptedException {
13+
if (getDisplay().isResizableMode()) {
14+
getDisplay().setDisplayMode(Display.DisplayMode.FIXED);
15+
} if (!getSettings().areRoofsEnabled()) {
16+
getSettings().setSetting(Settings.AllSettingsTab.DISPLAY, "Hide roofs", true);
17+
} else if (!getSettings().isShiftDropActive()) {
18+
getSettings().setSetting(Settings.AllSettingsTab.CONTROLS, "Shift click to drop items", true);
19+
} else if (getSettings().isAllSettingsWidgetVisible()){
20+
getWidgets().closeOpenInterface();
21+
} else if (!isAudioDisabled) {
22+
execute(new DisableAudioEvent());
23+
isAudioDisabled = true;
24+
} else {
25+
setFinished();
26+
}
27+
return 600;
28+
}
29+
30+
31+
}

‎src/main/java/util/event/DisableAudioEvent.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ public final class DisableAudioEvent extends Event {
1414
private final CachedWidget soundSettingsWidget = new CachedWidget(new WidgetActionFilter("Audio"));
1515
private final CachedWidget musicVolumeWidget = new CachedWidget(new WidgetActionFilter("Adjust Music Volume"));
1616
private final CachedWidget soundEffectVolumeWidget = new CachedWidget(new WidgetActionFilter("Adjust Sound Effect Volume"));
17-
private final CachedWidget areaSoundEffectVolumeWidget = new CachedWidget(new WidgetActionFilter("Adjust Area Sound Effect Volume"));
17+
private final CachedWidget areaSoundEffectVolumeWidget = new CachedWidget(new WidgetActionFilter("Adjust Area Sound Volume"));
1818

1919
@Override
2020
public final int execute() throws InterruptedException {
21-
if (Tab.SETTINGS.isDisabled(getBot())) {
21+
if (isVolumeDisabled(musicVolumeConfig) && isVolumeDisabled(soundEffectVolumeConfig) && isVolumeDisabled(areaSoundEffectVolumeConfig)) {
22+
setFinished();
23+
} else if (Tab.SETTINGS.isDisabled(getBot())) {
2224
setFailed();
2325
} else if (getTabs().getOpen() != Tab.SETTINGS) {
2426
getTabs().open(Tab.SETTINGS);
@@ -30,10 +32,8 @@ public final int execute() throws InterruptedException {
3032
soundEffectVolumeWidget.interact(getWidgets());
3133
} else if (!isVolumeDisabled(areaSoundEffectVolumeConfig)) {
3234
areaSoundEffectVolumeWidget.interact(getWidgets());
33-
} else {
34-
setFinished();
3535
}
36-
return 200;
36+
return 600;
3737
}
3838

3939
private boolean isVolumeDisabled(final int config) {

‎src/main/java/util/event/EnableFixedModeEvent.java‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎src/main/java/util/event/ToggleRoofsHiddenEvent.java‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎src/main/java/util/event/ToggleShiftDropEvent.java‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)