From 0ae03219a236602daa83e5e1d5d13280d143e3dc Mon Sep 17 00:00:00 2001 From: Emmastone Date: Sun, 16 Oct 2016 23:47:21 +0100 Subject: [PATCH 1/4] [FEATURE] Added dialog input && Set amount --- src/main/java/org/rev317/min/accessors/Client.java | 4 ++++ src/main/java/org/rev317/min/api/methods/Game.java | 8 ++++++++ .../java/org/rev317/min/api/methods/Interfaces.java | 8 ++++++++ .../java/org/rev317/min/api/methods/Inventory.java | 1 - src/main/java/org/rev317/min/api/methods/Menu.java | 13 +++++++++++++ 5 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/rev317/min/accessors/Client.java b/src/main/java/org/rev317/min/accessors/Client.java index f9555de..430797f 100644 --- a/src/main/java/org/rev317/min/accessors/Client.java +++ b/src/main/java/org/rev317/min/accessors/Client.java @@ -20,6 +20,8 @@ public interface Client { void setInterface(int id); + void setAmountOrNameInput(int amount); + int[] getCurrentExp(); Deque[][][] getGroundItems(); @@ -28,6 +30,8 @@ public interface Client { int getBackDialogId(); + int getInputDialogState(); + int getPlane(); int[] getMenuActionId(); diff --git a/src/main/java/org/rev317/min/api/methods/Game.java b/src/main/java/org/rev317/min/api/methods/Game.java index e1f0419..cf728e7 100644 --- a/src/main/java/org/rev317/min/api/methods/Game.java +++ b/src/main/java/org/rev317/min/api/methods/Game.java @@ -45,6 +45,14 @@ public class Game { return Loader.getClient().getBackDialogId(); } + /** + * Get current input dialog state + * @return input dialog state + */ + public static int getInputDialogState() { + return Loader.getClient().getInputDialogState(); + } + /** * Gets loop cycle * diff --git a/src/main/java/org/rev317/min/api/methods/Interfaces.java b/src/main/java/org/rev317/min/api/methods/Interfaces.java index 4e038c9..12e1142 100644 --- a/src/main/java/org/rev317/min/api/methods/Interfaces.java +++ b/src/main/java/org/rev317/min/api/methods/Interfaces.java @@ -36,6 +36,14 @@ public class Interfaces { Loader.getClient().setInterface(id); } + /** + * Sets the int by the given Amount + * @param amount Amount to set + */ + public static void setAmountOrNameInput(int amount) { + Loader.getClient().setAmountOrNameInput(amount); + } + /** * Get's the Open Interface ID. * @return The ID of the Open Interface , will be -1 if all Interfaces are closed. diff --git a/src/main/java/org/rev317/min/api/methods/Inventory.java b/src/main/java/org/rev317/min/api/methods/Inventory.java index bc925e6..86015b7 100644 --- a/src/main/java/org/rev317/min/api/methods/Inventory.java +++ b/src/main/java/org/rev317/min/api/methods/Inventory.java @@ -296,4 +296,3 @@ public class Inventory { return false; } } - diff --git a/src/main/java/org/rev317/min/api/methods/Menu.java b/src/main/java/org/rev317/min/api/methods/Menu.java index c069c70..b964c3b 100644 --- a/src/main/java/org/rev317/min/api/methods/Menu.java +++ b/src/main/java/org/rev317/min/api/methods/Menu.java @@ -6,6 +6,8 @@ import org.rev317.min.accessors.Client; import org.rev317.min.api.wrappers.Character; import org.rev317.min.api.wrappers.*; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.HashMap; /** @@ -320,6 +322,17 @@ public class Menu { Client client = Loader.getClient(); + try { + Method doAction = client.getClass().getDeclaredMethod("doAction", int.class); + doAction.setAccessible(true); + + doAction.invoke(client, 0); + + } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { + e.printStackTrace(); + } + + client.getMenuAction1()[index] = cmd1; client.getMenuAction2()[index] = cmd2; client.getMenuAction3()[index] = cmd3; From 0c07067201b1a939c4d61a24547ebdedf60fe84d Mon Sep 17 00:00:00 2001 From: Emmastone Date: Sun, 16 Oct 2016 23:55:41 +0100 Subject: [PATCH 2/4] [CLEANUP] Removed duplicated method && unused code --- .../java/org/rev317/min/api/methods/Game.java | 17 --------- .../rev317/min/api/methods/Interfaces.java | 38 ++++++++++++++----- .../java/org/rev317/min/api/methods/Menu.java | 36 +++++------------- .../org/rev317/min/debug/DInterfaces.java | 3 +- 4 files changed, 39 insertions(+), 55 deletions(-) diff --git a/src/main/java/org/rev317/min/api/methods/Game.java b/src/main/java/org/rev317/min/api/methods/Game.java index cf728e7..768a583 100644 --- a/src/main/java/org/rev317/min/api/methods/Game.java +++ b/src/main/java/org/rev317/min/api/methods/Game.java @@ -36,23 +36,6 @@ public class Game { return Loader.getClient().getOpenInterfaceId(); } - /** - * Get open back dialog id - * - * @return back dialog id - */ - public static int getOpenBackDialogId() { - return Loader.getClient().getBackDialogId(); - } - - /** - * Get current input dialog state - * @return input dialog state - */ - public static int getInputDialogState() { - return Loader.getClient().getInputDialogState(); - } - /** * Gets loop cycle * diff --git a/src/main/java/org/rev317/min/api/methods/Interfaces.java b/src/main/java/org/rev317/min/api/methods/Interfaces.java index 12e1142..9bd2b39 100644 --- a/src/main/java/org/rev317/min/api/methods/Interfaces.java +++ b/src/main/java/org/rev317/min/api/methods/Interfaces.java @@ -13,31 +13,35 @@ public class Interfaces { /** * Get's the interfaces loaded in the interface Cache. + * * @return Interfaces in the Interface Cache. */ - public static Interface[] getInterfaces(){ + public static Interface[] getInterfaces() { return Loader.getClient().getInterfaceCache(); } /** * Get's the Interface from the Interface Cache using the given ID. + * * @param id Interface ID. * @return Interface from the cache by the given ID. */ - public static Interface getInterface(int id){ + public static Interface getInterface(int id) { return getInterfaces()[id]; } /** * Opens the Interface by the given ID. + * * @param id ID of the Interface to Open. */ - public static void openInterface(int id){ + public static void openInterface(int id) { Loader.getClient().setInterface(id); } /** * Sets the int by the given Amount + * * @param amount Amount to set */ public static void setAmountOrNameInput(int amount) { @@ -46,45 +50,59 @@ public class Interfaces { /** * Get's the Open Interface ID. + * * @return The ID of the Open Interface , will be -1 if all Interfaces are closed. */ - public static int getOpenInterfaceId(){ + public static int getOpenInterfaceId() { return Loader.getClient().getOpenInterfaceId(); } /** * Get's the Open Back Dialog ID. + * * @return The ID of the Open Back Dialog , will be -1 if all Back Dialogs are closed. */ - public static int getBackDialogId(){ + public static int getBackDialogId() { return Loader.getClient().getBackDialogId(); } + /** + * Get current input dialog state + * + * @return input dialog state + */ + public static int getInputDialogState() { + return Loader.getClient().getInputDialogState(); + } + /** * Checks if the Interface or Back Dialog by the given ID is Open. + * * @param id ID of the Interface or Back Dialog to check for. * @return True is the Interface or Back Dialog is Open else will return false. */ - public static boolean isOpen(int id){ + public static boolean isOpen(int id) { return getOpenInterfaceId() == id || getBackDialogId() == id; } /** * Checks if the Interface by the given ID is Open. - * @param id ID of the Interface or Back Dialog to check for depending on the backDialog boolean. + * + * @param id ID of the Interface or Back Dialog to check for depending on the backDialog boolean. * @param backDialog When tru it will check the Bank Dialog ID else it will check for the Interface ID. * @return True is the Interface or Back Dialog is Open else will return false. */ - public static boolean isOpen(int id, boolean backDialog){ - if(backDialog){ + public static boolean isOpen(int id, boolean backDialog) { + if (backDialog) { return getBackDialogId() == id; - }else{ + } else { return getOpenInterfaceId() == id; } } /** * Clicks an option from the given back dialog + * * @param index Index of the requested option whereas you start at 0 */ public static void clickBackDialogOption(int index) { diff --git a/src/main/java/org/rev317/min/api/methods/Menu.java b/src/main/java/org/rev317/min/api/methods/Menu.java index b964c3b..703a228 100644 --- a/src/main/java/org/rev317/min/api/methods/Menu.java +++ b/src/main/java/org/rev317/min/api/methods/Menu.java @@ -6,8 +6,6 @@ import org.rev317.min.accessors.Client; import org.rev317.min.api.wrappers.Character; import org.rev317.min.api.wrappers.*; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.HashMap; /** @@ -34,10 +32,9 @@ public class Menu { /** * Interacts with a sceneobject * - * @deprecated - * * @param object * @param actionIndex + * @deprecated */ public static void interact(SceneObject object, int actionIndex) { int actionId = SceneObjects.Option.FIRST.getActionId(); @@ -88,10 +85,9 @@ public class Menu { /** * Interacts with a character * - * @deprecated - * * @param character * @param actionIndex + * @deprecated */ public static void interact(Character character, int actionIndex) { int actionId = 20; @@ -131,11 +127,10 @@ public class Menu { /** * Interacts with an item when it has the following menu Transform-1 Transform-5 Transform-10 etc.. * - * @deprecated - * * @param item * @param actionIndex * @param interfaceParentId + * @deprecated */ public static void transformItem(Item item, int actionIndex, int interfaceParentId) { @@ -183,10 +178,9 @@ public class Menu { /** * Interacts with a ground item * - * @deprecated - * * @param item * @param action + * @deprecated */ public static void interact(GroundItem item, int action) { int actionId = GroundItems.Option.FIRST.getActionId(); @@ -210,16 +204,16 @@ public class Menu { sendAction(actionId, item.getId(), item.getX(), item.getY()); } - public static void interact(Item item, Items.Option action){ + public static void interact(Item item, Items.Option action) { sendAction(action.getActionId(), item.getId() - 1, item.getSlot(), 3214); } /** * @deprecated */ - public static void interact(Item item, int action){ + public static void interact(Item item, int action) { int actionId = 447; - switch (action){ + switch (action) { case 0: actionId = 447; break; @@ -239,9 +233,9 @@ public class Menu { /** * @deprecated */ - public static void interact(Item item, String action){ + public static void interact(Item item, String action) { int actionId = 447; - switch (action.toLowerCase()){ + switch (action.toLowerCase()) { case "use": actionId = 447; break; @@ -319,20 +313,8 @@ public class Menu { * @param index */ public static void sendAction(int action, int cmd1, int cmd2, int cmd3, int cmd4, int index) { - Client client = Loader.getClient(); - try { - Method doAction = client.getClass().getDeclaredMethod("doAction", int.class); - doAction.setAccessible(true); - - doAction.invoke(client, 0); - - } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { - e.printStackTrace(); - } - - client.getMenuAction1()[index] = cmd1; client.getMenuAction2()[index] = cmd2; client.getMenuAction3()[index] = cmd3; diff --git a/src/main/java/org/rev317/min/debug/DInterfaces.java b/src/main/java/org/rev317/min/debug/DInterfaces.java index 045f297..18af28c 100644 --- a/src/main/java/org/rev317/min/debug/DInterfaces.java +++ b/src/main/java/org/rev317/min/debug/DInterfaces.java @@ -4,6 +4,7 @@ import org.parabot.core.Context; import org.parabot.core.paint.AbstractDebugger; import org.parabot.core.paint.PaintDebugger; import org.rev317.min.api.methods.Game; +import org.rev317.min.api.methods.Interfaces; import java.awt.*; @@ -14,7 +15,7 @@ public class DInterfaces extends AbstractDebugger { public void paint(Graphics g) { PaintDebugger p = Context.getInstance().getPaintDebugger(); p.addLine("Open interface: " + Game.getOpenInterfaceId()); - p.addLine("Open back dialog: " + Game.getOpenBackDialogId()); + p.addLine("Open back dialog: " + Interfaces.getBackDialogId()); } @Override From 33393875a687120b49ebbc3831c657a61e882626 Mon Sep 17 00:00:00 2001 From: Emmastone Date: Mon, 17 Oct 2016 00:20:12 +0100 Subject: [PATCH 3/4] [BUGFIX] Set getOpenBackDialogId as deprecated --- .../java/org/rev317/min/api/methods/Game.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/rev317/min/api/methods/Game.java b/src/main/java/org/rev317/min/api/methods/Game.java index 768a583..f2482e5 100644 --- a/src/main/java/org/rev317/min/api/methods/Game.java +++ b/src/main/java/org/rev317/min/api/methods/Game.java @@ -36,6 +36,18 @@ public class Game { return Loader.getClient().getOpenInterfaceId(); } + + /** + * Get open back dialog id + * + * @return back dialog id + * @deprecated Use {@link Interfaces #getBackDialogId()} instead. + */ + @Deprecated + public static int getOpenBackDialogId() { + return Loader.getClient().getBackDialogId(); + } + /** * Gets loop cycle * @@ -81,10 +93,9 @@ public class Game { * Returns the settings within the client * * @param index The index of the setting you want to gather - * * @return The specific setting for the given index */ - public static int getSetting(int index){ + public static int getSetting(int index) { return Loader.getClient().getSettings()[index]; } @@ -93,7 +104,7 @@ public class Game { * * @return All settings */ - public static int[] getSettings(){ + public static int[] getSettings() { return Loader.getClient().getSettings(); } @@ -109,15 +120,16 @@ public class Game { /** * Just simply drops the client */ - public static void dropClient(){ + public static void dropClient() { Loader.getClient().dropClient(); } /** * Drops the client and returns if the game is logged out or not + * * @return True if game is logged out, false if not */ - public static boolean confirmedDropClient(){ + public static boolean confirmedDropClient() { Loader.getClient().dropClient(); Time.sleep(new SleepCondition() { @Override From ec1feb393ff822ebf549235aaa3c48cc6ded3935 Mon Sep 17 00:00:00 2001 From: Emmastone Date: Mon, 17 Oct 2016 00:26:42 +0100 Subject: [PATCH 4/4] [CLEANUP] Deprecated code --- src/main/java/org/rev317/min/api/methods/Game.java | 4 +++- src/main/java/org/rev317/min/debug/DInterfaces.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/rev317/min/api/methods/Game.java b/src/main/java/org/rev317/min/api/methods/Game.java index f2482e5..e0bf09f 100644 --- a/src/main/java/org/rev317/min/api/methods/Game.java +++ b/src/main/java/org/rev317/min/api/methods/Game.java @@ -31,7 +31,9 @@ public class Game { * Gets open interface id * * @return interface id + * @deprecated Use {@link Interfaces #getOpenInterfaceId()} instead */ + @Deprecated public static int getOpenInterfaceId() { return Loader.getClient().getOpenInterfaceId(); } @@ -41,7 +43,7 @@ public class Game { * Get open back dialog id * * @return back dialog id - * @deprecated Use {@link Interfaces #getBackDialogId()} instead. + * @deprecated Use {@link Interfaces #getBackDialogId()} instead */ @Deprecated public static int getOpenBackDialogId() { diff --git a/src/main/java/org/rev317/min/debug/DInterfaces.java b/src/main/java/org/rev317/min/debug/DInterfaces.java index 18af28c..4f7e382 100644 --- a/src/main/java/org/rev317/min/debug/DInterfaces.java +++ b/src/main/java/org/rev317/min/debug/DInterfaces.java @@ -14,7 +14,7 @@ public class DInterfaces extends AbstractDebugger { @Override public void paint(Graphics g) { PaintDebugger p = Context.getInstance().getPaintDebugger(); - p.addLine("Open interface: " + Game.getOpenInterfaceId()); + p.addLine("Open interface: " + Interfaces.getOpenInterfaceId()); p.addLine("Open back dialog: " + Interfaces.getBackDialogId()); }