Merge branch 'upstream-master' into runelite

# Conflicts:
#	cache-client/pom.xml
#	cache-updater/pom.xml
#	cache/pom.xml
#	http-api/pom.xml
#	http-service/pom.xml
#	pom.xml
#	runelite-api/pom.xml
#	runelite-api/src/main/java/net/runelite/api/Client.java
#	runelite-api/src/main/java/net/runelite/api/events/MenuEntryAdded.java
#	runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java
#	runelite-api/src/main/java/net/runelite/api/events/PlayerMenuOptionClicked.java
#	runelite-client/pom.xml
#	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
#	runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
#	runelite-script-assembler-plugin/pom.xml
This commit is contained in:
zeruth
2021-01-29 21:19:28 -05:00
55 changed files with 1763 additions and 395 deletions
@@ -117,7 +117,7 @@ public enum ChatMessageType
*/
MODAUTOTYPER(91),
/**
* A game message (ie. when a setting is changed).
* A game message. (ie. when a setting is changed)
*/
CONSOLE(99),
/**
@@ -47,7 +47,7 @@ import org.slf4j.Logger;
/**
* Represents the RuneScape client.
*/
public interface Client extends GameShell
public interface Client extends GameEngine
{
/**
* The injected client invokes these callbacks to send events to us
@@ -68,6 +68,8 @@ public interface Client extends GameShell
*/
Logger getLogger();
String getBuildID();
/**
* Gets a list of all valid players from the player cache.
*
@@ -457,7 +459,7 @@ public interface Client extends GameShell
int getMouseCurrentButton();
/**
* Gets the currently selected tile (ie. last right clicked tile).
* Gets the currently selected tile. (ie. last right clicked tile)
*
* @return the selected tile
*/
@@ -1543,8 +1545,8 @@ public interface Client extends GameShell
void setPlayersHidden(boolean state);
/**
* Sets whether 2D sprites (ie. overhead prayers, PK skull) related to
* the other players are hidden.
* Sets whether 2D sprites related to the other players are hidden.
* (ie. overhead prayers, PK skull)
*
* @param state the new player 2D hidden state
*/
@@ -1572,8 +1574,8 @@ public interface Client extends GameShell
void setLocalPlayerHidden(boolean state);
/**
* Sets whether 2D sprites (ie. overhead prayers, PK skull) related to
* the local player are hidden.
* Sets whether 2D sprites related to the local player are hidden.
* (ie. overhead prayers, PK skull)
*
* @param state new local player 2D hidden state
*/
@@ -30,7 +30,7 @@ import java.awt.Canvas;
/**
* Represents the client game engine.
*/
public interface GameShell
public interface GameEngine
{
/**
* Gets the canvas that contains everything.
@@ -54,7 +54,7 @@ public enum HeadIcon
*/
REDEMPTION,
/**
* Protect from range and mage (ie. used by Kalphite Queen).
* Protect from range and mage. (ie. used by Kalphite Queen)
*/
RANGE_MAGE
}
@@ -11656,8 +11656,6 @@ public final class ItemID
public static final int GIANT_BOULDER = 25314;
public static final int GOBLIN_DECORATIONS = 25316;
public static final int GNOME_CHILD_ICON = 25319;
public static final int GNOME_CHILD = 25320;
public static final int GNOME_CHILD_25321 = 25321;
public static final int _20TH_ANNIVERSARY_HAT = 25322;
public static final int _20TH_ANNIVERSARY_TOP = 25324;
public static final int _20TH_ANNIVERSARY_BOTTOM = 25326;
@@ -11698,5 +11696,60 @@ public final class ItemID
public static final int TRAILBLAZER_RELIC_HUNTER_T1_ARMOUR_SET = 25380;
public static final int TRAILBLAZER_RELIC_HUNTER_T2_ARMOUR_SET = 25383;
public static final int TRAILBLAZER_RELIC_HUNTER_T3_ARMOUR_SET = 25386;
public static final int SWAMPBARK_BODY = 25389;
public static final int SWAMPBARK_GAUNTLETS = 25392;
public static final int SWAMPBARK_BOOTS = 25395;
public static final int SWAMPBARK_HELM = 25398;
public static final int SWAMPBARK_LEGS = 25401;
public static final int BLOODBARK_BODY = 25404;
public static final int BLOODBARK_GAUNTLETS = 25407;
public static final int BLOODBARK_BOOTS = 25410;
public static final int BLOODBARK_HELM = 25413;
public static final int BLOODBARK_LEGS = 25416;
public static final int URIUM_REMAINS = 25419;
public static final int BLEACHED_BONES = 25422;
public static final int GOLD_KEY_RED = 25424;
public static final int GOLD_KEY_BROWN = 25426;
public static final int GOLD_KEY_CRIMSON = 25428;
public static final int GOLD_KEY_BLACK = 25430;
public static final int GOLD_KEY_PURPLE = 25432;
public static final int ZEALOTS_ROBE_TOP = 25434;
public static final int ZEALOTS_ROBE_BOTTOM = 25436;
public static final int ZEALOTS_HELM = 25438;
public static final int ZEALOTS_BOOTS = 25440;
public static final int BRONZE_LOCKS = 25442;
public static final int STEEL_LOCKS = 25445;
public static final int BLACK_LOCKS = 25448;
public static final int SILVER_LOCKS = 25451;
public static final int GOLD_LOCKS = 25454;
public static final int BROKEN_COFFIN = 25457;
public static final int BRONZE_COFFIN = 25459;
public static final int STEEL_COFFIN = 25461;
public static final int BLACK_COFFIN = 25463;
public static final int SILVER_COFFIN = 25465;
public static final int GOLD_COFFIN = 25467;
public static final int OPEN_BRONZE_COFFIN = 25469;
public static final int OPEN_STEEL_COFFIN = 25470;
public static final int OPEN_BLACK_COFFIN = 25471;
public static final int OPEN_SILVER_COFFIN = 25472;
public static final int OPEN_GOLD_COFFIN = 25473;
public static final int TREE_WIZARDS_JOURNAL = 25474;
public static final int BLOODY_NOTES = 25476;
public static final int RUNESCROLL_OF_SWAMPBARK = 25478;
public static final int RUNESCROLL_OF_BLOODBARK = 25481;
public static final int TOXIC_BLOWPIPE_BETA__BRONZE = 25484;
public static final int TOXIC_BLOWPIPE_BETA__IRON = 25485;
public static final int TOXIC_BLOWPIPE_BETA__STEEL = 25486;
public static final int TOXIC_BLOWPIPE_BETA__BLACK = 25487;
public static final int TOXIC_BLOWPIPE_BETA__MITHRIL = 25488;
public static final int TOXIC_BLOWPIPE_BETA__ADAMANT = 25489;
public static final int TOXIC_BLOWPIPE_BETA__RUNE = 25490;
public static final int TOXIC_BLOWPIPE_BETA__DRAGON = 25491;
public static final int BLACK_DHIDE_BODY_BETA = 25492;
public static final int BLACK_DHIDE_CHAPS_BETA = 25493;
public static final int BLACK_DHIDE_VAMBRACES_BETA = 25494;
public static final int CRYSTAL_HELM_BETA = 25495;
public static final int CRYSTAL_BODY_BETA = 25496;
public static final int CRYSTAL_LEGS_BETA = 25497;
/* This file is automatically generated. Do not edit. */
}
@@ -35,11 +35,11 @@ import lombok.NoArgsConstructor;
public class MenuEntry implements Cloneable
{
/**
* The option text added to the menu (ie. "Walk here", "Use").
* The option text added to the menu. (ie. "Walk here", "Use")
*/
private String option;
/**
* The target of the action (ie. Item or Actor name).
* The target of the action. (ie. Item or Actor name)
* <p>
* If the option does not apply to any target, this field
* will be set to empty string.
@@ -58,7 +58,7 @@ public interface MessageNode extends Node
void setName(String name);
/**
* Gets the sender of the message (ie. friends chat name).
* Gets the sender of the message. (ie. friends chat name)
*
* @return the message sender
*/
@@ -2657,6 +2657,7 @@ public final class NpcID
public static final int DRYAD = 2828;
public static final int FAIRY_2829 = 2829;
public static final int MYSTERIOUS_OLD_MAN = 2830;
public static final int CHAIR = 2832;
public static final int LIL_CREATOR = 2833;
public static final int GIANT_BAT = 2834;
public static final int CAMEL = 2835;
@@ -5716,6 +5717,7 @@ public final class NpcID
public static final int THE_INADEQUACY_HARD = 6119;
public static final int THE_EVERLASTING_HARD = 6120;
public static final int THE_UNTOUCHABLE_HARD = 6121;
public static final int URIUM_SHADOW = 6143;
public static final int SCION_6177 = 6177;
public static final int JUNGLE_SPIDER_6267 = 6267;
public static final int JUNGLE_SPIDER_6271 = 6271;
@@ -8920,37 +8922,14 @@ public final class NpcID
public static final int DUCK_10546 = 10546;
public static final int DUCK_10547 = 10547;
public static final int CHICKEN_10556 = 10556;
public static final int GNOME_CHILD_10557 = 10557;
public static final int GNOME_CHILD_10558 = 10558;
public static final int SCRUBFOOT = 10559;
public static final int GNOME_CHILD_10560 = 10560;
public static final int RED_FIREFLIES = 10561;
public static final int GNOME_CHILD_10562 = 10562;
public static final int THRANDER = 10563;
public static final int GREEN_FIREFLIES = 10564;
public static final int CHUCK_10565 = 10565;
public static final int GOBLIN_10566 = 10566;
public static final int GOBLIN_10567 = 10567;
public static final int PIOUS_PETE = 10568;
public static final int MYSTERIOUS_WATCHER = 10569;
public static final int MYSTERIOUS_WATCHER_10570 = 10570;
public static final int MYSTERIOUS_WATCHER_10571 = 10571;
public static final int BIG_MO = 10572;
public static final int CHEERLEADER_10573 = 10573;
public static final int CHEERLEADER_10574 = 10574;
public static final int CHEERLEADER_10575 = 10575;
public static final int BLACK_DRAGON_10576 = 10576;
public static final int RED_DRAGON_10577 = 10577;
public static final int BLUE_DRAGON_10578 = 10578;
public static final int KING_BLACK_DRAGON_10579 = 10579;
public static final int BABY_BLUE_DRAGON_10580 = 10580;
public static final int LESSER_DEMON_10581 = 10581;
public static final int GREATER_DEMON_10582 = 10582;
public static final int BLACK_DEMON_10583 = 10583;
public static final int SCORPION_10584 = 10584;
public static final int KING_SCORPION_10585 = 10585;
public static final int ORC = 10586;
public static final int LIZARD_MAN = 10587;
public static final int TROLL_10588 = 10588;
public static final int URIUM_SHADE = 10589;
public static final int DAMPE = 10590;
public static final int UNDEAD_ZEALOT = 10591;
public static final int UNDEAD_ZEALOT_10592 = 10592;
/* This file is automatically generated. Do not edit. */
}
@@ -13453,6 +13453,8 @@ public final class NullItemID
public static final int NULL_25315 = 25315;
public static final int NULL_25317 = 25317;
public static final int NULL_25318 = 25318;
public static final int NULL_25320 = 25320;
public static final int NULL_25321 = 25321;
public static final int NULL_25323 = 25323;
public static final int NULL_25325 = 25325;
public static final int NULL_25327 = 25327;
@@ -13480,5 +13482,59 @@ public final class NullItemID
public static final int NULL_25385 = 25385;
public static final int NULL_25387 = 25387;
public static final int NULL_25388 = 25388;
public static final int NULL_25390 = 25390;
public static final int NULL_25391 = 25391;
public static final int NULL_25393 = 25393;
public static final int NULL_25394 = 25394;
public static final int NULL_25396 = 25396;
public static final int NULL_25397 = 25397;
public static final int NULL_25399 = 25399;
public static final int NULL_25400 = 25400;
public static final int NULL_25402 = 25402;
public static final int NULL_25403 = 25403;
public static final int NULL_25405 = 25405;
public static final int NULL_25406 = 25406;
public static final int NULL_25408 = 25408;
public static final int NULL_25409 = 25409;
public static final int NULL_25411 = 25411;
public static final int NULL_25412 = 25412;
public static final int NULL_25414 = 25414;
public static final int NULL_25415 = 25415;
public static final int NULL_25417 = 25417;
public static final int NULL_25418 = 25418;
public static final int NULL_25420 = 25420;
public static final int NULL_25421 = 25421;
public static final int NULL_25423 = 25423;
public static final int NULL_25425 = 25425;
public static final int NULL_25427 = 25427;
public static final int NULL_25429 = 25429;
public static final int NULL_25431 = 25431;
public static final int NULL_25433 = 25433;
public static final int NULL_25435 = 25435;
public static final int NULL_25437 = 25437;
public static final int NULL_25439 = 25439;
public static final int NULL_25441 = 25441;
public static final int NULL_25443 = 25443;
public static final int NULL_25444 = 25444;
public static final int NULL_25446 = 25446;
public static final int NULL_25447 = 25447;
public static final int NULL_25449 = 25449;
public static final int NULL_25450 = 25450;
public static final int NULL_25452 = 25452;
public static final int NULL_25453 = 25453;
public static final int NULL_25455 = 25455;
public static final int NULL_25456 = 25456;
public static final int NULL_25458 = 25458;
public static final int NULL_25460 = 25460;
public static final int NULL_25462 = 25462;
public static final int NULL_25464 = 25464;
public static final int NULL_25466 = 25466;
public static final int NULL_25468 = 25468;
public static final int NULL_25475 = 25475;
public static final int NULL_25477 = 25477;
public static final int NULL_25479 = 25479;
public static final int NULL_25480 = 25480;
public static final int NULL_25482 = 25482;
public static final int NULL_25483 = 25483;
/* This file is automatically generated. Do not edit. */
}
@@ -174,7 +174,6 @@ public final class NullNpcID
public static final int NULL_2780 = 2780;
public static final int NULL_2781 = 2781;
public static final int NULL_2831 = 2831;
public static final int NULL_2832 = 2832;
public static final int NULL_2934 = 2934;
public static final int NULL_2935 = 2935;
public static final int NULL_2936 = 2936;
@@ -879,7 +879,6 @@ public final class NullObjectID
public static final int NULL_1793 = 1793;
public static final int NULL_1794 = 1794;
public static final int NULL_1795 = 1795;
public static final int NULL_1796 = 1796;
public static final int NULL_1798 = 1798;
public static final int NULL_1799 = 1799;
public static final int NULL_1800 = 1800;
@@ -890,7 +889,6 @@ public final class NullObjectID
public static final int NULL_1807 = 1807;
public static final int NULL_1808 = 1808;
public static final int NULL_1809 = 1809;
public static final int NULL_1812 = 1812;
public static final int NULL_1815 = 1815;
public static final int NULL_1818 = 1818;
public static final int NULL_1819 = 1819;
@@ -19747,6 +19745,7 @@ public final class NullObjectID
public static final int NULL_40427 = 40427;
public static final int NULL_40428 = 40428;
public static final int NULL_40429 = 40429;
public static final int NULL_40470 = 40470;
public static final int NULL_40477 = 40477;
public static final int NULL_40478 = 40478;
public static final int NULL_40479 = 40479;
@@ -20009,84 +20008,6 @@ public final class NullObjectID
public static final int NULL_40934 = 40934;
public static final int NULL_40935 = 40935;
public static final int NULL_40936 = 40936;
public static final int NULL_40942 = 40942;
public static final int NULL_40943 = 40943;
public static final int NULL_40944 = 40944;
public static final int NULL_40945 = 40945;
public static final int NULL_40946 = 40946;
public static final int NULL_40947 = 40947;
public static final int NULL_40948 = 40948;
public static final int NULL_40949 = 40949;
public static final int NULL_40950 = 40950;
public static final int NULL_40951 = 40951;
public static final int NULL_40952 = 40952;
public static final int NULL_40953 = 40953;
public static final int NULL_40954 = 40954;
public static final int NULL_40955 = 40955;
public static final int NULL_40956 = 40956;
public static final int NULL_40957 = 40957;
public static final int NULL_40958 = 40958;
public static final int NULL_40959 = 40959;
public static final int NULL_40960 = 40960;
public static final int NULL_40961 = 40961;
public static final int NULL_40962 = 40962;
public static final int NULL_40963 = 40963;
public static final int NULL_40964 = 40964;
public static final int NULL_40965 = 40965;
public static final int NULL_40966 = 40966;
public static final int NULL_40967 = 40967;
public static final int NULL_40968 = 40968;
public static final int NULL_40969 = 40969;
public static final int NULL_40970 = 40970;
public static final int NULL_40971 = 40971;
public static final int NULL_40972 = 40972;
public static final int NULL_40973 = 40973;
public static final int NULL_40974 = 40974;
public static final int NULL_40975 = 40975;
public static final int NULL_40976 = 40976;
public static final int NULL_40977 = 40977;
public static final int NULL_40978 = 40978;
public static final int NULL_40979 = 40979;
public static final int NULL_40980 = 40980;
public static final int NULL_40981 = 40981;
public static final int NULL_40982 = 40982;
public static final int NULL_40983 = 40983;
public static final int NULL_40984 = 40984;
public static final int NULL_40985 = 40985;
public static final int NULL_40987 = 40987;
public static final int NULL_40988 = 40988;
public static final int NULL_40989 = 40989;
public static final int NULL_40990 = 40990;
public static final int NULL_40991 = 40991;
public static final int NULL_40992 = 40992;
public static final int NULL_40993 = 40993;
public static final int NULL_40994 = 40994;
public static final int NULL_40995 = 40995;
public static final int NULL_40996 = 40996;
public static final int NULL_40997 = 40997;
public static final int NULL_40998 = 40998;
public static final int NULL_40999 = 40999;
public static final int NULL_41000 = 41000;
public static final int NULL_41001 = 41001;
public static final int NULL_41002 = 41002;
public static final int NULL_41003 = 41003;
public static final int NULL_41004 = 41004;
public static final int NULL_41005 = 41005;
public static final int NULL_41006 = 41006;
public static final int NULL_41007 = 41007;
public static final int NULL_41008 = 41008;
public static final int NULL_41009 = 41009;
public static final int NULL_41010 = 41010;
public static final int NULL_41011 = 41011;
public static final int NULL_41012 = 41012;
public static final int NULL_41013 = 41013;
public static final int NULL_41014 = 41014;
public static final int NULL_41015 = 41015;
public static final int NULL_41016 = 41016;
public static final int NULL_41018 = 41018;
public static final int NULL_41019 = 41019;
public static final int NULL_41020 = 41020;
public static final int NULL_41021 = 41021;
public static final int NULL_41022 = 41022;
public static final int NULL_41191 = 41191;
public static final int NULL_41192 = 41192;
@@ -20096,5 +20017,15 @@ public final class NullObjectID
public static final int NULL_41196 = 41196;
public static final int NULL_41197 = 41197;
public static final int NULL_41198 = 41198;
public static final int NULL_41201 = 41201;
public static final int NULL_41202 = 41202;
public static final int NULL_41203 = 41203;
public static final int NULL_41204 = 41204;
public static final int NULL_41205 = 41205;
public static final int NULL_41206 = 41206;
public static final int NULL_41207 = 41207;
public static final int NULL_41208 = 41208;
public static final int NULL_41209 = 41209;
public static final int NULL_41211 = 41211;
/* This file is automatically generated. Do not edit. */
}
@@ -18582,7 +18582,7 @@ public final class ObjectID
public static final int RUBBLE_34803 = 34803;
public static final int RUBBLE_34804 = 34804;
public static final int RUBBLE_34805 = 34805;
public static final int JADFEST_PORTAL = 34826;
public static final int HANDY_PORTAL = 34826;
public static final int LARRANS_SMALL_CHEST_34828 = 34828;
public static final int LARRANS_BIG_CHEST = 34829;
public static final int LARRANS_BIG_CHEST_34830 = 34830;
@@ -19619,7 +19619,7 @@ public final class ObjectID
public static final int GATE_37954 = 37954;
public static final int LADDER_37955 = 37955;
public static final int LADDER_37956 = 37956;
public static final int HANDY_PORTAL = 37957;
public static final int HANDY_PORTAL_37957 = 37957;
public static final int BANK_BOOTH_37959 = 37959;
public static final int DOOR_37961 = 37961;
public static final int DOOR_37963 = 37963;
@@ -20709,6 +20709,8 @@ public final class ObjectID
public static final int EXPLOSIVE_POTION_TABLE_40467 = 40467;
public static final int POTION_OF_POWER_TABLE_40468 = 40468;
public static final int POTION_OF_POWER_TABLE_40469 = 40469;
public static final int GRAVESTONE_40471 = 40471;
public static final int COFFIN_40472 = 40472;
public static final int BANK_CHEST_40473 = 40473;
public static final int SOUL_WARS_PORTAL = 40474;
public static final int SOUL_WARS_PORTAL_40475 = 40475;
@@ -20899,25 +20901,8 @@ public final class ObjectID
public static final int STATUE_40915 = 40915;
public static final int STATUE_40916 = 40916;
public static final int STATUE_40917 = 40917;
public static final int INERT_PORTAL = 40918;
public static final int PORTAL_40919 = 40919;
public static final int ODD_FEATHERS = 40920;
public static final int PORTAL_40921 = 40921;
public static final int BARRIER_40922 = 40922;
public static final int SLEEPING_BAG_40923 = 40923;
public static final int STATUE_40924 = 40924;
public static final int ARCHWAY_40929 = 40929;
public static final int LIGHT_40930 = 40930;
public static final int LIGHT_40931 = 40931;
public static final int EVERGREEN_40932 = 40932;
public static final int EVERGREEN_40933 = 40933;
public static final int LIGHT_40937 = 40937;
public static final int LIGHT_40938 = 40938;
public static final int LIGHT_40939 = 40939;
public static final int LIGHT_40940 = 40940;
public static final int FIREWORKS = 40941;
public static final int POST_40986 = 40986;
public static final int PARTY_TABLE = 41017;
public static final int POTION_OF_POWER_TABLE_41023 = 41023;
public static final int PEDESTAL_SPACE = 41024;
public static final int PEDESTAL_SPACE_41025 = 41025;
@@ -21088,5 +21073,17 @@ public final class ObjectID
public static final int ANCIENT_BRAZIER_41190 = 41190;
public static final int BARRIER_41199 = 41199;
public static final int BARRIER_41200 = 41200;
public static final int SOLID_GOLD_DOOR = 41210;
public static final int GOLD_CHEST = 41212;
public static final int GOLD_CHEST_41213 = 41213;
public static final int GOLD_CHEST_41214 = 41214;
public static final int GOLD_CHEST_41215 = 41215;
public static final int GOLD_CHEST_41216 = 41216;
public static final int GOLD_CHEST_41217 = 41217;
public static final int GOLD_CHEST_41218 = 41218;
public static final int GOLD_CHEST_41219 = 41219;
public static final int GOLD_CHEST_41220 = 41220;
public static final int GOLD_CHEST_41221 = 41221;
public static final int ALTAR_41222 = 41222;
/* This file is automatically generated. Do not edit. */
}
@@ -25,7 +25,7 @@
package net.runelite.api;
/**
* Represents a projectile entity (ie. cannonball, arrow).
* Represents a projectile entity. (ie. cannonball, arrow)
*/
public interface Projectile extends Renderable
{
@@ -27,7 +27,7 @@ package net.runelite.api.events;
import net.runelite.api.Client;
/**
* Posted when the game world the client wants to connect to has changed
* Posted when the game world the client wants to connect to has changed.
* This is posted after the world ID and type have updated, but before a new
* connection is established
*