From 2555ae44ff55a0e213af7f30418d2e94d82ea542 Mon Sep 17 00:00:00 2001 From: PBLord Date: Thu, 31 Aug 2017 16:29:26 +0100 Subject: [PATCH 1/6] [FEATURE] Skills Debug Added Skills to Debug menus getLevel / getRealLevel --- .../java/org/rev317/min/debug/DSkills.java | 48 +++++++++++++++++++ src/main/java/org/rev317/min/ui/BotMenu.java | 3 ++ 2 files changed, 51 insertions(+) create mode 100644 src/main/java/org/rev317/min/debug/DSkills.java diff --git a/src/main/java/org/rev317/min/debug/DSkills.java b/src/main/java/org/rev317/min/debug/DSkills.java new file mode 100644 index 0000000..73f3d04 --- /dev/null +++ b/src/main/java/org/rev317/min/debug/DSkills.java @@ -0,0 +1,48 @@ +package org.rev317.min.debug; + +import org.parabot.core.paint.AbstractDebugger; +import org.rev317.min.api.methods.Skill; + +import java.awt.*; + +public class DSkills extends AbstractDebugger { + + @Override + public void toggle() { + System.out.println("Agility level: " + Skill.AGILITY.getLevel() + " / " + Skill.AGILITY.getRealLevel()); + System.out.println("Attack level: " + Skill.ATTACK.getLevel() + " / " + Skill.ATTACK.getRealLevel()); + System.out.println("Constuction level: " + Skill.CONSTRUCTION.getLevel() + " / " + Skill.CONSTRUCTION.getRealLevel()); + System.out.println("Cooking level: " + Skill.COOKING.getLevel() + " / " + Skill.COOKING.getRealLevel()); + System.out.println("Crafting level: " + Skill.CRAFTING.getLevel() + " / " + Skill.CRAFTING.getRealLevel()); + System.out.println("Defence level: " + Skill.DEFENSE.getLevel() + " / " + Skill.DEFENSE.getRealLevel()); + System.out.println("Dungeoneering level: " + Skill.DUNGEONEERING.getLevel() + " / " + Skill.DUNGEONEERING.getRealLevel()); + System.out.println("Farming level: " + Skill.FARMING.getLevel() + " / " + Skill.FARMING.getRealLevel()); + System.out.println("Firemaking level: " + Skill.FIREMAKING.getLevel() + " / " + Skill.FIREMAKING.getRealLevel()); + System.out.println("Fishing level: " + Skill.FISHING.getLevel() + " / " + Skill.FISHING.getRealLevel()); + System.out.println("Fletching level: " + Skill.FLETCHING.getLevel() + " / " + Skill.FLETCHING.getRealLevel()); + System.out.println("Herblore level: " + Skill.HERBLORE.getLevel() + " / " + Skill.HERBLORE.getRealLevel()); + System.out.println("Hitpoints level: " + Skill.HITPOINTS.getLevel() + " / " + Skill.HITPOINTS.getRealLevel()); + System.out.println("Hunter level: " + Skill.HUNTER.getLevel() + " / " + Skill.HUNTER.getRealLevel()); + System.out.println("Magic level: " + Skill.MAGIC.getLevel() + " / " + Skill.MAGIC.getRealLevel()); + System.out.println("Mining level: " + Skill.MINING.getLevel() + " / " + Skill.MINING.getRealLevel()); + System.out.println("Prayer level: " + Skill.PRAYER.getLevel() + " / " + Skill.PRAYER.getRealLevel()); + System.out.println("Range level: " + Skill.RANGE.getLevel() + " / " + Skill.RANGE.getRealLevel()); + System.out.println("Runecrafting level: " + Skill.RUNECRAFTING.getLevel() + " / " + Skill.RUNECRAFTING.getRealLevel()); + System.out.println("Slayer level: " + Skill.SLAYER.getLevel() + " / " + Skill.SLAYER.getRealLevel()); + System.out.println("Smithing level: " + Skill.SMITHING.getLevel() + " / " + Skill.SMITHING.getRealLevel()); + System.out.println("Strength level: " + Skill.STRENGTH.getLevel() + " / " + Skill.STRENGTH.getRealLevel()); + System.out.println("Summoning level: " + Skill.SUMMONING.getLevel() + " / " + Skill.SUMMONING.getRealLevel()); + System.out.println("Thieving level: " + Skill.THIEVING.getLevel() + " / " + Skill.THIEVING.getRealLevel()); + System.out.println("Woodcutting level: " + Skill.WOODCUTTING.getLevel() + " / " + Skill.WOODCUTTING.getRealLevel()); + } + + @Override + public boolean isEnabled() { + return false; + } + + @Override + public void paint(Graphics graphics) { + + } +} diff --git a/src/main/java/org/rev317/min/ui/BotMenu.java b/src/main/java/org/rev317/min/ui/BotMenu.java index 97966ca..eeb3926 100644 --- a/src/main/java/org/rev317/min/ui/BotMenu.java +++ b/src/main/java/org/rev317/min/ui/BotMenu.java @@ -34,6 +34,7 @@ public class BotMenu implements ActionListener { JMenuItem npcs = newItem("Npcs"); JMenuItem objects = newItem("Objects"); JMenuItem players = newItem("Players"); + JMenuItem skills = newItem("Skills"); debugger.addDebugger("Enable Actions", new DActions()); debugger.addDebugger("Animation", new DAnimation()); @@ -48,6 +49,7 @@ public class BotMenu implements ActionListener { debugger.addDebugger("Npcs", new DNpcs()); debugger.addDebugger("Objects", new DSceneObjects()); debugger.addDebugger("Players", new DPlayers()); + debugger.addDebugger("Skills", new DSkills()); debug.add(actions); actions.add(enableActions); @@ -63,6 +65,7 @@ public class BotMenu implements ActionListener { debug.add(npcs); debug.add(objects); debug.add(players); + debug.add(skills); actions.addSeparator(); From cd4820d201b5b02080b0227b6d6c77a9b4fd2fb8 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 31 Aug 2017 18:09:26 +0200 Subject: [PATCH 2/6] [CLEANUP] Used less code --- .../java/org/rev317/min/debug/DSkills.java | 28 ++----------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/rev317/min/debug/DSkills.java b/src/main/java/org/rev317/min/debug/DSkills.java index 73f3d04..288efe3 100644 --- a/src/main/java/org/rev317/min/debug/DSkills.java +++ b/src/main/java/org/rev317/min/debug/DSkills.java @@ -9,31 +9,9 @@ public class DSkills extends AbstractDebugger { @Override public void toggle() { - System.out.println("Agility level: " + Skill.AGILITY.getLevel() + " / " + Skill.AGILITY.getRealLevel()); - System.out.println("Attack level: " + Skill.ATTACK.getLevel() + " / " + Skill.ATTACK.getRealLevel()); - System.out.println("Constuction level: " + Skill.CONSTRUCTION.getLevel() + " / " + Skill.CONSTRUCTION.getRealLevel()); - System.out.println("Cooking level: " + Skill.COOKING.getLevel() + " / " + Skill.COOKING.getRealLevel()); - System.out.println("Crafting level: " + Skill.CRAFTING.getLevel() + " / " + Skill.CRAFTING.getRealLevel()); - System.out.println("Defence level: " + Skill.DEFENSE.getLevel() + " / " + Skill.DEFENSE.getRealLevel()); - System.out.println("Dungeoneering level: " + Skill.DUNGEONEERING.getLevel() + " / " + Skill.DUNGEONEERING.getRealLevel()); - System.out.println("Farming level: " + Skill.FARMING.getLevel() + " / " + Skill.FARMING.getRealLevel()); - System.out.println("Firemaking level: " + Skill.FIREMAKING.getLevel() + " / " + Skill.FIREMAKING.getRealLevel()); - System.out.println("Fishing level: " + Skill.FISHING.getLevel() + " / " + Skill.FISHING.getRealLevel()); - System.out.println("Fletching level: " + Skill.FLETCHING.getLevel() + " / " + Skill.FLETCHING.getRealLevel()); - System.out.println("Herblore level: " + Skill.HERBLORE.getLevel() + " / " + Skill.HERBLORE.getRealLevel()); - System.out.println("Hitpoints level: " + Skill.HITPOINTS.getLevel() + " / " + Skill.HITPOINTS.getRealLevel()); - System.out.println("Hunter level: " + Skill.HUNTER.getLevel() + " / " + Skill.HUNTER.getRealLevel()); - System.out.println("Magic level: " + Skill.MAGIC.getLevel() + " / " + Skill.MAGIC.getRealLevel()); - System.out.println("Mining level: " + Skill.MINING.getLevel() + " / " + Skill.MINING.getRealLevel()); - System.out.println("Prayer level: " + Skill.PRAYER.getLevel() + " / " + Skill.PRAYER.getRealLevel()); - System.out.println("Range level: " + Skill.RANGE.getLevel() + " / " + Skill.RANGE.getRealLevel()); - System.out.println("Runecrafting level: " + Skill.RUNECRAFTING.getLevel() + " / " + Skill.RUNECRAFTING.getRealLevel()); - System.out.println("Slayer level: " + Skill.SLAYER.getLevel() + " / " + Skill.SLAYER.getRealLevel()); - System.out.println("Smithing level: " + Skill.SMITHING.getLevel() + " / " + Skill.SMITHING.getRealLevel()); - System.out.println("Strength level: " + Skill.STRENGTH.getLevel() + " / " + Skill.STRENGTH.getRealLevel()); - System.out.println("Summoning level: " + Skill.SUMMONING.getLevel() + " / " + Skill.SUMMONING.getRealLevel()); - System.out.println("Thieving level: " + Skill.THIEVING.getLevel() + " / " + Skill.THIEVING.getRealLevel()); - System.out.println("Woodcutting level: " + Skill.WOODCUTTING.getLevel() + " / " + Skill.WOODCUTTING.getRealLevel()); + for (Skill skill : Skill.values()){ + System.out.println(String.format("%s level: %d / %d", skill.getName(), skill.getLevel(), skill.getRealLevel())); + } } @Override From 6c81f42cc03aa7effef1dd77f0aaf413b1e2e453 Mon Sep 17 00:00:00 2001 From: Emmastone Date: Mon, 27 Nov 2017 12:51:11 +0000 Subject: [PATCH 3/6] [BUGFIX] Actions Output Related to an issue on @Parabot --- src/main/java/org/rev317/min/callback/MenuAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/rev317/min/callback/MenuAction.java b/src/main/java/org/rev317/min/callback/MenuAction.java index 1d7246b..f38ea11 100644 --- a/src/main/java/org/rev317/min/callback/MenuAction.java +++ b/src/main/java/org/rev317/min/callback/MenuAction.java @@ -52,7 +52,7 @@ public class MenuAction { * @param currentOutputIndex */ public static void setCurrentOutputIndex(int currentOutputIndex) { - if (currentOutputIndex > outputs.length - 1) { + if (currentOutputIndex > outputs.length) { currentOutputIndex = 0; } MenuAction.currentOutputIndex = currentOutputIndex; From bc1197dfd3767d3f5dc82f11ff305a7b3db9e601 Mon Sep 17 00:00:00 2001 From: Emmastone Date: Mon, 27 Nov 2017 12:52:17 +0000 Subject: [PATCH 4/6] [TASK] Version Bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf33b70..db169a7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.parabot 317-api-minified - 1.21.3 + 1.21.4 Parabot 317-API-Minified From 26b22268cfe9fc7539770380fb812762376eba50 Mon Sep 17 00:00:00 2001 From: Emmastone Date: Mon, 27 Nov 2017 12:52:34 +0000 Subject: [PATCH 5/6] [TASK] Travis Version Bump --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8064595..38abefd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ notifications: env: global: - - PROVIDER_VERSION=1.21.3 + - PROVIDER_VERSION=1.21.4 cache: directories: From d0edfe77a6adb845930b35a4671b443d4510fc14 Mon Sep 17 00:00:00 2001 From: Emmastone Date: Mon, 27 Nov 2017 12:56:20 +0000 Subject: [PATCH 6/6] [BUGFIX] Fixed jdk version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 38abefd..b11ba9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: java jdk: - - oraclejdk7 + - openjdk7 - oraclejdk8 before_install: