2006-Scape/Parabot-317-API-Minified
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot-317-API-Minified.git synced 2026-10-01 02:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FEATURE] Added getLongId

Browse Source
This commit is contained in:
Emma Stone
2017-02-01 19:23:45 +00:00
parent f98b1e1258
commit e6b1767f3c
27 changed files with 161 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
src/main/java/org/rev317/min/api/methods/Bank.java
-2
View File
@@ -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) {
src/main/java/org/rev317/min/api/methods/Equipment.java
+1 -1
View File
@@ -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;
src/main/java/org/rev317/min/api/methods/Game.java
+4
View File
@@ -154,6 +154,7 @@ public class Game {
/**
* Login to a server
*
* @param username String
* @param password String
* @param reconnecting True if it's a retry, false if not
@@ -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) {
src/main/java/org/rev317/min/api/methods/GroundItems.java
-5
View File
@@ -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) {
@@ -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<GroundItem> 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<GroundItem> 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) {
src/main/java/org/rev317/min/api/methods/Inventory.java
+1 -11
View File
@@ -17,8 +17,6 @@ import java.util.HashMap;
*/
public class Inventory {
private static HashMap<String, Integer> settings = Context.getInstance().getServerProviderInfo().getSettings();
private static final Filter<Item> ALL_FILTER = new Filter<Item>() {
@Override
@@ -27,6 +25,7 @@ public class Inventory {
}
};
private static HashMap<String, Integer> 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<Item> 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) {
@@ -276,7 +267,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
* @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) {
src/main/java/org/rev317/min/api/methods/Items.java
+8 -3
View File
@@ -60,12 +60,14 @@ public class Items {
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
*/
@@ -83,12 +85,14 @@ public class Items {
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
*/
@@ -106,7 +110,8 @@ public class Items {
return ids;
}
}
} catch (MalformedURLException | ParseException ignored) {}
} catch (MalformedURLException | ParseException ignored) {
}
return new int[0];
}
src/main/java/org/rev317/min/api/methods/Npcs.java
+4 -6
View File
@@ -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<Npc> 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<Npc> 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<Npc> 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) {
src/main/java/org/rev317/min/api/methods/Players.java
+4 -3
View File
@@ -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<Player> 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<Player> filter) {
src/main/java/org/rev317/min/api/methods/Prayer.java
+58 -59
View File
@@ -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<Book> 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<Book> 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();
}
}
src/main/java/org/rev317/min/api/methods/SceneObjects.java
-3
View File
@@ -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<SceneObject> 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<SceneObject> getSceneObjectsAtTile(int x, int y, boolean useCached) {
src/main/java/org/rev317/min/api/methods/Skill.java
-7
View File
@@ -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) {
src/main/java/org/rev317/min/api/methods/Trading.java
+4 -4
View File
@@ -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,6 +18,7 @@ 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
*/
@@ -29,6 +28,7 @@ public class Trading {
/**
* Checks if any of the trade screens are open
*
* @return True if open, false if not open
*/
public static boolean isOpen() {
@@ -98,7 +98,7 @@ public class Trading {
/**
* TODO: Add the id into the settings
*
* <p>
* 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
*
* <p>
* Accepts the trade and hits the button to complete the trade
*/
public static void acceptTrade() {
src/main/java/org/rev317/min/api/wrappers/Area.java
+3 -9
View File
@@ -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 <b>true</b> if area does contain the tile, otherwise <b>false</b>
*/
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) {
src/main/java/org/rev317/min/api/wrappers/Character.java
+1 -2
View File
@@ -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);
src/main/java/org/rev317/min/api/wrappers/GroundItem.java
+5 -3
View File
@@ -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);
src/main/java/org/rev317/min/api/wrappers/Item.java
+3 -7
View File
@@ -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) {
Menu.interact(this, s);
}
/**
* @deprecated
*
* @param actionIndex
* @param interfaceParentId
* @deprecated
*/
public void transform(int actionIndex, int interfaceParentId) {
Menu.transformItem(this, actionIndex, interfaceParentId);
src/main/java/org/rev317/min/api/wrappers/NpcDef.java
+16 -4
View File
@@ -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 {
}
}
src/main/java/org/rev317/min/api/wrappers/SceneObject.java
+1 -2
View File
@@ -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);
src/main/java/org/rev317/min/api/wrappers/Tile.java
-1
View File
@@ -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 <code>true</code> if this tile is reachable, otherwise <code>false</code>
*/
public boolean isReachable(boolean isObject) {