From 234a2809f25c97e66fe0b72fcf33afab8c63cd3b Mon Sep 17 00:00:00 2001 From: matt123337 Date: Wed, 16 Jul 2014 13:57:02 -0400 Subject: [PATCH 01/11] Update Skill.java Removed redundant indexes, deprecated getIndex() --- src/org/rev317/min/api/methods/Skill.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/org/rev317/min/api/methods/Skill.java b/src/org/rev317/min/api/methods/Skill.java index 333e327..cf6b1a1 100644 --- a/src/org/rev317/min/api/methods/Skill.java +++ b/src/org/rev317/min/api/methods/Skill.java @@ -9,11 +9,11 @@ import org.rev317.min.Loader; */ public enum Skill { - ATTACK(0), DEFENSE(1), STRENGTH(2), HITPOINTS(3), CONSTITUTION(3), RANGE(4), PRAYER( - 5), MAGIC(6), COOKING(7), WOODCUTTING(8), FLETCHING(9), FISHING(10), FIREMAKING( - 11), CRAFTING(12), SMITHING(13), MINING(14), HERBLORE(15), HERBLAW( - 15), AGILITY(16), THIEVING(17), SLAYER(18), FARMING(19), RUNECRAFTING( - 20), HUNTER(21), CONSTRUCTION(22), SUMMONING(23), DUNGEONEERING(24); + ATTACK, DEFENSE, STRENGTH, HITPOINTS, CONSTITUTION, RANGE, PRAYER + , MAGIC, COOKING, WOODCUTTING, FLETCHING, FISHING, FIREMAKING + , CRAFTING, SMITHING, MINING, HERBLORE, HERBLAW + , AGILITY, THIEVING, SLAYER, FARMING, RUNECRAFTING + , HUNTER, CONSTRUCTION, SUMMONING, DUNGEONEERING; private static final int[] EXPERIENCE = { 0, 0, 83, 174, 276, 388, 512, 650, 801, 969, 1154, 1358, 1584, 1833, 2107, 2411, 2746, 3115, @@ -32,17 +32,12 @@ public enum Skill { 42769801, 47221641, 52136869, 57563718, 63555443, 70170840, 77474828, 85539082, 94442737, 104273167 }; - private int index; - - private Skill(int index) { - this.index = index; - } - /** + * @Deprecated use Skill.ordinal() instead * Returns the skill's index. */ public int getIndex() { - return this.index; + return ordinal(); } /** From 2cbc0ffa7c038665b544d7113c6da35b21562cc7 Mon Sep 17 00:00:00 2001 From: matt123337 Date: Wed, 16 Jul 2014 14:01:11 -0400 Subject: [PATCH 02/11] Create ActionListener.java Used for for Action listener (as the file name implies) --- .../rev317/min/api/events/listeners/ActionListener.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/org/rev317/min/api/events/listeners/ActionListener.java diff --git a/src/org/rev317/min/api/events/listeners/ActionListener.java b/src/org/rev317/min/api/events/listeners/ActionListener.java new file mode 100644 index 0000000..eefcffe --- /dev/null +++ b/src/org/rev317/min/api/events/listeners/ActionListener.java @@ -0,0 +1,7 @@ +package org.rev317.min.api.event.listeners; + +public interface ActionListener{ + + public void onGameAction(int id,int cmd1,int cmd2,int cmd3); + +} From fb775a92aefb4048288837bc8b79019ad1896de1 Mon Sep 17 00:00:00 2001 From: matt123337 Date: Wed, 16 Jul 2014 14:04:10 -0400 Subject: [PATCH 03/11] Update Menu.java Added changes from patch-1 --- src/org/rev317/min/api/methods/Menu.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/org/rev317/min/api/methods/Menu.java b/src/org/rev317/min/api/methods/Menu.java index edd22cf..83d126f 100644 --- a/src/org/rev317/min/api/methods/Menu.java +++ b/src/org/rev317/min/api/methods/Menu.java @@ -170,23 +170,22 @@ public class Menu { * @param cmd3 */ public static void sendAction(int action, int cmd1, int cmd2, int cmd3) { - sendAction(action, cmd1, cmd2, cmd3, 0); + sendAction(action, cmd1, cmd2, cmd3, 1); } - + /** * Sends an action to the client * @param action * @param cmd1 * @param cmd2 * @param cmd3 - * @param cmd4 + * @param index */ - public static void sendAction(int action, int cmd1, int cmd2, int cmd3, int cmd4) { + public static void sendAction(int action, int cmd1, int cmd2, int cmd3, int index) { if (constants == null) { constants = Context.getInstance().getHookParser().getConstants(); } - int index = 0; Client client = Loader.getClient(); client.getMenuAction1()[index] = cmd1; From 47f5a6d3c41e53553d1a6e783e3e2ee58bb21b2c Mon Sep 17 00:00:00 2001 From: matt123337 Date: Wed, 16 Jul 2014 14:07:27 -0400 Subject: [PATCH 04/11] Create ActionEvent.java --- .../rev317/min/api/events/ActionEvent.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/org/rev317/min/api/events/ActionEvent.java diff --git a/src/org/rev317/min/api/events/ActionEvent.java b/src/org/rev317/min/api/events/ActionEvent.java new file mode 100644 index 0000000..6cab88a --- /dev/null +++ b/src/org/rev317/min/api/events/ActionEvent.java @@ -0,0 +1,31 @@ +package org.rev317.min.api.events; + +public final class ActionEvent{ + private int index,cmd1,cmd2,cmd3,action; + + public ActionEvent(int action,int cmd1,int cmd2, int cmd3,int index){ + this.action = action; + this.cmd1 = cmd1; + this.cmd2 = cmd2; + this.cmd3 = cmd3; + this.index = index; + } + + public int getCmd1(){ + return cmd1; + } + + public int getCmd2(){ + return cmd2; + } + + public int getCmd3(){ + return cmd3; + } + + public int getAction(){ + return acrtion; + } + + +} From 26bfe32f4d741670f0a71cb20226c7b9bfbdbdb2 Mon Sep 17 00:00:00 2001 From: matt123337 Date: Wed, 16 Jul 2014 14:10:02 -0400 Subject: [PATCH 05/11] Update MenuAction.java Added in the ActionEvent stuff. --- src/org/rev317/min/callback/MenuAction.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/org/rev317/min/callback/MenuAction.java b/src/org/rev317/min/callback/MenuAction.java index f61a46b..a4ee0de 100644 --- a/src/org/rev317/min/callback/MenuAction.java +++ b/src/org/rev317/min/callback/MenuAction.java @@ -4,22 +4,30 @@ import org.rev317.min.Loader; import org.rev317.min.accessors.Client; import org.rev317.min.debug.DActions; +import org.rev317.min.api.events.ActionEvent; + +import org.rev317.min.script.ScriptEngine; + /** * * @author Everel - * + * @author mat123337 + * */ public class MenuAction { public static void intercept(int index) { - if(DActions.debugActions()) { - Client client = Loader.getClient(); int action1 = client.getMenuAction1()[index]; int action2 = client.getMenuAction2()[index]; int action3 = client.getMenuAction3()[index]; int actionId = client.getMenuActionId()[index]; + if(DActions.debugActions()) { + Client client = Loader.getClient(); System.out.println(String.format("[index: %d, action1: %d, action2: %d, action3: %d, id: %d]", index, action1, action2, action3, actionId)); } + + final ActionEvent actionEvent = new ActionEvent(actionId,action1,action2,action3,index); + ScriptEngine.getInstance().dispatch(actionEvent); } } From 1453c99d6cf4b4bac8383500f28b40292c981f67 Mon Sep 17 00:00:00 2001 From: matt123337 Date: Wed, 16 Jul 2014 14:14:42 -0400 Subject: [PATCH 06/11] Update ScriptEngine.java Added in Action Listener shit. --- src/org/rev317/min/script/ScriptEngine.java | 23 +++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/org/rev317/min/script/ScriptEngine.java b/src/org/rev317/min/script/ScriptEngine.java index dd99929..93b2079 100644 --- a/src/org/rev317/min/script/ScriptEngine.java +++ b/src/org/rev317/min/script/ScriptEngine.java @@ -12,10 +12,13 @@ import org.parabot.environment.api.interfaces.Paintable; import org.parabot.environment.scripts.Script; import org.rev317.min.api.events.MessageEvent; import org.rev317.min.api.events.listeners.MessageListener; +import org.rev317.min.api.events.ActionEvent; +import org.rev317.min.api.events.listeners.ActionListener; /** * * @author Everel + * @author matt123337 * */ public class ScriptEngine { @@ -23,6 +26,7 @@ public class ScriptEngine { private ArrayList mouseListeners; private ArrayList mouseMotionListeners; private ArrayList messageListeners; + private ArrayList actionListeners; private Script script = null; @@ -30,6 +34,7 @@ public class ScriptEngine { this.mouseListeners = new ArrayList(); this.mouseMotionListeners = new ArrayList(); this.messageListeners = new ArrayList(); + this.actionListeners = new ArrayList(); instances.put(Context.getInstance(), this); } @@ -41,6 +46,18 @@ public class ScriptEngine { return new ScriptEngine(); } + public void addActionListener(ActionListener a){ + actionListeners.add(a); + } + + public void removeActionListener(ActionListener a){ + actionListeners.remove(a); + } + + public void clearActionListeners(){ + actionListeners.clear(); + } + public void addMouseListener(MouseListener mouseListener) { mouseListeners.add(mouseListener); } @@ -152,6 +169,12 @@ public class ScriptEngine { messageListener.messageReceived(event); } } + + public void dispatch(ActionEvent event) { + for(final ActionListener a : actionListeners) { + a.onGameAction(event); + } + } } From a899682c1bd34a187f865d010192d92fe4e044a1 Mon Sep 17 00:00:00 2001 From: matt123337 Date: Wed, 16 Jul 2014 14:17:06 -0400 Subject: [PATCH 07/11] Update ActionEvent.java fixed typos, added in getIndex() --- src/org/rev317/min/api/events/ActionEvent.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/org/rev317/min/api/events/ActionEvent.java b/src/org/rev317/min/api/events/ActionEvent.java index 6cab88a..7b6e425 100644 --- a/src/org/rev317/min/api/events/ActionEvent.java +++ b/src/org/rev317/min/api/events/ActionEvent.java @@ -24,7 +24,11 @@ public final class ActionEvent{ } public int getAction(){ - return acrtion; + return action; + } + + public int getIndex(){ + return index; } From 5742af612988a49a92a68a0a772a46b127264fcb Mon Sep 17 00:00:00 2001 From: matt123337 Date: Wed, 16 Jul 2014 14:17:45 -0400 Subject: [PATCH 08/11] Update ActionListener.java Fixed a typo in the package declaration. --- src/org/rev317/min/api/events/listeners/ActionListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/rev317/min/api/events/listeners/ActionListener.java b/src/org/rev317/min/api/events/listeners/ActionListener.java index eefcffe..16c114b 100644 --- a/src/org/rev317/min/api/events/listeners/ActionListener.java +++ b/src/org/rev317/min/api/events/listeners/ActionListener.java @@ -1,4 +1,4 @@ -package org.rev317.min.api.event.listeners; +package org.rev317.min.api.events.listeners; public interface ActionListener{ From 013ba04de8a13b77b0804e05e5207ddd9496d289 Mon Sep 17 00:00:00 2001 From: matt123337 Date: Wed, 16 Jul 2014 14:20:24 -0400 Subject: [PATCH 09/11] Update MenuAction.java Fixed yet another silly mistake --- src/org/rev317/min/callback/MenuAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/rev317/min/callback/MenuAction.java b/src/org/rev317/min/callback/MenuAction.java index a4ee0de..e9e14b7 100644 --- a/src/org/rev317/min/callback/MenuAction.java +++ b/src/org/rev317/min/callback/MenuAction.java @@ -17,12 +17,12 @@ import org.rev317.min.script.ScriptEngine; public class MenuAction { public static void intercept(int index) { + Client client = Loader.getClient(); int action1 = client.getMenuAction1()[index]; int action2 = client.getMenuAction2()[index]; int action3 = client.getMenuAction3()[index]; int actionId = client.getMenuActionId()[index]; if(DActions.debugActions()) { - Client client = Loader.getClient(); System.out.println(String.format("[index: %d, action1: %d, action2: %d, action3: %d, id: %d]", index, action1, action2, action3, actionId)); } From ee2656cdd063bfd40d7fe8738ed66118b4f29d36 Mon Sep 17 00:00:00 2001 From: matt123337 Date: Wed, 16 Jul 2014 14:22:07 -0400 Subject: [PATCH 10/11] Update ActionListener.java Fixed another silly mistake on my part, really shouldn't have been doing these edits on github itself. --- src/org/rev317/min/api/events/listeners/ActionListener.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/org/rev317/min/api/events/listeners/ActionListener.java b/src/org/rev317/min/api/events/listeners/ActionListener.java index 16c114b..9a1940c 100644 --- a/src/org/rev317/min/api/events/listeners/ActionListener.java +++ b/src/org/rev317/min/api/events/listeners/ActionListener.java @@ -1,7 +1,9 @@ package org.rev317.min.api.events.listeners; +import org.rev317.min.api.events.ActionEvent; + public interface ActionListener{ - public void onGameAction(int id,int cmd1,int cmd2,int cmd3); + public void onGameAction(ActionEvent event); } From c0c2419005d1fa23a235ef836afea1b257d46f18 Mon Sep 17 00:00:00 2001 From: matt123337 Date: Wed, 16 Jul 2014 14:24:08 -0400 Subject: [PATCH 11/11] Update Skill.java Made it compilable, but getCurrentLevel() needs to be fixed (see comment in code) --- src/org/rev317/min/api/methods/Skill.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/rev317/min/api/methods/Skill.java b/src/org/rev317/min/api/methods/Skill.java index cf6b1a1..35793ca 100644 --- a/src/org/rev317/min/api/methods/Skill.java +++ b/src/org/rev317/min/api/methods/Skill.java @@ -124,7 +124,8 @@ public enum Skill { * Done by Bears */ public static final int getCurrentLevel(int index) { - return Loader.getClient().getCurrentStats()[index]; + //return Loader.getClient().getCurrentStats()[index]; + return getRealLevel(index); //TODO fix this method, it invokes a method not in the client accessor. } /**