Add worldhopping and gem bag to Fortis Gem Stall

README.md

@@ -20,32 +20,6 @@ If you have any questions, please join our [Discord](https://discord.gg/zaGrfqFE
 
 If you enjoy my open source work and would like to support me, consider buying me a coffee! Your support helps me stay caffeinated and motivated to keep improving and creating awesome projects.
 
-## Quest Helper Integration
-
-The integrated Quest Helper works together with other plugins to give a nice unified experience while questing.
-
-### Not Enough Runes
-
-If you have the [Not Enough Runes](https://runelite.net/plugin-hub/show/not-enough-runes) plugin installed, you can
-right-click item requirements and click `Go to NER...` to look that item up in Not Enough Runes.
-
-![Not Enough Runes context menu](./images/not-enough-runes-01.png)
-
-### Shortest Path
-
-If you have the [Shortest Path](https://runelite.net/plugin-hub/show/shortest-path) plugin installed, you can enable the
-the "Use 'Shortest Path' plugin" in the Quest Helper config.
-
-![](./images/shortest-path-01.png)
-
-Next time you start a quest, the Shortest Path plugin will help you take the shortest path to the destination.
-
-![Shortest Path path overlay example](./images/shortest-path-02.png)
-
-You can configure what teleportation methods, or the aesthetic of the path in the Shortest Path config.
-
-## Help and discussion
-
 [![Buy Me a Coffee](https://img.shields.io/badge/Buy%20Me%20a%20Coffee-donate-yellow)](https://www.paypal.com/paypalme/MicrobotBE?country.x=BE)
 
 

runelite-client/src/main/java/net/runelite/client/plugins/microbot/thieving/stalls/model/FortisGemStallThievingSpot.java

@@ -3,11 +3,17 @@
 import net.runelite.api.GameObject;
 import net.runelite.api.Skill;
 import net.runelite.api.coords.WorldPoint;
-import net.runelite.client.plugins.microbot.util.bank.Rs2Bank;
+import net.runelite.api.gameval.ItemID;
 import net.runelite.client.plugins.microbot.util.Global;
+import net.runelite.client.plugins.microbot.util.bank.Rs2Bank;
 import net.runelite.client.plugins.microbot.util.gameobject.Rs2GameObject;
+import net.runelite.client.plugins.microbot.util.inventory.Rs2Gembag;
+import net.runelite.client.plugins.microbot.util.inventory.Rs2Inventory;
+import net.runelite.client.plugins.microbot.util.inventory.Rs2ItemModel;
 import net.runelite.client.plugins.microbot.util.player.Rs2Player;
 import net.runelite.client.plugins.microbot.util.walker.Rs2Walker;
+import net.runelite.client.plugins.microbot.Microbot;
+import net.runelite.client.plugins.microbot.util.security.Login;
 
 import javax.inject.Inject;
 
@@ -30,24 +36,85 @@ public void thieve() {
             }
         }
 
+        if (Rs2Player.hopIfPlayerDetected(1, 0, 2)) {
+            return;
+        }
+
         final GameObject stall = Rs2GameObject.getGameObject(STALL_ID, SAFESPOT, 2);
         if (stall == null) {
+            boolean started = Microbot.hopToWorld(Login.getRandomWorld(Rs2Player.isMember()));
+            if (started) {
+                Global.sleepUntil(Microbot::isLoggedIn, 15000);
+            }
+            return;
+        }
+
+        if (!Rs2GameObject.hasAction(Rs2GameObject.convertToObjectComposition(stall), "Steal-from")) {
+            boolean started = Microbot.hopToWorld(Login.getRandomWorld(Rs2Player.isMember()));
+            if (started) {
+                Global.sleepUntil(Microbot::isLoggedIn, 15000);
+            }
             return;
         }
 
         Rs2GameObject.interact(stall, "Steal-from");
         Rs2Player.waitForXpDrop(Skill.THIEVING);
+
+        if (Rs2Gembag.hasGemBag()) {
+            if (Rs2Gembag.isUnknown()) {
+                Rs2Gembag.checkGemBag();
+            }
+            if (!isGemBagCompletelyFull()) {
+                if (Rs2Inventory.hasItem(ItemID.GEM_BAG)) {
+                    Rs2Inventory.interact(ItemID.GEM_BAG, "Open");
+                    Global.sleepUntil(Rs2Gembag::isGemBagOpen, 2000);
+                }
+                if (Rs2Gembag.isGemBagOpen() && hasAnyUncutGemInInventory()) {
+                    Rs2Inventory.interact(ItemID.GEM_BAG_OPEN, "Fill");
+                }
+            }
+        }
     }
 
     @Override
     public void bank() {
         Rs2Bank.walkToBankAndUseBank();
-        Rs2Bank.depositAll();
+        if (!Rs2Bank.isOpen()) return;
+
+        Rs2Bank.depositAll(ItemID.UNCUT_SAPPHIRE);
+        Rs2Bank.depositAll(ItemID.UNCUT_EMERALD);
+        Rs2Bank.depositAll(ItemID.UNCUT_RUBY);
+        Rs2Bank.depositAll(ItemID.UNCUT_DIAMOND);
+
+        Rs2Bank.emptyGemBag();
+
+        Rs2Bank.depositAllExcept(ItemID.GEM_BAG, ItemID.GEM_BAG_OPEN);
         Rs2Bank.closeBank();
     }
 
     @Override
     public Integer[] getItemIdsToDrop() {
         return new Integer[0];
     }
+
+    private boolean hasAnyUncutGemInInventory() {
+        return Rs2Inventory.items(this::isUncutGem).findAny().isPresent();
+    }
+
+    private boolean isUncutGem(Rs2ItemModel item) {
+        int id = item.getId();
+        return id == ItemID.UNCUT_SAPPHIRE ||
+                id == ItemID.UNCUT_EMERALD ||
+                id == ItemID.UNCUT_RUBY ||
+                id == ItemID.UNCUT_DIAMOND;
+    }
+
+    private boolean isGemBagCompletelyFull() {
+        if (Rs2Gembag.isUnknown()) return false;
+        int sapphire = Rs2Gembag.getGemBagContents().stream().filter(i -> i.getId() == ItemID.UNCUT_SAPPHIRE).findFirst().map(Rs2ItemModel::getQuantity).orElse(0);
+        int emerald = Rs2Gembag.getGemBagContents().stream().filter(i -> i.getId() == ItemID.UNCUT_EMERALD).findFirst().map(Rs2ItemModel::getQuantity).orElse(0);
+        int ruby = Rs2Gembag.getGemBagContents().stream().filter(i -> i.getId() == ItemID.UNCUT_RUBY).findFirst().map(Rs2ItemModel::getQuantity).orElse(0);
+        int diamond = Rs2Gembag.getGemBagContents().stream().filter(i -> i.getId() == ItemID.UNCUT_DIAMOND).findFirst().map(Rs2ItemModel::getQuantity).orElse(0);
+        return sapphire >= 60 && emerald >= 60 && ruby >= 60 && diamond >= 60;
+    }
 }