diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5256980..65704e6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,13 @@ - + + + + + + + diff --git a/src/main/java/ParaScript/strategies/BuryBones.java b/src/main/java/ParaScript/strategies/BuryBones.java index 8fac957..366452e 100644 --- a/src/main/java/ParaScript/strategies/BuryBones.java +++ b/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: ¯\\_(ツ)_/¯"); } } diff --git a/src/main/java/ParaScript/strategies/MakeArrowShafts.java b/src/main/java/ParaScript/strategies/MakeArrowShafts.java index 8f1853e..34ac3d6 100644 --- a/src/main/java/ParaScript/strategies/MakeArrowShafts.java +++ b/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: ¯\\_(ツ)_/¯"); } } diff --git a/src/main/java/ParaScript/strategies/PickupItems.java b/src/main/java/ParaScript/strategies/PickupItems.java index 2a946db..00355b5 100644 --- a/src/main/java/ParaScript/strategies/PickupItems.java +++ b/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; } } \ No newline at end of file diff --git a/src/main/java/ParaScript/ui/UI.java b/src/main/java/ParaScript/ui/UI.java index a04a373..2b415d6 100644 --- a/src/main/java/ParaScript/ui/UI.java +++ b/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}); } }