ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2020-04-18 23:38:58 +02:00
parent 87baaffee2 87185bffa1
commit 1debe8a99b
32 changed files with 812 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/AnimationID.java
+4
View File
@@ -121,6 +121,10 @@ public final class AnimationID
public static final int FISHING_BAREHAND_CAUGHT_SWORDFISH_2 = 6708;
public static final int FISHING_BAREHAND_CAUGHT_TUNA_1 = 6710;
public static final int FISHING_BAREHAND_CAUGHT_TUNA_2 = 6711;
public static final int FISHING_PEARL_ROD = 8188;
public static final int FISHING_PEARL_FLY_ROD = 8189;
public static final int FISHING_PEARL_BARBARIAN_ROD = 8190;
public static final int FISHING_PEARL_OILY_ROD = 6932;
public static final int MINING_BRONZE_PICKAXE = 625;
public static final int MINING_IRON_PICKAXE = 626;
public static final int MINING_STEEL_PICKAXE = 627;
runelite-api/src/main/java/net/runelite/api/Client.java
+7
View File
@@ -138,6 +138,13 @@ public interface Client extends GameShell
*/
void setGameState(GameState gameState);
/**
* Causes the client to shutdown. It is faster than
* {@link java.applet.Applet#stop()} because it doesn't wait for 4000ms.
* This will call {@link System#exit} when it is done
*/
void stopNow();
/**
* Gets the current logged in username.
*
runelite-api/src/main/java/net/runelite/api/ItemID.java
+7 -2
View File
@@ -11426,8 +11426,13 @@ public final class ItemID
public static final int CARROT = 24546;
public static final int BROKEN_GOAT_HORN = 24547;
public static final int CAKE_24549 = 24549;
public static final int BLADE_OF_SAELDOR_I = 24551;
public static final int BLADE_OF_SAELDOR_I_24553 = 24553;
public static final int BLADE_OF_SAELDOR_C = 24551;
public static final int BLADE_OF_SAELDOR_C_24553 = 24553;
public static final int PYROMANCER_SET = 24554;
public static final int TANGLEROOT_24555 = 24555;
public static final int TANGLEROOT_24557 = 24557;
public static final int TANGLEROOT_24559 = 24559;
public static final int TANGLEROOT_24561 = 24561;
public static final int TANGLEROOT_24563 = 24563;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+12 -17
View File
@@ -5993,7 +5993,6 @@ public final class NpcID
public static final int SISTER_SCAROPHIA = 6590;
public static final int LAVA_DRAGON = 6593;
public static final int ENT = 6594;
public static final int THE_DISAPPOINTING_GELT = 6595;
public static final int ZOMBIE_6596 = 6596;
public static final int ZOMBIE_6597 = 6597;
public static final int ZOMBIE_6598 = 6598;
@@ -8483,21 +8482,17 @@ public final class NpcID
public static final int SISTER_SENGA = 9471;
public static final int SISTER_SENGA_9472 = 9472;
public static final int ENT_TRUNK = 9474;
public static final int DUKE_RABBACIO = 9475;
public static final int PAWS = 9476;
public static final int RABBIT_CHEF = 9477;
public static final int GUARD_9478 = 9478;
public static final int MAGIC_EGG = 9479;
public static final int RABBIT_9480 = 9480;
public static final int RABBIT_9481 = 9481;
public static final int RABBIT_9482 = 9482;
public static final int RID = 9483;
public static final int FARMER_MAGGOT = 9484;
public static final int FATHER_BUCKEREK = 9485;
public static final int RESTLESS_GOAT = 9486;
public static final int SHOP_KEEPER_9487 = 9487;
public static final int BARTENDER_9488 = 9488;
public static final int COW_CALF_9489 = 9489;
public static final int CHICKEN_9490 = 9490;
public static final int TANGLEROOT_9492 = 9492;
public static final int TANGLEROOT_9493 = 9493;
public static final int TANGLEROOT_9494 = 9494;
public static final int TANGLEROOT_9495 = 9495;
public static final int TANGLEROOT_9496 = 9496;
public static final int TANGLEROOT_9497 = 9497;
public static final int TANGLEROOT_9498 = 9498;
public static final int TANGLEROOT_9499 = 9499;
public static final int TANGLEROOT_9500 = 9500;
public static final int TANGLEROOT_9501 = 9501;
public static final int IORWERTH_WARRIOR_9502 = 9502;
public static final int IORWERTH_WARRIOR_9503 = 9503;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+5
View File
@@ -12917,5 +12917,10 @@ public final class NullItemID
public static final int NULL_24548 = 24548;
public static final int NULL_24550 = 24550;
public static final int NULL_24552 = 24552;
public static final int NULL_24556 = 24556;
public static final int NULL_24558 = 24558;
public static final int NULL_24560 = 24560;
public static final int NULL_24562 = 24562;
public static final int NULL_24564 = 24564;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
-11
View File
@@ -14123,10 +14123,6 @@ public final class NullObjectID
public static final int NULL_30144 = 30144;
public static final int NULL_30156 = 30156;
public static final int NULL_30159 = 30159;
public static final int NULL_30165 = 30165;
public static final int NULL_30166 = 30166;
public static final int NULL_30167 = 30167;
public static final int NULL_30168 = 30168;
public static final int NULL_30171 = 30171;
public static final int NULL_30181 = 30181;
public static final int NULL_30182 = 30182;
@@ -14981,7 +14977,6 @@ public final class NullObjectID
public static final int NULL_31895 = 31895;
public static final int NULL_31896 = 31896;
public static final int NULL_31897 = 31897;
public static final int NULL_31899 = 31899;
public static final int NULL_31937 = 31937;
public static final int NULL_31938 = 31938;
public static final int NULL_31945 = 31945;
@@ -16166,7 +16161,6 @@ public final class NullObjectID
public static final int NULL_34678 = 34678;
public static final int NULL_34679 = 34679;
public static final int NULL_34680 = 34680;
public static final int NULL_34688 = 34688;
public static final int NULL_34689 = 34689;
public static final int NULL_34690 = 34690;
public static final int NULL_34691 = 34691;
@@ -18168,7 +18162,6 @@ public final class NullObjectID
public static final int NULL_37722 = 37722;
public static final int NULL_37723 = 37723;
public static final int NULL_37724 = 37724;
public static final int NULL_37725 = 37725;
public static final int NULL_37732 = 37732;
public static final int NULL_37733 = 37733;
public static final int NULL_37734 = 37734;
@@ -18336,11 +18329,7 @@ public final class NullObjectID
public static final int NULL_37933 = 37933;
public static final int NULL_37934 = 37934;
public static final int NULL_37935 = 37935;
public static final int NULL_37940 = 37940;
public static final int NULL_37945 = 37945;
public static final int NULL_37947 = 37947;
public static final int NULL_37950 = 37950;
public static final int NULL_37956 = 37956;
public static final int NULL_37958 = 37958;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
-21
View File
@@ -15803,8 +15803,6 @@ public final class ObjectID
public static final int POOL_OF_NIGHTMARES = 29706;
public static final int POOL_OF_NIGHTMARES_29707 = 29707;
public static final int SCOREBOARD_29708 = 29708;
public static final int MAGIC_PORTAL_29711 = 29711;
public static final int PAINT_BUCKETS = 29712;
public static final int NOTICEBOARD_29718 = 29718;
public static final int BALLISTA_29719 = 29719;
public static final int STAIRCASE_29720 = 29720;
@@ -16025,11 +16023,6 @@ public final class ObjectID
public static final int PAINTING_30155 = 30155;
public static final int FURNACE_30157 = 30157;
public static final int FURNACE_30158 = 30158;
public static final int BROKEN_EGG = 30160;
public static final int CONCH_SHELL = 30161;
public static final int THE_MAGIC_EGG = 30162;
public static final int CAKE = 30163;
public static final int CARROT = 30164;
public static final int CRACK_30169 = 30169;
public static final int ROOT_30170 = 30170;
public static final int PORTAL_30172 = 30172;
@@ -19545,9 +19538,6 @@ public final class ObjectID
public static final int NIGHTMARE_TOPIARY = 37630;
public static final int SUPPLIES_37631 = 37631;
public static final int BANNER_37726 = 37726;
public static final int RABBIT = 37727;
public static final int RABBIT_37728 = 37728;
public static final int GRAVE_37729 = 37729;
public static final int ENERGY_BARRIER_37730 = 37730;
public static final int ENERGY_BARRIER_37731 = 37731;
public static final int SPORE = 37738;
@@ -19590,19 +19580,8 @@ public final class ObjectID
public static final int CRATE_37936 = 37936;
public static final int DOOR_37937 = 37937;
public static final int DOOR_37938 = 37938;
public static final int BROKEN_GOAT_HORN = 37939;
public static final int GATE_37941 = 37941;
public static final int GATE_37942 = 37942;
public static final int GATE_37943 = 37943;
public static final int GATE_37944 = 37944;
public static final int TREE_37946 = 37946;
public static final int DEAD_TREE_37948 = 37948;
public static final int SCOREBOARD_37949 = 37949;
public static final int COFFIN_37951 = 37951;
public static final int JUNGLE_TREE_37952 = 37952;
public static final int YEW_37953 = 37953;
public static final int TREE_STUMP_37954 = 37954;
public static final int FURNACE_37955 = 37955;
public static final int HANDY_PORTAL = 37957;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ScriptID.java
+9
View File
@@ -308,4 +308,13 @@ public final class ScriptID
*/
@ScriptArguments(integer = 7)
public static final int IGNORE_UPDATE = 630;
/**
* Called in an onTimer, determines whether to layout the bank during a search
* <ul>
* <li> int (WidgetID) * 16, various widgets making up the bank interface </li>
* </ul>
*/
@ScriptArguments(integer = 16)
public static final int BANKMAIN_SEARCH_REFRESH = 283;
}