Project layout refactor v2

Adjusted classes

Author: christophernarciso

.gitignore

@@ -0,0 +1,2 @@
+
+*.xml

TRILEZ SOFTWARE INC [TRiBot.org]/Projects/TribotMetalDragons/TribotMetalDragons.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="TRiBot" level="project" />
+  </component>
+</module>

TRILEZ SOFTWARE INC [TRiBot.org]/Projects/TribotMetalDragons/src/org/chris/script/md/Main.java

@@ -19,17 +19,15 @@
 @ScriptManifest(authors = "AliveInMe", name = "CMetalDragons", category = "Combat")
 public class Main extends Script implements Starting, Painting, Ending, MessageListening07{
 
-    private ABCUtil abc;
-
     @Override
     public void onStart() {
         //Start AntibanCompliance instance
         General.useAntiBanCompliance(true);
-        abc = new ABCUtil();
+        Variables.get().abc = new ABCUtil();
         //Drink when the script first starts inside the dragon room.
         Variables.get().shouldDrinkAntifire = true;
         //Generate our eatAt from the abc instance
-        Variables.get().eatAt = abc.generateEatAtHP();
+        Variables.get().eatAt = Variables.get().abc.generateEatAtHP();
         //Set to use ranged potions if the inventory contains them
         Variables.get().shouldDrinkRangingPotion = Inventory.find(Constants.Filters.ITEM.POTION_RANGING).length > 0;
     }
@@ -38,9 +36,11 @@ public void onStart() {
     public void run() {
         while (true) {
             if (Constants.METAL_DRAGONS_ROOM.contains(Player.getPosition())){
+                /* checks if it should leave the area due to certain conditions */
+                if (Variables.get().shouldLeave)
+                    leave();
                 /* Check item consumables food & potions*/
                 consumables();
-
                 if (!isAttacking()){
                     /* checks for loot if shouldLoot */
                     loot();
@@ -68,7 +68,7 @@ public void onPaint(Graphics graphics) {
     @Override
     public void onEnd() {
         //Close the abcl instance.
-        abc.close();
+        Variables.get().abc.close();
     }
 
     @Override
@@ -97,6 +97,8 @@ public void serverMessageReceived(String s) {
             Variables.get().shouldDrinkAntifire = true;
         else if (s.contains("You drink some of your antifire") || s.equals("You drink some of your extended antifire potion."))
             Variables.get().shouldDrinkAntifire = false;
+        else if (s.contains("There is no ammo left in your quiver.") || s.contains("You can’t use that ammo with your crossbow."))
+            Variables.get().shouldLeave = true;
     }
 
     @Override
@@ -157,29 +159,29 @@ private RSNPC[] getAvailableValidNPCS() {
      * Tribot Antiban Compliance Methods
      */
     private void antibanCompliance(){
-        if (this.abc.shouldCheckTabs())
-            this.abc.checkTabs();
+        if (Variables.get().abc.shouldCheckTabs())
+            Variables.get().abc.checkTabs();
 
-        if (this.abc.shouldCheckXP())
-            this.abc.checkXP();
+        if (Variables.get().abc.shouldCheckXP())
+            Variables.get().abc.checkXP();
 
-        if (this.abc.shouldExamineEntity())
-            this.abc.examineEntity();
+        if (Variables.get().abc.shouldExamineEntity())
+            Variables.get().abc.examineEntity();
 
-        if (this.abc.shouldMoveMouse())
-            this.abc.moveMouse();
+        if (Variables.get().abc.shouldMoveMouse())
+            Variables.get().abc.moveMouse();
 
-        if (this.abc.shouldPickupMouse())
-            this.abc.pickupMouse();
+        if (Variables.get().abc.shouldPickupMouse())
+            Variables.get().abc.pickupMouse();
 
-        if (this.abc.shouldRightClick())
-            this.abc.rightClick();
+        if (Variables.get().abc.shouldRightClick())
+            Variables.get().abc.rightClick();
 
-        if (this.abc.shouldRotateCamera())
-            this.abc.rotateCamera();
+        if (Variables.get().abc.shouldRotateCamera())
+            Variables.get().abc.rotateCamera();
 
-        if (this.abc.shouldLeaveGame())
-            this.abc.leaveGame();
+        if (Variables.get().abc.shouldLeaveGame())
+            Variables.get().abc.leaveGame();
     }
 
     /**
@@ -305,4 +307,13 @@ private void walkAwayFromDanger(){
         }
     }
 
+    private void leave(){
+        RSItem[] teleport = Inventory.find(Constants.Filters.ITEM.TELEPORT_ITEM);
+        if (teleport.length > 0){
+            if (teleport[0].click("Break")){
+                Timing.waitCondition(Constants.Conditions.HAS_LEFT, 3000);
+            }
+        }
+    }
+
 }

TRILEZ SOFTWARE INC [TRiBot.org]/Projects/TribotMetalDragons/src/org/chris/script/md/data/Constants.java

@@ -13,8 +13,18 @@ public final class Constants {
     public static final double SCRIPT_VERSION = 1.0;
     public static final String SCRIPT_AUTHOR = "AIM";
 
-    public static final String[] LOOTABLES = {};
-    public static final String[] ALCHABLES = {};
+    public static final String[] LOOTABLES = {"Runite limbs", "Runite bar", "Rune battleaxe", "Rune med helm", "Rune full helm", "Rune axe", "Rune mace"
+            , "Adamantite bar", "Adamant platebody", "Rune spear" , "Rune 2h sword", "Rune sq shield", "Rune kiteshield", "Adamant 2h sword", "Adamant sq shield"
+            , "Adamant axe", "Adamant battleaxe","Loop half of key", "Tooth half of key", "Runite bar", "Rune spear",
+            "Rune battleaxe", "Rune 2h sword", "Uncut diamond", "Silver ore", "Rune sq shield",
+            "Death rune", "Rune kiteshield", "Dragon med helm", "Shield left half", "Runite bolts", "Rune javelin",
+            "Dragon spear", "Ensouled dragon head", "Death rune", "Rune longsword", "Draconic visage",
+            "Blood rune", "Soul rune", "Dragon platelegs", "Dragon plateskirt", "Rune dart(p)", "Rune knife"
+            , "Looting bag", "Dragon javelin heads", "Uncut dragonstone", "Dragonstone", "Dragon full helm", "Runite ore"};
+
+    public static final String[] ALCHABLES = {"Runite limbs", "Runite bar", "Rune battleaxe", "Rune med helm", "Rune full helm", "Rune axe", "Rune mace"
+            , "Adamantite bar", "Adamant platebody", "Rune spear" , "Rune 2h sword", "Rune sq shield", "Rune kiteshield", "Adamant 2h sword", "Adamant sq shield"
+            , "Adamant axe", "Adamant battleaxe"};
 
     public static final RSArea METAL_DRAGONS_ROOM = new RSArea(
             new RSTile(2690, 9466),
@@ -49,6 +59,12 @@ public boolean active() {
                 return Magic.isSpellSelected();
             }
         };
+        public static final Condition HAS_LEFT = new Condition() {
+            @Override
+            public boolean active() {
+                return !Constants.METAL_DRAGONS_ROOM.contains(Player.getPosition());
+            }
+        };
     }
 
     public static class Filters {
@@ -97,6 +113,13 @@ public boolean accept(RSItem rsItem) {
                             && Arrays.stream(Constants.ALCHABLES).anyMatch(i -> i.contains(rsItem.getDefinition().getName()));
                 }
             };
+            public static final Filter<RSItem> TELEPORT_ITEM = new Filter<RSItem>() {
+                @Override
+                public boolean accept(RSItem rsItem) {
+                    return rsItem.getDefinition() != null && rsItem.isClickable() && rsItem.getDefinition().getActions().length > 0
+                            && Arrays.asList(rsItem.getDefinition().getActions()).contains("Break");
+                }
+            };
         }
 
         public static class GROUNDITEM {

TRILEZ SOFTWARE INC [TRiBot.org]/Projects/TribotMetalDragons/src/org/chris/script/md/data/Variables.java

@@ -1,5 +1,7 @@
 package org.chris.script.md.data;
 
+import org.tribot.api.util.abc.ABCUtil;
+
 public class Variables {
 
     /**
@@ -11,7 +13,9 @@ public class Variables {
 
     public int eatAt;
 
-    public boolean shouldDrinkAntifire, shouldDrinkRangingPotion, shouldLoot;
+    public ABCUtil abc;
+
+    public boolean shouldDrinkAntifire, shouldDrinkRangingPotion, shouldLoot, shouldLeave;
 
     public static Variables get(){
         return instance;