diff --git a/pom.xml b/pom.xml index ed59980..124bc6d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 diff --git a/src/main/java/org/rev317/min/Loader.java b/src/main/java/org/rev317/min/Loader.java index bdced28..cbc5802 100644 --- a/src/main/java/org/rev317/min/Loader.java +++ b/src/main/java/org/rev317/min/Loader.java @@ -23,8 +23,8 @@ import java.io.File; import java.net.URL; /** -* @author Everel, JKetelaar -*/ + * @author Everel, JKetelaar + */ @ServerManifest(author = "Everel & JKetelaar", name = "Server name here", type = Type.INJECTION, version = 2.1) public class Loader extends ServerProvider { private boolean extended = true; @@ -70,7 +70,7 @@ public class Loader extends ServerProvider { try { super.injectHooks(); } catch (Exception e) { - if (Core.inVerboseMode()){ + if (Core.inVerboseMode()) { e.printStackTrace(); } this.extended = false; @@ -86,9 +86,9 @@ public class Loader extends ServerProvider { @Override public HookFile getHookFile() { - if (this.extended){ + if (this.extended) { return new HookFile(Context.getInstance().getServerProviderInfo().getExtendedHookFile(), HookFile.TYPE_XML); - }else{ + } else { return new HookFile(Context.getInstance().getServerProviderInfo().getHookFile(), HookFile.TYPE_XML); } } diff --git a/src/main/java/org/rev317/min/accessors/Ground.java b/src/main/java/org/rev317/min/accessors/Ground.java index 38c39b7..9bcd69d 100644 --- a/src/main/java/org/rev317/min/accessors/Ground.java +++ b/src/main/java/org/rev317/min/accessors/Ground.java @@ -8,8 +8,8 @@ public interface Ground { SceneObjectTile getGroundDecoration(); - SceneObjectTile getGroundItem(); + SceneObjectTile getGroundItem(); - SceneObjectTile[] getInteractiveObjects(); + SceneObjectTile[] getInteractiveObjects(); } diff --git a/src/main/java/org/rev317/min/api/methods/Bank.java b/src/main/java/org/rev317/min/api/methods/Bank.java index 6925c5b..1c91a0c 100644 --- a/src/main/java/org/rev317/min/api/methods/Bank.java +++ b/src/main/java/org/rev317/min/api/methods/Bank.java @@ -124,7 +124,6 @@ public class Bank { * Gets bank item with given id * * @param id - * * @return bank item */ public static Item getItem(int id) { @@ -147,7 +146,6 @@ public class Bank { * Counts the amount of items with given id in bank * * @param id - * * @return count */ public static int getCount(int id) { diff --git a/src/main/java/org/rev317/min/api/methods/Equipment.java b/src/main/java/org/rev317/min/api/methods/Equipment.java index 2a12ea3..4447e86 100644 --- a/src/main/java/org/rev317/min/api/methods/Equipment.java +++ b/src/main/java/org/rev317/min/api/methods/Equipment.java @@ -115,8 +115,8 @@ public class Equipment { RING(12), AMMO(13); - private int slot; private final int INTERFACE_ID = 1688; + private int slot; Slot(int slot) { this.slot = slot; 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 27856fb..392cc29 100644 --- a/src/main/java/org/rev317/min/api/methods/Game.java +++ b/src/main/java/org/rev317/min/api/methods/Game.java @@ -154,8 +154,9 @@ public class Game { /** * Login to a server - * @param username String - * @param password String + * + * @param username String + * @param password String * @param reconnecting True if it's a retry, false if not */ public static void login(String username, String password, boolean reconnecting) { @@ -164,6 +165,7 @@ public class Game { /** * Login to a server + * * @param username String * @param password String */ @@ -173,6 +175,7 @@ public class Game { /** * Adds friend + * * @param username String */ public static void addFriend(String username) { @@ -181,6 +184,7 @@ public class Game { /** * Deletes friend + * * @param username String */ public static void deleteFriend(String username) { diff --git a/src/main/java/org/rev317/min/api/methods/GroundItems.java b/src/main/java/org/rev317/min/api/methods/GroundItems.java index b96a5b9..acd4790 100644 --- a/src/main/java/org/rev317/min/api/methods/GroundItems.java +++ b/src/main/java/org/rev317/min/api/methods/GroundItems.java @@ -68,7 +68,6 @@ public class GroundItems { * * @param x - local region x * @param y - local region y - * * @return GroundItems Array of the Nearest GroundItems with the first index to be the nearest. */ public static final GroundItem[] getGroundItemsAt(final int x, final int y) { @@ -103,7 +102,7 @@ public class GroundItems { * @return GroundItems Array of the Nearest GroundItems with the first index to be the nearest. */ public static final GroundItem[] getGroundItemsAt(final Tile tile) { - return getGroundItemsAt(tile.getX(),tile.getY()); + return getGroundItemsAt(tile.getX(), tile.getY()); } /** @@ -119,7 +118,6 @@ public class GroundItems { * Gets the closest GroundItem which matches the given filter. * * @param filter Filter that should be applied to the GroundItem. - * * @return closest GroundItem */ public static final GroundItem getClosest(final Filter filter) { @@ -134,7 +132,6 @@ public class GroundItems { * Gets the closest GroundItems which matches the given ids. * * @param ids ID's of the GroundItems to look for. - * * @return closest GroundItems */ public static final GroundItem getClosest(int... ids) { @@ -149,7 +146,6 @@ public class GroundItems { * Returns Array of GroundItems with the first index to be the nearest. * * @param filter Filter that should be applied to the GroundItem. - * * @return GroundItems Array of the Nearest GroundItems with the first index to be the nearest. */ public static final GroundItem[] getNearest(Filter filter) { @@ -171,7 +167,6 @@ public class GroundItems { * Returns Array of GroundItems with the first index to be the nearest. * * @param ids GroundItem ID's to look for. - * * @return GroundItems Array of the Nearest GroundItems with the first index to be the nearest. */ public static final GroundItem[] getNearest(final int... ids) { @@ -190,7 +185,7 @@ public class GroundItems { }); } - public enum Option{ + public enum Option { FIRST(settings.get("menu_ground_item_first_interaction")), SECOND(settings.get("menu_ground_item_second_interaction")), 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 86015b7..8e427f3 100644 --- a/src/main/java/org/rev317/min/api/methods/Inventory.java +++ b/src/main/java/org/rev317/min/api/methods/Inventory.java @@ -17,8 +17,6 @@ import java.util.HashMap; */ public class Inventory { - private static HashMap settings = Context.getInstance().getServerProviderInfo().getSettings(); - private static final Filter ALL_FILTER = new Filter() { @Override @@ -27,6 +25,7 @@ public class Inventory { } }; + private static HashMap settings = Context.getInstance().getServerProviderInfo().getSettings(); /** * Clears the inventory @@ -75,7 +74,6 @@ public class Inventory { * Gets the amount of items with given ids in inventory, excludes the stack sizes * * @param ids - * * @return amount of items */ public static int getCount(int... ids) { @@ -86,7 +84,6 @@ public class Inventory { * Gets the amount of items in inventory * * @param includeStack - true for including stack sizes to the counting - * * @return amount of items */ public static int getCount(final boolean includeStack) { @@ -110,7 +107,6 @@ public class Inventory { * * @param includeStack - true for including stack sizes to the counting * @param ids - * * @return amount of items */ public static int getCount(final boolean includeStack, int... ids) { @@ -148,7 +144,6 @@ public class Inventory { * Gets all items with given ids * * @param ids - * * @return items */ public static Item[] getItems(final int... ids) { @@ -171,7 +166,6 @@ public class Inventory { * Gets all items accepted by filter * * @param filter - * * @return items */ public static Item[] getItems(final Filter filter) { @@ -218,7 +212,6 @@ public class Inventory { * Checks if an item exists in the inventory * * @param id The item id that will be looked for - * * @return True if the item exists in the inventory */ public static boolean contains(int... id) { @@ -234,7 +227,6 @@ public class Inventory { * Returns the item in the inventory based on the given id * * @param id The item id that will be used to find the item in the inventory - * * @return First found item in the inventory */ public static Item getItem(int id) { @@ -251,7 +243,6 @@ public class Inventory { * * @param itemOne The first item id that will be used to combine * @param itemTwo The second item id that will be used to combine - * * @return True if nothing unexpected happened */ public static boolean combine(int itemOne, int itemTwo) { @@ -273,10 +264,9 @@ public class Inventory { /** * Combines two items by using it on each other * - * @param itemOne The first item id that will be used to combine - * @param itemTwo The second item id that will be used to combine + * @param itemOne The first item id that will be used to combine + * @param itemTwo The second item id that will be used to combine * @param sleepCondition The sleep condition that will be used to check and wait until the condition is valid - * * @return True if the condition was true and nothing unexpected happened */ public static boolean combine(int itemOne, int itemTwo, SleepCondition sleepCondition) { diff --git a/src/main/java/org/rev317/min/api/methods/Items.java b/src/main/java/org/rev317/min/api/methods/Items.java index 2b65a43..ff54b96 100644 --- a/src/main/java/org/rev317/min/api/methods/Items.java +++ b/src/main/java/org/rev317/min/api/methods/Items.java @@ -24,11 +24,11 @@ public class Items { private static HashMap prices = new HashMap<>(); private static HashMap names = new HashMap<>(); - public static String getName(int id){ + public static String getName(int id) { String name; - if ((name = names.get(id)) != null){ + if ((name = names.get(id)) != null) { return name; - }else { + } else { try { String content = WebUtil.getContents(Configuration.ITEM_API + id); if (content.length() > 0) { @@ -46,74 +46,79 @@ public class Items { return null; } - public static int[] getIds(String name){ + public static int[] getIds(String name) { try { String content = WebUtil.getContents(Configuration.ITEM_API + name); if (content.length() > 0) { JSONObject jsonObject = (JSONObject) jsonParser.parse(content); JSONArray array = (JSONArray) jsonObject.get("result"); - if (array.size() > 0){ + if (array.size() > 0) { int[] ids = new int[array.size()]; - for (int i = 0; i < array.size(); i++){ + for (int i = 0; i < array.size(); i++) { ids[i] = Integer.parseInt((String) array.get(i)); } return ids; } } - } catch (MalformedURLException | ParseException ignored) {} + } catch (MalformedURLException | ParseException ignored) { + } return new int[0]; } /** * Returns an int array based on the string it starts with. getIdsStart(dragon) will return an int array with all items starting with dragon + * * @param name * @return */ - public static int[] getIdsStart(String name){ + public static int[] getIdsStart(String name) { try { String content = WebUtil.getContents(Configuration.ITEM_API + "starts/" + name); if (content.length() > 0) { JSONObject jsonObject = (JSONObject) jsonParser.parse(content); JSONArray array = (JSONArray) jsonObject.get("result"); - if (array.size() > 0){ + if (array.size() > 0) { int[] ids = new int[array.size()]; - for (int i = 0; i < array.size(); i++){ + for (int i = 0; i < array.size(); i++) { ids[i] = Integer.parseInt((String) array.get(i)); } return ids; } } - } catch (MalformedURLException | ParseException ignored) {} + } catch (MalformedURLException | ParseException ignored) { + } return new int[0]; } /** * Returns an int array based on the string it contains. getIdsContain(dragon) will return an int array with all items containingdragon + * * @param name * @return */ - public static int[] getIdsContain(String name){ + public static int[] getIdsContain(String name) { try { String content = WebUtil.getContents(Configuration.ITEM_API + "contains/" + name); if (content.length() > 0) { JSONObject jsonObject = (JSONObject) jsonParser.parse(content); JSONArray array = (JSONArray) jsonObject.get("result"); - if (array.size() > 0){ + if (array.size() > 0) { int[] ids = new int[array.size()]; - for (int i = 0; i < array.size(); i++){ + for (int i = 0; i < array.size(); i++) { ids[i] = Integer.parseInt((String) array.get(i)); } return ids; } } - } catch (MalformedURLException | ParseException ignored) {} + } catch (MalformedURLException | ParseException ignored) { + } return new int[0]; } - public static long getPrice(int id){ - if (prices.containsKey(id)){ + public static long getPrice(int id) { + if (prices.containsKey(id)) { return prices.get(id); - }else { + } else { try { String content = WebUtil.getContents(Configuration.ITEM_API + id + "/" + Context.getInstance().getServerProviderInfo().getServerName()); if (content.length() > 0) { @@ -131,7 +136,7 @@ public class Items { return 0; } - public enum Option{ + public enum Option { TRANSFORM_FIRST(settings.get("menu_transform_one_interaction")), VALUE(settings.get("menu_transform_one_interaction")), TRANSFORM_ONE(settings.get("menu_transform_one_interaction")), diff --git a/src/main/java/org/rev317/min/api/methods/Npcs.java b/src/main/java/org/rev317/min/api/methods/Npcs.java index 13b69aa..cd81490 100644 --- a/src/main/java/org/rev317/min/api/methods/Npcs.java +++ b/src/main/java/org/rev317/min/api/methods/Npcs.java @@ -6,7 +6,10 @@ import org.rev317.min.Loader; import org.rev317.min.accessors.Client; import org.rev317.min.api.wrappers.Npc; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashMap; /** * @author Everel, JKetelaar @@ -36,7 +39,6 @@ public class Npcs { * Gets all Npcs except local Npc * * @param filter - * * @return all Npcs */ public static final Npc[] getNpcs(final Filter filter) { @@ -68,7 +70,6 @@ public class Npcs { * Gets the closest npc which matches the given filter * * @param filter - * * @return closest npc */ public static final Npc getClosest(final Filter filter) { @@ -83,7 +84,6 @@ public class Npcs { * Gets the closest npc which matches the given ids * * @param ids - * * @return closest npc */ public static final Npc getClosest(int... ids) { @@ -98,7 +98,6 @@ public class Npcs { * Returns array with the first index to be the nearest Npc * * @param filter - * * @return nearest Npcs */ public static final Npc[] getNearest(final Filter filter) { @@ -111,7 +110,6 @@ public class Npcs { * Gets nearest npcs which hold given id(s) * * @param ids - * * @return array of npcs with the first index to be the nearest */ public static final Npc[] getNearest(final int... ids) { @@ -119,7 +117,7 @@ public class Npcs { @Override public boolean accept(Npc npc) { - if (npc.getDef() != null){ + if (npc.getDef() != null) { for (final int id : ids) { if (id == npc.getDef().getId()) { return true; @@ -143,7 +141,7 @@ public class Npcs { return getNearest(ALL_FILTER); } - public enum Option{ + public enum Option { FIRST(settings.get("menu_character_first_interaction")), ATTACK(settings.get("menu_character_first_interaction")), diff --git a/src/main/java/org/rev317/min/api/methods/Players.java b/src/main/java/org/rev317/min/api/methods/Players.java index 9f0a574..fb8a638 100644 --- a/src/main/java/org/rev317/min/api/methods/Players.java +++ b/src/main/java/org/rev317/min/api/methods/Players.java @@ -6,7 +6,10 @@ import org.rev317.min.Loader; import org.rev317.min.accessors.Client; import org.rev317.min.api.wrappers.Player; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashMap; /** * @author Everel, JKetelaar @@ -36,7 +39,6 @@ public class Players { * Gets all players except local player * * @param filter - * * @return all players */ public static final Player[] getPlayers(final Filter filter) { @@ -68,7 +70,6 @@ public class Players { * Returns array with the first index to be the nearest player * * @param filter - * * @return nearest players */ public static final Player[] getNearest(final Filter filter) { @@ -95,7 +96,7 @@ public class Players { return new Player(Loader.getClient().getMyPlayer(), -1); } - public enum Option{ + public enum Option { FIRST(settings.get("menu_character_first_interaction")), SECOND(settings.get("menu_character_second_interaction")), diff --git a/src/main/java/org/rev317/min/api/methods/Prayer.java b/src/main/java/org/rev317/min/api/methods/Prayer.java index ceb97d0..182b339 100644 --- a/src/main/java/org/rev317/min/api/methods/Prayer.java +++ b/src/main/java/org/rev317/min/api/methods/Prayer.java @@ -12,14 +12,62 @@ import java.util.ArrayList; */ public class Prayer { - public interface Book { - public int getSetting(); + public static boolean isEnabled(Book book) { + return Game.getSetting(book.getSetting()) == 1; + } - public int getAction(); + public static void enable(final Book book) { + if (!isEnabled(book)) { + Menu.sendAction(169, -1, -1, book.getAction()); + Time.sleep(new SleepCondition() { + @Override + public boolean isValid() { + return isEnabled(book); + } + }, 1500); + } + } - public int getLevel(); + public static void disable(final Book book) { + if (isEnabled(book)) { + Menu.sendAction(169, -1, -1, book.getAction()); + Time.sleep(new SleepCondition() { + @Override + public boolean isValid() { + return !isEnabled(book); + } + }, 1500); + } + } - public String getName(); + public static Book[] getActivePrayers() { + ArrayList prayers = new ArrayList<>(); + for (Book normal : Normal.values()) { + if (isEnabled(normal)) { + prayers.add(normal); + } + } + for (Book curse : Curse.values()) { + if (isEnabled(curse)) { + prayers.add(curse); + } + } + return prayers.toArray(new Book[prayers.size()]); + } + + public static void setActivePrayers(Book[] prayers) { + for (Book book : prayers) { + for (Book normal : Normal.values()) { + if (!isEnabled(normal) && normal.equals(book)) { + enable(normal); + } + } + for (Book curse : Curse.values()) { + if (!isEnabled(curse) && curse.equals(book)) { + enable(curse); + } + } + } } public enum Normal implements Book { @@ -176,62 +224,13 @@ public class Prayer { } + public interface Book { + public int getSetting(); - public static boolean isEnabled(Book book) { - return Game.getSetting(book.getSetting()) == 1; - } + public int getAction(); - public static void enable(final Book book) { - if (!isEnabled(book)) { - Menu.sendAction(169, -1, -1, book.getAction()); - Time.sleep(new SleepCondition() { - @Override - public boolean isValid() { - return isEnabled(book); - } - }, 1500); - } - } + public int getLevel(); - public static void disable(final Book book) { - if (isEnabled(book)) { - Menu.sendAction(169, -1, -1, book.getAction()); - Time.sleep(new SleepCondition() { - @Override - public boolean isValid() { - return !isEnabled(book); - } - }, 1500); - } - } - - public static Book[] getActivePrayers() { - ArrayList prayers = new ArrayList<>(); - for (Book normal : Normal.values()) { - if (isEnabled(normal)) { - prayers.add(normal); - } - } - for (Book curse : Curse.values()) { - if (isEnabled(curse)) { - prayers.add(curse); - } - } - return prayers.toArray(new Book[prayers.size()]); - } - - public static void setActivePrayers(Book[] prayers) { - for (Book book : prayers) { - for (Book normal : Normal.values()) { - if (!isEnabled(normal) && normal.equals(book)) { - enable(normal); - } - } - for (Book curse : Curse.values()) { - if (!isEnabled(curse) && curse.equals(book)) { - enable(curse); - } - } - } + public String getName(); } } diff --git a/src/main/java/org/rev317/min/api/methods/SceneObjects.java b/src/main/java/org/rev317/min/api/methods/SceneObjects.java index e2b5cb8..86bbc59 100644 --- a/src/main/java/org/rev317/min/api/methods/SceneObjects.java +++ b/src/main/java/org/rev317/min/api/methods/SceneObjects.java @@ -66,7 +66,6 @@ public class SceneObjects { * Returns array of sceneobjects with the first index to be the nearest * * @param filter - * * @return sceneobjects */ public static final SceneObject[] getNearest(Filter filter) { @@ -88,7 +87,6 @@ public class SceneObjects { * Returns nearest objects with given id * * @param ids - * * @return sceneobjects */ public static final SceneObject[] getNearest(final int... ids) { @@ -172,7 +170,6 @@ public class SceneObjects { * @param x * @param y * @param useCached - * * @return array of sceneobjects, or null if there aren't any */ public static final Collection getSceneObjectsAtTile(int x, int y, boolean useCached) { @@ -225,7 +222,7 @@ public class SceneObjects { return sceneObjects; } - public enum Option{ + public enum Option { FIRST(settings.get("menu_scene_object_first_interaction")), TALK_TO(settings.get("menu_scene_object_first_interaction")), CHOP_DOWN(settings.get("menu_scene_object_first_interaction")), diff --git a/src/main/java/org/rev317/min/api/methods/Skill.java b/src/main/java/org/rev317/min/api/methods/Skill.java index 9381036..8bc08d1 100644 --- a/src/main/java/org/rev317/min/api/methods/Skill.java +++ b/src/main/java/org/rev317/min/api/methods/Skill.java @@ -30,7 +30,6 @@ public enum Skill { * Returns the experience of the provided skill. * * @param index the skill index. - * * @return the experience. */ public static final int getCurrentExperience(int index) { @@ -41,7 +40,6 @@ public enum Skill { * Returns the real level of the provided skill. * * @param index the skill index. - * * @return the real skill level. */ public static final int getRealLevel(int index) { @@ -52,7 +50,6 @@ public enum Skill { * Returns the current level of the provided skill. (Will return de-buffed/buffed levels) * * @param index the skill index. - * * @return the current skill level. Done by Bears */ public static final int getCurrentLevel(int index) { @@ -63,7 +60,6 @@ public enum Skill { * Returns the exact experience at the provided level. * * @param level the level. - * * @return the experience at the provided level. */ public static final int getExperienceByLevel(int level) { @@ -77,7 +73,6 @@ public enum Skill { * Returns the exact level with the provided experience. * * @param experience the experience. - * * @return the level at the provided experience. */ public static final int getLevelByExperience(int experience) { @@ -93,7 +88,6 @@ public enum Skill { * Returns the remaining experience for the provided skill to level up. * * @param index the skill index. - * * @return the remaining experience. */ public static final int getRemainingExperience(int index) { @@ -108,7 +102,6 @@ public enum Skill { * Returns the percentage to the next level for the provided skill. * * @param index the skill index. - * * @return the remaining percentage. */ public static final int getPercentToNextLevel(int index) { diff --git a/src/main/java/org/rev317/min/api/methods/Trading.java b/src/main/java/org/rev317/min/api/methods/Trading.java index 89f98c0..8198245 100644 --- a/src/main/java/org/rev317/min/api/methods/Trading.java +++ b/src/main/java/org/rev317/min/api/methods/Trading.java @@ -2,9 +2,7 @@ package org.rev317.min.api.methods; import org.parabot.core.Context; import org.parabot.environment.api.utils.Time; -import org.parabot.environment.input.Mouse; import org.parabot.environment.scripts.framework.SleepCondition; -import org.rev317.min.Loader; import org.rev317.min.accessors.Interface; import org.rev317.min.api.wrappers.Item; @@ -20,26 +18,28 @@ public class Trading { /** * Checks if the first or the second screen is open, based on the given boolean + * * @param first If true, the first trade screen will be checked. If false, the second screen will be checked * @return True if the requested screen is open */ - public static boolean isOpen(boolean first){ + public static boolean isOpen(boolean first) { return Interfaces.getOpenInterfaceId() == (first ? settings.get("first_trade_interface_id") : settings.get("second_trade_interface_id")); } /** * Checks if any of the trade screens are open + * * @return True if open, false if not open */ - public static boolean isOpen(){ + public static boolean isOpen() { return Interfaces.getOpenInterfaceId() == settings.get("first_trade_interface_id") || Interfaces.getOpenInterfaceId() == settings.get("second_trade_interface_id"); } /** * Still in development - * For now it simply walks away from the trade by walking to the location of the player + * For now it simply walks away from the trade by walking to the location of the player */ - public static void close(){ + public static void close() { Players.getMyPlayer().getLocation().walkTo(); Time.sleep(new SleepCondition() { @Override @@ -98,7 +98,7 @@ public class Trading { /** * TODO: Add the id into the settings - * + *

* Accepts the offer and hits the button to continue to the second screen */ public static void acceptOffer() { @@ -113,7 +113,7 @@ public class Trading { /** * TODO: Add the id into the settings - * + *

* Accepts the trade and hits the button to complete the trade */ public static void acceptTrade() { diff --git a/src/main/java/org/rev317/min/api/wrappers/Area.java b/src/main/java/org/rev317/min/api/wrappers/Area.java index e17d78c..4a23fb8 100644 --- a/src/main/java/org/rev317/min/api/wrappers/Area.java +++ b/src/main/java/org/rev317/min/api/wrappers/Area.java @@ -4,9 +4,7 @@ import java.awt.*; import java.util.ArrayList; /** - * * @author Matt, JKetelaar - * */ public class Area { private Polygon p; @@ -14,8 +12,7 @@ public class Area { /** * Initializes a PolygonArea with the tiles given * - * @param tiles - * tiles to use in the area + * @param tiles tiles to use in the area */ public Area(Tile... tiles) { this.p = new Polygon(); @@ -27,8 +24,7 @@ public class Area { /** * Adds a tile to the area * - * @param t - * The tile to add the area + * @param t The tile to add the area */ public void addTile(Tile t) { p.addPoint(t.getX(), t.getY()); @@ -86,8 +82,7 @@ public class Area { /** * Checks if a tile is in the area * - * @param tile - * The tile to check + * @param tile The tile to check * @return true if area does contain the tile, otherwise false */ public boolean contains(Tile tile) { @@ -99,7 +94,6 @@ public class Area { * * @param x The x-axis from the tile * @param y The y-axis from the tile - * * @return True if the area does contain the tile, otherwise false */ public boolean contains(int x, int y) { diff --git a/src/main/java/org/rev317/min/api/wrappers/Character.java b/src/main/java/org/rev317/min/api/wrappers/Character.java index f4aaf11..d918f29 100644 --- a/src/main/java/org/rev317/min/api/wrappers/Character.java +++ b/src/main/java/org/rev317/min/api/wrappers/Character.java @@ -115,9 +115,8 @@ public class Character implements Locatable { /** * Interacts with this character * - * @deprecated - * * @param i + * @deprecated */ public void interact(int i) { Menu.interact(this, i); diff --git a/src/main/java/org/rev317/min/api/wrappers/GroundItem.java b/src/main/java/org/rev317/min/api/wrappers/GroundItem.java index e4a568e..ca8e7c6 100644 --- a/src/main/java/org/rev317/min/api/wrappers/GroundItem.java +++ b/src/main/java/org/rev317/min/api/wrappers/GroundItem.java @@ -2,7 +2,10 @@ package org.rev317.min.api.wrappers; import org.parabot.core.reflect.RefClass; import org.rev317.min.api.interfaces.Locatable; -import org.rev317.min.api.methods.*; +import org.rev317.min.api.methods.Calculations; +import org.rev317.min.api.methods.Game; +import org.rev317.min.api.methods.GroundItems; +import org.rev317.min.api.methods.Menu; /** * @author Everel @@ -57,9 +60,8 @@ public class GroundItem implements Locatable { /** * Interacts with this ground item * - * @deprecated - * * @param actionIndex + * @deprecated */ public void interact(int actionIndex) { Menu.interact(this, actionIndex); diff --git a/src/main/java/org/rev317/min/api/wrappers/Item.java b/src/main/java/org/rev317/min/api/wrappers/Item.java index dbdb868..ca1af6a 100644 --- a/src/main/java/org/rev317/min/api/wrappers/Item.java +++ b/src/main/java/org/rev317/min/api/wrappers/Item.java @@ -60,7 +60,6 @@ public class Item { } /** - * * @param option * @param interfaceParentId */ @@ -71,9 +70,8 @@ public class Item { /** * Interacts with this item * - * @deprecated - * * @param i + * @deprecated */ public void interact(int i) { Menu.interact(this, i); @@ -82,19 +80,17 @@ public class Item { /** * Interacts with this item * - * @deprecated - * * @param s + * @deprecated */ - public void interact(String s){ + public void interact(String s) { Menu.interact(this, s); } /** - * @deprecated - * * @param actionIndex * @param interfaceParentId + * @deprecated */ public void transform(int actionIndex, int interfaceParentId) { Menu.transformItem(this, actionIndex, interfaceParentId); diff --git a/src/main/java/org/rev317/min/api/wrappers/NpcDef.java b/src/main/java/org/rev317/min/api/wrappers/NpcDef.java index bbc18b3..4c7e9f3 100644 --- a/src/main/java/org/rev317/min/api/wrappers/NpcDef.java +++ b/src/main/java/org/rev317/min/api/wrappers/NpcDef.java @@ -3,7 +3,7 @@ package org.rev317.min.api.wrappers; import org.parabot.core.reflect.RefClass; /** - * @author Everel + * @author Everel, JKetelaar, EmmaStone */ public class NpcDef { private org.rev317.min.accessors.NpcDef accessor; @@ -18,12 +18,25 @@ public class NpcDef { * @return id of this item */ public int getId() { - if (accessor != null) { - return accessor.getId(); + try { + return (int) getLongId(); + } catch (Exception e) { + e.printStackTrace(); } return -1; } + private long getLongId() { + if (accessor != null) { + if (accessor.getId() < Integer.MAX_VALUE) { + return (long) accessor.getId(); + } + } + + return -1; + } + + /** * Gets the accessor class * @@ -34,4 +47,3 @@ public class NpcDef { } } - diff --git a/src/main/java/org/rev317/min/api/wrappers/Player.java b/src/main/java/org/rev317/min/api/wrappers/Player.java index b43f245..785f524 100644 --- a/src/main/java/org/rev317/min/api/wrappers/Player.java +++ b/src/main/java/org/rev317/min/api/wrappers/Player.java @@ -12,7 +12,7 @@ public class Player extends Character { super(accessor, index); } - public String getName(){ + public String getName() { return getAccessor().getName(); } diff --git a/src/main/java/org/rev317/min/api/wrappers/SceneObject.java b/src/main/java/org/rev317/min/api/wrappers/SceneObject.java index ecb4b02..5060778 100644 --- a/src/main/java/org/rev317/min/api/wrappers/SceneObject.java +++ b/src/main/java/org/rev317/min/api/wrappers/SceneObject.java @@ -101,9 +101,8 @@ public class SceneObject implements Locatable { /** * Interacts with this object * - * @deprecated - * * @param actionIndex + * @deprecated */ public void interact(int actionIndex) { Menu.interact(this, actionIndex); diff --git a/src/main/java/org/rev317/min/api/wrappers/Tile.java b/src/main/java/org/rev317/min/api/wrappers/Tile.java index cb28680..0ca9382 100644 --- a/src/main/java/org/rev317/min/api/wrappers/Tile.java +++ b/src/main/java/org/rev317/min/api/wrappers/Tile.java @@ -139,7 +139,6 @@ public final class Tile implements TileFlags, Locatable { * Determines if this tile is reachable * * @param isObject whether this tile is an object tile - * * @return true if this tile is reachable, otherwise false */ public boolean isReachable(boolean isObject) { diff --git a/src/main/java/org/rev317/min/debug/DInventory.java b/src/main/java/org/rev317/min/debug/DInventory.java index 613a6e7..5ec332d 100644 --- a/src/main/java/org/rev317/min/debug/DInventory.java +++ b/src/main/java/org/rev317/min/debug/DInventory.java @@ -41,9 +41,9 @@ public class DInventory extends AbstractDebugger { } } - public int getSlotItemID(int slot){ - for (Item item : Inventory.getItems()){ - if (item.getSlot() == slot){ + public int getSlotItemID(int slot) { + for (Item item : Inventory.getItems()) { + if (item.getSlot() == slot) { return item.getId(); } } diff --git a/src/main/java/org/rev317/min/debug/DMessages.java b/src/main/java/org/rev317/min/debug/DMessages.java index 9a61819..35c13eb 100644 --- a/src/main/java/org/rev317/min/debug/DMessages.java +++ b/src/main/java/org/rev317/min/debug/DMessages.java @@ -22,9 +22,9 @@ public class DMessages extends AbstractDebugger implements MessageListener { @Override public void toggle() { enabled = !enabled; - if (enabled){ + if (enabled) { ScriptEngine.getInstance().addMessageListener(this); - }else{ + } else { ScriptEngine.getInstance().removeMessageListener(this); } } diff --git a/src/main/java/org/rev317/min/debug/DPlayers.java b/src/main/java/org/rev317/min/debug/DPlayers.java index 996fa52..ed7f25d 100644 --- a/src/main/java/org/rev317/min/debug/DPlayers.java +++ b/src/main/java/org/rev317/min/debug/DPlayers.java @@ -12,7 +12,7 @@ import java.awt.*; public class DPlayers extends AbstractDebugger { @Override public void toggle() { - for (Player player : Players.getNearest()){ + for (Player player : Players.getNearest()) { System.out.println("Username: " + player.getName() + " Index: " + player.getIndex() + " Distance: " + player.distanceTo() + " Location: " + player.getLocation().toString()); } } diff --git a/src/main/java/org/rev317/min/ui/BotMenu.java b/src/main/java/org/rev317/min/ui/BotMenu.java index 8e3ce45..bec560f 100644 --- a/src/main/java/org/rev317/min/ui/BotMenu.java +++ b/src/main/java/org/rev317/min/ui/BotMenu.java @@ -67,7 +67,7 @@ public class BotMenu implements ActionListener { actions.addSeparator(); ButtonGroup group = new ButtonGroup(); - for (int i = 0; i < MenuAction.getOutputs().length; i++){ + for (int i = 0; i < MenuAction.getOutputs().length; i++) { final int index = i; JMenuItem debugOutput = new JRadioButtonMenuItem("Output: " + index); debugOutput.addActionListener(new ActionListener() {