From c7b02239a144c5c6677ce0c56d1e87ff961ab4fd Mon Sep 17 00:00:00 2001
From: RedSparr0w <admin@redsparr0w.com>
Date: Mon, 14 Oct 2019 19:49:15 +1300
Subject: [PATCH] Add settings panel, choose which skill to train

---
 .idea/workspace.xml                       | 10 +++-
 ParaScript.iml                            |  2 +-
 src/ParaScript/Main.java                  | 11 ++++-
 src/ParaScript/data/Variables.java        |  1 +
 src/ParaScript/data/variables/Trees.java  |  2 +-
 src/ParaScript/strategies/Bank.java       |  2 +-
 src/ParaScript/strategies/BankRunner.java | 56 +++++++++++++++++++++
 src/ParaScript/strategies/Mine.java       |  6 +--
 src/ParaScript/strategies/Walk.java       |  2 +-
 src/ParaScript/ui/UI.java                 | 60 +++++++++++++++++------
 10 files changed, 125 insertions(+), 27 deletions(-)
 create mode 100644 src/ParaScript/strategies/BankRunner.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5f7856a..b14c28d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,14 @@
   <component name="ChangeListManager">
     <list default="true" id="3ab8e8a0-ccfd-4b0b-9547-98173085dc38" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ParaScript.iml" beforeDir="false" afterPath="$PROJECT_DIR$/ParaScript.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/ParaScript/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ParaScript/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ParaScript/data/Variables.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ParaScript/data/Variables.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ParaScript/data/variables/Trees.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ParaScript/data/variables/Trees.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ParaScript/strategies/Bank.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ParaScript/strategies/Bank.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/ParaScript/strategies/Mine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ParaScript/strategies/Mine.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ParaScript/strategies/Walk.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ParaScript/strategies/Walk.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ParaScript/ui/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ParaScript/ui/UI.java" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -33,8 +39,8 @@
     <property name="GenerateAntBuildDialog.forceTargetJdk" value="true" />
     <property name="GenerateAntBuildDialog.generateSingleFile" value="true" />
     <property name="GenerateAntBuildDialog.outputFileNameProperty" value="parascript" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../Script-Factory" />
-    <property name="project.structure.last.edited" value="Modules" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
diff --git a/ParaScript.iml b/ParaScript.iml
index f40cab0..f1662ba 100644
--- a/ParaScript.iml
+++ b/ParaScript.iml
@@ -9,7 +9,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
           <root url="jar://$USER_HOME$/OneDrive/Documents/Java Dependencies/Parabot/Parabot-317-API-Minified.jar!/" />
diff --git a/src/ParaScript/Main.java b/src/ParaScript/Main.java
index 38b1801..f8e533e 100644
--- a/src/ParaScript/Main.java
+++ b/src/ParaScript/Main.java
@@ -26,8 +26,15 @@ public class Main extends Script{
         }
 
         strategies.add(new ScriptState());
-        strategies.add(new MakeArrowShafts());
-        strategies.add(new WoodcutTree());
+        if(Variables.skill_to_train.equalsIgnoreCase("Woodcutting")) {
+            strategies.add(new MakeArrowShafts());
+            strategies.add(new WoodcutTree());
+        }
+        if(Variables.skill_to_train.equalsIgnoreCase("Mining")) {
+            strategies.add(new Mine());
+            strategies.add(new Bank());
+            strategies.add(new Walk());
+        }
         strategies.add(new HandleLogin());
         provide(strategies);
         return true;
diff --git a/src/ParaScript/data/Variables.java b/src/ParaScript/data/Variables.java
index ad062f8..cb829bb 100644
--- a/src/ParaScript/data/Variables.java
+++ b/src/ParaScript/data/Variables.java
@@ -13,6 +13,7 @@ public class Variables {
     private static String currentStatus = "none";
     private static String username = "";
     private static String password = "";
+    public static String skill_to_train = "Woodcutting";
     public static TilePath pathToWalk;
 
     public static String getStatus() {
diff --git a/src/ParaScript/data/variables/Trees.java b/src/ParaScript/data/variables/Trees.java
index 9fdeffe..7ba88a4 100644
--- a/src/ParaScript/data/variables/Trees.java
+++ b/src/ParaScript/data/variables/Trees.java
@@ -5,7 +5,7 @@ import java.util.Arrays;
 import java.util.List;
 
 public enum Trees {
-    NORMAL("Normal", new int[]{1276, 1278}),
+    NORMAL("Normal", new int[]{1276, 1278, 1279}),
     OAK("Oak", new int[]{1281}),
     WILLOW ("Willow", new int[]{5551, 1308, 5553, 5552}),
     MAPLE("Maple", new int[]{1307});
diff --git a/src/ParaScript/strategies/Bank.java b/src/ParaScript/strategies/Bank.java
index 900a3fd..8bed8a5 100644
--- a/src/ParaScript/strategies/Bank.java
+++ b/src/ParaScript/strategies/Bank.java
@@ -23,7 +23,7 @@ public class Bank implements Strategy {
         Variables.setStatus("banking items");
         while (Variables.pathToWalk != null && !Variables.pathToWalk.hasReached()) {
             Variables.pathToWalk.traverse();
-            Time.sleep(1000, 2000);
+            Time.sleep(2000, 3000);
         }
         depositItems();
     }
diff --git a/src/ParaScript/strategies/BankRunner.java b/src/ParaScript/strategies/BankRunner.java
new file mode 100644
index 0000000..f7386d4
--- /dev/null
+++ b/src/ParaScript/strategies/BankRunner.java
@@ -0,0 +1,56 @@
+package ParaScript.strategies;
+
+import ParaScript.data.Variables;
+import ParaScript.data.variables.Ores;
+import org.parabot.environment.api.utils.Time;
+import org.parabot.environment.scripts.framework.Strategy;
+import org.rev317.min.api.methods.Inventory;
+import org.rev317.min.api.methods.Players;
+import org.rev317.min.api.methods.SceneObjects;
+import org.rev317.min.api.wrappers.SceneObject;
+
+public class BankRunner implements Strategy {
+    private SceneObject ore;
+
+    @Override
+    public boolean activate() {
+        ore = ore(); // set the local Variable
+        if (Variables.running
+                && ore != null
+                && (Variables.getStatus() == "none" || Variables.getStatus() == "mining")
+                && Variables.VARROCK_EAST_MINE_ZONE.inTheZone()
+                && !Players.getMyPlayer().isInCombat()
+                && Players.getMyPlayer().getAnimation() == -1
+                && !Inventory.isFull()) {
+            Variables.setStatus("mining");
+            return true;
+        }
+        Variables.setStatus("none");
+        return false;
+    }
+
+    @Override
+    public void execute() {
+        try {
+            ore.interact(SceneObjects.Option.MINE);
+            Time.sleep(1000);
+            Time.sleep(() -> Players.getMyPlayer().getAnimation() == -1, 3000);
+        } catch (Exception err){
+            System.out.println("Mining error: ¯\\_(ツ)_/¯");
+        }
+    }
+
+    private SceneObject ore(){
+        int[] ore_to_mine = Ores.COPPER_TIN.getIDs();
+        if (Inventory.getCount(437) >= 14)
+            ore_to_mine = Ores.TIN.getIDs();
+        if (Inventory.getCount(439) >= 14)
+            ore_to_mine = Ores.COPPER.getIDs();
+        for(SceneObject ore : SceneObjects.getNearest(ore_to_mine)){
+            if(Variables.VARROCK_EAST_MINE_ZONE.inTheZoneObject(ore)) {
+                return ore;
+            }
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/src/ParaScript/strategies/Mine.java b/src/ParaScript/strategies/Mine.java
index e120445..4f7cf92 100644
--- a/src/ParaScript/strategies/Mine.java
+++ b/src/ParaScript/strategies/Mine.java
@@ -2,8 +2,6 @@ package ParaScript.strategies;
 
 import ParaScript.data.Variables;
 import ParaScript.data.variables.Ores;
-import ParaScript.data.variables.Trees;
-import com.sun.deploy.util.ArrayUtil;
 import org.parabot.environment.api.utils.Time;
 import org.parabot.environment.scripts.framework.Strategy;
 import org.rev317.min.api.methods.Inventory;
@@ -44,9 +42,9 @@ public class Mine implements Strategy {
 
     private SceneObject ore(){
         int[] ore_to_mine = Ores.COPPER_TIN.getIDs();
-        if (Inventory.getCount(Ores.COPPER.getIDs()) >= 14)
+        if (Inventory.getCount(437) >= 14)
             ore_to_mine = Ores.TIN.getIDs();
-        if (Inventory.getCount(Ores.TIN.getIDs()) >= 14)
+        if (Inventory.getCount(439) >= 14)
             ore_to_mine = Ores.COPPER.getIDs();
         for(SceneObject ore : SceneObjects.getNearest(ore_to_mine)){
             if(Variables.VARROCK_EAST_MINE_ZONE.inTheZoneObject(ore)) {
diff --git a/src/ParaScript/strategies/Walk.java b/src/ParaScript/strategies/Walk.java
index b8d29e2..16dc8b0 100644
--- a/src/ParaScript/strategies/Walk.java
+++ b/src/ParaScript/strategies/Walk.java
@@ -25,7 +25,7 @@ public class Walk implements Strategy {
         //Variables.setBotStatus("walking to " + Variables.getTree().getName());
         while (Variables.pathToWalk != null && !Variables.pathToWalk.hasReached()) {
             Variables.pathToWalk.traverse();
-            Time.sleep(1000, 2000);
+            Time.sleep(2000, 3000);
         }
     }
 }
\ No newline at end of file
diff --git a/src/ParaScript/ui/UI.java b/src/ParaScript/ui/UI.java
index 7e13d27..147ccff 100644
--- a/src/ParaScript/ui/UI.java
+++ b/src/ParaScript/ui/UI.java
@@ -15,15 +15,18 @@ import java.awt.event.ActionListener;
 public class UI extends JFrame {
     private final ButtonGroup woodcutOptionButtonGroup = new ButtonGroup();
     private JPanel contentPane;
-    private JComboBox location = new JComboBox();
-    private JComboBox treeSelect = new JComboBox();
-    private JRadioButton bank = new JRadioButton("Bank");
-    private JRadioButton drop = new JRadioButton("Drop");
-    private JCheckBox birdsNest = new JCheckBox();
     // Login tab
     private JTextField username = new JTextField();
     private JPasswordField password = new JPasswordField();
     private JCheckBox autoLogin = new JCheckBox();
+    // Settings
+    private JComboBox skillSelect = new JComboBox();
+    private JRadioButton bank = new JRadioButton("Bank");
+    private JRadioButton drop = new JRadioButton("Drop");
+    // Woodcutting
+    private JComboBox treeSelect = new JComboBox();
+    private JComboBox location = new JComboBox();
+    private JCheckBox birdsNest = new JCheckBox();
     // Our colors
     private Color Color_MidnightBlue = new Color(44, 62, 80);
     private Color Color_WetAsphalt = new Color(52, 73, 94);
@@ -84,22 +87,41 @@ public class UI extends JFrame {
         autoLogin.setSelected(true);
         loginPanel.add(autoLogin);
 
+        /*
+         * Settings
+         */
+        JPanel settingsPanel = new JPanel();
+        settingsPanel.setForeground(Color_WhiteSmoke);
+        settingsPanel.setBackground(Color_WetAsphalt);
+        tabbedPane.addTab("Settings", null, settingsPanel, null);
+        settingsPanel.setLayout(null);
+
+        // Which skill are we training
+        JLabel lblSkillToTrain = new JLabel("Skill to train");
+        lblSkillToTrain.setForeground(Color_WhiteSmoke);
+        lblSkillToTrain.setBounds(20, 20, 73, 20);
+        settingsPanel.add(lblSkillToTrain);
+        skillSelect.setModel(new DefaultComboBoxModel(new String[]{
+                "Woodcutting",
+                "Mining",
+        }));
+        skillSelect.setBounds(20, 40, 150, 20);
+        settingsPanel.add(skillSelect);
+        skillSelect.addActionListener (new ActionListener () {
+            public void actionPerformed(ActionEvent e) {
+                Variables.skill_to_train = skillSelect.getSelectedItem().toString();
+            }
+        });
+        /*
+         * Woodcutting Stuff
+         */
+
         JPanel woodcuttingPanel = new JPanel();
         woodcuttingPanel.setForeground(Color_WhiteSmoke);
         woodcuttingPanel.setBackground(Color_WetAsphalt);
         tabbedPane.addTab("Woodcutting", null, woodcuttingPanel, null);
         woodcuttingPanel.setLayout(null);
 
-        /*
-        JLabel lblLocation = new JLabel("Location");
-        lblLocation.setBounds(200, 20, 73, 20);
-        woodcuttingPanel.add(lblLocation);
-
-        location.setModel(new DefaultComboBoxModel(Methods.locationToStringArray()));
-        location.setBounds(200, 40, 150, 20);
-        woodcuttingPanel.add(location);
-        */
-
         // Select which tree to cut
         JLabel lblTree = new JLabel("Tree");
         lblTree.setForeground(Color_WhiteSmoke);
@@ -110,6 +132,14 @@ public class UI extends JFrame {
         woodcuttingPanel.add(treeSelect);
 
         /*
+        JLabel lblLocation = new JLabel("Location");
+        lblLocation.setBounds(200, 20, 73, 20);
+        woodcuttingPanel.add(lblLocation);
+
+        location.setModel(new DefaultComboBoxModel(Methods.locationToStringArray()));
+        location.setBounds(200, 40, 150, 20);
+        woodcuttingPanel.add(location);
+
         JLabel lblMethod = new JLabel("Method");
         lblMethod.setBounds(20, 120, 73, 20);
         woodcuttingPanel.add(lblMethod);