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

Merge branch 'cache-code-2020-01-09-rev182'

Browse Source
This commit is contained in:
Max Weber
2020-01-09 04:41:26 -07:00
parent 818018e858 a3d1c9b348
commit fa5c6eee35
5 changed files with 10 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/NpcID.java
+2 -18
View File
@@ -993,14 +993,6 @@ public final class NpcID
public static final int BANDIT_1026 = 1026;
public static final int GUARD_BANDIT = 1027;
public static final int BARBARIAN_GUARD = 1028;
public static final int JACK_FROST = 1029;
public static final int SANTA = 1030;
public static final int ANTISANTA = 1031;
public static final int ANTISANTA_1032 = 1032;
public static final int ICELORD_1033 = 1033;
public static final int WORRIED_BAKER = 1034;
public static final int PAUL = 1035;
public static final int MARY = 1036;
public static final int SNAKE = 1037;
public static final int MONKEY_1038 = 1038;
public static final int ALBINO_BAT = 1039;
@@ -2884,14 +2876,6 @@ public final class NpcID
public static final int GOBLIN_3074 = 3074;
public static final int GOBLIN_3075 = 3075;
public static final int GOBLIN_3076 = 3076;
public static final int GEORGIE = 3077;
public static final int GEORGIE_3078 = 3078;
public static final int BEVERLY = 3079;
public static final int BEVERLY_3080 = 3080;
public static final int BILL = 3081;
public static final int BILL_3082 = 3082;
public static final int JESS = 3083;
public static final int JESS_3084 = 3084;
public static final int PORTAL_3086 = 3086;
public static final int PORTAL_3088 = 3088;
public static final int BANKER_3089 = 3089;
@@ -3977,7 +3961,7 @@ public final class NpcID
public static final int PIERRE = 4213;
public static final int HOBBES = 4214;
public static final int LOUISA = 4215;
public static final int MARY_4216 = 4216;
public static final int MARY = 4216;
public static final int STANFORD = 4217;
public static final int GUARD_4218 = 4218;
public static final int GOSSIP = 4219;
@@ -7172,7 +7156,7 @@ public final class NpcID
public static final int REVENANT_DARK_BEAST = 7938;
public static final int REVENANT_KNIGHT = 7939;
public static final int REVENANT_DRAGON = 7940;
public static final int PAUL_7941 = 7941;
public static final int PAUL = 7941;
public static final int EMBLEM_TRADER_7943 = 7943;
public static final int FISHING_SPOT_7946 = 7946;
public static final int FISHING_SPOT_7947 = 7947;
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
-25
View File
@@ -12856,7 +12856,6 @@ public final class NullObjectID
public static final int NULL_27103 = 27103;
public static final int NULL_27104 = 27104;
public static final int NULL_27105 = 27105;
public static final int NULL_27106 = 27106;
public static final int NULL_27111 = 27111;
public static final int NULL_27112 = 27112;
public static final int NULL_27113 = 27113;
@@ -18074,29 +18073,5 @@ public final class NullObjectID
public static final int NULL_37481 = 37481;
public static final int NULL_37490 = 37490;
public static final int NULL_37491 = 37491;
public static final int NULL_37561 = 37561;
public static final int NULL_37562 = 37562;
public static final int NULL_37563 = 37563;
public static final int NULL_37564 = 37564;
public static final int NULL_37565 = 37565;
public static final int NULL_37566 = 37566;
public static final int NULL_37567 = 37567;
public static final int NULL_37568 = 37568;
public static final int NULL_37569 = 37569;
public static final int NULL_37573 = 37573;
public static final int NULL_37574 = 37574;
public static final int NULL_37575 = 37575;
public static final int NULL_37576 = 37576;
public static final int NULL_37577 = 37577;
public static final int NULL_37578 = 37578;
public static final int NULL_37579 = 37579;
public static final int NULL_37580 = 37580;
public static final int NULL_37581 = 37581;
public static final int NULL_37582 = 37582;
public static final int NULL_37583 = 37583;
public static final int NULL_37584 = 37584;
public static final int NULL_37585 = 37585;
public static final int NULL_37597 = 37597;
public static final int NULL_37598 = 37598;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
-29
View File
@@ -14234,7 +14234,6 @@ public final class ObjectID
public static final int LIGHT_27093 = 27093;
public static final int CLAN_CUP_PORTAL = 27095;
public static final int EXIT_PORTAL_27096 = 27096;
public static final int ANTISANTA = 27097;
public static final int SOFA = 27098;
public static final int CRATE_27100 = 27100;
public static final int CRATES_27101 = 27101;
@@ -19460,33 +19459,5 @@ public final class ObjectID
public static final int ORNATE_JEWELLERY_BOX_37544 = 37544;
public static final int ORNATE_JEWELLERY_BOX_37545 = 37545;
public static final int ORNATE_JEWELLERY_BOX_37546 = 37546;
public static final int CELL_DOOR_37547 = 37547;
public static final int TRAPDOOR_37548 = 37548;
public static final int TRAPDOOR_37549 = 37549;
public static final int BARREL_OF_FESTIVE_BRANCHES = 37550;
public static final int SACK_OF_FLOUR = 37551;
public static final int SACK_OF_GINGER = 37552;
public static final int BUCKET_OF_EGGS = 37553;
public static final int LADDER_37554 = 37554;
public static final int DOOR_37555 = 37555;
public static final int DOOR_37556 = 37556;
public static final int FIREPLACE_37557 = 37557;
public static final int LOGS_37558 = 37558;
public static final int SHELVES_37559 = 37559;
public static final int SANTAS_SACK = 37560;
public static final int TREE_37570 = 37570;
public static final int GIFTS = 37571;
public static final int GIFTS_37572 = 37572;
public static final int TREE_37586 = 37586;
public static final int TREE_STUMP_37587 = 37587;
public static final int LEVER_37588 = 37588;
public static final int LEVER_37589 = 37589;
public static final int TABLE_37590 = 37590;
public static final int RECEIVER = 37591;
public static final int MIXER = 37592;
public static final int CONVEYOR_BELT_37593 = 37593;
public static final int HOPPER_37594 = 37594;
public static final int SUPPORT_37595 = 37595;
public static final int OVEN_37596 = 37596;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+8 -19
View File
@@ -228,14 +228,14 @@ public class WidgetID
static final int BANK_CONTAINER = 1;
static final int INVENTORY_ITEM_CONTAINER = 3;
static final int BANK_TITLE_BAR = 4;
static final int CONTENT_CONTAINER = 10;
static final int TAB_CONTAINER = 11;
static final int ITEM_CONTAINER = 13;
static final int SEARCH_BUTTON_BACKGROUND = 40;
static final int DEPOSIT_INVENTORY = 42;
static final int DEPOSIT_EQUIPMENT = 44;
static final int INCINERATOR = 46;
static final int INCINERATOR_CONFIRM = 47;
static final int CONTENT_CONTAINER = 9;
static final int TAB_CONTAINER = 10;
static final int ITEM_CONTAINER = 12;
static final int SEARCH_BUTTON_BACKGROUND = 39;
static final int DEPOSIT_INVENTORY = 41;
static final int DEPOSIT_EQUIPMENT = 43;
static final int INCINERATOR = 45;
static final int INCINERATOR_CONFIRM = 46;
}
static class GrandExchange
@@ -279,17 +279,6 @@ public class WidgetID
static class Equipment
{
static final int HELMET = 6;
static final int CAPE = 7;
static final int AMULET = 8;
static final int WEAPON = 9;
static final int BODY = 10;
static final int SHIELD = 11;
static final int LEGS = 12;
static final int GLOVES = 13;
static final int BOOTS = 14;
static final int RING = 15;
static final int AMMO = 16;
static final int INVENTORY_ITEM_CONTAINER = 0;
}
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
-12
View File
@@ -62,18 +62,6 @@ public enum WidgetInfo
EQUIPMENT(WidgetID.EQUIPMENT_GROUP_ID, 0),
EQUIPMENT_INVENTORY_ITEMS_CONTAINER(WidgetID.EQUIPMENT_INVENTORY_GROUP_ID, WidgetID.Equipment.INVENTORY_ITEM_CONTAINER),
EQUIPMENT_HELMET(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.HELMET),
EQUIPMENT_CAPE(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.CAPE),
EQUIPMENT_AMULET(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.AMULET),
EQUIPMENT_WEAPON(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.WEAPON),
EQUIPMENT_BODY(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.BODY),
EQUIPMENT_SHIELD(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.SHIELD),
EQUIPMENT_LEGS(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.LEGS),
EQUIPMENT_GLOVES(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.GLOVES),
EQUIPMENT_BOOTS(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.BOOTS),
EQUIPMENT_RING(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.RING),
EQUIPMENT_AMMO(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.AMMO),
EMOTE_WINDOW(WidgetID.EMOTES_GROUP_ID, WidgetID.Emotes.EMOTE_WINDOW),
EMOTE_CONTAINER(WidgetID.EMOTES_GROUP_ID, WidgetID.Emotes.EMOTE_CONTAINER),
EMOTE_SCROLLBAR(WidgetID.EMOTES_GROUP_ID, WidgetID.Emotes.EMOTE_SCROLLBAR),