Fixed instructor name and minor bug fixes (#2)

phqnta · Explv · commit f28e8f13ea99 · 2018-10-13T14:52:51.000+01:00
diff --git a/src/events/ToggleShiftDropEvent.java b/src/events/ToggleShiftDropEvent.java
@@ -0,0 +1,26 @@
+package events;
+
+import org.osbot.rs07.api.Settings;
+import org.osbot.rs07.api.ui.Tab;
+import org.osbot.rs07.event.Event;
+import utils.CachedWidget;
+import utils.WidgetActionFilter;
+
+public final class ToggleShiftDropEvent extends Event {
+
+    private final CachedWidget toggleShiftClickDrop = new CachedWidget(new WidgetActionFilter("Toggle shift click to drop"));
+
+    @Override
+    public final int execute() throws InterruptedException {
+        if (Tab.SETTINGS.isDisabled(getBot())) {
+            setFailed();
+        } else if (getTabs().getOpen() != Tab.SETTINGS) {
+            getTabs().open(Tab.SETTINGS);
+        } else if (!toggleShiftClickDrop.get(getWidgets()).isPresent()) {
+            getSettings().open(Settings.SettingsTab.CONTROLS);
+        } else if (toggleShiftClickDrop.get(getWidgets()).get().interact()) {
+            setFinished();
+        }
+        return 200;
+    }
+}
diff --git a/src/script/TutorialIsland.java b/src/script/TutorialIsland.java
@@ -28,6 +28,9 @@ public void onStart() throws InterruptedException {
         bankSection.exchangeContext(getBot());
         priestSection.exchangeContext(getBot());
         wizardSection.exchangeContext(getBot());
+
+        // prevents script from skipping character customization
+        sleep(4000);
     }
 
     @Override
diff --git a/src/sections/BankSection.java b/src/sections/BankSection.java
@@ -1,7 +1,5 @@
 package sections;
 
-import org.osbot.rs07.api.filter.NameFilter;
-import org.osbot.rs07.api.filter.PositionFilter;
 import org.osbot.rs07.api.map.Area;
 import org.osbot.rs07.api.map.Position;
 import org.osbot.rs07.api.model.RS2Object;
@@ -60,39 +58,41 @@ public final void onLoop() throws InterruptedException {
             case 510:
                 if (!BANK_AREA.contains(myPosition())) {
                     if (getWalking().walkPath(PATH_TO_BANK)) {
-                         getDoorHandler().handleNextObstacle(BANK_AREA);
+                        getDoorHandler().handleNextObstacle(BANK_AREA);
                     }
                 } else if (getDialogues().isPendingOption()) {
                     getDialogues().selectOption("Yes.");
                 } else if (getObjects().closest("Bank booth").interact("Use")) {
-                    Sleep.sleepUntil(this::pendingContinue, 5000);
+                    Sleep.sleepUntil(this::pendingContinue, 5000, 500);
                 }
                 break;
             case 520:
                 if (getBank().isOpen()) {
                     getBank().close();
+                } else if (!getObjects().closest("Poll booth").isVisible()) {
+                    getCamera().toEntity(getObjects().closest("Poll booth"));
                 } else if (getObjects().closest("Poll booth").interact("Use")) {
-                    Sleep.sleepUntil(this::pendingContinue, 5000);
+                    Sleep.sleepUntil(this::pendingContinue, 5000, 500);
                 }
                 break;
             case 525:
                 if (getWidgets().closeOpenInterface() && openDoorAtPosition(new Position(3125, 3124, 0))) {
-                    Sleep.sleepUntil(() -> getProgress() != 525, 5000);
+                    Sleep.sleepUntil(() -> getProgress() != 525, 5000, 500);
                 }
                 break;
             case 530:
                 talkToInstructor();
                 break;
             case 540:
                 if (openDoorAtPosition(new Position(3130, 3124, 0))) {
-                    Sleep.sleepUntil(() -> getProgress() != 540, 5000);
+                    Sleep.sleepUntil(() -> getProgress() != 540, 5000, 500);
                 }
                 break;
         }
     }
 
     private boolean openDoorAtPosition(final Position position) {
-        RS2Object door =  getObjects().closest(obj -> obj.getName().equals("Door") && obj.getPosition().equals(position));
+        RS2Object door = getObjects().closest(obj -> obj.getName().equals("Door") && obj.getPosition().equals(position));
         return door != null && door.interact("Open");
     }
 }
diff --git a/src/sections/CookingSection.java b/src/sections/CookingSection.java
@@ -32,7 +32,7 @@ public final void onLoop() throws InterruptedException {
             case 130:
                 if (getWalking().walkPath(PATH_TO_COOK_BUILDING)) {
                     if (getDoorHandler().handleNextObstacle(COOK_BUILDING)) {
-                        Sleep.sleepUntil(() -> getProgress() == 140, 5000);
+                        Sleep.sleepUntil(() -> getProgress() == 140, 5000,500);
                     }
                 }
                 break;
@@ -50,7 +50,7 @@ public final void onLoop() throws InterruptedException {
                 break;
             case 180:
                 if (getDoorHandler().handleNextObstacle(new Position(3071, 3090, 0))) {
-                    Sleep.sleepUntil(() -> getProgress() != 180, 5000);
+                    Sleep.sleepUntil(() -> getProgress() != 180, 5000,500);
                 }
                 break;
         }
@@ -60,15 +60,15 @@ private void makeDough() {
         if (!"Pot of flour".equals(getInventory().getSelectedItemName())) {
             getInventory().interact("Use", "Pot of flour");
         } else if (getInventory().getItem("Bucket of water").interact()) {
-            Sleep.sleepUntil(() -> getInventory().contains("Bread dough"), 3000);
+            Sleep.sleepUntil(() -> getInventory().contains("Bread dough"), 3000,500);
         }
     }
 
     private void bakeDough() {
         if (!"Bread dough".equals(getInventory().getSelectedItemName())) {
             getInventory().interact("Use", "Bread dough");
         } else if (getObjects().closest("Range").interact()) {
-            Sleep.sleepUntil(() -> getInventory().contains("Bread"), 5000);
+            Sleep.sleepUntil(() -> getInventory().contains("Bread"), 5000,500);
         }
     }
 }
diff --git a/src/sections/FightingSection.java b/src/sections/FightingSection.java
@@ -37,7 +37,7 @@ public final void onLoop() throws InterruptedException {
                 case 400:
                     VIEW_EQUIPMENT_STATS_WIDGET.get(getWidgets()).ifPresent(widget -> {
                         if (widget.interact()) {
-                            Sleep.sleepUntil(() -> getProgress() != 400, 3000);
+                            Sleep.sleepUntil(() -> getProgress() != 400, 3000,500);
                         }
                     });
                     break;
@@ -89,7 +89,7 @@ public final void onLoop() throws InterruptedException {
                     if (!LADDER_AREA.contains(myPosition())) {
                         getWalking().walk(LADDER_AREA);
                     } else if (getObjects().closest("Ladder").interact("Climb-up")) {
-                        Sleep.sleepUntil(() -> !LADDER_AREA.contains(myPosition()), 5000);
+                        Sleep.sleepUntil(() -> !LADDER_AREA.contains(myPosition()), 5000,500);
                     }
                     break;
             }
@@ -103,15 +103,15 @@ private void enterRatCage() {
         if (!OUTSIDE_RAT_CAGE_GATE_AREA.contains(myPosition())) {
             getWalking().walk(OUTSIDE_RAT_CAGE_GATE_AREA);
         } else if (getObjects().closest("Gate").interact("Open")) {
-            Sleep.sleepUntil(this::inRatCage, 5000);
+            Sleep.sleepUntil(this::inRatCage, 5000,500);
         }
     }
 
     private void leaveRatCage() {
         if (!INSIDE_RAT_CAGE_GATE_AREA.contains(myPosition())) {
             getWalking().walk(INSIDE_RAT_CAGE_GATE_AREA);
         } else if (getObjects().closest("Gate").interact("Open")) {
-            Sleep.sleepUntil(() -> !inRatCage(), 5000);
+            Sleep.sleepUntil(() -> !inRatCage(), 5000,500);
         }
     }
 
@@ -123,7 +123,7 @@ private void attackRat() {
         //noinspection unchecked
         NPC giantRat = getNpcs().closest(npc -> npc.getName().equals("Giant rat") && npc.isAttackable());
         if (giantRat != null && giantRat.interact("Attack")) {
-            Sleep.sleepUntil(() -> myPlayer().getInteracting() != null, 5000);
+            Sleep.sleepUntil(() -> myPlayer().getInteracting() != null, 5000,500);
         }
     }
 
diff --git a/src/sections/MiningSection.java b/src/sections/MiningSection.java
@@ -78,7 +78,7 @@ public final void onLoop() throws InterruptedException {
                 Optional<RS2Widget> daggerWidgetOpt = getDaggerWidget();
                 if (daggerWidgetOpt.isPresent()) {
                     if (daggerWidgetOpt.get().interact()) {
-                        Sleep.sleepUntil(() -> getInventory().contains("Bronze dagger"), 6000);
+                        Sleep.sleepUntil(() -> getInventory().contains("Bronze dagger"), 6000,500);
                     }
                 } else {
                     smith();
@@ -87,7 +87,7 @@ public final void onLoop() throws InterruptedException {
             case 360:
                 if (getWalking().walkPath(PATH_TO_GATE)) {
                     if (getDoorHandler().handleNextObstacle(new Position(3096, 9503, 0))) {
-                        Sleep.sleepUntil(() -> getProgress() != 360, 5000);
+                        Sleep.sleepUntil(() -> getProgress() != 360, 5000,500);
                     }
                 }
                 break;
@@ -100,7 +100,7 @@ private void smith() {
         } else if (!"Bronze bar".equals(getInventory().getSelectedItemName())) {
             getInventory().getItem("Bronze bar").interact("Use");
         } else if (getObjects().closest("Anvil").interact("Use")) {
-            Sleep.sleepUntil(() -> getDaggerWidget().isPresent(), 5000);
+            Sleep.sleepUntil(() -> getDaggerWidget().isPresent(), 5000,500);
         }
     }
 
@@ -116,21 +116,21 @@ private void smelt() {
         if (!"Tin ore".equals(getInventory().getSelectedItemName())) {
             getInventory().getItem("Tin ore").interact("Use");
         } else if (getObjects().closest("Furnace").interact("Use")) {
-            Sleep.sleepUntil(() -> getInventory().contains("Bronze bar"), 5000);
+            Sleep.sleepUntil(() -> getInventory().contains("Bronze bar"), 5000,500);
         }
     }
 
     private void prospect(Rock rock) {
         RS2Object closestRock = rock.getClosestWithOre(getBot().getMethods());
         if (closestRock != null && closestRock.interact("Prospect")) {
-            Sleep.sleepUntil(this::pendingContinue, 6000);
+            Sleep.sleepUntil(this::pendingContinue, 6000,500);
         }
     }
 
     private void mine(Rock rock) {
         RS2Object closestRock = rock.getClosestWithOre(getBot().getMethods());
         if (closestRock != null && closestRock.interact("Mine")) {
-            Sleep.sleepUntil(this::pendingContinue, 6000);
+            Sleep.sleepUntil(this::pendingContinue, 6000,500);
         }
     }
 }
diff --git a/src/sections/PriestSection.java b/src/sections/PriestSection.java
@@ -60,7 +60,7 @@ public final void onLoop() throws InterruptedException {
                 break;
             case 610:
                 if (getDoorHandler().handleNextObstacle(new Position(3122, 3101, 0))) {
-                    Sleep.sleepUntil(() -> getProgress() != 610, 5000);
+                    Sleep.sleepUntil(() -> getProgress() != 610, 5000,500);
                 }
                 break;
         }
diff --git a/src/sections/QuestSection.java b/src/sections/QuestSection.java
@@ -45,7 +45,7 @@ public final void onLoop() throws InterruptedException {
             case 187:
                 // Use random emote
                 if (getWidgets().get(216, 1, new Random().nextInt(20)).interact()) {
-                    Sleep.sleepUntil(() -> getProgress() != 187, 5000);
+                    Sleep.sleepUntil(() -> getProgress() != 187, 5000,500);
                 }
                 break;
             case 190:
@@ -57,7 +57,7 @@ public final void onLoop() throws InterruptedException {
             case 210:
                 if (getWalking().walkPath(PATH_TO_QUEST_BUILDING)) {
                     if (getDoorHandler().handleNextObstacle(QUEST_BUILDING)) {
-                        Sleep.sleepUntil(() -> getProgress() != 210, 5000);
+                        Sleep.sleepUntil(() -> getProgress() != 210, 5000,500);
                     }
                 }
                 break;
@@ -72,7 +72,7 @@ public final void onLoop() throws InterruptedException {
                 break;
             case 250:
                 if (getObjects().closest("Ladder").interact("Climb-down")) {
-                    Sleep.sleepUntil(() -> getProgress() != 250, 5000);
+                    Sleep.sleepUntil(() -> getProgress() != 250, 5000,500);
                 }
                 break;
         }
diff --git a/src/sections/RuneScapeGuideSection.java b/src/sections/RuneScapeGuideSection.java
@@ -1,13 +1,14 @@
 package sections;
 
+import events.DisableAudioEvent;
+import events.ToggleRoofsHiddenEvent;
+import events.ToggleShiftDropEvent;
 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 events.DisableAudioEvent;
 import utils.CachedWidget;
 import utils.Sleep;
-import events.ToggleRoofsHiddenEvent;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -19,7 +20,7 @@ public final class RuneScapeGuideSection extends TutorialSection {
     private boolean isAudioDisabled;
 
     public RuneScapeGuideSection() {
-        super("RuneScape Guide");
+        super("Gielinor Guide");
     }
 
     @Override
@@ -33,8 +34,8 @@ public final void onLoop() throws InterruptedException {
             case 0:
                 if (creationScreenIsVisible()) {
                     createRandomCharacter();
-                } else if (getDialogues().isPendingOption()) {
-                    getDialogues().selectOption(3);
+                } else if (getWidgets().getWidgetContainingText("What's your experience with Old School Runescape?") != null) {
+                    getDialogues().selectOption(random(1, 3));
                 } else {
                     talkToInstructor();
                 }
@@ -47,8 +48,10 @@ public final void onLoop() throws InterruptedException {
                     isAudioDisabled = disableAudio();
                 } else if (!getSettings().areRoofsEnabled()) {
                     toggleRoofsHidden();
+                } else if (!getSettings().isShiftDropActive()) {
+                    toggleShiftDrop();
                 } else if (getObjects().closest("Door").interact("Open")) {
-                    Sleep.sleepUntil(() -> getProgress() != 10, 5000);
+                    Sleep.sleepUntil(() -> getProgress() != 10, 5000, 500);
                 }
                 break;
             default:
@@ -80,7 +83,7 @@ private void createRandomCharacter() throws InterruptedException {
         }
 
         if (getWidgets().getWidgetContainingText("Accept").interact()) {
-            Sleep.sleepUntil(() -> !creationScreenIsVisible(), 3000);
+            Sleep.sleepUntil(() -> !creationScreenIsVisible(), 3000, 500);
         }
     }
 
@@ -105,4 +108,10 @@ private boolean toggleRoofsHidden() {
         execute(toggleRoofsHiddenEvent);
         return toggleRoofsHiddenEvent.hasFinished();
     }
+
+    private boolean toggleShiftDrop() {
+        Event toggleShiftDrop = new ToggleShiftDropEvent();
+        execute(toggleShiftDrop);
+        return toggleShiftDrop.hasFinished();
+    }
 }
diff --git a/src/sections/SurvivalSection.java b/src/sections/SurvivalSection.java
@@ -1,7 +1,5 @@
 package sections;
 
-import org.osbot.rs07.api.filter.NameFilter;
-import org.osbot.rs07.api.filter.PositionFilter;
 import org.osbot.rs07.api.map.Position;
 import org.osbot.rs07.api.model.Entity;
 import org.osbot.rs07.api.model.GroundDecoration;
@@ -72,9 +70,9 @@ public final void onLoop() throws InterruptedException {
                 break;
             case 120:
                 RS2Object gate = getObjects().closest("Gate");
-                if (gate != null) {
-                    if (gate.interact("Open")){
-                        Sleep.sleepUntil(() -> getProgress() == 130, 5000);
+                if (gate != null && gate.isVisible()) {
+                    if (gate.interact("Open")) {
+                        Sleep.sleepUntil(() -> getProgress() == 130, 5000,500);
                     }
                 } else {
                     getWalking().walkPath(PATH_TO_GATE);
@@ -86,15 +84,15 @@ public final void onLoop() throws InterruptedException {
     private void chopTree() {
         Entity tree = getObjects().closest("Tree");
         if (tree != null && tree.interact("Chop down")) {
-            Sleep.sleepUntil(() -> getInventory().contains("Logs") || !tree.exists(), 10_000);
+            Sleep.sleepUntil(() -> getInventory().contains("Logs") || !tree.exists(), 10_000,500);
         }
     }
 
     private void fish() {
         NPC fishingSpot = getNpcs().closest("Fishing spot");
         if (fishingSpot != null && fishingSpot.interact("Net")) {
             long rawShrimpCount = getInventory().getAmount("Raw shrimps");
-            Sleep.sleepUntil(() -> getInventory().getAmount("Raw shrimps") > rawShrimpCount, 10_000);
+            Sleep.sleepUntil(() -> getInventory().getAmount("Raw shrimps") > rawShrimpCount, 10_000,500);
         }
     }
 
@@ -109,7 +107,7 @@ private void lightFire() {
             getInventory().getItem("Tinderbox").interact("Use");
         } else if (getInventory().getItem("Logs").interact()) {
             Position playerPos = myPosition();
-            Sleep.sleepUntil(() -> !myPosition().equals(playerPos), 10_000);
+            Sleep.sleepUntil(() -> !myPosition().equals(playerPos), 10_000,500);
         }
     }
 
@@ -121,7 +119,7 @@ private Optional<Position> getEmptyPosition() {
         List<Position> allPositions = myPlayer().getArea(10).getPositions();
 
         // Remove any position with an object (except ground decorations, as they can be walked on)
-        for(RS2Object object : getObjects().getAll()){
+        for (RS2Object object : getObjects().getAll()) {
             if (object instanceof GroundDecoration) {
                 continue;
             }
@@ -140,7 +138,7 @@ private void cook() {
             RS2Object fire = getObjects().closest("Fire");
             if (fire != null && fire.interact("Use")) {
                 long rawShrimpCount = getInventory().getAmount("Raw shrimps");
-                Sleep.sleepUntil(() -> getInventory().getAmount("Raw shrimps") < rawShrimpCount, 5000);
+                Sleep.sleepUntil(() -> getInventory().getAmount("Raw shrimps") < rawShrimpCount, 5000,500);
             }
         }
     }
diff --git a/src/sections/TutorialSection.java b/src/sections/TutorialSection.java
diff --git a/src/sections/WizardSection.java b/src/sections/WizardSection.java

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@ public void onStart() throws InterruptedException {`
`28`	`28`	`bankSection.exchangeContext(getBot());`
`29`	`29`	`priestSection.exchangeContext(getBot());`
`30`	`30`	`wizardSection.exchangeContext(getBot());`
	`31`	`+`
	`32`	`+ // prevents script from skipping character customization`
	`33`	`+ sleep(4000);`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public final void onLoop() throws InterruptedException {`
`32`	`32`	`case 130:`
`33`	`33`	`if (getWalking().walkPath(PATH_TO_COOK_BUILDING)) {`
`34`	`34`	`if (getDoorHandler().handleNextObstacle(COOK_BUILDING)) {`
`35`		`- Sleep.sleepUntil(() -> getProgress() == 140, 5000);`
	`35`	`+ Sleep.sleepUntil(() -> getProgress() == 140, 5000,500);`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`break;`
`@@ -50,7 +50,7 @@ public final void onLoop() throws InterruptedException {`
`50`	`50`	`break;`
`51`	`51`	`case 180:`
`52`	`52`	`if (getDoorHandler().handleNextObstacle(new Position(3071, 3090, 0))) {`
`53`		`- Sleep.sleepUntil(() -> getProgress() != 180, 5000);`
	`53`	`+ Sleep.sleepUntil(() -> getProgress() != 180, 5000,500);`
`54`	`54`	`}`
`55`	`55`	`break;`
`56`	`56`	`}`
`@@ -60,15 +60,15 @@ private void makeDough() {`
`60`	`60`	`if (!"Pot of flour".equals(getInventory().getSelectedItemName())) {`
`61`	`61`	`getInventory().interact("Use", "Pot of flour");`
`62`	`62`	`} else if (getInventory().getItem("Bucket of water").interact()) {`
`63`		`- Sleep.sleepUntil(() -> getInventory().contains("Bread dough"), 3000);`
	`63`	`+ Sleep.sleepUntil(() -> getInventory().contains("Bread dough"), 3000,500);`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`private void bakeDough() {`
`68`	`68`	`if (!"Bread dough".equals(getInventory().getSelectedItemName())) {`
`69`	`69`	`getInventory().interact("Use", "Bread dough");`
`70`	`70`	`} else if (getObjects().closest("Range").interact()) {`
`71`		`- Sleep.sleepUntil(() -> getInventory().contains("Bread"), 5000);`
	`71`	`+ Sleep.sleepUntil(() -> getInventory().contains("Bread"), 5000,500);`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public final void onLoop() throws InterruptedException {`
`37`	`37`	`case 400:`
`38`	`38`	`VIEW_EQUIPMENT_STATS_WIDGET.get(getWidgets()).ifPresent(widget -> {`
`39`	`39`	`if (widget.interact()) {`
`40`		`- Sleep.sleepUntil(() -> getProgress() != 400, 3000);`
	`40`	`+ Sleep.sleepUntil(() -> getProgress() != 400, 3000,500);`
`41`	`41`	`}`
`42`	`42`	`});`
`43`	`43`	`break;`
`@@ -89,7 +89,7 @@ public final void onLoop() throws InterruptedException {`
`89`	`89`	`if (!LADDER_AREA.contains(myPosition())) {`
`90`	`90`	`getWalking().walk(LADDER_AREA);`
`91`	`91`	`} else if (getObjects().closest("Ladder").interact("Climb-up")) {`
`92`		`- Sleep.sleepUntil(() -> !LADDER_AREA.contains(myPosition()), 5000);`
	`92`	`+ Sleep.sleepUntil(() -> !LADDER_AREA.contains(myPosition()), 5000,500);`
`93`	`93`	`}`
`94`	`94`	`break;`
`95`	`95`	`}`
`@@ -103,15 +103,15 @@ private void enterRatCage() {`
`103`	`103`	`if (!OUTSIDE_RAT_CAGE_GATE_AREA.contains(myPosition())) {`
`104`	`104`	`getWalking().walk(OUTSIDE_RAT_CAGE_GATE_AREA);`
`105`	`105`	`} else if (getObjects().closest("Gate").interact("Open")) {`
`106`		`- Sleep.sleepUntil(this::inRatCage, 5000);`
	`106`	`+ Sleep.sleepUntil(this::inRatCage, 5000,500);`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`private void leaveRatCage() {`
`111`	`111`	`if (!INSIDE_RAT_CAGE_GATE_AREA.contains(myPosition())) {`
`112`	`112`	`getWalking().walk(INSIDE_RAT_CAGE_GATE_AREA);`
`113`	`113`	`} else if (getObjects().closest("Gate").interact("Open")) {`
`114`		`- Sleep.sleepUntil(() -> !inRatCage(), 5000);`
	`114`	`+ Sleep.sleepUntil(() -> !inRatCage(), 5000,500);`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`@@ -123,7 +123,7 @@ private void attackRat() {`
`123`	`123`	`//noinspection unchecked`
`124`	`124`	`NPC giantRat = getNpcs().closest(npc -> npc.getName().equals("Giant rat") && npc.isAttackable());`
`125`	`125`	`if (giantRat != null && giantRat.interact("Attack")) {`
`126`		`- Sleep.sleepUntil(() -> myPlayer().getInteracting() != null, 5000);`
	`126`	`+ Sleep.sleepUntil(() -> myPlayer().getInteracting() != null, 5000,500);`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public final void onLoop() throws InterruptedException {`
`78`	`78`	`Optional<RS2Widget> daggerWidgetOpt = getDaggerWidget();`
`79`	`79`	`if (daggerWidgetOpt.isPresent()) {`
`80`	`80`	`if (daggerWidgetOpt.get().interact()) {`
`81`		`- Sleep.sleepUntil(() -> getInventory().contains("Bronze dagger"), 6000);`
	`81`	`+ Sleep.sleepUntil(() -> getInventory().contains("Bronze dagger"), 6000,500);`
`82`	`82`	`}`
`83`	`83`	`} else {`
`84`	`84`	`smith();`
`@@ -87,7 +87,7 @@ public final void onLoop() throws InterruptedException {`
`87`	`87`	`case 360:`
`88`	`88`	`if (getWalking().walkPath(PATH_TO_GATE)) {`
`89`	`89`	`if (getDoorHandler().handleNextObstacle(new Position(3096, 9503, 0))) {`
`90`		`- Sleep.sleepUntil(() -> getProgress() != 360, 5000);`
	`90`	`+ Sleep.sleepUntil(() -> getProgress() != 360, 5000,500);`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`break;`
`@@ -100,7 +100,7 @@ private void smith() {`
`100`	`100`	`} else if (!"Bronze bar".equals(getInventory().getSelectedItemName())) {`
`101`	`101`	`getInventory().getItem("Bronze bar").interact("Use");`
`102`	`102`	`} else if (getObjects().closest("Anvil").interact("Use")) {`
`103`		`- Sleep.sleepUntil(() -> getDaggerWidget().isPresent(), 5000);`
	`103`	`+ Sleep.sleepUntil(() -> getDaggerWidget().isPresent(), 5000,500);`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
`@@ -116,21 +116,21 @@ private void smelt() {`
`116`	`116`	`if (!"Tin ore".equals(getInventory().getSelectedItemName())) {`
`117`	`117`	`getInventory().getItem("Tin ore").interact("Use");`
`118`	`118`	`} else if (getObjects().closest("Furnace").interact("Use")) {`
`119`		`- Sleep.sleepUntil(() -> getInventory().contains("Bronze bar"), 5000);`
	`119`	`+ Sleep.sleepUntil(() -> getInventory().contains("Bronze bar"), 5000,500);`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`private void prospect(Rock rock) {`
`124`	`124`	`RS2Object closestRock = rock.getClosestWithOre(getBot().getMethods());`
`125`	`125`	`if (closestRock != null && closestRock.interact("Prospect")) {`
`126`		`- Sleep.sleepUntil(this::pendingContinue, 6000);`
	`126`	`+ Sleep.sleepUntil(this::pendingContinue, 6000,500);`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`private void mine(Rock rock) {`
`131`	`131`	`RS2Object closestRock = rock.getClosestWithOre(getBot().getMethods());`
`132`	`132`	`if (closestRock != null && closestRock.interact("Mine")) {`
`133`		`- Sleep.sleepUntil(this::pendingContinue, 6000);`
	`133`	`+ Sleep.sleepUntil(this::pendingContinue, 6000,500);`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public final void onLoop() throws InterruptedException {`
`60`	`60`	`break;`
`61`	`61`	`case 610:`
`62`	`62`	`if (getDoorHandler().handleNextObstacle(new Position(3122, 3101, 0))) {`
`63`		`- Sleep.sleepUntil(() -> getProgress() != 610, 5000);`
	`63`	`+ Sleep.sleepUntil(() -> getProgress() != 610, 5000,500);`
`64`	`64`	`}`
`65`	`65`	`break;`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public final void onLoop() throws InterruptedException {`
`45`	`45`	`case 187:`
`46`	`46`	`// Use random emote`
`47`	`47`	`if (getWidgets().get(216, 1, new Random().nextInt(20)).interact()) {`
`48`		`- Sleep.sleepUntil(() -> getProgress() != 187, 5000);`
	`48`	`+ Sleep.sleepUntil(() -> getProgress() != 187, 5000,500);`
`49`	`49`	`}`
`50`	`50`	`break;`
`51`	`51`	`case 190:`
`@@ -57,7 +57,7 @@ public final void onLoop() throws InterruptedException {`
`57`	`57`	`case 210:`
`58`	`58`	`if (getWalking().walkPath(PATH_TO_QUEST_BUILDING)) {`
`59`	`59`	`if (getDoorHandler().handleNextObstacle(QUEST_BUILDING)) {`
`60`		`- Sleep.sleepUntil(() -> getProgress() != 210, 5000);`
	`60`	`+ Sleep.sleepUntil(() -> getProgress() != 210, 5000,500);`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`break;`
`@@ -72,7 +72,7 @@ public final void onLoop() throws InterruptedException {`
`72`	`72`	`break;`
`73`	`73`	`case 250:`
`74`	`74`	`if (getObjects().closest("Ladder").interact("Climb-down")) {`
`75`		`- Sleep.sleepUntil(() -> getProgress() != 250, 5000);`
	`75`	`+ Sleep.sleepUntil(() -> getProgress() != 250, 5000,500);`
`76`	`76`	`}`
`77`	`77`	`break;`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`package sections;`
`2`	`2`
`3`		`-import org.osbot.rs07.api.filter.NameFilter;`
`4`		`-import org.osbot.rs07.api.filter.PositionFilter;`
`5`	`3`	`import org.osbot.rs07.api.map.Position;`
`6`	`4`	`import org.osbot.rs07.api.model.Entity;`
`7`	`5`	`import org.osbot.rs07.api.model.GroundDecoration;`
`@@ -72,9 +70,9 @@ public final void onLoop() throws InterruptedException {`
`72`	`70`	`break;`
`73`	`71`	`case 120:`
`74`	`72`	`RS2Object gate = getObjects().closest("Gate");`
`75`		`- if (gate != null) {`
`76`		`- if (gate.interact("Open")){`
`77`		`- Sleep.sleepUntil(() -> getProgress() == 130, 5000);`
	`73`	`+ if (gate != null && gate.isVisible()) {`
	`74`	`+ if (gate.interact("Open")) {`
	`75`	`+ Sleep.sleepUntil(() -> getProgress() == 130, 5000,500);`
`78`	`76`	`}`
`79`	`77`	`} else {`
`80`	`78`	`getWalking().walkPath(PATH_TO_GATE);`
`@@ -86,15 +84,15 @@ public final void onLoop() throws InterruptedException {`
`86`	`84`	`private void chopTree() {`
`87`	`85`	`Entity tree = getObjects().closest("Tree");`
`88`	`86`	`if (tree != null && tree.interact("Chop down")) {`
`89`		`- Sleep.sleepUntil(() -> getInventory().contains("Logs") \|\| !tree.exists(), 10_000);`
	`87`	`+ Sleep.sleepUntil(() -> getInventory().contains("Logs") \|\| !tree.exists(), 10_000,500);`
`90`	`88`	`}`
`91`	`89`	`}`
`92`	`90`
`93`	`91`	`private void fish() {`
`94`	`92`	`NPC fishingSpot = getNpcs().closest("Fishing spot");`
`95`	`93`	`if (fishingSpot != null && fishingSpot.interact("Net")) {`
`96`	`94`	`long rawShrimpCount = getInventory().getAmount("Raw shrimps");`
`97`		`- Sleep.sleepUntil(() -> getInventory().getAmount("Raw shrimps") > rawShrimpCount, 10_000);`
	`95`	`+ Sleep.sleepUntil(() -> getInventory().getAmount("Raw shrimps") > rawShrimpCount, 10_000,500);`
`98`	`96`	`}`
`99`	`97`	`}`
`100`	`98`
`@@ -109,7 +107,7 @@ private void lightFire() {`
`109`	`107`	`getInventory().getItem("Tinderbox").interact("Use");`
`110`	`108`	`} else if (getInventory().getItem("Logs").interact()) {`
`111`	`109`	`Position playerPos = myPosition();`
`112`		`- Sleep.sleepUntil(() -> !myPosition().equals(playerPos), 10_000);`
	`110`	`+ Sleep.sleepUntil(() -> !myPosition().equals(playerPos), 10_000,500);`
`113`	`111`	`}`
`114`	`112`	`}`
`115`	`113`
`@@ -121,7 +119,7 @@ private Optional<Position> getEmptyPosition() {`
`121`	`119`	`List<Position> allPositions = myPlayer().getArea(10).getPositions();`
`122`	`120`
`123`	`121`	`// Remove any position with an object (except ground decorations, as they can be walked on)`
`124`		`- for(RS2Object object : getObjects().getAll()){`
	`122`	`+ for (RS2Object object : getObjects().getAll()) {`
`125`	`123`	`if (object instanceof GroundDecoration) {`
`126`	`124`	`continue;`
`127`	`125`	`}`
`@@ -140,7 +138,7 @@ private void cook() {`
`140`	`138`	`RS2Object fire = getObjects().closest("Fire");`
`141`	`139`	`if (fire != null && fire.interact("Use")) {`
`142`	`140`	`long rawShrimpCount = getInventory().getAmount("Raw shrimps");`
`143`		`- Sleep.sleepUntil(() -> getInventory().getAmount("Raw shrimps") < rawShrimpCount, 5000);`
	`141`	`+ Sleep.sleepUntil(() -> getInventory().getAmount("Raw shrimps") < rawShrimpCount, 5000,500);`
`144`	`142`	`}`
`145`	`143`	`}`
`146`	`144`	`}`