ಠ_ಠ

.idea/workspace.xml

@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="3ab8e8a0-ccfd-4b0b-9547-98173085dc38" name="Default Changelist" comment="" />
+    <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$/src/main/java/ParaScript/strategies/BuryBones.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/BuryBones.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/MakeArrowShafts.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/MakeArrowShafts.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/PickupItems.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/PickupItems.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/ui/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/ui/UI.java" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -47,8 +53,10 @@
     <key name="ExtractSuperBase.RECENT_KEYS">
       <recent name="ParaScript" />
     </key>
-    <key name="CopyFile.RECENT_KEYS">
+    <key name="MoveFile.RECENT_KEYS">
-      <recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript" />
+      <recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\src\main" />
+      <recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\src" />
+      <recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\main\java" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="ParaScript.strategies" />
@@ -57,10 +65,8 @@
       <recent name="ParaScript.ui" />
       <recent name="ParaScript.data" />
     </key>
-    <key name="MoveFile.RECENT_KEYS">
+    <key name="CopyFile.RECENT_KEYS">
-      <recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\src\main" />
+      <recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript" />
-      <recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\src" />
-      <recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\main\java" />
     </key>
   </component>
   <component name="RunDashboard">

src/main/java/ParaScript/strategies/BuryBones.java

@@ -32,7 +32,7 @@ public class BuryBones implements Strategy {
             Inventory.getItem(527).interact(Items.Option.SECOND);
             Time.sleep(500);
             if (Game.isLoggedIn() && hasBones()) buryBones();
-        } catch (Exception err) {
+        } catch (Exception ಠ_ಠ) {
             System.out.println("Bone burying error: ¯\\_(ツ)_/¯");
         }
     }

src/main/java/ParaScript/strategies/MakeArrowShafts.java

@@ -39,7 +39,7 @@ public class MakeArrowShafts implements Strategy {
             Time.sleep(3000);
             //Wait for the Player to chop the Tree
             Time.sleep(() -> Players.getMyPlayer().getAnimation() == -1, 3000);
-        } catch (Exception err) {
+        } catch (Exception ಠ_ಠ) {
             System.out.println("Fletching error: ¯\\_(ツ)_/¯");
         }
     }

src/main/java/ParaScript/strategies/PickupItems.java

@@ -40,19 +40,23 @@ public class PickupItems implements Strategy {
                     break;
                 }
             }
-        } catch (Exception err){
+        } catch (Exception ಠ_ಠ){
             System.out.println("Pickup items error: ¯\\_(ツ)_/¯");
         }
         Variables.addItemGained(Inventory.getCount(true) - currentItemAmount);
     }
 
     private GroundItem[] getItems(){
+        return GroundItems.getNearest(getItemIDs());
+    }
+
+    private int[] getItemIDs(){
         int[] itemIDs = new int[]{};
         if (Variables.skill_to_train == Skill.ATTACK){
             if (Variables.fighting_bury_bones)
                 itemIDs = new int[]{526}; // TODO: need to add all the other bones
         }
         itemIDs = Methods.combineIntArrays(Variables.fighting_item_ids, itemIDs);
-        return GroundItems.getNearest(itemIDs);
+        return itemIDs;
     }
 }

src/main/java/ParaScript/ui/UI.java

@@ -327,7 +327,7 @@ public class UI extends JFrame {
                     for (int i = 0; i < sample.length; i++)
                         customIDs[i] = Integer.parseInt(sample[i]);
                     Variables.fighting_npc_selected.setIDs(customIDs);
-                } catch (Exception err) {
+                } catch (Exception ಠ_ಠ) {
                     FightingNpcs.CUSTOM.setIDs(new int[]{0});
                 }
             }
@@ -371,7 +371,7 @@ public class UI extends JFrame {
                     for (int i = 0; i < sample.length; i++)
                         customIDs[i] = Integer.parseInt(sample[i]);
                     Variables.fighting_item_ids = customIDs;
-                } catch (Exception err) {
+                } catch (Exception ಠ_ಠ) {
                     Variables.fighting_item_ids = new int[]{};
                 }
             }
@@ -435,7 +435,7 @@ public class UI extends JFrame {
                     for (int i = 0; i < sample.length; i++)
                         customIDs[i] = Integer.parseInt(sample[i]);
                     Variables.thieving_npc_selected.setIDs(customIDs);
-                } catch (Exception err) {
+                } catch (Exception ಠ_ಠ) {
                     ThievingNpcs.CUSTOM.setIDs(new int[]{0});
                 }
             }