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

runeliteplus: merge upstream

Browse Source
This commit is contained in:
Zeruth
2019-07-25 14:30:56 -04:00
parent 51e1ae5aaf
commit 5de903304e
69 changed files with 888 additions and 4463 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deobfuscator/src/test/java/net/runelite/runesuite/hooks.json
+3 -3
View File
@@ -3673,7 +3673,7 @@
"descriptor" : "(ILdy;Ldy;I)V"
} ]
}, {
"class" : "GroundItem",
"class" : "TileItem",
"name" : "ck",
"super" : "ex",
"access" : 49,
@@ -3992,7 +3992,7 @@
"descriptor" : "()V"
} ]
}, {
"class" : "GroundItemPile",
"class" : "TileItemPile",
"name" : "dr",
"super" : "java.lang.Object",
"access" : 49,
@@ -10949,7 +10949,7 @@
"descriptor" : "I",
"decoder" : 1192947815
}, {
"field" : "groundItemPile",
"field" : "TileItemPile",
"owner" : "dj",
"name" : "x",
"access" : 0,
runelite-api/src/main/java/net/runelite/api/Client.java
+3 -12
View File
@@ -30,11 +30,8 @@ import java.math.BigInteger;
import java.util.EnumSet;
import java.util.List;
import java.util.Map;
<<<<<<< HEAD
import java.util.Set;
=======
import javax.annotation.Nonnull;
>>>>>>> Upstream/master
import javax.annotation.Nullable;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint;
@@ -354,12 +351,8 @@ public interface Client extends GameShell
* @return the corresponding item composition
* @see ItemID
*/
<<<<<<< HEAD
ItemDefinition getItemDefinition(int id);
=======
@Nonnull
ItemComposition getItemDefinition(int id);
>>>>>>> Upstream/master
ItemDefinition getItemDefinition(int id);
/**
* Creates an item icon sprite with passed variables.
@@ -1665,7 +1658,6 @@ public interface Client extends GameShell
void resetHealthBarCaches();
<<<<<<< HEAD
boolean getRenderSelf();
void setRenderSelf(boolean enabled);
@@ -1735,10 +1727,9 @@ public interface Client extends GameShell
BigInteger getModulus();
void setModulus(BigInteger modulus);
=======
/**
/*
* Returns the max item index + 1 from cache
*/
int getItemCount();
>>>>>>> Upstream/master
}
runelite-api/src/main/java/net/runelite/api/Item.java
+6 -6
View File
@@ -24,11 +24,11 @@
*/
package net.runelite.api;
import lombok.Value;
@Value
public class Item
public interface Item
{
private final int id;
private final int quantity;
int id = -1;
int quantity = -1;
int getId();
int getQuantity();
}
runelite-api/src/main/java/net/runelite/api/ItemID.java
+31 -270
View File
@@ -181,12 +181,12 @@ public final class ItemID
public static final int RESEARCH_PACKAGE = 290;
public static final int NOTES = 291;
public static final int BOOK_ON_BAXTORIAN = 292;
public static final int KEY_293 = 293;
public static final int A_KEY = 293;
public static final int GLARIALS_PEBBLE = 294;
public static final int GLARIALS_AMULET = 295;
public static final int GLARIALS_URN = 296;
public static final int GLARIALS_URN_EMPTY = 297;
public static final int KEY_298 = 298;
public static final int GLARIALS_URN_297 = 297;
public static final int A_KEY_298 = 298;
public static final int MITHRIL_SEEDS = 299;
public static final int RATS_TAIL = 300;
public static final int LOBSTER_POT = 301;
@@ -261,7 +261,7 @@ public final class ItemID
public static final int PIGEON_CAGE_425 = 425;
public static final int PRIEST_GOWN = 426;
public static final int PRIEST_GOWN_428 = 428;
public static final int MEDICAL_GOWN = 430;
public static final int DOCTORS_GOWN = 430;
public static final int KARAMJAN_RUM = 431;
public static final int CHEST_KEY = 432;
public static final int PIRATE_MESSAGE = 433;
@@ -364,7 +364,7 @@ public final class ItemID
public static final int LIT_TORCH = 594;
public static final int TORCH = 595;
public static final int UNLIT_TORCH = 596;
public static final int BRONZE_FIRE_ARROW = 598;
public static final int BRONZE_FIRE_ARROWS = 598;
public static final int ASTRONOMY_BOOK = 600;
public static final int GOBLIN_KITCHEN_KEY = 601;
public static final int LENS_MOULD = 602;
@@ -616,7 +616,7 @@ public final class ItemID
public static final int ADAMANT_ARROWP = 891;
public static final int RUNE_ARROW = 892;
public static final int RUNE_ARROWP = 893;
public static final int BRONZE_FIRE_ARROW_LIT = 942;
public static final int BRONZE_FIRE_ARROWS_942 = 942;
public static final int WORM = 943;
public static final int THROWING_ROPE = 945;
public static final int KNIFE = 946;
@@ -891,7 +891,7 @@ public final class ItemID
public static final int ORB_OF_LIGHT_1482 = 1482;
public static final int ORB_OF_LIGHT_1483 = 1483;
public static final int ORB_OF_LIGHT_1484 = 1484;
public static final int OILY_CLOTH = 1485;
public static final int DAMP_CLOTH = 1485;
public static final int PIECE_OF_RAILING = 1486;
public static final int UNICORN_HORN_1487 = 1487;
public static final int PALADINS_BADGE = 1488;
@@ -911,7 +911,7 @@ public final class ItemID
public static final int IBANS_ASHES = 1502;
public static final int WARRANT = 1503;
public static final int HANGOVER_CURE = 1504;
public static final int ARDOUGNE_TELEPORT_SCROLL = 1505;
public static final int A_MAGIC_SCROLL = 1505;
public static final int GAS_MASK = 1506;
public static final int A_SMALL_KEY = 1507;
public static final int A_SCRUFFY_NOTE = 1508;
@@ -1507,16 +1507,16 @@ public final class ItemID
public static final int LAMP = 2528;
public static final int DEAD_ORB = 2529;
public static final int BONES_2530 = 2530;
public static final int IRON_FIRE_ARROW = 2532;
public static final int IRON_FIRE_ARROW_LIT = 2533;
public static final int STEEL_FIRE_ARROW = 2534;
public static final int STEEL_FIRE_ARROW_LIT = 2535;
public static final int MITHRIL_FIRE_ARROW = 2536;
public static final int MITHRIL_FIRE_ARROW_LIT = 2537;
public static final int ADAMANT_FIRE_ARROW = 2538;
public static final int ADAMANT_FIRE_ARROW_LIT = 2539;
public static final int RUNE_FIRE_ARROW = 2540;
public static final int RUNE_FIRE_ARROW_LIT = 2541;
public static final int IRON_FIRE_ARROWS = 2532;
public static final int IRON_FIRE_ARROWS_2533 = 2533;
public static final int STEEL_FIRE_ARROWS = 2534;
public static final int STEEL_FIRE_ARROWS_2535 = 2535;
public static final int MITHRIL_FIRE_ARROWS = 2536;
public static final int MITHRIL_FIRE_ARROWS_2537 = 2537;
public static final int ADAMANT_FIRE_ARROWS = 2538;
public static final int ADAMANT_FIRE_ARROWS_2539 = 2539;
public static final int RUNE_FIRE_ARROWS = 2540;
public static final int RUNE_FIRE_ARROWS_2541 = 2541;
public static final int RING_OF_RECOIL = 2550;
public static final int RING_OF_DUELING8 = 2552;
public static final int RING_OF_DUELING7 = 2554;
@@ -1961,7 +1961,7 @@ public final class ItemID
public static final int BARREL_3216 = 3216;
public static final int BARREL_BOMB = 3218;
public static final int BARREL_BOMB_3219 = 3219;
public static final int BARREL_OF_COAL_TAR = 3220;
public static final int BARREL_OF_COALTAR = 3220;
public static final int BARREL_OF_NAPHTHA = 3221;
public static final int NAPHTHA_MIX = 3222;
public static final int NAPHTHA_MIX_3223 = 3223;
@@ -2526,11 +2526,10 @@ public final class ItemID
public static final int LETTER = 4204;
public static final int CONSECRATION_SEED = 4205;
public static final int CONSECRATION_SEED_4206 = 4206;
public static final int CRYSTAL_WEAPON_SEED = 4207;
public static final int CRYSTAL_SEED = 4207;
public static final int CADARN_LINEAGE = 4209;
public static final int ELF_CRYSTAL = 4211;
public static final int NEW_CRYSTAL_BOW = 4212;
public static final int NEW_CRYSTAL_BOW_4213 = 4213;
public static final int CRYSTAL_BOW_FULL = 4214;
public static final int CRYSTAL_BOW_910 = 4215;
public static final int CRYSTAL_BOW_810 = 4216;
@@ -2552,7 +2551,6 @@ public final class ItemID
public static final int CRYSTAL_SHIELD_310 = 4232;
public static final int CRYSTAL_SHIELD_210 = 4233;
public static final int CRYSTAL_SHIELD_110 = 4234;
public static final int NEW_CRYSTAL_SHIELD_4235 = 4235;
public static final int SIGNED_OAK_BOW = 4236;
public static final int NETTLEWATER = 4237;
public static final int PUDDLE_OF_SLIME = 4238;
@@ -2613,7 +2611,7 @@ public final class ItemID
public static final int HAM_LOGO = 4306;
public static final int HAM_GLOVES = 4308;
public static final int HAM_BOOTS = 4310;
public static final int CRYSTAL_SINGING_FOR_BEGINNERS = 4313;
public static final int CRYSTAL_OF_SEREN = 4313;
public static final int TEAM1_CAPE = 4315;
public static final int TEAM2_CAPE = 4317;
public static final int TEAM3_CAPE = 4319;
@@ -3630,8 +3628,8 @@ public final class ItemID
public static final int SPIRIT_TREE = 6063;
public static final int BLOODY_MOURNER_TOP = 6064;
public static final int MOURNER_TOP = 6065;
public static final int RIPPED_MOURNER_TROUSERS = 6066;
public static final int MOURNER_TROUSERS = 6067;
public static final int MOURNER_TROUSERS = 6066;
public static final int MOURNER_TROUSERS_6067 = 6067;
public static final int MOURNER_GLOVES = 6068;
public static final int MOURNER_BOOTS = 6069;
public static final int MOURNER_CLOAK = 6070;
@@ -3663,7 +3661,7 @@ public final class ItemID
public static final int TELEPORT_CRYSTAL_3 = 6100;
public static final int TELEPORT_CRYSTAL_2 = 6101;
public static final int TELEPORT_CRYSTAL_1 = 6102;
public static final int CRYSTAL_TELEPORT_SEED = 6103;
public static final int TINY_ELF_CRYSTAL = 6103;
public static final int NEW_KEY = 6104;
public static final int ELF = 6105;
public static final int GHOSTLY_BOOTS = 6106;
@@ -4184,7 +4182,7 @@ public final class ItemID
public static final int BEER_SOAKED_HAND = 6946;
public static final int BERTS_ROTA = 6947;
public static final int SANDYS_ROTA = 6948;
public static final int A_MAGIC_SCROLL = 6949;
public static final int A_MAGIC_SCROLL_6949 = 6949;
public static final int MAGICAL_ORB = 6950;
public static final int MAGICAL_ORB_A = 6951;
public static final int TRUTH_SERUM = 6952;
@@ -5959,7 +5957,7 @@ public final class ItemID
public static final int A_VIOLET_SQUARE = 9623;
public static final int A_VIOLET_PENTAGON = 9624;
public static final int CRYSTAL_SAW = 9625;
public static final int CRYSTAL_SAW_SEED = 9626;
public static final int SMALL_CRYSTAL_SEED = 9626;
public static final int A_HANDWRITTEN_BOOK = 9627;
public static final int TYRAS_HELM = 9629;
public static final int DAEYALT_ORE = 9632;
@@ -7110,8 +7108,8 @@ public final class ItemID
public static final int GOLDEN_GOBLIN = 11210;
public static final int MAGIC_BEANS = 11211;
public static final int DRAGON_ARROW = 11212;
public static final int DRAGON_FIRE_ARROW = 11217;
public static final int DRAGON_FIRE_ARROW_LIT = 11222;
public static final int DRAGON_FIRE_ARROWS = 11217;
public static final int DRAGON_FIRE_ARROWS_11222 = 11222;
public static final int DRAGON_ARROWP = 11227;
public static final int DRAGON_ARROWP_11228 = 11228;
public static final int DRAGON_ARROWP_11229 = 11229;
@@ -7828,7 +7826,7 @@ public final class ItemID
public static final int PEST_CONTROL_TELEPORT = 12407;
public static final int PISCATORIS_TELEPORT = 12408;
public static final int TAI_BWO_WANNAI_TELEPORT = 12409;
public static final int IORWERTH_CAMP_TELEPORT = 12410;
public static final int ELF_CAMP_TELEPORT = 12410;
public static final int MOS_LEHARMLESS_TELEPORT = 12411;
public static final int PIRATE_HAT__PATCH = 12412;
public static final int DRAGON_CHAINBODY_G = 12414;
@@ -8787,12 +8785,6 @@ public final class ItemID
public static final int CABBAGE_RUNE = 13680;
public static final int CRUCIFEROUS_CODEX = 13681;
public static final int USELESS_KEY_16684 = 16684;
public static final int NEW_CRYSTAL_BOW_16888 = 16888;
public static final int NEW_CRYSTAL_BOW_I_16889 = 16889;
public static final int NEW_CRYSTAL_SHIELD_16890 = 16890;
public static final int NEW_CRYSTAL_SHIELD_I_16891 = 16891;
public static final int NEW_CRYSTAL_HALBERD_FULL_I_16892 = 16892;
public static final int NEW_CRYSTAL_HALBERD_FULL_16893 = 16893;
public static final int DEAD_ORB_17152 = 17152;
public static final int BAG_FULL_OF_GEMS = 19473;
public static final int ACHIEVEMENT_DIARY_CAPE = 19476;
@@ -9829,8 +9821,8 @@ public final class ItemID
public static final int AMETHYST_JAVELINP_21322 = 21322;
public static final int AMETHYST_JAVELINP_21324 = 21324;
public static final int AMETHYST_ARROW = 21326;
public static final int AMETHYST_FIRE_ARROW = 21328;
public static final int AMETHYST_FIRE_ARROW_LIT = 21330;
public static final int AMETHYST_FIRE_ARROWS = 21328;
public static final int AMETHYST_FIRE_ARROWS_21330 = 21330;
public static final int AMETHYST_ARROWP = 21332;
public static final int AMETHYST_ARROWP_21334 = 21334;
public static final int AMETHYST_ARROWP_21336 = 21336;
@@ -10909,236 +10901,5 @@ public final class ItemID
public static final int MAGES_BOOK_23652 = 23652;
public static final int AHRIMS_STAFF_23653 = 23653;
public static final int OCCULT_NECKLACE_23654 = 23654;
public static final int CRYSTAL_SEEDLING = 23655;
public static final int CRYSTAL_SEEDLING_W = 23657;
public static final int CRYSTAL_SAPLING = 23659;
public static final int CRYSTAL_ACORN = 23661;
public static final int DRAGONSTONE_ARMOUR_SET = 23667;
public static final int FLIER_23670 = 23670;
public static final int CRYSTAL_AXE = 23673;
public static final int CRYSTAL_AXE_INACTIVE = 23675;
public static final int DRAGON_PICKAXEOR = 23677;
public static final int CRYSTAL_PICKAXE = 23680;
public static final int CRYSTAL_PICKAXE_INACTIVE = 23682;
public static final int DIVINE_SUPER_COMBAT_POTION4 = 23685;
public static final int DIVINE_SUPER_COMBAT_POTION3 = 23688;
public static final int DIVINE_SUPER_COMBAT_POTION2 = 23691;
public static final int DIVINE_SUPER_COMBAT_POTION1 = 23694;
public static final int DIVINE_SUPER_ATTACK_POTION4 = 23697;
public static final int DIVINE_SUPER_ATTACK_POTION3 = 23700;
public static final int DIVINE_SUPER_ATTACK_POTION2 = 23703;
public static final int DIVINE_SUPER_ATTACK_POTION1 = 23706;
public static final int DIVINE_SUPER_STRENGTH_POTION4 = 23709;
public static final int DIVINE_SUPER_STRENGTH_POTION3 = 23712;
public static final int DIVINE_SUPER_STRENGTH_POTION2 = 23715;
public static final int DIVINE_SUPER_STRENGTH_POTION1 = 23718;
public static final int DIVINE_SUPER_DEFENCE_POTION4 = 23721;
public static final int DIVINE_SUPER_DEFENCE_POTION3 = 23724;
public static final int DIVINE_SUPER_DEFENCE_POTION2 = 23727;
public static final int DIVINE_SUPER_DEFENCE_POTION1 = 23730;
public static final int DIVINE_RANGING_POTION4 = 23733;
public static final int DIVINE_RANGING_POTION3 = 23736;
public static final int DIVINE_RANGING_POTION2 = 23739;
public static final int DIVINE_RANGING_POTION1 = 23742;
public static final int DIVINE_MAGIC_POTION4 = 23745;
public static final int DIVINE_MAGIC_POTION3 = 23748;
public static final int DIVINE_MAGIC_POTION2 = 23751;
public static final int DIVINE_MAGIC_POTION1 = 23754;
public static final int YOUNGLLEF = 23757;
public static final int CORRUPTED_YOUNGLLEF = 23759;
public static final int SMOLCANO = 23760;
public static final int CRYSTAL_HARPOON = 23762;
public static final int CRYSTAL_HARPOON_INACTIVE = 23764;
public static final int CRYSTAL_IMPLING_JAR = 23768;
public static final int CLUE_SCROLL_ELITE_23770 = 23770;
public static final int PRIFDDINAS_TELEPORT = 23771;
public static final int SCRAWLED_NOTES = 23773;
public static final int HAND_MIRROR_23775 = 23775;
public static final int RED_CRYSTAL_23776 = 23776;
public static final int YELLOW_CRYSTAL_23777 = 23777;
public static final int GREEN_CRYSTAL_23778 = 23778;
public static final int CYAN_CRYSTAL_23779 = 23779;
public static final int BLUE_CRYSTAL_23780 = 23780;
public static final int MAGENTA_CRYSTAL_23781 = 23781;
public static final int BLACK_CRYSTAL = 23782;
public static final int GREEN_CRYSTAL_23783 = 23783;
public static final int FRACTURED_CRYSTAL_23784 = 23784;
public static final int ARDOUGNE_KNIGHT_HELM = 23785;
public static final int ARDOUGNE_KNIGHT_PLATEBODY = 23787;
public static final int ARDOUGNE_KNIGHT_PLATELEGS = 23789;
public static final int ARDOUGNE_KNIGHT_TABARD = 23791;
public static final int BLUE_LIQUID = 23792;
public static final int GREEN_POWDER = 23793;
public static final int CLEAR_LIQUID = 23794;
public static final int RED_POWDER = 23795;
public static final int ODE_TO_ETERNITY = 23796;
public static final int ELDER_CADANTINE = 23798;
public static final int ELDER_CADANTINE_POTION_UNF = 23800;
public static final int CRYSTAL_23802 = 23802;
public static final int CRYSTAL_DUST = 23804;
public static final int INVERSION_POTION = 23806;
public static final int CRYSTAL_SEED = 23808;
public static final int CRYSTAL_SEED_23810 = 23810;
public static final int ORB_OF_LIGHT_23812 = 23812;
public static final int CLUE_SCROLL_23814 = 23814;
public static final int CLUE_SCROLL_23815 = 23815;
public static final int CLUE_SCROLL_23816 = 23816;
public static final int CLUE_SCROLL_23817 = 23817;
public static final int EXPLOSIVE_POTION_23818 = 23818;
public static final int CORRUPTED_SCEPTRE = 23820;
public static final int CORRUPTED_AXE = 23821;
public static final int CORRUPTED_PICKAXE = 23822;
public static final int CORRUPTED_HARPOON = 23823;
public static final int CORRUPTED_SHARDS = 23824;
public static final int CORRUPTED_DUST = 23830;
public static final int CORRUPTED_SPIKE = 23831;
public static final int CORRUPTED_BOWSTRING = 23832;
public static final int CORRUPTED_ORB = 23833;
public static final int WEAPON_FRAME = 23834;
public static final int GRYM_LEAF = 23835;
public static final int LINUM_TIRINUM = 23836;
public static final int CORRUPTED_ORE = 23837;
public static final int PHREN_BARK = 23838;
public static final int VIAL_23839 = 23839;
public static final int CORRUPTED_HELM_BASIC = 23840;
public static final int CORRUPTED_HELM_ATTUNED = 23841;
public static final int CORRUPTED_HELM_PERFECTED = 23842;
public static final int CORRUPTED_BODY_BASIC = 23843;
public static final int CORRUPTED_BODY_ATTUNED = 23844;
public static final int CORRUPTED_BODY_PERFECTED = 23845;
public static final int CORRUPTED_LEGS_BASIC = 23846;
public static final int CORRUPTED_LEGS_ATTUNED = 23847;
public static final int CORRUPTED_LEGS_PERFECTED = 23848;
public static final int CORRUPTED_HALBERD_BASIC = 23849;
public static final int CORRUPTED_HALBERD_ATTUNED = 23850;
public static final int CORRUPTED_HALBERD_PERFECTED = 23851;
public static final int CORRUPTED_STAFF_BASIC = 23852;
public static final int CORRUPTED_STAFF_ATTUNED = 23853;
public static final int CORRUPTED_STAFF_PERFECTED = 23854;
public static final int CORRUPTED_BOW_BASIC = 23855;
public static final int CORRUPTED_BOW_ATTUNED = 23856;
public static final int CORRUPTED_BOW_PERFECTED = 23857;
public static final int CORRUPTED_TELEPORT_CRYSTAL = 23858;
public static final int GAUNTLET_CAPE = 23859;
public static final int CRYSTAL_SCEPTRE = 23861;
public static final int CRYSTAL_AXE_23862 = 23862;
public static final int CRYSTAL_PICKAXE_23863 = 23863;
public static final int CRYSTAL_HARPOON_23864 = 23864;
public static final int PESTLE_AND_MORTAR_23865 = 23865;
public static final int CRYSTAL_SHARDS = 23866;
public static final int CRYSTAL_DUST_23867 = 23867;
public static final int CRYSTAL_SPIKE = 23868;
public static final int CRYSTALLINE_BOWSTRING = 23869;
public static final int CRYSTAL_ORB = 23870;
public static final int WEAPON_FRAME_23871 = 23871;
public static final int RAW_PADDLEFISH = 23872;
public static final int BURNT_FISH_23873 = 23873;
public static final int PADDLEFISH = 23874;
public static final int GRYM_LEAF_23875 = 23875;
public static final int LINUM_TIRINUM_23876 = 23876;
public static final int CRYSTAL_ORE = 23877;
public static final int PHREN_BARK_23878 = 23878;
public static final int VIAL_23879 = 23879;
public static final int WATERFILLED_VIAL = 23880;
public static final int GRYM_POTION_UNF = 23881;
public static final int EGNIOL_POTION_1 = 23882;
public static final int EGNIOL_POTION_2 = 23883;
public static final int EGNIOL_POTION_3 = 23884;
public static final int EGNIOL_POTION_4 = 23885;
public static final int CRYSTAL_HELM_BASIC = 23886;
public static final int CRYSTAL_HELM_ATTUNED = 23887;
public static final int CRYSTAL_HELM_PERFECTED = 23888;
public static final int CRYSTAL_BODY_BASIC = 23889;
public static final int CRYSTAL_BODY_ATTUNED = 23890;
public static final int CRYSTAL_BODY_PERFECTED = 23891;
public static final int CRYSTAL_LEGS_BASIC = 23892;
public static final int CRYSTAL_LEGS_ATTUNED = 23893;
public static final int CRYSTAL_LEGS_PERFECTED = 23894;
public static final int CRYSTAL_HALBERD_BASIC = 23895;
public static final int CRYSTAL_HALBERD_ATTUNED = 23896;
public static final int CRYSTAL_HALBERD_PERFECTED = 23897;
public static final int CRYSTAL_STAFF_BASIC = 23898;
public static final int CRYSTAL_STAFF_ATTUNED = 23899;
public static final int CRYSTAL_STAFF_PERFECTED = 23900;
public static final int CRYSTAL_BOW_BASIC = 23901;
public static final int CRYSTAL_BOW_ATTUNED = 23902;
public static final int CRYSTAL_BOW_PERFECTED = 23903;
public static final int TELEPORT_CRYSTAL = 23904;
public static final int TEPHRA = 23905;
public static final int REFINED_TEPHRA = 23906;
public static final int IMBUED_TEPHRA = 23907;
public static final int ZALCANO_SHARD = 23908;
public static final int CRYSTAL_CROWN = 23911;
public static final int CRYSTAL_CROWN_23913 = 23913;
public static final int CRYSTAL_CROWN_23915 = 23915;
public static final int CRYSTAL_CROWN_23917 = 23917;
public static final int CRYSTAL_CROWN_23919 = 23919;
public static final int CRYSTAL_CROWN_23921 = 23921;
public static final int CRYSTAL_CROWN_23923 = 23923;
public static final int CRYSTAL_CROWN_23925 = 23925;
public static final int CRYSTAL_OF_ITHELL = 23927;
public static final int CRYSTAL_OF_IORWERTH = 23929;
public static final int CRYSTAL_OF_TRAHAEARN = 23931;
public static final int CRYSTAL_OF_CADARN = 23933;
public static final int CRYSTAL_OF_CRWYS = 23935;
public static final int CRYSTAL_OF_MEILYR = 23937;
public static final int CRYSTAL_OF_HEFIN = 23939;
public static final int CRYSTAL_OF_AMLODD = 23941;
public static final int ELVEN_SIGNET = 23943;
public static final int ETERNAL_TELEPORT_CRYSTAL = 23946;
public static final int ELVEN_DAWN = 23948;
public static final int ENHANCED_CRYSTAL_KEY = 23951;
public static final int CRYSTAL_TOOL_SEED = 23953;
public static final int CRYSTAL_ARMOUR_SEED = 23956;
public static final int ENHANCED_CRYSTAL_TELEPORT_SEED = 23959;
public static final int CRYSTAL_SHARD = 23962;
public static final int CRYSTAL_DUST_23964 = 23964;
public static final int CRYSTAL_HELM = 23971;
public static final int CRYSTAL_HELM_INACTIVE = 23973;
public static final int CRYSTAL_BODY = 23975;
public static final int CRYSTAL_BODY_INACTIVE = 23977;
public static final int CRYSTAL_LEGS = 23979;
public static final int CRYSTAL_LEGS_INACTIVE = 23981;
public static final int CRYSTAL_BOW = 23983;
public static final int CRYSTAL_BOW_INACTIVE = 23985;
public static final int CRYSTAL_HALBERD = 23987;
public static final int CRYSTAL_HALBERD_INACTIVE = 23989;
public static final int CRYSTAL_SHIELD = 23991;
public static final int CRYSTAL_SHIELD_INACTIVE = 23993;
public static final int BLADE_OF_SAELDOR = 23995;
public static final int BLADE_OF_SAELDOR_INACTIVE = 23997;
public static final int CRYSTAL_GRAIL = 24000;
public static final int ELVEN_BOOTS = 24003;
public static final int ELVEN_GLOVES = 24006;
public static final int ELVEN_TOP = 24009;
public static final int ELVEN_SKIRT = 24012;
public static final int ELVEN_TOP_24015 = 24015;
public static final int ELVEN_SKIRT_24018 = 24018;
public static final int ELVEN_TOP_24021 = 24021;
public static final int ELVEN_LEGWEAR = 24024;
public static final int ELVEN_TOP_24027 = 24027;
public static final int MEMORIAM_CRYSTAL_1 = 24030;
public static final int MEMORIAM_CRYSTAL_2 = 24031;
public static final int MEMORIAM_CRYSTAL_3 = 24032;
public static final int MEMORIAM_CRYSTAL_4 = 24033;
public static final int DRAGONSTONE_FULL_HELM = 24034;
public static final int DRAGONSTONE_PLATEBODY = 24037;
public static final int DRAGONSTONE_PLATELEGS = 24040;
public static final int DRAGONSTONE_BOOTS = 24043;
public static final int DRAGONSTONE_GAUNTLETS = 24046;
public static final int CRAZED_SCRIBBLES = 24049;
public static final int A_DEAR_FRIEND = 24051;
public static final int ON_LEPRECHAUNS = 24053;
public static final int BLOODY_DIARY = 24055;
public static final int THE_EIGHT_CLANS = 24057;
public static final int GOLLWYNS_FINAL_STATEMENT = 24059;
public static final int NIFF__HARRY = 24061;
public static final int SOGGY_JOURNAL = 24063;
public static final int EBRILLS_JOURNAL = 24065;
public static final int STAINED_JOURNAL = 24067;
public static final int THE_TRUTH_BEHIND_THE_MYTH_EXCERPT = 24069;
public static final int THE_LIVING_STATUES = 24071;
public static final int THE_SPURNED_DEMON = 24073;
public static final int LEGENDS_OF_THE_MOUNTAIN = 24075;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+92 -481
View File
@@ -98,6 +98,7 @@ public final class NpcID
public static final int GHOST_95 = 95;
public static final int GHOST_96 = 96;
public static final int GHOST_97 = 97;
public static final int SOULLESS = 98;
public static final int DEATH_WING = 99;
public static final int ROCK_CRAB = 100;
public static final int ROCKS = 101;
@@ -621,6 +622,7 @@ public final class NpcID
public static final int FISHING_SPOT = 635;
public static final int KARAMTHULHU = 636;
public static final int FUNGI_637 = 637;
public static final int ELF_TRACKER = 638;
public static final int TYRAS_GUARD = 639;
public static final int UG = 640;
public static final int AGA = 641;
@@ -858,7 +860,8 @@ public final class NpcID
public static final int SCARG = 886;
public static final int GRUH = 887;
public static final int IRWIN_FEASELBAUM = 888;
public static final int MOSS_GUARDIAN = 891;
public static final int ELUNED = 889;
public static final int MOSS_GIANT = 891;
public static final int GOLRIE = 892;
public static final int FATHER_REEN = 893;
public static final int FATHER_REEN_894 = 894;
@@ -1066,11 +1069,15 @@ public final class NpcID
public static final int CHANCY_1106 = 1106;
public static final int HOPS = 1107;
public static final int HOPS_1108 = 1108;
public static final int JULIE = 1109;
public static final int GUIDORS_WIFE = 1109;
public static final int GUIDOR = 1110;
public static final int GUARD_1111 = 1111;
public static final int GUARD_1112 = 1112;
public static final int GUARD_1113 = 1113;
public static final int MOURNER = 1114;
public static final int MOURNER_1115 = 1115;
public static final int KILRON = 1116;
public static final int OMART = 1117;
public static final int MAN_1118 = 1118;
public static final int WOMAN = 1119;
public static final int DOMINIC_ONION = 1120;
@@ -1084,16 +1091,22 @@ public final class NpcID
public static final int CHILD_1133 = 1133;
public static final int DAMIS_HARD = 1134;
public static final int DAMIS_HARD_1135 = 1135;
public static final int MOURNER_1136 = 1136;
public static final int PRIEST = 1137;
public static final int MAN_1138 = 1138;
public static final int WOMAN_1139 = 1139;
public static final int WOMAN_1140 = 1140;
public static final int WOMAN_1141 = 1141;
public static final int WOMAN_1142 = 1142;
public static final int KING_LATHAS = 1143;
public static final int PALADIN = 1144;
public static final int JERICO = 1145;
public static final int CHEMIST = 1146;
public static final int GUARD_1147 = 1147;
public static final int MOURNER_1148 = 1148;
public static final int MOURNER_1149 = 1149;
public static final int MOURNER_1150 = 1150;
public static final int MOURNER_1151 = 1151;
public static final int NURSE_SARAH = 1152;
public static final int OGRE_1153 = 1153;
public static final int SHARK = 1154;
@@ -1928,7 +1941,7 @@ public final class NpcID
public static final int ICE_GIANT_2087 = 2087;
public static final int ICE_GIANT_2088 = 2088;
public static final int ICE_GIANT_2089 = 2089;
public static final int MOSS_GIANT = 2090;
public static final int MOSS_GIANT_2090 = 2090;
public static final int MOSS_GIANT_2091 = 2091;
public static final int MOSS_GIANT_2092 = 2092;
public static final int MOSS_GIANT_2093 = 2093;
@@ -2719,7 +2732,7 @@ public final class NpcID
public static final int SHOP_KEEPER_2884 = 2884;
public static final int SHOP_ASSISTANT_2885 = 2885;
public static final int AUBURY = 2886;
public static final int ASYFF = 2887;
public static final int FANCY_DRESS_SHOP_OWNER = 2887;
public static final int SHOP_KEEPER_2888 = 2888;
public static final int GRUM_2889 = 2889;
public static final int WYDIN_2890 = 2890;
@@ -3009,6 +3022,7 @@ public final class NpcID
public static final int IRKSOL = 3203;
public static final int FAIRY_3204 = 3204;
public static final int ZAMBO = 3205;
public static final int SILVER_MERCHANT = 3206;
public static final int GEM_MERCHANT = 3207;
public static final int BAKER = 3208;
public static final int SPICE_SELLER = 3209;
@@ -3207,11 +3221,15 @@ public final class NpcID
public static final int GRIZZLY_BEAR_CUB = 3424;
public static final int GRIZZLY_BEAR_CUB_3425 = 3425;
public static final int DIRE_WOLF = 3426;
public static final int IORWERTH_ARCHER = 3428;
public static final int IORWERTH_WARRIOR = 3429;
public static final int LORD_IORWERTH = 3427;
public static final int ELF_WARRIOR = 3428;
public static final int ELF_WARRIOR_3429 = 3429;
public static final int ELVEN_CITY_GUARD = 3430;
public static final int ELF_WARRIOR_3431 = 3431;
public static final int ARIANWYN = 3432;
public static final int TYRAS_GUARD_3433 = 3433;
public static final int TYRAS_GUARD_3434 = 3434;
public static final int TYRAS_GUARD_3435 = 3435;
public static final int TYRAS_GUARD_3436 = 3436;
public static final int GENERAL_HINING = 3437;
public static final int QUARTERMASTER = 3438;
@@ -3749,12 +3767,13 @@ public final class NpcID
public static final int ZOMBIE_3980 = 3980;
public static final int ZOMBIE_3981 = 3981;
public static final int LESSER_DEMON_3982 = 3982;
public static final int COUNCILLOR_HALGRIVE = 3983;
public static final int DOCTOR_ORBON = 3984;
public static final int FARMER_BRUMTY = 3985;
public static final int RED_SHEEP = 3986;
public static final int GREEN_SHEEP = 3987;
public static final int BLUE_SHEEP = 3988;
public static final int YELLOW_SHEEP = 3989;
public static final int SICKLOOKING_SHEEP_1 = 3986;
public static final int SICKLOOKING_SHEEP_2 = 3987;
public static final int SICKLOOKING_SHEEP_3 = 3988;
public static final int SICKLOOKING_SHEEP_4 = 3989;
public static final int BOY = 3994;
public static final int NORA_T_HAGG = 3995;
public static final int WITCHS_EXPERIMENT = 3996;
@@ -3766,6 +3785,10 @@ public final class NpcID
public static final int CHOMPY_CHICK_4002 = 4002;
public static final int SHADOW_4004 = 4004;
public static final int DARK_BEAST = 4005;
public static final int MOURNER_4006 = 4006;
public static final int SLAVE = 4007;
public static final int SLAVE_4008 = 4008;
public static final int SLAVE_4009 = 4009;
public static final int THORGEL = 4010;
public static final int BILL_TEACH = 4011;
public static final int BILL_TEACH_4012 = 4012;
@@ -3954,7 +3977,7 @@ public final class NpcID
public static final int SCABARAS = 4197;
public static final int CRONDIS = 4198;
public static final int ICTHLARIN = 4199;
public static final int SLAVE = 4200;
public static final int SLAVE_4200 = 4200;
public static final int SLAVE_4201 = 4201;
public static final int EMBALMER = 4202;
public static final int CARPENTER = 4203;
@@ -4007,18 +4030,26 @@ public final class NpcID
public static final int ALRENA_4251 = 4251;
public static final int BRAVEK = 4252;
public static final int BRAVEK_4253 = 4253;
public static final int CARLA = 4254;
public static final int CLERK = 4255;
public static final int EDMOND_4256 = 4256;
public static final int ELENA_4257 = 4257;
public static final int HEAD_MOURNER = 4258;
public static final int MOURNER_4259 = 4259;
public static final int MOURNER_4260 = 4260;
public static final int MOURNER_4261 = 4261;
public static final int RECRUITER = 4262;
public static final int TED_REHNISON = 4263;
public static final int MARTHA_REHNISON = 4264;
public static final int BILLY_REHNISON = 4265;
public static final int MILLI_REHNISON = 4266;
public static final int JETHICK = 4267;
public static final int MAN_4268 = 4268;
public static final int MAN_4269 = 4269;
public static final int MAN_4270 = 4270;
public static final int MAN_4271 = 4271;
public static final int MAN_4272 = 4272;
public static final int MOURNER_4273 = 4273;
public static final int LEELA = 4274;
public static final int JOE_4275 = 4275;
public static final int JAIL_GUARD = 4276;
@@ -4261,13 +4292,38 @@ public final class NpcID
public static final int GUARD_4525 = 4525;
public static final int GUARD_4526 = 4526;
public static final int CHADWELL = 4527;
public static final int KOFTIK_4528 = 4528;
public static final int KOFTIK_4529 = 4529;
public static final int KOFTIK_4530 = 4530;
public static final int KOFTIK_4531 = 4531;
public static final int KOFTIK_4532 = 4532;
public static final int BLESSED_SPIDER = 4533;
public static final int BLESSED_GIANT_RAT = 4534;
public static final int BLESSED_GIANT_RAT_4535 = 4535;
public static final int SLAVE_4536 = 4536;
public static final int SLAVE_4537 = 4537;
public static final int SLAVE_4538 = 4538;
public static final int SLAVE_4539 = 4539;
public static final int SLAVE_4540 = 4540;
public static final int SLAVE_4541 = 4541;
public static final int SLAVE_4542 = 4542;
public static final int BOULDER_4543 = 4543;
public static final int UNICORN_4544 = 4544;
public static final int SIR_JERRO = 4545;
public static final int SIR_CARL = 4546;
public static final int SIR_HARRY = 4547;
public static final int HALFSOULLESS = 4548;
public static final int KARDIA = 4549;
public static final int WITCHS_CAT = 4550;
public static final int NILOOF = 4551;
public static final int KLANK = 4552;
public static final int KAMEN = 4553;
public static final int KALRAG = 4554;
public static final int OTHAINIAN = 4555;
public static final int DOOMION = 4556;
public static final int HOLTHION = 4557;
public static final int DISCIPLE_OF_IBAN = 4559;
public static final int LORD_IBAN = 4560;
public static final int SPIDER_4561 = 4561;
public static final int GIANT_BAT_4562 = 4562;
public static final int MONK_4563 = 4563;
@@ -4285,11 +4341,11 @@ public final class NpcID
public static final int POX_4575 = 4575;
public static final int BONES_4576 = 4576;
public static final int CERIL_CARNILLEAN_4577 = 4577;
public static final int COUNCILLOR_HALGRIVE = 4578;
public static final int COUNCILLOR_HALGRIVE_4578 = 4578;
public static final int SPICE_SELLER_4579 = 4579;
public static final int FUR_TRADER_4580 = 4580;
public static final int GEM_MERCHANT_4581 = 4581;
public static final int SILVER_MERCHANT = 4582;
public static final int SILVER_MERCHANT_4582 = 4582;
public static final int SILK_MERCHANT_4583 = 4583;
public static final int ZENESHA = 4584;
public static final int ALI_MORRISANE_4585 = 4585;
@@ -4953,25 +5009,34 @@ public final class NpcID
public static final int MONKEY_ZOMBIE_5282 = 5282;
public static final int MONKEY_ZOMBIE_5283 = 5283;
public static final int BONZARA = 5284;
public static final int MOURNER_5285 = 5285;
public static final int MOURNER_5286 = 5286;
public static final int MOURNER_5287 = 5287;
public static final int EMBALMER_5288 = 5288;
public static final int CARPENTER_5289 = 5289;
public static final int LINEN_WORKER = 5290;
public static final int PRIEST_5291 = 5291;
public static final int ELF_WARRIOR = 5293;
public static final int ARIANWYN_5292 = 5292;
public static final int ELF_WARRIOR_5293 = 5293;
public static final int ELF_WARRIOR_5294 = 5294;
public static final int ELF_ARCHER = 5295;
public static final int ELF_ARCHER_5296 = 5296;
public static final int ELF_WARRIOR_5295 = 5295;
public static final int ELF_WARRIOR_5296 = 5296;
public static final int GOREU = 5297;
public static final int YSGAWYN = 5298;
public static final int ARVEL = 5299;
public static final int MAWRTH = 5300;
public static final int KELYN = 5301;
public static final int EOIN = 5302;
public static final int IONA = 5303;
public static final int ELUNED = 5304;
public static final int RED_SHEEP_5305 = 5305;
public static final int GREEN_SHEEP_5306 = 5306;
public static final int BLUE_SHEEP_5307 = 5307;
public static final int YELLOW_SHEEP_5308 = 5308;
public static final int ELUNED_5304 = 5304;
public static final int SICKLOOKING_SHEEP_1_5305 = 5305;
public static final int SICKLOOKING_SHEEP_2_5306 = 5306;
public static final int SICKLOOKING_SHEEP_3_5307 = 5307;
public static final int SICKLOOKING_SHEEP_4_5308 = 5308;
public static final int GNOME_5309 = 5309;
public static final int HEAD_MOURNER_5310 = 5310;
public static final int MOURNER_5311 = 5311;
public static final int MOURNER_5312 = 5312;
public static final int GPDT_EMPLOYEE = 5313;
public static final int HORACIO = 5315;
public static final int KANGAI_MAU = 5316;
@@ -5761,7 +5826,7 @@ public final class NpcID
public static final int THE_KENDAL_HARD = 6322;
public static final int GIANT_ROC_HARD = 6323;
public static final int SLAGILITH_HARD = 6324;
public static final int MOSS_GUARDIAN_HARD = 6325;
public static final int MOSS_GIANT_HARD = 6325;
public static final int SKELETON_HELLHOUND_HARD = 6326;
public static final int AGRITH_NAAR_HARD = 6327;
public static final int KING_ROALD_HARD = 6328;
@@ -5822,7 +5887,7 @@ public final class NpcID
public static final int THE_KENDAL_6383 = 6383;
public static final int GIANT_ROC_6384 = 6384;
public static final int SLAGILITH_6385 = 6385;
public static final int MOSS_GUARDIAN_6386 = 6386;
public static final int MOSS_GIANT_6386 = 6386;
public static final int SKELETON_HELLHOUND_6387 = 6387;
public static final int AGRITH_NAAR_6388 = 6388;
public static final int KING_ROALD_6389 = 6389;
@@ -6691,6 +6756,7 @@ public final class NpcID
public static final int WINTER_SOLDIER = 7379;
public static final int CAT_7380 = 7380;
public static final int WINTERTOAD = 7381;
public static final int ED = 7382;
public static final int SNOW = 7383;
public static final int STUMPY = 7384;
public static final int PUMPY = 7385;
@@ -7001,7 +7067,7 @@ public final class NpcID
public static final int FISHING_SPOT_7731 = 7731;
public static final int FISHING_SPOT_7732 = 7732;
public static final int FISHING_SPOT_7733 = 7733;
public static final int RECRUITER = 7734;
public static final int RECRUITER_7734 = 7734;
public static final int ROCK_GOLEM_7736 = 7736;
public static final int ROCK_GOLEM_7737 = 7737;
public static final int ROCK_GOLEM_7738 = 7738;
@@ -7252,7 +7318,7 @@ public final class NpcID
public static final int AEONISIG_RAISPHER_8043 = 8043;
public static final int SIR_AMIK_VARZE_8044 = 8044;
public static final int SIR_TIFFY_CASHIEN_8045 = 8045;
public static final int KING_LATHAS = 8046;
public static final int KING_LATHAS_8046 = 8046;
public static final int KING_ARTHUR_8047 = 8047;
public static final int BRUNDT_THE_CHIEFTAIN_8048 = 8048;
public static final int ONEIROMANCER_8049 = 8049;
@@ -7779,6 +7845,7 @@ public final class NpcID
public static final int PUFFER_FISH_8667 = 8667;
public static final int ISLWYN_8675 = 8675;
public static final int ILFEEN = 8676;
public static final int ILFEEN_8677 = 8677;
public static final int FERAL_VAMPYRE_8678 = 8678;
public static final int ABIDOR_CRANK_8679 = 8679;
public static final int DAVON = 8680;
@@ -7816,461 +7883,5 @@ public final class NpcID
public static final int SPAWN_OF_SARACHNIS = 8714;
public static final int SPAWN_OF_SARACHNIS_8715 = 8715;
public static final int JUSTINE = 8721;
public static final int SILVER_MERCHANT_8722 = 8722;
public static final int GEM_MERCHANT_8723 = 8723;
public static final int BAKER_8724 = 8724;
public static final int BAKER_8725 = 8725;
public static final int SPICE_SELLER_8726 = 8726;
public static final int FUR_TRADER_8727 = 8727;
public static final int SILK_MERCHANT_8728 = 8728;
public static final int YOUNGLLEF = 8729;
public static final int CORRUPTED_YOUNGLLEF = 8730;
public static final int SMOLCANO = 8731;
public static final int MUGGER_8732 = 8732;
public static final int CRAB_8733 = 8733;
public static final int SOULLESS = 8734;
public static final int MOSS_GIANT_8736 = 8736;
public static final int YOUNGLLEF_8737 = 8737;
public static final int CORRUPTED_YOUNGLLEF_8738 = 8738;
public static final int SMOLCANO_8739 = 8739;
public static final int CRYSTAL_IMPLING = 8741;
public static final int CRYSTAL_IMPLING_8742 = 8742;
public static final int CRYSTAL_IMPLING_8743 = 8743;
public static final int CRYSTAL_IMPLING_8744 = 8744;
public static final int CRYSTAL_IMPLING_8745 = 8745;
public static final int CRYSTAL_IMPLING_8746 = 8746;
public static final int CRYSTAL_IMPLING_8747 = 8747;
public static final int CRYSTAL_IMPLING_8748 = 8748;
public static final int CRYSTAL_IMPLING_8749 = 8749;
public static final int CRYSTAL_IMPLING_8750 = 8750;
public static final int CRYSTAL_IMPLING_8751 = 8751;
public static final int CRYSTAL_IMPLING_8752 = 8752;
public static final int CRYSTAL_IMPLING_8753 = 8753;
public static final int CRYSTAL_IMPLING_8754 = 8754;
public static final int CRYSTAL_IMPLING_8755 = 8755;
public static final int CRYSTAL_IMPLING_8756 = 8756;
public static final int CRYSTAL_IMPLING_8757 = 8757;
public static final int LORD_IORWERTH = 8758;
public static final int IORWERTH_WARRIOR_8759 = 8759;
public static final int IORWERTH_ARCHER_8760 = 8760;
public static final int ELF_TRACKER = 8761;
public static final int TYRAS_GUARD_8762 = 8762;
public static final int CAPTAIN_BARNABY_8763 = 8763;
public static final int CAPTAIN_BARNABY_8764 = 8764;
public static final int COUNCILLOR_HALGRIVE_8765 = 8765;
public static final int ELUNED_8766 = 8766;
public static final int ELUNED_8767 = 8767;
public static final int ELVEN_SCOUT = 8768;
public static final int ILFEEN_8769 = 8769;
public static final int ELVEN_SCOUT_8770 = 8770;
public static final int MOURNER = 8771;
public static final int SLAVE_8772 = 8772;
public static final int SLAVE_8773 = 8773;
public static final int SLAVE_8774 = 8774;
public static final int SEREN = 8775;
public static final int MEMORY_OF_SEREN = 8776;
public static final int MEMORY_OF_SEREN_8777 = 8777;
public static final int MEMORY_OF_SEREN_8778 = 8778;
public static final int MEMORY_OF_SEREN_8779 = 8779;
public static final int MEMORY_OF_SEREN_8780 = 8780;
public static final int MEMORY_OF_SEREN_8781 = 8781;
public static final int MEMORY_OF_SEREN_8782 = 8782;
public static final int MEMORY_OF_SEREN_8783 = 8783;
public static final int MEMORY_OF_SEREN_8784 = 8784;
public static final int ELENA_8791 = 8791;
public static final int ELENA_8792 = 8792;
public static final int ELENA_8793 = 8793;
public static final int ELENA_8794 = 8794;
public static final int ELENA_8795 = 8795;
public static final int ELENA_8797 = 8797;
public static final int ELENA_8798 = 8798;
public static final int KNIGHT_OF_ARDOUGNE_8799 = 8799;
public static final int KNIGHT_OF_ARDOUGNE_8800 = 8800;
public static final int KNIGHT_OF_ARDOUGNE_8801 = 8801;
public static final int COUNCILLOR_HALGRIVE_8802 = 8802;
public static final int COUNCILLOR_HALGRIVE_8803 = 8803;
public static final int OMART = 8804;
public static final int KILRON = 8805;
public static final int JETHICK = 8806;
public static final int CARLA = 8807;
public static final int BAXTORIAN = 8808;
public static final int BAXTORIAN_8809 = 8809;
public static final int BAXTORIAN_8810 = 8810;
public static final int BAXTORIAN_8811 = 8811;
public static final int BAXTORIAN_8812 = 8812;
public static final int BAXTORIAN_8813 = 8813;
public static final int YSGAWYN = 8814;
public static final int YSGAWYN_8815 = 8815;
public static final int YSGAWYN_8816 = 8816;
public static final int ISLWYN_8818 = 8818;
public static final int ISLWYN_8819 = 8819;
public static final int ISLWYN_8821 = 8821;
public static final int ISLWYN_8822 = 8822;
public static final int ISLWYN_8823 = 8823;
public static final int ILFEEN_8825 = 8825;
public static final int ILFEEN_8827 = 8827;
public static final int ELUNED_8829 = 8829;
public static final int ELUNED_8830 = 8830;
public static final int RESISTANCE_FIGHTER = 8831;
public static final int RESISTANCE_FIGHTER_8832 = 8832;
public static final int RESISTANCE_FIGHTER_8833 = 8833;
public static final int RESISTANCE_FIGHTER_8834 = 8834;
public static final int RESISTANCE_FIGHTER_8835 = 8835;
public static final int OMART_8836 = 8836;
public static final int KILRON_8837 = 8837;
public static final int ELENA_8838 = 8838;
public static final int JETHICK_8839 = 8839;
public static final int OMART_8840 = 8840;
public static final int KILRON_8841 = 8841;
public static final int KING_LATHAS_8842 = 8842;
public static final int LATHAS = 8843;
public static final int MOURNER_8844 = 8844;
public static final int MOURNER_8845 = 8845;
public static final int MOURNER_8846 = 8846;
public static final int ESSYLLT_8847 = 8847;
public static final int GNOME_8848 = 8848;
public static final int PALADIN_8849 = 8849;
public static final int PALADIN_8850 = 8850;
public static final int KNIGHT_OF_ARDOUGNE_8851 = 8851;
public static final int KNIGHT_OF_ARDOUGNE_8852 = 8852;
public static final int PALADIN_8853 = 8853;
public static final int KNIGHT_OF_ARDOUGNE_8854 = 8854;
public static final int KNIGHT_OF_ARDOUGNE_8855 = 8855;
public static final int EXECUTIONER = 8856;
public static final int HOODED_FIGURE = 8857;
public static final int MAN_8858 = 8858;
public static final int MAN_8859 = 8859;
public static final int MAN_8860 = 8860;
public static final int MAN_8861 = 8861;
public static final int MAN_8862 = 8862;
public static final int WOMAN_8863 = 8863;
public static final int WOMAN_8864 = 8864;
public static final int ARIANWYN_8865 = 8865;
public static final int ARIANWYN_8866 = 8866;
public static final int ARIANWYN_8867 = 8867;
public static final int ARIANWYN_8868 = 8868;
public static final int MORVRAN_8869 = 8869;
public static final int MORVRAN_8870 = 8870;
public static final int ESSYLLT_8871 = 8871;
public static final int ESSYLLT_8872 = 8872;
public static final int LORD_IORWERTH_8873 = 8873;
public static final int LORD_IORWERTH_8874 = 8874;
public static final int LORD_IORWERTH_8875 = 8875;
public static final int LORD_IORWERTH_8876 = 8876;
public static final int IORWERTH_WARRIOR_8877 = 8877;
public static final int IORWERTH_ARCHER_8878 = 8878;
public static final int IORWERTH_WARRIOR_8879 = 8879;
public static final int IORWERTH_ARCHER_8880 = 8880;
public static final int IORWERTH_WARRIOR_8881 = 8881;
public static final int IORWERTH_WARRIOR_8882 = 8882;
public static final int IORWERTH_WARRIOR_8883 = 8883;
public static final int IORWERTH_WARRIOR_8884 = 8884;
public static final int IORWERTH_ARCHER_8885 = 8885;
public static final int IORWERTH_ARCHER_8886 = 8886;
public static final int REBEL_ARCHER = 8887;
public static final int REBEL_ARCHER_8888 = 8888;
public static final int REBEL_ARCHER_8889 = 8889;
public static final int REBEL_WARRIOR = 8890;
public static final int REBEL_WARRIOR_8891 = 8891;
public static final int LADY_TANGWEN_TRAHAEARN = 8892;
public static final int ELDERLY_ELF = 8893;
public static final int ELDERLY_ELF_8894 = 8894;
public static final int LADY_TANGWEN_TRAHAEARN_8895 = 8895;
public static final int MYSTERIOUS_FIGURE = 8897;
public static final int LORD_IEUAN_AMLODD = 8898;
public static final int LORD_IEUAN_AMLODD_8899 = 8899;
public static final int TREE_8901 = 8901;
public static final int TREE_8902 = 8902;
public static final int LORD_PIQUAN_CRWYS = 8903;
public static final int LORD_PIQUAN_CRWYS_8904 = 8904;
public static final int ELF_HERMIT = 8906;
public static final int LADY_CARYS_HEFIN = 8907;
public static final int LADY_CARYS_HEFIN_8908 = 8908;
public static final int LADY_FFION_MEILYR = 8910;
public static final int LADY_FFION_MEILYR_8911 = 8911;
public static final int LADY_KELYN_ITHELL = 8913;
public static final int KELYN = 8914;
public static final int LADY_KELYN_ITHELL_8915 = 8915;
public static final int FRAGMENT_OF_SEREN = 8917;
public static final int FRAGMENT_OF_SEREN_8918 = 8918;
public static final int FRAGMENT_OF_SEREN_8919 = 8919;
public static final int FRAGMENT_OF_SEREN_8920 = 8920;
public static final int CRYSTAL_WHIRLWIND = 8921;
public static final int IORWERTH_WARRIOR_8922 = 8922;
public static final int IORWERTH_ARCHER_8923 = 8923;
public static final int IESTIN = 8924;
public static final int IESTIN_8925 = 8925;
public static final int IESTIN_8926 = 8926;
public static final int MAWRTH_8927 = 8927;
public static final int MAWRTH_8928 = 8928;
public static final int IONA_8929 = 8929;
public static final int EOIN_8930 = 8930;
public static final int EOIN_8931 = 8931;
public static final int REBEL_ARCHER_8932 = 8932;
public static final int REBEL_ARCHER_8933 = 8933;
public static final int REBEL_WARRIOR_8934 = 8934;
public static final int REBEL_WARRIOR_8935 = 8935;
public static final int IORWERTH_ARCHER_8936 = 8936;
public static final int IORWERTH_ARCHER_8937 = 8937;
public static final int IORWERTH_WARRIOR_8938 = 8938;
public static final int IORWERTH_WARRIOR_8939 = 8939;
public static final int KLANK_8940 = 8940;
public static final int NILOOF_8941 = 8941;
public static final int KAMEN_8942 = 8942;
public static final int THORGEL_8943 = 8943;
public static final int GENERAL_HINING_8944 = 8944;
public static final int TYRAS_GUARD_8945 = 8945;
public static final int REBEL_ARCHER_8946 = 8946;
public static final int REBEL_ARCHER_8947 = 8947;
public static final int REBEL_WARRIOR_8948 = 8948;
public static final int REBEL_WARRIOR_8949 = 8949;
public static final int ESSYLLT_8950 = 8950;
public static final int BARRIER = 8951;
public static final int BARRIER_8952 = 8952;
public static final int IORWERTH_ARCHER_8953 = 8953;
public static final int IORWERTH_ARCHER_8954 = 8954;
public static final int IORWERTH_WARRIOR_8955 = 8955;
public static final int IORWERTH_WARRIOR_8956 = 8956;
public static final int REBEL_ARCHER_8957 = 8957;
public static final int REBEL_ARCHER_8958 = 8958;
public static final int REBEL_WARRIOR_8959 = 8959;
public static final int REBEL_WARRIOR_8960 = 8960;
public static final int TYRAS_GUARD_8961 = 8961;
public static final int TYRAS_GUARD_8962 = 8962;
public static final int TYRAS_GUARD_8963 = 8963;
public static final int TYRAS_GUARD_8964 = 8964;
public static final int REBEL_SCOUT = 8965;
public static final int REBEL_SCOUT_8966 = 8966;
public static final int CARLA_8967 = 8967;
public static final int CLERK_8968 = 8968;
public static final int HEAD_MOURNER = 8969;
public static final int MOURNER_8970 = 8970;
public static final int MOURNER_8971 = 8971;
public static final int MOURNER_8972 = 8972;
public static final int RECRUITER_8973 = 8973;
public static final int JETHICK_8974 = 8974;
public static final int MOURNER_8975 = 8975;
public static final int KOFTIK_8976 = 8976;
public static final int BLESSED_SPIDER_8978 = 8978;
public static final int SLAVE_8979 = 8979;
public static final int SLAVE_8980 = 8980;
public static final int SLAVE_8981 = 8981;
public static final int SLAVE_8982 = 8982;
public static final int SLAVE_8983 = 8983;
public static final int SLAVE_8984 = 8984;
public static final int SLAVE_8985 = 8985;
public static final int UNICORN_8986 = 8986;
public static final int SIR_JERRO = 8987;
public static final int SIR_CARL = 8988;
public static final int SIR_HARRY = 8989;
public static final int HALFSOULLESS = 8990;
public static final int KARDIA = 8991;
public static final int WITCHS_CAT = 8992;
public static final int KALRAG = 8993;
public static final int OTHAINIAN = 8994;
public static final int DOOMION = 8995;
public static final int HOLTHION = 8996;
public static final int DISCIPLE_OF_IBAN = 8997;
public static final int IBAN = 8998;
public static final int MOURNER_8999 = 8999;
public static final int MOURNER_9000 = 9000;
public static final int KILRON_9001 = 9001;
public static final int OMART_9002 = 9002;
public static final int MOURNER_9003 = 9003;
public static final int MOURNER_9004 = 9004;
public static final int KING_LATHAS_9005 = 9005;
public static final int KING_THOROS = 9006;
public static final int MOURNER_9007 = 9007;
public static final int MOURNER_9008 = 9008;
public static final int MOURNER_9009 = 9009;
public static final int MOURNER_9010 = 9010;
public static final int KING_THOROS_9011 = 9011;
public static final int MOURNER_9013 = 9013;
public static final int ARIANWYN_9014 = 9014;
public static final int KELYN_9015 = 9015;
public static final int ESSYLLT_9016 = 9016;
public static final int MOURNER_9017 = 9017;
public static final int MOURNER_9018 = 9018;
public static final int ED = 9019;
public static final int BRYN = 9020;
public static final int CRYSTALLINE_HUNLLEF = 9021;
public static final int CRYSTALLINE_HUNLLEF_9022 = 9022;
public static final int CRYSTALLINE_HUNLLEF_9023 = 9023;
public static final int CRYSTALLINE_HUNLLEF_9024 = 9024;
public static final int CRYSTALLINE_RAT = 9026;
public static final int CRYSTALLINE_SPIDER = 9027;
public static final int CRYSTALLINE_BAT = 9028;
public static final int CRYSTALLINE_UNICORN = 9029;
public static final int CRYSTALLINE_SCORPION = 9030;
public static final int CRYSTALLINE_WOLF = 9031;
public static final int CRYSTALLINE_BEAR = 9032;
public static final int CRYSTALLINE_DRAGON = 9033;
public static final int CRYSTALLINE_DARK_BEAST = 9034;
public static final int CORRUPTED_HUNLLEF = 9035;
public static final int CORRUPTED_HUNLLEF_9036 = 9036;
public static final int CORRUPTED_HUNLLEF_9037 = 9037;
public static final int CORRUPTED_HUNLLEF_9038 = 9038;
public static final int CORRUPTED_RAT = 9040;
public static final int CORRUPTED_SPIDER = 9041;
public static final int CORRUPTED_BAT = 9042;
public static final int CORRUPTED_UNICORN = 9043;
public static final int CORRUPTED_SCORPION = 9044;
public static final int CORRUPTED_WOLF = 9045;
public static final int CORRUPTED_BEAR = 9046;
public static final int CORRUPTED_DRAGON = 9047;
public static final int CORRUPTED_DARK_BEAST = 9048;
public static final int ZALCANO = 9049;
public static final int ZALCANO_9050 = 9050;
public static final int GOLEM_9051 = 9051;
public static final int RHIANNON = 9052;
public static final int AMROD = 9053;
public static final int MIRIEL = 9054;
public static final int CURUFIN = 9055;
public static final int ENERDHIL = 9056;
public static final int TATIE = 9057;
public static final int FINDUILAS = 9058;
public static final int GELMIR = 9059;
public static final int MITHRELLAS = 9060;
public static final int ERESTOR = 9061;
public static final int LINDIR = 9062;
public static final int IDRIL = 9063;
public static final int INGWION = 9064;
public static final int THINGOL = 9065;
public static final int ELENWE = 9066;
public static final int OROPHIN = 9067;
public static final int VAIRE = 9068;
public static final int ELLADAN = 9069;
public static final int GUILIN = 9070;
public static final int INGWE = 9071;
public static final int CIRDAN = 9072;
public static final int GLORFINDEL = 9073;
public static final int AREDHEL = 9074;
public static final int CELEGORM = 9075;
public static final int ANAIRE = 9076;
public static final int MAEGLIN = 9077;
public static final int EDRAHIL = 9078;
public static final int FINGON = 9079;
public static final int SALGANT = 9080;
public static final int CELEBRIAN = 9081;
public static final int IMIN = 9082;
public static final int OROPHER = 9083;
public static final int FINGOLFIN = 9084;
public static final int MAHTAN = 9085;
public static final int INDIS = 9086;
public static final int IMINYE = 9087;
public static final int FEANOR = 9088;
public static final int SAEROS = 9089;
public static final int NELLAS = 9090;
public static final int RHYFEL = 9091;
public static final int GWYL = 9092;
public static final int ENILLY = 9093;
public static final int FFONI = 9094;
public static final int YMLADD = 9095;
public static final int SADWRN = 9096;
public static final int DIOL = 9097;
public static final int YSBEID = 9098;
public static final int CLEDDYF = 9099;
public static final int SAETH = 9100;
public static final int NIMRODEL = 9101;
public static final int MAEDHROS = 9102;
public static final int FINARFIN = 9103;
public static final int GWINDOR = 9104;
public static final int ELDALOTE = 9105;
public static final int ENELYE = 9106;
public static final int NERDANEL = 9107;
public static final int NIMLOTH = 9108;
public static final int FINDIS = 9109;
public static final int EARWEN = 9110;
public static final int CARANTHIR = 9111;
public static final int ENEL = 9112;
public static final int HENDOR_9113 = 9113;
public static final int GALATHIL = 9114;
public static final int TURGON = 9115;
public static final int LENWE = 9116;
public static final int ARANWE = 9117;
public static final int RABBIT_9118 = 9118;
public static final int LORD_IEUAN_AMLODD_9119 = 9119;
public static final int LORD_BAXTORIAN_CADARN = 9120;
public static final int LADY_KELYN_ITHELL_9121 = 9121;
public static final int LADY_TANGWEN_TRAHAEARN_9122 = 9122;
public static final int LORD_PIQUAN_CRWYS_9123 = 9123;
public static final int LADY_FFION_MEILYR_9124 = 9124;
public static final int LADY_CARYS_HEFIN_9125 = 9125;
public static final int LORD_IESTIN_IORWERTH = 9126;
public static final int BANKER_9127 = 9127;
public static final int BANKER_9128 = 9128;
public static final int BANKER_9129 = 9129;
public static final int BANKER_9130 = 9130;
public static final int BANKER_9131 = 9131;
public static final int BANKER_9132 = 9132;
public static final int REESE = 9133;
public static final int REESE_9134 = 9134;
public static final int CONWENNA = 9135;
public static final int CONWENNA_9136 = 9136;
public static final int ALWYN = 9137;
public static final int OSWALLT = 9138;
public static final int EIRA = 9139;
public static final int SAWMILL_OPERATOR_9140 = 9140;
public static final int PENNANT = 9141;
public static final int PENNANT_9142 = 9142;
public static final int GLADIATOR = 9143;
public static final int GLADIATOR_9144 = 9144;
public static final int ELUNED_9145 = 9145;
public static final int ISLWYN_9146 = 9146;
public static final int ELENA_9148 = 9148;
public static final int MORVRAN_9149 = 9149;
public static final int LILIFANG = 9150;
public static final int CREFYDD = 9151;
public static final int YSTWYTH = 9152;
public static final int IWAN = 9153;
public static final int DERWEN_9154 = 9154;
public static final int ELGAN = 9155;
public static final int CELYN = 9156;
public static final int ANEIRIN = 9157;
public static final int GWALLTER = 9158;
public static final int GWYN = 9159;
public static final int OSIAN = 9160;
public static final int CAERWYN = 9161;
public static final int ANWEN = 9162;
public static final int GLENDA = 9163;
public static final int GUINEVERE = 9164;
public static final int NIA = 9165;
public static final int SIAN = 9166;
public static final int BRANWEN = 9167;
public static final int LLIO = 9168;
public static final int EFA = 9169;
public static final int LLIANN = 9170;
public static final int FISHING_SPOT_9171 = 9171;
public static final int FISHING_SPOT_9172 = 9172;
public static final int FISHING_SPOT_9173 = 9173;
public static final int FISHING_SPOT_9174 = 9174;
public static final int RHODDWR_TAN = 9175;
public static final int MEDDWL_YMLAEN_LLAW = 9176;
public static final int LLEIDR_GOLAU = 9177;
public static final int GWERIN_HAPUS = 9178;
public static final int PRESWYLWYR_DALL = 9179;
public static final int MARWOLAETH_DAWNSIO = 9180;
public static final int DIRE_WOLF_9181 = 9181;
public static final int GUARD_9182 = 9182;
public static final int GUARD_9183 = 9183;
public static final int GUARD_9184 = 9184;
public static final int GUARD_9185 = 9185;
public static final int GUARD_9186 = 9186;
public static final int GUARD_9187 = 9187;
public static final int GUARD_9188 = 9188;
public static final int GUARD_9189 = 9189;
public static final int GUARD_9190 = 9190;
public static final int GUARD_9191 = 9191;
public static final int RAVEN = 9192;
public static final int LENNY = 9193;
public static final int GHOST_9194 = 9194;
public static final int IAN_9195 = 9195;
public static final int SURMA = 9196;
public static final int SLIPPERS = 9197;
public static final int RED_PANDA = 9198;
public static final int BEAR_CUB_9199 = 9199;
public static final int ED_9200 = 9200;
public static final int CRAB_9201 = 9201;
public static final int TIDE = 9202;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+8 -191
View File
@@ -1569,6 +1569,8 @@ public final class NullItemID
public static final int NULL_4177 = 4177;
public static final int NULL_4208 = 4208;
public static final int NULL_4210 = 4210;
public static final int NULL_4213 = 4213;
public static final int NULL_4235 = 4235;
public static final int NULL_4279 = 4279;
public static final int NULL_4280 = 4280;
public static final int NULL_4281 = 4281;
@@ -7986,6 +7988,12 @@ public final class NullItemID
public static final int NULL_16885 = 16885;
public static final int NULL_16886 = 16886;
public static final int NULL_16887 = 16887;
public static final int NULL_16888 = 16888;
public static final int NULL_16889 = 16889;
public static final int NULL_16890 = 16890;
public static final int NULL_16891 = 16891;
public static final int NULL_16892 = 16892;
public static final int NULL_16893 = 16893;
public static final int NULL_16894 = 16894;
public static final int NULL_16895 = 16895;
public static final int NULL_16896 = 16896;
@@ -12535,196 +12543,5 @@ public final class NullItemID
public static final int NULL_23645 = 23645;
public static final int NULL_23647 = 23647;
public static final int NULL_23651 = 23651;
public static final int NULL_23656 = 23656;
public static final int NULL_23658 = 23658;
public static final int NULL_23660 = 23660;
public static final int NULL_23662 = 23662;
public static final int NULL_23663 = 23663;
public static final int NULL_23664 = 23664;
public static final int NULL_23665 = 23665;
public static final int NULL_23666 = 23666;
public static final int NULL_23668 = 23668;
public static final int NULL_23669 = 23669;
public static final int NULL_23671 = 23671;
public static final int NULL_23672 = 23672;
public static final int NULL_23674 = 23674;
public static final int NULL_23676 = 23676;
public static final int NULL_23678 = 23678;
public static final int NULL_23679 = 23679;
public static final int NULL_23681 = 23681;
public static final int NULL_23683 = 23683;
public static final int NULL_23684 = 23684;
public static final int NULL_23686 = 23686;
public static final int NULL_23687 = 23687;
public static final int NULL_23689 = 23689;
public static final int NULL_23690 = 23690;
public static final int NULL_23692 = 23692;
public static final int NULL_23693 = 23693;
public static final int NULL_23695 = 23695;
public static final int NULL_23696 = 23696;
public static final int NULL_23698 = 23698;
public static final int NULL_23699 = 23699;
public static final int NULL_23701 = 23701;
public static final int NULL_23702 = 23702;
public static final int NULL_23704 = 23704;
public static final int NULL_23705 = 23705;
public static final int NULL_23707 = 23707;
public static final int NULL_23708 = 23708;
public static final int NULL_23710 = 23710;
public static final int NULL_23711 = 23711;
public static final int NULL_23713 = 23713;
public static final int NULL_23714 = 23714;
public static final int NULL_23716 = 23716;
public static final int NULL_23717 = 23717;
public static final int NULL_23719 = 23719;
public static final int NULL_23720 = 23720;
public static final int NULL_23722 = 23722;
public static final int NULL_23723 = 23723;
public static final int NULL_23725 = 23725;
public static final int NULL_23726 = 23726;
public static final int NULL_23728 = 23728;
public static final int NULL_23729 = 23729;
public static final int NULL_23731 = 23731;
public static final int NULL_23732 = 23732;
public static final int NULL_23734 = 23734;
public static final int NULL_23735 = 23735;
public static final int NULL_23737 = 23737;
public static final int NULL_23738 = 23738;
public static final int NULL_23740 = 23740;
public static final int NULL_23741 = 23741;
public static final int NULL_23743 = 23743;
public static final int NULL_23744 = 23744;
public static final int NULL_23746 = 23746;
public static final int NULL_23747 = 23747;
public static final int NULL_23749 = 23749;
public static final int NULL_23750 = 23750;
public static final int NULL_23752 = 23752;
public static final int NULL_23753 = 23753;
public static final int NULL_23755 = 23755;
public static final int NULL_23756 = 23756;
public static final int NULL_23758 = 23758;
public static final int NULL_23761 = 23761;
public static final int NULL_23763 = 23763;
public static final int NULL_23765 = 23765;
public static final int NULL_23766 = 23766;
public static final int NULL_23767 = 23767;
public static final int NULL_23769 = 23769;
public static final int NULL_23772 = 23772;
public static final int NULL_23774 = 23774;
public static final int NULL_23786 = 23786;
public static final int NULL_23788 = 23788;
public static final int NULL_23790 = 23790;
public static final int NULL_23797 = 23797;
public static final int NULL_23799 = 23799;
public static final int NULL_23801 = 23801;
public static final int NULL_23803 = 23803;
public static final int NULL_23805 = 23805;
public static final int NULL_23807 = 23807;
public static final int NULL_23809 = 23809;
public static final int NULL_23811 = 23811;
public static final int NULL_23813 = 23813;
public static final int NULL_23819 = 23819;
public static final int NULL_23825 = 23825;
public static final int NULL_23826 = 23826;
public static final int NULL_23827 = 23827;
public static final int NULL_23828 = 23828;
public static final int NULL_23829 = 23829;
public static final int NULL_23860 = 23860;
public static final int NULL_23909 = 23909;
public static final int NULL_23910 = 23910;
public static final int NULL_23912 = 23912;
public static final int NULL_23914 = 23914;
public static final int NULL_23916 = 23916;
public static final int NULL_23918 = 23918;
public static final int NULL_23920 = 23920;
public static final int NULL_23922 = 23922;
public static final int NULL_23924 = 23924;
public static final int NULL_23926 = 23926;
public static final int NULL_23928 = 23928;
public static final int NULL_23930 = 23930;
public static final int NULL_23932 = 23932;
public static final int NULL_23934 = 23934;
public static final int NULL_23936 = 23936;
public static final int NULL_23938 = 23938;
public static final int NULL_23940 = 23940;
public static final int NULL_23942 = 23942;
public static final int NULL_23944 = 23944;
public static final int NULL_23945 = 23945;
public static final int NULL_23947 = 23947;
public static final int NULL_23949 = 23949;
public static final int NULL_23950 = 23950;
public static final int NULL_23952 = 23952;
public static final int NULL_23954 = 23954;
public static final int NULL_23955 = 23955;
public static final int NULL_23957 = 23957;
public static final int NULL_23958 = 23958;
public static final int NULL_23960 = 23960;
public static final int NULL_23961 = 23961;
public static final int NULL_23963 = 23963;
public static final int NULL_23965 = 23965;
public static final int NULL_23966 = 23966;
public static final int NULL_23967 = 23967;
public static final int NULL_23968 = 23968;
public static final int NULL_23969 = 23969;
public static final int NULL_23970 = 23970;
public static final int NULL_23972 = 23972;
public static final int NULL_23974 = 23974;
public static final int NULL_23976 = 23976;
public static final int NULL_23978 = 23978;
public static final int NULL_23980 = 23980;
public static final int NULL_23982 = 23982;
public static final int NULL_23984 = 23984;
public static final int NULL_23986 = 23986;
public static final int NULL_23988 = 23988;
public static final int NULL_23990 = 23990;
public static final int NULL_23992 = 23992;
public static final int NULL_23994 = 23994;
public static final int NULL_23996 = 23996;
public static final int NULL_23998 = 23998;
public static final int NULL_23999 = 23999;
public static final int NULL_24001 = 24001;
public static final int NULL_24002 = 24002;
public static final int NULL_24004 = 24004;
public static final int NULL_24005 = 24005;
public static final int NULL_24007 = 24007;
public static final int NULL_24008 = 24008;
public static final int NULL_24010 = 24010;
public static final int NULL_24011 = 24011;
public static final int NULL_24013 = 24013;
public static final int NULL_24014 = 24014;
public static final int NULL_24016 = 24016;
public static final int NULL_24017 = 24017;
public static final int NULL_24019 = 24019;
public static final int NULL_24020 = 24020;
public static final int NULL_24022 = 24022;
public static final int NULL_24023 = 24023;
public static final int NULL_24025 = 24025;
public static final int NULL_24026 = 24026;
public static final int NULL_24028 = 24028;
public static final int NULL_24029 = 24029;
public static final int NULL_24035 = 24035;
public static final int NULL_24036 = 24036;
public static final int NULL_24038 = 24038;
public static final int NULL_24039 = 24039;
public static final int NULL_24041 = 24041;
public static final int NULL_24042 = 24042;
public static final int NULL_24044 = 24044;
public static final int NULL_24045 = 24045;
public static final int NULL_24047 = 24047;
public static final int NULL_24048 = 24048;
public static final int NULL_24050 = 24050;
public static final int NULL_24052 = 24052;
public static final int NULL_24054 = 24054;
public static final int NULL_24056 = 24056;
public static final int NULL_24058 = 24058;
public static final int NULL_24060 = 24060;
public static final int NULL_24062 = 24062;
public static final int NULL_24064 = 24064;
public static final int NULL_24066 = 24066;
public static final int NULL_24068 = 24068;
public static final int NULL_24070 = 24070;
public static final int NULL_24072 = 24072;
public static final int NULL_24074 = 24074;
public static final int NULL_24076 = 24076;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+3 -1748
View File
File diff suppressed because it is too large Load Diff
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+56 -750
View File
@@ -839,6 +839,8 @@ public final class ObjectID
public static final int CURTAIN_1534 = 1534;
public static final int DOOR_1535 = 1535;
public static final int DOOR_1536 = 1536;
public static final int DOOR_1537 = 1537;
public static final int DOOR_1538 = 1538;
public static final int DOOR_1540 = 1540;
public static final int DOOR_1541 = 1541;
public static final int DOOR_1543 = 1543;
@@ -959,21 +961,23 @@ public final class ObjectID
public static final int DOOR_1991 = 1991;
public static final int GLARIALS_TOMBSTONE = 1992;
public static final int GLARIALS_TOMB = 1993;
public static final int CHEST_1994 = 1994;
public static final int CHEST_1995 = 1995;
public static final int CLOSED_CHEST_1994 = 1994;
public static final int OPEN_CHEST_1995 = 1995;
public static final int ROCK = 1996;
public static final int ROCK_1997 = 1997;
public static final int ROPE = 1998;
public static final int CRATE_1999 = 1999;
public static final int DOOR_2000 = 2000;
public static final int DOOR_2002 = 2002;
public static final int PILLAR = 2004;
public static final int STATUE_OF_BAXTORIAN = 2005;
public static final int STATUE_OF_GLARIAL = 2006;
public static final int DOOR_2010 = 2010;
public static final int LEDGE = 2011;
public static final int LEDGE = 2010;
public static final int LEDGE_2011 = 2011;
public static final int LEDGE_2012 = 2012;
public static final int VINE_2013 = 2013;
public static final int CHALICE = 2014;
public static final int CHALICE_2015 = 2015;
public static final int CHALICE_OF_ETERNITY = 2014;
public static final int CHALICE_OF_ETERNITY_2015 = 2015;
public static final int WHIRLPOOL = 2019;
public static final int DEAD_TREE_2020 = 2020;
public static final int BARREL_2022 = 2022;
@@ -994,6 +998,7 @@ public final class ObjectID
public static final int DUMMY_2038 = 2038;
public static final int GATE_2039 = 2039;
public static final int GATE_2041 = 2041;
public static final int CAULDRON_2043 = 2043;
public static final int TROUGH = 2044;
public static final int DOOR_2048 = 2048;
public static final int DOOR_2049 = 2049;
@@ -1009,6 +1014,7 @@ public final class ObjectID
public static final int CRATE_2064 = 2064;
public static final int ROPE_LADDER = 2065;
public static final int WALL_2066 = 2066;
public static final int WATCHTOWER = 2067;
public static final int FENCE = 2068;
public static final int DOOR_2069 = 2069;
public static final int CRATE_2071 = 2071;
@@ -1285,7 +1291,7 @@ public final class ObjectID
public static final int CLOSED_CHEST_2436 = 2436;
public static final int GATE_2438 = 2438;
public static final int GATE_2439 = 2439;
public static final int PILLAR = 2440;
public static final int PILLAR_2440 = 2440;
public static final int PILLAR_2441 = 2441;
public static final int PILLAR_2442 = 2442;
public static final int PILLAR_2443 = 2443;
@@ -1355,6 +1361,9 @@ public final class ObjectID
public static final int BARREL_2530 = 2530;
public static final int MUD_PATCH_2531 = 2531;
public static final int MUD_PILE_2533 = 2533;
public static final int DOOR_2534 = 2534;
public static final int DOOR_2535 = 2535;
public static final int DOOR_2536 = 2536;
public static final int DOOR_2537 = 2537;
public static final int DOOR_2538 = 2538;
public static final int STAIRS_2539 = 2539;
@@ -1771,15 +1780,15 @@ public final class ObjectID
public static final int BARREL_3210 = 3210;
public static final int POSTER_3212 = 3212;
public static final int CAVE_ENTRANCE_3213 = 3213;
public static final int CAVE_EXIT_3214 = 3214;
public static final int LOOSE_MUD = 3216;
public static final int UNDERGROUND_PASS_EXIT = 3214;
public static final int MUD = 3216;
public static final int CAVE_3217 = 3217;
public static final int TUNNEL_3218 = 3218;
public static final int TUNNEL_3219 = 3219;
public static final int DOOR_3220 = 3220;
public static final int DOOR_3221 = 3221;
public static final int CAVE_3222 = 3222;
public static final int CAVE_3223 = 3223;
public static final int CAVE_STAIRS = 3222;
public static final int CAVE_STAIRS_3223 = 3223;
public static final int CAVE_3224 = 3224;
public static final int TRAP = 3227;
public static final int TRAP_3228 = 3228;
@@ -1789,9 +1798,9 @@ public final class ObjectID
public static final int STALAGMITES = 3232;
public static final int TRAP_3233 = 3233;
public static final int ODD_MARKINGS = 3234;
public static final int PIPE_3235 = 3235;
public static final int PIPE_3236 = 3236;
public static final int PIPE_3237 = 3237;
public static final int OBSTACLE_PIPE = 3235;
public static final int OBSTACLE_PIPE_3236 = 3236;
public static final int OBSTACLE_PIPE_3237 = 3237;
public static final int LEDGE_3238 = 3238;
public static final int BRIDGE = 3239;
public static final int BRIDGE_3240 = 3240;
@@ -1814,9 +1823,9 @@ public final class ObjectID
public static final int SWAMP = 3263;
public static final int WELL_3264 = 3264;
public static final int PILE_OF_ROCKS = 3265;
public static final int GATE_3266 = 3266;
public static final int CAGE = 3267;
public static final int GATE_3268 = 3268;
public static final int CAGE = 3266;
public static final int CAGE_3267 = 3267;
public static final int CAGE_3268 = 3268;
public static final int DOOR_3270 = 3270;
public static final int DOOR_3271 = 3271;
public static final int CHEST_3272 = 3272;
@@ -1851,7 +1860,7 @@ public final class ObjectID
public static final int GUIDE_ROPE = 3340;
public static final int GUIDE_ROPE_3341 = 3341;
public static final int ROCK_PILE_3343 = 3343;
public static final int BREW_BARREL = 3344;
public static final int BARREL_3344 = 3344;
public static final int IBANS_THRONE = 3348;
public static final int CAGE_3351 = 3351;
public static final int CAGE_3352 = 3352;
@@ -1859,6 +1868,7 @@ public final class ObjectID
public static final int TOMB_3354 = 3354;
public static final int WELL_3359 = 3359;
public static final int CRATE_3360 = 3360;
public static final int ORB_OF_LIGHT = 3361;
public static final int WINDOW_3362 = 3362;
public static final int ROCK_3364 = 3364;
public static final int PROTRUDING_ROCKS = 3365;
@@ -2149,8 +2159,7 @@ public final class ObjectID
public static final int MUSHROOM_3917 = 3917;
public static final int ELVEN_LAMP = 3918;
public static final int TWIGS = 3919;
public static final int TRIPWIRE = 3920;
public static final int TRIPWIRE_3921 = 3921;
public static final int TRIPWIRE = 3921;
public static final int STICKS = 3922;
public static final int LEAVES = 3923;
public static final int LEAVES_3924 = 3924;
@@ -2165,6 +2174,7 @@ public final class ObjectID
public static final int DENSE_FOREST = 3937;
public static final int DENSE_FOREST_3938 = 3938;
public static final int DENSE_FOREST_3939 = 3939;
public static final int TRACKS_3941 = 3941;
public static final int HUGE_GATE = 3944;
public static final int HUGE_GATE_3945 = 3945;
public static final int HUGE_GATE_3946 = 3946;
@@ -2180,7 +2190,7 @@ public final class ObjectID
public static final int CORPSE_3972 = 3972;
public static final int CORPSE_3973 = 3973;
public static final int CORPSE_3974 = 3974;
public static final int COAL_TAR = 3975;
public static final int TAR = 3975;
public static final int CATAPULT_3976 = 3976;
public static final int CATAPULTWINCH = 3977;
public static final int CATAPULTLEVER = 3978;
@@ -2208,7 +2218,7 @@ public final class ObjectID
public static final int ALTAR_4008 = 4008;
public static final int BARREL_4024 = 4024;
public static final int BARREL_4025 = 4025;
public static final int FRACTIONALISING_STILL = 4026;
public static final int FRACTIONALIZING_STILL = 4026;
public static final int STUMP = 4027;
public static final int TREE_4028 = 4028;
public static final int TREE_4029 = 4029;
@@ -3126,7 +3136,7 @@ public final class ObjectID
public static final int TABLE_5879 = 5879;
public static final int STOOL_5880 = 5880;
public static final int STANDING_TORCH_5881 = 5881;
public static final int MUD = 5883;
public static final int MUD_5883 = 5883;
public static final int SWAMP_5884 = 5884;
public static final int ROOTS_5885 = 5885;
public static final int ROOTS_5886 = 5886;
@@ -5108,7 +5118,7 @@ public final class ObjectID
public static final int YOUNG_TREE_8732 = 8732;
public static final int YOUNG_TREE_8733 = 8733;
public static final int NET_TRAP_8734 = 8734;
public static final int TAP_8737 = 8737;
public static final int BARREL_TAP = 8737;
public static final int ARDOUGNE_WALL_DOOR = 8738;
public static final int ARDOUGNE_WALL_DOOR_8739 = 8739;
public static final int ARDOUGNE_WALL_DOOR_8740 = 8740;
@@ -5148,12 +5158,19 @@ public final class ObjectID
public static final int DOOR_8792 = 8792;
public static final int DOOR_8793 = 8793;
public static final int GNOME_ON_A_RACK = 8795;
public static final int EMPTY_RACK = 8796;
public static final int AN_EMPTY_RACK = 8796;
public static final int CLOSED_CHEST_8797 = 8797;
public static final int OPEN_CHEST_8798 = 8798;
public static final int DESK_8799 = 8799;
public static final int CLOSED_CHEST_8800 = 8800;
public static final int APPLE_PRESS = 8807;
public static final int APPLE_PRESS_8808 = 8808;
public static final int GRAIN_SACKS = 8801;
public static final int GRAIN_SACKS_8802 = 8802;
public static final int GRAIN_SACKS_8803 = 8803;
public static final int GRAIN_SACKS_8804 = 8804;
public static final int GRAIN_SACKS_8805 = 8805;
public static final int GRAIN_SACKS_8806 = 8806;
public static final int APPLE_BARREL = 8807;
public static final int APPLE_BARREL_8808 = 8808;
public static final int ROTTEN_APPLE_PILE = 8809;
public static final int GATE_8810 = 8810;
public static final int GATE_8811 = 8811;
@@ -5174,8 +5191,6 @@ public final class ObjectID
public static final int STOCKS_8840 = 8840;
public static final int APPLE_TREE_8842 = 8842;
public static final int APPLE_TREE_8843 = 8843;
public static final int CITY_GATE_8844 = 8844;
public static final int CITY_GATE_8845 = 8845;
public static final int KELDA_HOPS_PATCH = 8861;
public static final int KELDA_HOPS_PATCH_8862 = 8862;
public static final int KELDA_HOPS_PATCH_8863 = 8863;
@@ -5707,8 +5722,8 @@ public final class ObjectID
public static final int LADDER_9742 = 9742;
public static final int SHIPS_LADDER_9744 = 9744;
public static final int SHIPS_LADDER_9745 = 9745;
public static final int CRYSTAL_DISPENSER = 9748;
public static final int CRYSTAL_DISPENSER_9749 = 9749;
public static final int CRYSTAL_COLLECTOR = 9748;
public static final int CRYSTAL_COLLECTOR_9749 = 9749;
public static final int CRYSTAL = 9751;
public static final int CRYSTAL_9752 = 9752;
public static final int OPEN_CHEST_9753 = 9753;
@@ -5775,7 +5790,7 @@ public final class ObjectID
public static final int PILLAR_OF_LIGHT_9936 = 9936;
public static final int PILLAR_OF_LIGHT_9937 = 9937;
public static final int PILLAR_OF_LIGHT_9973 = 9973;
public static final int CAVE_9975 = 9975;
public static final int CAVE_STAIRS_9975 = 9975;
public static final int CAVE_WALL_9976 = 9976;
public static final int TUNNEL_9977 = 9977;
public static final int LADDER_9978 = 9978;
@@ -6103,7 +6118,7 @@ public final class ObjectID
public static final int WHEELBARROW_10516 = 10516;
public static final int BANK_BOOTH_10517 = 10517;
public static final int CLOSED_BANK_BOOTH_10518 = 10518;
public static final int CHALICE_10521 = 10521;
public static final int CHALICE = 10521;
public static final int TAPESTRY = 10522;
public static final int STAIRCASE_10525 = 10525;
public static final int STAIRCASE_10526 = 10526;
@@ -8372,7 +8387,7 @@ public final class ObjectID
public static final int CRATE_14739 = 14739;
public static final int BARREL_14740 = 14740;
public static final int CRATES_14741 = 14741;
public static final int CRATES_14742 = 14742;
public static final int PILE_OF_CRATES = 14742;
public static final int SACK_14743 = 14743;
public static final int LADDER_14745 = 14745;
public static final int LADDER_14746 = 14746;
@@ -9352,7 +9367,7 @@ public final class ObjectID
public static final int GATE_16493 = 16493;
public static final int FLAGPOLE_16494 = 16494;
public static final int OBSTACLE_NET = 16499;
public static final int OBSTACLE_PIPE = 16500;
public static final int OBSTACLE_PIPE_16500 = 16500;
public static final int EXERCISE_MAT_16508 = 16508;
public static final int OBSTACLE_PIPE_16509 = 16509;
public static final int STRANGE_FLOOR = 16510;
@@ -11443,9 +11458,9 @@ public final class ObjectID
public static final int DEAD_EXPLORER = 20788;
public static final int LEVER_20789 = 20789;
public static final int ENTRANCE_20790 = 20790;
public static final int APPLE_PRESS_20791 = 20791;
public static final int APPLE_PRESS_20792 = 20792;
public static final int TAP_20794 = 20794;
public static final int APPLE_BARREL_20791 = 20791;
public static final int APPLE_BARREL_20792 = 20792;
public static final int BARREL_TAP_20794 = 20794;
public static final int EXERCISE_MAT_20801 = 20801;
public static final int TARGET_20802 = 20802;
public static final int TREE_20803 = 20803;
@@ -14273,9 +14288,9 @@ public final class ObjectID
public static final int BARREL_27221 = 27221;
public static final int BARREL_27222 = 27222;
public static final int CRATE_27223 = 27223;
public static final int CRATES_27224 = 27224;
public static final int CRATES_27225 = 27225;
public static final int CRATES_27226 = 27226;
public static final int CRATE_27224 = 27224;
public static final int CRATE_27225 = 27225;
public static final int CRATE_27226 = 27226;
public static final int BARREL_27227 = 27227;
public static final int BARREL_27228 = 27228;
public static final int BARREL_27229 = 27229;
@@ -18640,714 +18655,5 @@ public final class ObjectID
public static final int WEB_34898 = 34898;
public static final int SLASHED_WEB_34899 = 34899;
public static final int FOG_MARKER = 34905;
public static final int CRYSTAL_TREE_PATCH = 34907;
public static final int CRYSTAL_TREE_PATCH_34908 = 34908;
public static final int CRYSTAL_TREE_PATCH_34909 = 34909;
public static final int CRYSTAL_TREE_PATCH_34910 = 34910;
public static final int CRYSTAL_TREE = 34911;
public static final int CRYSTAL_TREE_34912 = 34912;
public static final int CRYSTAL_TREE_34913 = 34913;
public static final int CRYSTAL_TREE_34914 = 34914;
public static final int CRYSTAL_TREE_34915 = 34915;
public static final int CRYSTAL_TREE_34916 = 34916;
public static final int CRYSTAL_TREE_34917 = 34917;
public static final int CRYSTAL_TREE_34918 = 34918;
public static final int STAIRCASE_34923 = 34923;
public static final int STAIRCASE_34924 = 34924;
public static final int LADDER_34925 = 34925;
public static final int DOOR_34926 = 34926;
public static final int DOOR_34927 = 34927;
public static final int DOOR_34928 = 34928;
public static final int DOOR_34929 = 34929;
public static final int DOOR_34930 = 34930;
public static final int DOOR_34931 = 34931;
public static final int DOOR_34932 = 34932;
public static final int DEAD_TREE_34933 = 34933;
public static final int DEAD_TREE_34934 = 34934;
public static final int DEAD_TREE_34935 = 34935;
public static final int TABLE_34936 = 34936;
public static final int BUCKET_34937 = 34937;
public static final int SPEAR_WALL_34938 = 34938;
public static final int DRAWERS_34939 = 34939;
public static final int SACKS_34940 = 34940;
public static final int CHEST_34941 = 34941;
public static final int CHEST_34942 = 34942;
public static final int SINK_34943 = 34943;
public static final int TABLE_34944 = 34944;
public static final int PORTAL_34947 = 34947;
public static final int GANGPLANK_34948 = 34948;
public static final int GANGPLANK_34949 = 34949;
public static final int INCONSPICUOUS_CRATE_MASTER_34950 = 34950;
public static final int STASH_MASTER_34951 = 34951;
public static final int ROPE_34955 = 34955;
public static final int ROCKS_34956 = 34956;
public static final int ROCKS_34957 = 34957;
public static final int ELVEN_LAMP_34958 = 34958;
public static final int LOOM_34959 = 34959;
public static final int TRACKS_34960 = 34960;
public static final int TRACKS_34961 = 34961;
public static final int TALL_REEDS_34962 = 34962;
public static final int GUARD_34963 = 34963;
public static final int CAVE_34964 = 34964;
public static final int PILLAR_34965 = 34965;
public static final int PILLAR_34966 = 34966;
public static final int STATUE_OF_BAXTORIAN = 34967;
public static final int STATUE_PLINTH_34968 = 34968;
public static final int STATUE_OF_BAXTORIAN_34969 = 34969;
public static final int BUST_35033 = 35033;
public static final int BUST_35034 = 35034;
public static final int BUST_35035 = 35035;
public static final int BUST_35036 = 35036;
public static final int BUST_35037 = 35037;
public static final int BUST_35038 = 35038;
public static final int PORTAL_35075 = 35075;
public static final int CRYSTAL_DISPENSER_35076 = 35076;
public static final int PACK = 35077;
public static final int FLOATING_BOOK = 35078;
public static final int FLOATING_BOOK_35079 = 35079;
public static final int FLOATING_BOOK_35080 = 35080;
public static final int FLOATING_BOOK_35081 = 35081;
public static final int PILLAR_OF_LIGHT_35082 = 35082;
public static final int PILLAR_OF_LIGHT_35083 = 35083;
public static final int PILLAR_OF_LIGHT_35084 = 35084;
public static final int PILLAR_OF_LIGHT_35085 = 35085;
public static final int PILLAR_OF_LIGHT_35086 = 35086;
public static final int PILLAR_OF_LIGHT_35087 = 35087;
public static final int PILLAR_OF_LIGHT_35088 = 35088;
public static final int PILLAR_OF_LIGHT_35089 = 35089;
public static final int PILLAR_OF_LIGHT_35090 = 35090;
public static final int PILLAR_OF_LIGHT_35091 = 35091;
public static final int PILLAR_OF_LIGHT_35092 = 35092;
public static final int PILLAR_OF_LIGHT_35093 = 35093;
public static final int PILLAR_OF_LIGHT_35094 = 35094;
public static final int PILLAR_OF_LIGHT_35095 = 35095;
public static final int PILLAR_OF_LIGHT_35096 = 35096;
public static final int PILLAR_OF_LIGHT_35097 = 35097;
public static final int PILLAR_OF_LIGHT_35098 = 35098;
public static final int PILLAR_OF_LIGHT_35099 = 35099;
public static final int PILLAR_OF_LIGHT_35100 = 35100;
public static final int PILLAR_OF_LIGHT_35101 = 35101;
public static final int PILLAR_OF_LIGHT_35102 = 35102;
public static final int PILLAR_OF_LIGHT_35103 = 35103;
public static final int PILLAR_OF_LIGHT_35104 = 35104;
public static final int PILLAR_OF_LIGHT_35105 = 35105;
public static final int PILLAR_OF_LIGHT_35106 = 35106;
public static final int PILLAR_OF_LIGHT_35107 = 35107;
public static final int PILLAR_OF_LIGHT_35108 = 35108;
public static final int PILLAR_OF_LIGHT_35109 = 35109;
public static final int PILLAR_OF_LIGHT_35110 = 35110;
public static final int PILLAR_OF_LIGHT_35111 = 35111;
public static final int PILLAR_OF_LIGHT_35112 = 35112;
public static final int PILLAR_OF_LIGHT_35113 = 35113;
public static final int PILLAR_OF_LIGHT_35114 = 35114;
public static final int PILLAR_OF_LIGHT_35115 = 35115;
public static final int PILLAR_OF_LIGHT_35116 = 35116;
public static final int PILLAR_OF_LIGHT_35117 = 35117;
public static final int PILLAR_OF_LIGHT_35118 = 35118;
public static final int PILLAR_OF_LIGHT_35119 = 35119;
public static final int PILLAR_OF_LIGHT_35120 = 35120;
public static final int PILLAR_OF_LIGHT_35121 = 35121;
public static final int PILLAR_OF_LIGHT_35122 = 35122;
public static final int PILLAR_OF_LIGHT_35123 = 35123;
public static final int PILLAR_OF_LIGHT_35124 = 35124;
public static final int PILLAR_OF_LIGHT_35125 = 35125;
public static final int PILLAR_OF_LIGHT_35126 = 35126;
public static final int PILLAR_OF_LIGHT_35127 = 35127;
public static final int PILLAR_OF_LIGHT_35128 = 35128;
public static final int PILLAR_OF_LIGHT_35129 = 35129;
public static final int PILLAR_OF_LIGHT_35130 = 35130;
public static final int PILLAR_OF_LIGHT_35131 = 35131;
public static final int PILLAR_OF_LIGHT_35132 = 35132;
public static final int PILLAR_OF_LIGHT_35133 = 35133;
public static final int PILLAR_OF_LIGHT_35134 = 35134;
public static final int PILLAR_OF_LIGHT_35135 = 35135;
public static final int PILLAR_OF_LIGHT_35136 = 35136;
public static final int PILLAR_OF_LIGHT_35137 = 35137;
public static final int PILLAR_OF_LIGHT_35138 = 35138;
public static final int PILLAR_OF_LIGHT_35139 = 35139;
public static final int PILLAR_OF_LIGHT_35140 = 35140;
public static final int PILLAR_OF_LIGHT_35141 = 35141;
public static final int PILLAR_OF_LIGHT_35142 = 35142;
public static final int PILLAR_OF_LIGHT_35143 = 35143;
public static final int PILLAR_OF_LIGHT_35144 = 35144;
public static final int PILLAR_OF_LIGHT_35145 = 35145;
public static final int PILLAR_OF_LIGHT_35146 = 35146;
public static final int PILLAR_OF_LIGHT_35147 = 35147;
public static final int PILLAR_OF_LIGHT_35148 = 35148;
public static final int PILLAR_OF_LIGHT_35149 = 35149;
public static final int PILLAR_OF_LIGHT_35150 = 35150;
public static final int PILLAR_OF_LIGHT_35151 = 35151;
public static final int PILLAR_OF_LIGHT_35152 = 35152;
public static final int PILLAR_OF_LIGHT_35153 = 35153;
public static final int PILLAR_OF_LIGHT_35154 = 35154;
public static final int PILLAR_OF_LIGHT_35155 = 35155;
public static final int PILLAR_OF_LIGHT_35156 = 35156;
public static final int PILLAR_OF_LIGHT_35157 = 35157;
public static final int PILLAR_OF_LIGHT_35158 = 35158;
public static final int PILLAR_OF_LIGHT_35159 = 35159;
public static final int PILLAR_OF_LIGHT_35160 = 35160;
public static final int PILLAR_OF_LIGHT_35161 = 35161;
public static final int PILLAR_OF_LIGHT_35162 = 35162;
public static final int PILLAR_OF_LIGHT_35163 = 35163;
public static final int PILLAR_OF_LIGHT_35164 = 35164;
public static final int PILLAR_OF_LIGHT_35165 = 35165;
public static final int PILLAR_OF_LIGHT_35166 = 35166;
public static final int PILLAR_OF_LIGHT_35167 = 35167;
public static final int PILLAR_OF_LIGHT_35168 = 35168;
public static final int PILLAR_OF_LIGHT_35169 = 35169;
public static final int PILLAR_OF_LIGHT_35170 = 35170;
public static final int PILLAR_OF_LIGHT_35171 = 35171;
public static final int PILLAR_OF_LIGHT_35172 = 35172;
public static final int PILLAR_OF_LIGHT_35173 = 35173;
public static final int PILLAR_OF_LIGHT_35174 = 35174;
public static final int PILLAR_OF_LIGHT_35175 = 35175;
public static final int PILLAR_OF_LIGHT_35176 = 35176;
public static final int PILLAR_OF_LIGHT_35177 = 35177;
public static final int PILLAR_OF_LIGHT_35178 = 35178;
public static final int PILLAR_OF_LIGHT_35179 = 35179;
public static final int PILLAR_OF_LIGHT_35180 = 35180;
public static final int PILLAR_OF_LIGHT_35181 = 35181;
public static final int PILLAR_OF_LIGHT_35182 = 35182;
public static final int PILLAR_OF_LIGHT_35183 = 35183;
public static final int PILLAR_OF_LIGHT_35184 = 35184;
public static final int PILLAR_OF_LIGHT_35185 = 35185;
public static final int PILLAR_OF_LIGHT_35186 = 35186;
public static final int PILLAR_OF_LIGHT_35187 = 35187;
public static final int PILLAR_OF_LIGHT_35188 = 35188;
public static final int PILLAR_OF_LIGHT_35189 = 35189;
public static final int PILLAR_OF_LIGHT_35190 = 35190;
public static final int PILLAR_OF_LIGHT_35191 = 35191;
public static final int PILLAR_OF_LIGHT_35192 = 35192;
public static final int PILLAR_OF_LIGHT_35193 = 35193;
public static final int PILLAR_OF_LIGHT_35194 = 35194;
public static final int PILLAR_OF_LIGHT_35195 = 35195;
public static final int PILLAR_OF_LIGHT_35196 = 35196;
public static final int PILLAR_OF_LIGHT_35197 = 35197;
public static final int PILLAR_OF_LIGHT_35198 = 35198;
public static final int PILLAR_OF_LIGHT_35199 = 35199;
public static final int PILLAR_OF_LIGHT_35200 = 35200;
public static final int PILLAR_OF_LIGHT_35201 = 35201;
public static final int PILLAR_OF_LIGHT_35202 = 35202;
public static final int PILLAR_OF_LIGHT_35203 = 35203;
public static final int PILLAR_OF_LIGHT_35204 = 35204;
public static final int PILLAR_OF_LIGHT_35205 = 35205;
public static final int PILLAR_OF_LIGHT_35206 = 35206;
public static final int PILLAR_OF_LIGHT_35207 = 35207;
public static final int PILLAR_OF_LIGHT_35208 = 35208;
public static final int PILLAR_OF_LIGHT_35209 = 35209;
public static final int PILLAR_OF_LIGHT_35210 = 35210;
public static final int PILLAR_OF_LIGHT_35211 = 35211;
public static final int PILLAR_OF_LIGHT_35221 = 35221;
public static final int PILLAR_OF_LIGHT_35222 = 35222;
public static final int PILLAR_OF_LIGHT_35223 = 35223;
public static final int PILLAR_OF_LIGHT_35224 = 35224;
public static final int PILLAR_OF_LIGHT_35225 = 35225;
public static final int PILLAR_OF_LIGHT_35226 = 35226;
public static final int PILLAR_OF_LIGHT_35227 = 35227;
public static final int PILLAR_OF_LIGHT_35228 = 35228;
public static final int PILLAR_OF_LIGHT_35229 = 35229;
public static final int PILLAR_OF_LIGHT_35230 = 35230;
public static final int PILLAR_OF_LIGHT_35231 = 35231;
public static final int PILLAR_OF_LIGHT_35232 = 35232;
public static final int PILLAR_OF_LIGHT_35233 = 35233;
public static final int PILLAR_OF_LIGHT_35234 = 35234;
public static final int PILLAR_OF_LIGHT_35235 = 35235;
public static final int PILLAR_OF_LIGHT_35236 = 35236;
public static final int PILLAR_OF_LIGHT_35237 = 35237;
public static final int PILLAR_OF_LIGHT_35238 = 35238;
public static final int PILLAR_OF_LIGHT_35239 = 35239;
public static final int PILLAR_OF_LIGHT_35240 = 35240;
public static final int PILLAR_OF_LIGHT_35241 = 35241;
public static final int PILLAR_OF_LIGHT_35242 = 35242;
public static final int PILLAR_OF_LIGHT_35243 = 35243;
public static final int PILLAR_OF_LIGHT_35244 = 35244;
public static final int PILLAR_OF_LIGHT_35245 = 35245;
public static final int PILLAR_OF_LIGHT_35246 = 35246;
public static final int PILLAR_OF_LIGHT_35247 = 35247;
public static final int PILLAR_OF_LIGHT_35248 = 35248;
public static final int PILLAR_OF_LIGHT_35249 = 35249;
public static final int PILLAR_OF_LIGHT_35250 = 35250;
public static final int PILLAR_OF_LIGHT_35251 = 35251;
public static final int PILLAR_OF_LIGHT_35252 = 35252;
public static final int PILLAR_OF_LIGHT_35257 = 35257;
public static final int PILLAR_OF_LIGHT_35258 = 35258;
public static final int PILLAR_OF_LIGHT_35261 = 35261;
public static final int PILLAR_OF_LIGHT_35266 = 35266;
public static final int PILLAR_OF_LIGHT_35267 = 35267;
public static final int PILLAR_OF_LIGHT_35272 = 35272;
public static final int PILLAR_OF_LIGHT_35273 = 35273;
public static final int PILLAR_OF_LIGHT_35274 = 35274;
public static final int PILLAR_OF_LIGHT_35275 = 35275;
public static final int PILLAR_OF_LIGHT_35276 = 35276;
public static final int PILLAR_OF_LIGHT_35277 = 35277;
public static final int PILLAR_OF_LIGHT_35278 = 35278;
public static final int PILLAR_OF_LIGHT_35283 = 35283;
public static final int PILLAR_OF_LIGHT_35284 = 35284;
public static final int PILLAR_OF_LIGHT_35285 = 35285;
public static final int PILLAR_OF_LIGHT_35286 = 35286;
public static final int PILLAR_OF_LIGHT_35287 = 35287;
public static final int PILLAR_OF_LIGHT_35288 = 35288;
public static final int PILLAR_OF_LIGHT_35289 = 35289;
public static final int PILLAR_OF_LIGHT_35290 = 35290;
public static final int PILLAR_OF_LIGHT_35291 = 35291;
public static final int PILLAR_OF_LIGHT_35292 = 35292;
public static final int PILLAR_OF_LIGHT_35293 = 35293;
public static final int PILLAR_OF_LIGHT_35300 = 35300;
public static final int PILLAR_OF_LIGHT_35301 = 35301;
public static final int PILLAR_OF_LIGHT_35302 = 35302;
public static final int PILLAR_OF_LIGHT_35305 = 35305;
public static final int PILLAR_OF_LIGHT_35306 = 35306;
public static final int PILLAR_OF_LIGHT_35311 = 35311;
public static final int PILLAR_OF_LIGHT_35312 = 35312;
public static final int PILLAR_OF_LIGHT_35313 = 35313;
public static final int PILLAR_OF_LIGHT_35314 = 35314;
public static final int PILLAR_OF_LIGHT_35317 = 35317;
public static final int PILLAR_OF_LIGHT_35322 = 35322;
public static final int PILLAR_OF_LIGHT_35323 = 35323;
public static final int PILLAR_OF_LIGHT_35330 = 35330;
public static final int PILLAR_OF_LIGHT_35331 = 35331;
public static final int TELEPORT_PLATFORM = 35387;
public static final int TELEPORT_PLATFORM_35388 = 35388;
public static final int TELEPORT_PLATFORM_35389 = 35389;
public static final int BOOKS_35434 = 35434;
public static final int BOOKS_35435 = 35435;
public static final int BOOKS_35436 = 35436;
public static final int STEPS_35437 = 35437;
public static final int STEPS_35438 = 35438;
public static final int BOOK_CART = 35439;
public static final int BOOK_CART_35440 = 35440;
public static final int BUST_35441 = 35441;
public static final int BUST_35442 = 35442;
public static final int BUST_35443 = 35443;
public static final int BUST_35444 = 35444;
public static final int BUST_35445 = 35445;
public static final int BUST_35446 = 35446;
public static final int BOOKS_35447 = 35447;
public static final int BOOKS_35448 = 35448;
public static final int SEAL_OF_CADARN = 35451;
public static final int SEAL_OF_CADARN_35452 = 35452;
public static final int SEAL_OF_CRWYS = 35453;
public static final int SEAL_OF_CRWYS_35454 = 35454;
public static final int SEAL_OF_AMLODD = 35455;
public static final int SEAL_OF_AMLODD_35456 = 35456;
public static final int SEAL_OF_HEFIN = 35457;
public static final int SEAL_OF_HEFIN_35458 = 35458;
public static final int SEAL_OF_IORWERTH = 35459;
public static final int SEAL_OF_IORWERTH_35460 = 35460;
public static final int SEAL_OF_ITHELL = 35461;
public static final int SEAL_OF_ITHELL_35462 = 35462;
public static final int SEAL_OF_MEILYR = 35463;
public static final int SEAL_OF_MEILYR_35464 = 35464;
public static final int SEAL_OF_TRAHAEARN = 35465;
public static final int SEAL_OF_TRAHAEARN_35466 = 35466;
public static final int SEAL_OF_THE_FORGOTTEN = 35467;
public static final int STAIRCASE_35791 = 35791;
public static final int STAIRCASE_35792 = 35792;
public static final int GRATE_35793 = 35793;
public static final int BROKEN_GRATE = 35794;
public static final int CELL_DOOR_35795 = 35795;
public static final int CABINET_35796 = 35796;
public static final int BED_35797 = 35797;
public static final int BED_35798 = 35798;
public static final int LADDER_35799 = 35799;
public static final int BARREL_35800 = 35800;
public static final int BARREL_35801 = 35801;
public static final int FISHING_NET_35802 = 35802;
public static final int FISHING_NET_35803 = 35803;
public static final int BARRICADE_35804 = 35804;
public static final int BARRICADE_35805 = 35805;
public static final int BARRICADE_35806 = 35806;
public static final int MOURNER = 35807;
public static final int MOURNER_35808 = 35808;
public static final int MOURNER_35809 = 35809;
public static final int FIRE_35810 = 35810;
public static final int FIRE_35811 = 35811;
public static final int FIRE_35812 = 35812;
public static final int TRAPDOOR_35815 = 35815;
public static final int LADDER_35816 = 35816;
public static final int KNIGHT_OF_ARDOUGNE = 35817;
public static final int MAN = 35818;
public static final int MAN_35819 = 35819;
public static final int MAN_35820 = 35820;
public static final int MAN_35821 = 35821;
public static final int MAN_35822 = 35822;
public static final int MAN_35823 = 35823;
public static final int WOMAN = 35824;
public static final int WOMAN_35825 = 35825;
public static final int WOMAN_35826 = 35826;
public static final int WOMAN_35827 = 35827;
public static final int WOMAN_35828 = 35828;
public static final int WOMAN_35829 = 35829;
public static final int FARMING_PATCH = 35830;
public static final int HERB = 35831;
public static final int HERB_35832 = 35832;
public static final int HERB_35833 = 35833;
public static final int HERB_35834 = 35834;
public static final int CLOSED_CHEST_35835 = 35835;
public static final int OPEN_CHEST_35836 = 35836;
public static final int WALL_35837 = 35837;
public static final int BLOCKED_CREVICE = 35838;
public static final int BLOCKED_CREVICE_35839 = 35839;
public static final int CREVICE_35840 = 35840;
public static final int CREVICE_35841 = 35841;
public static final int FLOWERS_35842 = 35842;
public static final int STONE_35843 = 35843;
public static final int STEPPING_STONE_35844 = 35844;
public static final int CAVE_35845 = 35845;
public static final int CAVE_35846 = 35846;
public static final int CAVE_35847 = 35847;
public static final int CHEST_35848 = 35848;
public static final int CHEST_35849 = 35849;
public static final int ROCKS_35853 = 35853;
public static final int ROCKS_35854 = 35854;
public static final int ROCK_35855 = 35855;
public static final int ROCK_35856 = 35856;
public static final int ROCK_35857 = 35857;
public static final int ROCK_35858 = 35858;
public static final int ROCKS_35859 = 35859;
public static final int ROCKS_35860 = 35860;
public static final int MUSHROOMS_35861 = 35861;
public static final int MUSHROOMS_35862 = 35862;
public static final int MUSHROOM_35863 = 35863;
public static final int MUSHROOM_35864 = 35864;
public static final int MUSHROOM_35865 = 35865;
public static final int MUSHROOM_35866 = 35866;
public static final int ELVEN_LAMP_35867 = 35867;
public static final int ELVEN_LAMP_35868 = 35868;
public static final int BROKEN_CART_35869 = 35869;
public static final int BROKEN_CART_35870 = 35870;
public static final int BARRICADE_35871 = 35871;
public static final int SACK_35872 = 35872;
public static final int TABLE_35873 = 35873;
public static final int BENCH_35874 = 35874;
public static final int COOKING_POTS_35875 = 35875;
public static final int COOKING_POTS_35876 = 35876;
public static final int COOKING_RANGE_35877 = 35877;
public static final int SYMBOL_35878 = 35878;
public static final int SYMBOL_35879 = 35879;
public static final int WELL_35881 = 35881;
public static final int BROKEN_WELL = 35882;
public static final int STATUE_SPACE_35883 = 35883;
public static final int STATUE_35884 = 35884;
public static final int DWARF_MULTICANNON_35885 = 35885;
public static final int DWARF_MULTICANNON_35886 = 35886;
public static final int HOLE_35887 = 35887;
public static final int HOLE_35888 = 35888;
public static final int HOLE_35889 = 35889;
public static final int CATAPULT_35890 = 35890;
public static final int CATAPULT_35891 = 35891;
public static final int PILLAR_OF_LIGHT_35892 = 35892;
public static final int PILLAR_OF_LIGHT_35893 = 35893;
public static final int PILLAR_OF_LIGHT_35894 = 35894;
public static final int TUNNEL_35896 = 35896;
public static final int BLOCKED_TUNNEL_35897 = 35897;
public static final int TUNNEL_35898 = 35898;
public static final int TUNNEL_35899 = 35899;
public static final int FRAGMENT_OF_SEREN = 35900;
public static final int FRAGMENT_OF_SEREN_35901 = 35901;
public static final int FIRE_35912 = 35912;
public static final int FIRE_35913 = 35913;
public static final int GRAVESTONE_35914 = 35914;
public static final int DAISIES_35915 = 35915;
public static final int DEAD_ELF = 35916;
public static final int DEAD_ELF_35917 = 35917;
public static final int DEAD_ELF_35918 = 35918;
public static final int DEAD_ELF_35919 = 35919;
public static final int DEAD_ELF_35920 = 35920;
public static final int DEAD_ELF_35921 = 35921;
public static final int DEAD_ELF_35922 = 35922;
public static final int DEAD_ELF_35923 = 35923;
public static final int DEAD_ELF_35924 = 35924;
public static final int DEAD_ELF_35925 = 35925;
public static final int DEAD_ELF_35926 = 35926;
public static final int DEAD_ELF_35927 = 35927;
public static final int DEAD_ELF_35928 = 35928;
public static final int DEAD_ELF_35929 = 35929;
public static final int DEAD_ELF_35930 = 35930;
public static final int DOOR_35931 = 35931;
public static final int DOOR_35932 = 35932;
public static final int DOOR_35933 = 35933;
public static final int DOOR_35934 = 35934;
public static final int DOOR_35935 = 35935;
public static final int DOOR_35936 = 35936;
public static final int DAIRY_CHURN_35937 = 35937;
public static final int ABANDONED_EQUIPMENT = 35938;
public static final int CRATE_35939 = 35939;
public static final int CAVE_35940 = 35940;
public static final int PIPE_35941 = 35941;
public static final int PIPE_35942 = 35942;
public static final int ORB_OF_LIGHT = 35944;
public static final int CAULDRON_35945 = 35945;
public static final int CAULDRON_35946 = 35946;
public static final int WATCHTOWER = 35947;
public static final int WATCHTOWER_35948 = 35948;
public static final int SPIRIT_TREE_35949 = 35949;
public static final int SPIRIT_TREE_35950 = 35950;
public static final int GRAIN_SACKS = 35954;
public static final int GRAIN_SACKS_35955 = 35955;
public static final int GRAIN_SACKS_35956 = 35956;
public static final int GRAIN_SACKS_35957 = 35957;
public static final int EMPTY_RACK_35958 = 35958;
public static final int DESK_35959 = 35959;
public static final int DESK_35960 = 35960;
public static final int CLOSED_CHEST_35961 = 35961;
public static final int OPEN_CHEST_35962 = 35962;
public static final int DESK_35963 = 35963;
public static final int CORRUPTED_SCEPTRE = 35964;
public static final int TELEPORT_PLATFORM_35965 = 35965;
public static final int SINGING_BOWL_35966 = 35966;
public static final int CORRUPT_DEPOSIT = 35967;
public static final int CORRUPT_DEPOSIT_DEPLETED = 35968;
public static final int PHREN_ROOTS = 35969;
public static final int PHREN_ROOTS_DEPLETED = 35970;
public static final int FISHING_SPOT_35971 = 35971;
public static final int FISHING_SPOT_DEPLETED = 35972;
public static final int GRYM_ROOT = 35973;
public static final int GRYM_ROOT_DEPLETED = 35974;
public static final int LINUM_TIRINUM = 35975;
public static final int LINUM_TIRINUM_DEPLETED = 35976;
public static final int TOOL_STORAGE = 35977;
public static final int CRYSTAL_SINGING_RECIPES = 35978;
public static final int EGNIOL_POTIONS = 35979;
public static final int RANGE_35980 = 35980;
public static final int WATER_PUMP_35981 = 35981;
public static final int BARRIER_35982 = 35982;
public static final int BARRIER_35983 = 35983;
public static final int TELEPORT_PLATFORM_35984 = 35984;
public static final int TELEPORT_PLATFORM_35985 = 35985;
public static final int THE_GAUNTLET = 35986;
public static final int REWARD_CHEST_35988 = 35988;
public static final int REWARD_CHEST_35989 = 35989;
public static final int ILLUMINATED_SYMBOL = 35992;
public static final int INACTIVE_SYMBOL = 35994;
public static final int NODE_35998 = 35998;
public static final int NODE_35999 = 35999;
public static final int SCOREBOARD_36060 = 36060;
public static final int CRYSTAL_SCEPTRE = 36061;
public static final int TELEPORT_PLATFORM_36062 = 36062;
public static final int SINGING_BOWL_36063 = 36063;
public static final int CRYSTAL_DEPOSIT = 36064;
public static final int CRYSTAL_DEPOSIT_DEPLETED = 36065;
public static final int PHREN_ROOTS_36066 = 36066;
public static final int PHREN_ROOTS_DEPLETED_36067 = 36067;
public static final int FISHING_SPOT_36068 = 36068;
public static final int FISHING_SPOT_DEPLETED_36069 = 36069;
public static final int GRYM_ROOT_36070 = 36070;
public static final int GRYM_ROOT_DEPLETED_36071 = 36071;
public static final int LINUM_TIRINUM_36072 = 36072;
public static final int LINUM_TIRINUM_DEPLETED_36073 = 36073;
public static final int TOOL_STORAGE_36074 = 36074;
public static final int CRYSTAL_SINGING_RECIPES_36075 = 36075;
public static final int EGNIOL_POTIONS_36076 = 36076;
public static final int RANGE_36077 = 36077;
public static final int WATER_PUMP_36078 = 36078;
public static final int BARRIER_36079 = 36079;
public static final int BARRIER_36080 = 36080;
public static final int GAUNTLET_PORTAL = 36081;
public static final int TELEPORT_PLATFORM_36082 = 36082;
public static final int THE_GAUNTLET_36083 = 36083;
public static final int THE_GAUNTLET_36084 = 36084;
public static final int BANK_DEPOSIT_BOX_36086 = 36086;
public static final int REWARD_CHEST_36087 = 36087;
public static final int REWARD_CHEST_36088 = 36088;
public static final int ILLUMINATED_SYMBOL_36095 = 36095;
public static final int INACTIVE_SYMBOL_36097 = 36097;
public static final int NODE_36101 = 36101;
public static final int NODE_36102 = 36102;
public static final int ROCK_FORMATION_GLOWING = 36192;
public static final int ROCK_FORMATION = 36193;
public static final int ROCK_FORMATION_DEPLETED = 36194;
public static final int FURNACE_36195 = 36195;
public static final int ALTAR_36196 = 36196;
public static final int TELEPORT_PLATFORM_36197 = 36197;
public static final int TELEPORT_PLATFORM_36198 = 36198;
public static final int DEMONIC_SYMBOL = 36199;
public static final int DEMONIC_SYMBOL_36200 = 36200;
public static final int BARRIER_36201 = 36201;
public static final int ROCKS_36202 = 36202;
public static final int ROCKS_36203 = 36203;
public static final int ROCKS_36204 = 36204;
public static final int ROCKS_36205 = 36205;
public static final int ROCKS_36206 = 36206;
public static final int ROCKS_36207 = 36207;
public static final int ROCKS_36208 = 36208;
public static final int ROCKS_36209 = 36209;
public static final int ROCKS_36210 = 36210;
public static final int STEPS_36215 = 36215;
public static final int CRYSTAL_OUTCROP_36217 = 36217;
public static final int CRYSTAL_OUTCROP_36218 = 36218;
public static final int MINE_CART_36219 = 36219;
public static final int LADDER_36221 = 36221;
public static final int TIGHTROPE_36225 = 36225;
public static final int CHIMNEY_36227 = 36227;
public static final int ROOF_EDGE = 36228;
public static final int DARK_HOLE_36229 = 36229;
public static final int LADDER_36231 = 36231;
public static final int LADDER_36232 = 36232;
public static final int ROPE_BRIDGE_36233 = 36233;
public static final int TIGHTROPE_36234 = 36234;
public static final int ROPE_BRIDGE_36235 = 36235;
public static final int TIGHTROPE_36236 = 36236;
public static final int TIGHTROPE_36237 = 36237;
public static final int DARK_HOLE_36238 = 36238;
public static final int PORTAL_36240 = 36240;
public static final int DOOR_36253 = 36253;
public static final int DOOR_36254 = 36254;
public static final int CRYSTAL_STAIRCASE = 36387;
public static final int CRYSTAL_STAIRCASE_36390 = 36390;
public static final int TELEPORT_PLATFORM_36490 = 36490;
public static final int MEMORIAM_DEVICE = 36491;
public static final int ELVEN_LAMP_36492 = 36492;
public static final int CRYSTAL_SPIRE = 36493;
public static final int BENCH_36494 = 36494;
public static final int STAFF_BARREL = 36495;
public static final int WAND_RACK = 36496;
public static final int DISPLAY_CASE_36497 = 36497;
public static final int SHOP_COUNTER_36498 = 36498;
public static final int SCROLL = 36499;
public static final int SCROLL_36500 = 36500;
public static final int SIGN_36501 = 36501;
public static final int SHELVES_36502 = 36502;
public static final int SHELVES_36503 = 36503;
public static final int SHELVES_36504 = 36504;
public static final int SHELVES_36505 = 36505;
public static final int RUNE_POUCHES = 36506;
public static final int CITY_GATE_36518 = 36518;
public static final int CITY_GATE_36519 = 36519;
public static final int CITY_GATE_36520 = 36520;
public static final int CITY_GATE_36521 = 36521;
public static final int CITY_GATE_36522 = 36522;
public static final int CITY_GATE_36523 = 36523;
public static final int SINGING_BOWL_36552 = 36552;
public static final int BELL_36553 = 36553;
public static final int BELL_MECHANISM_36554 = 36554;
public static final int FURNACE_36555 = 36555;
public static final int CAVE_ENTRANCE_36556 = 36556;
public static final int CLOSED_CHEST_36557 = 36557;
public static final int CHEST_36558 = 36558;
public static final int BANK_BOOTH_36559 = 36559;
public static final int CLOSED_BANK_BOOTH_36560 = 36560;
public static final int ARMOUR_STAND_36561 = 36561;
public static final int SAND_PIT_36563 = 36563;
public static final int TABLE_36564 = 36564;
public static final int DUMMY_36566 = 36566;
public static final int TABLE_SAW = 36567;
public static final int MARKET_STALL_36568 = 36568;
public static final int SILK_STALL_36569 = 36569;
public static final int SILVER_STALL_36570 = 36570;
public static final int GEM_STALL_36571 = 36571;
public static final int SPICE_STALL_36572 = 36572;
public static final int AMLODD_BANNER = 36573;
public static final int CADARN_BANNER = 36574;
public static final int CRWYS_BANNER = 36575;
public static final int HEFIN_BANNER = 36576;
public static final int IORWERTH_BANNER = 36577;
public static final int ITHELL_BANNER = 36578;
public static final int MEILYR_BANNER = 36579;
public static final int TRAHAEARN_BANNER = 36580;
public static final int ELVEN_CRYSTAL_CHEST = 36581;
public static final int ELVEN_CRYSTAL_CHEST_36582 = 36582;
public static final int SAILS_36583 = 36583;
public static final int MILL_36586 = 36586;
public static final int MILL_36587 = 36587;
public static final int MILL_36588 = 36588;
public static final int MILL_36589 = 36589;
public static final int FLOUR_BIN_36590 = 36590;
public static final int HOPPER_36591 = 36591;
public static final int HOPPER_CONTROLS_36592 = 36592;
public static final int CENOTAPH = 36593;
public static final int CORPSES = 36594;
public static final int STATUE_36595 = 36595;
public static final int STATUE_36596 = 36596;
public static final int STEPS_36597 = 36597;
public static final int CAVE_36598 = 36598;
public static final int SIGN_36600 = 36600;
public static final int CRYSTAL_OUTCROP_36604 = 36604;
public static final int BUSH_36605 = 36605;
public static final int COOKING_POTS_36606 = 36606;
public static final int ROCK_36607 = 36607;
public static final int BOOKCASE_36608 = 36608;
public static final int FLAGPOLE_36609 = 36609;
public static final int CHAIR_36610 = 36610;
public static final int DESK_36611 = 36611;
public static final int STOOL_36612 = 36612;
public static final int STOOL_36613 = 36613;
public static final int TELEPORT_PLATFORM_36614 = 36614;
public static final int TELEPORT_PLATFORM_36615 = 36615;
public static final int BOOKCASE_36616 = 36616;
public static final int BOOKCASE_36617 = 36617;
public static final int BOOKCASE_36618 = 36618;
public static final int BOOKCASE_36623 = 36623;
public static final int BOOKCASE_36624 = 36624;
public static final int BOOKCASE_36625 = 36625;
public static final int BOOKCASE_36626 = 36626;
public static final int BOOKCASE_36627 = 36627;
public static final int BOOKCASE_36628 = 36628;
public static final int BOOKCASE_36629 = 36629;
public static final int BOOKCASE_36630 = 36630;
public static final int BOOKCASE_36631 = 36631;
public static final int BOOKCASE_36632 = 36632;
public static final int BOOKCASE_36633 = 36633;
public static final int BOOKCASE_36634 = 36634;
public static final int BOOKCASE_36635 = 36635;
public static final int BOOKCASE_36636 = 36636;
public static final int BOOKCASE_36637 = 36637;
public static final int BOOKCASE_36638 = 36638;
public static final int BOOKCASE_36639 = 36639;
public static final int BOOKCASE_36640 = 36640;
public static final int BOOKCASE_36641 = 36641;
public static final int BOOKCASE_36642 = 36642;
public static final int BOOKCASE_36643 = 36643;
public static final int BOOKCASE_36644 = 36644;
public static final int BOOKCASE_36645 = 36645;
public static final int BOOKCASE_36646 = 36646;
public static final int BOOKCASE_36647 = 36647;
public static final int BOOKCASE_36648 = 36648;
public static final int BOOKCASE_36649 = 36649;
public static final int BOOKCASE_36650 = 36650;
public static final int BOOKCASE_36651 = 36651;
public static final int BOOKCASE_36652 = 36652;
public static final int BOOKCASE_36653 = 36653;
public static final int BOOKCASE_36654 = 36654;
public static final int BOOKS_36660 = 36660;
public static final int BOOKS_36661 = 36661;
public static final int BOOKS_36662 = 36662;
public static final int BOOK_CART_36663 = 36663;
public static final int BOOK_CART_36664 = 36664;
public static final int BOOK_CART_36665 = 36665;
public static final int BUST_36666 = 36666;
public static final int BUST_36667 = 36667;
public static final int BUST_36668 = 36668;
public static final int BUST_36669 = 36669;
public static final int BUST_36670 = 36670;
public static final int BUST_36671 = 36671;
public static final int TREE_36672 = 36672;
public static final int TREE_STUMP_36673 = 36673;
public static final int TREE_36674 = 36674;
public static final int TREE_STUMP_36675 = 36675;
public static final int TREE_36676 = 36676;
public static final int TREE_36677 = 36677;
public static final int TREE_STUMP_36678 = 36678;
public static final int TREE_36679 = 36679;
public static final int TREE_STUMP_36680 = 36680;
public static final int MAPLE_TREE_36681 = 36681;
public static final int MAPLE_TREE_36682 = 36682;
public static final int YEW_36683 = 36683;
public static final int TREE_STUMP_36684 = 36684;
public static final int MAGIC_TREE_36685 = 36685;
public static final int TEAK_36686 = 36686;
public static final int TREE_STUMP_36687 = 36687;
public static final int MAHOGANY_36688 = 36688;
public static final int TREE_STUMP_36689 = 36689;
public static final int CAVE_36690 = 36690;
public static final int STEPS_36691 = 36691;
public static final int TIGHT_GAP = 36692;
public static final int TIGHT_GAP_36693 = 36693;
public static final int TIGHT_GAP_36694 = 36694;
public static final int TIGHT_GAP_36695 = 36695;
public static final int EYE = 36698;
public static final int RANGE_36699 = 36699;
public static final int CRYSTAL_SINGING_RECIPES_37344 = 37344;
public static final int ARCHERY_TARGET_37345 = 37345;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/TileItem.java
-15
View File
@@ -22,25 +22,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
<<<<<<< HEAD:runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java
package net.runelite.api.events;
=======
package net.runelite.api;
>>>>>>> Upstream/master:runelite-api/src/main/java/net/runelite/api/TileItem.java
/**
* Represents an item inside an {@link ItemLayer}.
*/
<<<<<<< HEAD:runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java
public class WidgetPositioned
{
public static final WidgetPositioned INSTANCE = new WidgetPositioned();
private WidgetPositioned()
{
// noop
}
=======
public interface TileItem extends Renderable
{
/**
@@ -57,5 +43,4 @@ public interface TileItem extends Renderable
* @return the items quantity
*/
int getQuantity();
>>>>>>> Upstream/master:runelite-api/src/main/java/net/runelite/api/TileItem.java
}
runelite-api/src/main/java/net/runelite/api/events/ItemDespawned.java
-4
View File
@@ -24,12 +24,8 @@
*/
package net.runelite.api.events;
<<<<<<< HEAD
import net.runelite.api.Item;
=======
import lombok.Value;
import net.runelite.api.TileItem;
>>>>>>> Upstream/master
import net.runelite.api.Tile;
import lombok.Value;
runelite-api/src/main/java/net/runelite/api/events/ItemQuantityChanged.java
-4
View File
@@ -24,12 +24,8 @@
*/
package net.runelite.api.events;
<<<<<<< HEAD
import net.runelite.api.Item;
=======
import lombok.Value;
import net.runelite.api.TileItem;
>>>>>>> Upstream/master
import net.runelite.api.Tile;
import lombok.Value;
runelite-api/src/main/java/net/runelite/api/events/ItemSpawned.java
-4
View File
@@ -24,12 +24,8 @@
*/
package net.runelite.api.events;
<<<<<<< HEAD
import net.runelite.api.Item;
=======
import lombok.Value;
import net.runelite.api.TileItem;
>>>>>>> Upstream/master
import net.runelite.api.Tile;
import lombok.Value;
runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java
+39
View File
@@ -0,0 +1,39 @@
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.api.events;
/**
* An event where the position of a {@link net.runelite.api.widgets.Widget}
* relative to its parent has changed.
*/
public class WidgetPositioned
{
public static final WidgetPositioned INSTANCE = new WidgetPositioned();
private WidgetPositioned()
{
// noop
}
}
runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
+1 -5
View File
@@ -411,12 +411,8 @@ public class ItemManager
* @param itemId item id
* @return item composition
*/
<<<<<<< HEAD
public ItemDefinition getItemDefinition(int itemId)
=======
@Nonnull
public ItemComposition getItemComposition(int itemId)
>>>>>>> Upstream/master
public ItemDefinition getItemDefinition(int itemId)
{
assert client.isClientThread() : "getItemDefinition must be called on client thread";
return itemDefinitions.getUnchecked(itemId);
runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxItemSearch.java
+7 -7
View File
@@ -34,7 +34,7 @@ import java.util.function.Consumer;
import javax.inject.Singleton;
import lombok.Getter;
import net.runelite.api.Client;
import net.runelite.api.ItemComposition;
import net.runelite.api.ItemDefinition;
import net.runelite.api.widgets.ItemQuantityMode;
import net.runelite.api.widgets.JavaScriptCallback;
import net.runelite.api.widgets.Widget;
@@ -59,7 +59,7 @@ public class ChatboxItemSearch extends ChatboxTextInput
private final ItemManager itemManager;
private final Client client;
private Map<Integer, ItemComposition> results = new LinkedHashMap<>();
private Map<Integer, ItemDefinition> results = new LinkedHashMap<>();
private String tooltipText;
private int index = -1;
@@ -121,7 +121,7 @@ public class ChatboxItemSearch extends ChatboxTextInput
int x = PADDING;
int y = PADDING * 3;
int idx = 0;
for (ItemComposition itemComposition : results.values())
for (ItemDefinition itemDefinition : results.values())
{
Widget item = container.createChild(-1, WidgetType.GRAPHIC);
item.setXPositionMode(WidgetPositionMode.ABSOLUTE_LEFT);
@@ -130,8 +130,8 @@ public class ChatboxItemSearch extends ChatboxTextInput
item.setOriginalY(y + FONT_SIZE * 2);
item.setOriginalHeight(ICON_HEIGHT);
item.setOriginalWidth(ICON_WIDTH);
item.setName("<col=ff9040>" + itemComposition.getName());
item.setItemId(itemComposition.getId());
item.setName("<col=ff9040>" + itemDefinition.getName());
item.setItemId(itemDefinition.getId());
item.setItemQuantity(10000);
item.setItemQuantityMode(ItemQuantityMode.NEVER);
item.setBorderType(1);
@@ -152,7 +152,7 @@ public class ChatboxItemSearch extends ChatboxTextInput
{
if (onItemSelected != null)
{
onItemSelected.accept(itemComposition.getId());
onItemSelected.accept(itemDefinition.getId());
}
chatboxPanelManager.close();
@@ -289,7 +289,7 @@ public class ChatboxItemSearch extends ChatboxTextInput
for (int i = 0; i < client.getItemCount() && results.size() < MAX_RESULTS; i++)
{
ItemComposition itemComposition = itemManager.getItemComposition(itemManager.canonicalize(i));
ItemDefinition itemComposition = itemManager.getItemDefinition(itemManager.canonicalize(i));
String name = itemComposition.getName();
// The client assigns "null" to item names of items it doesn't know about
if (!name.equals("null") && name.toLowerCase().contains(search))
runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
+1 -3
View File
@@ -114,6 +114,7 @@ public class TabInterface
private static final int SCROLL_TICK = 500;
private static final int INCINERATOR_WIDTH = 48;
private static final int INCINERATOR_HEIGHT = 39;
private static TagTab iconToSet;
private final Client client;
private final ClientThread clientThread;
@@ -592,7 +593,6 @@ public class TabInterface
bankSearch.search(InputType.NONE, rememberedSearch, true);
}
<<<<<<< HEAD
if (iconToSet != null)
{
if (event.getOption().startsWith(CHANGE_ICON + " ("))
@@ -612,8 +612,6 @@ public class TabInterface
iconToSet = null;
}
=======
>>>>>>> Upstream/master
if (activeTab != null
&& event.getOption().equals("Search")
&& client.getWidget(WidgetInfo.BANK_SEARCH_BUTTON_BACKGROUND).getSpriteId() != SpriteID.EQUIPMENT_SLOT_SELECTED)
runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java
+6 -29
View File
@@ -27,25 +27,16 @@ package net.runelite.client.plugins.chatboxperformance;
import javax.inject.Inject;
import javax.inject.Singleton;
import net.runelite.api.Client;
<<<<<<< HEAD
import net.runelite.api.events.WidgetPositioned;
=======
import net.runelite.api.GameState;
import net.runelite.api.ScriptID;
import net.runelite.api.events.ScriptCallbackEvent;
import net.runelite.api.widgets.WidgetType;
>>>>>>> Upstream/master
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.api.widgets.WidgetPositionMode;
import net.runelite.api.widgets.WidgetSizeMode;
<<<<<<< HEAD
import net.runelite.api.widgets.WidgetType;
import net.runelite.client.eventbus.EventBus;
=======
import net.runelite.client.callback.ClientThread;
import net.runelite.client.eventbus.Subscribe;
>>>>>>> Upstream/master
import net.runelite.client.eventbus.EventBus;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
@@ -60,29 +51,15 @@ public class ChatboxPerformancePlugin extends Plugin
private Client client;
@Inject
<<<<<<< HEAD
private ClientThread clientThread;
@Inject
private EventBus eventBus;
@Override
protected void startUp() throws Exception
{
eventBus.subscribe(WidgetPositioned.class, this, this::onWidgetPositioned);
}
@Override
protected void shutDown() throws Exception
{
eventBus.unregister(this);
}
private void onWidgetPositioned(WidgetPositioned event)
=======
private ClientThread clientThread;
@Override
public void startUp()
>>>>>>> Upstream/master
{
eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent);
if (client.getGameState() == GameState.LOGGED_IN)
{
clientThread.invokeLater(() -> client.runScript(ScriptID.RESET_CHATBOX_INPUT));
@@ -96,9 +73,9 @@ public class ChatboxPerformancePlugin extends Plugin
{
clientThread.invokeLater(() -> client.runScript(ScriptID.RESET_CHATBOX_INPUT));
}
eventBus.unregister(this);
}
@Subscribe
private void onScriptCallbackEvent(ScriptCallbackEvent ev)
{
if (!"chatboxBackgroundBuilt".equals(ev.getEventName()))
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java
+1 -1
View File
@@ -108,7 +108,7 @@ public enum HotColdLocation
KANDARIN_KHAZARD_BATTLEFIELD(new WorldPoint(2518, 3249, 0), KANDARIN, "Khazard Battlefield, in the small ruins south of tracker gnome 2."),
KANDARIN_WEST_ARDY(new WorldPoint(2533, 3320, 0), KANDARIN, "West Ardougne, near the staircase outside the Civic Office."),
KANDARIN_SW_TREE_GNOME_STRONGHOLD(new WorldPoint(2411, 3431, 0), KANDARIN, "South-west Tree Gnome Stronghold"),
KANDARIN_OUTPOST(new WorldPoint(2457, 3362, 0), KANDARIN, "South of the Tree Gnome Stronghold, north-east of the Outpost."),
KANDARIN_OUTPOST(new WorldPoint(2458, 3364, 0), KANDARIN, "South of the Tree Gnome Stronghold, north-east of the Outpost."),
KANDARIN_BAXTORIAN_FALLS(new WorldPoint(2534, 3479, 0), KANDARIN, "South-east of Almera's house on Baxtorian Falls."),
KANDARIN_BA_AGILITY_COURSE(new WorldPoint(2536, 3546, 0), KANDARIN, "Inside the Barbarian Agility Course. Completion of Alfred Grimhand's Barcrawl is required."),
KARAMJA_MUSA_POINT(new WorldPoint(2914, 3168, 0), KARAMJA, "Musa Point, banana plantation."),
runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java
+4 -6
View File
@@ -86,7 +86,6 @@ import static net.runelite.api.NpcID.FISHING_SPOT_8525;
import static net.runelite.api.NpcID.FISHING_SPOT_8526;
import static net.runelite.api.NpcID.FISHING_SPOT_8527;
import static net.runelite.api.NpcID.ROD_FISHING_SPOT;
import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1506;
import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1508;
import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1509;
import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1513;
@@ -128,11 +127,10 @@ enum FishingSpot
FISHING_SPOT_4316
),
SALMON("Salmon, Trout", ItemID.RAW_SALMON,
ROD_FISHING_SPOT, ROD_FISHING_SPOT_1506, ROD_FISHING_SPOT_1508,
ROD_FISHING_SPOT_1509, ROD_FISHING_SPOT_1513, ROD_FISHING_SPOT_1515,
ROD_FISHING_SPOT_1516, ROD_FISHING_SPOT_1526, ROD_FISHING_SPOT_1527,
ROD_FISHING_SPOT_7463, ROD_FISHING_SPOT_7464, ROD_FISHING_SPOT_7468,
ROD_FISHING_SPOT_8524
ROD_FISHING_SPOT, ROD_FISHING_SPOT_1508, ROD_FISHING_SPOT_1509,
ROD_FISHING_SPOT_1513, ROD_FISHING_SPOT_1515, ROD_FISHING_SPOT_1516,
ROD_FISHING_SPOT_1526, ROD_FISHING_SPOT_1527, ROD_FISHING_SPOT_7463,
ROD_FISHING_SPOT_7464, ROD_FISHING_SPOT_7468, ROD_FISHING_SPOT_8524
),
BARB_FISH("Sturgeon, Salmon, Trout", ItemID.LEAPING_STURGEON,
FISHING_SPOT_1542, FISHING_SPOT_7323
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsConfig.java
+6 -5
View File
@@ -281,6 +281,7 @@ public interface GroundItemsConfig extends Config
{
return false;
}
@ConfigItem(
keyName = "itemHighlightMode",
name = "Item Highlight Mode",
@@ -616,11 +617,11 @@ public interface GroundItemsConfig extends Config
}
@ConfigItem(
keyName = "showTimer",
name = "Show ground item tick countdown timer",
description = "Shows how many ticks left until disappearing.",
position = 48,
parent = "miscStub"
keyName = "showTimer",
name = "Show ground item tick countdown timer",
description = "Shows how many ticks left until disappearing.",
position = 48,
parent = "miscStub"
)
default boolean showTimer()
{
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
+12 -37
View File
@@ -52,12 +52,7 @@ import lombok.Getter;
import lombok.Setter;
import net.runelite.api.Client;
import net.runelite.api.GameState;
<<<<<<< HEAD
import net.runelite.api.Item;
import net.runelite.api.ItemDefinition;
=======
import net.runelite.api.ItemComposition;
>>>>>>> Upstream/master
import net.runelite.api.ItemID;
import net.runelite.api.ItemLayer;
import net.runelite.api.MenuAction;
@@ -72,11 +67,11 @@ import net.runelite.api.events.ClientTick;
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.FocusChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.ItemDespawned;
import net.runelite.api.events.ItemQuantityChanged;
import net.runelite.api.events.ItemSpawned;
import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.events.GameTick;
import net.runelite.client.Notifier;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.EventBus;
@@ -110,9 +105,10 @@ import net.runelite.client.util.Text;
@Singleton
public class GroundItemsPlugin extends Plugin
{
@Getter(AccessLevel.PUBLIC)
public static final Map<GroundItem.GroundItemKey, GroundItem> collectedGroundItems = new LinkedHashMap<>();
// ItemID for coins
private static final int COINS = ItemID.COINS_995;
// items stay on the ground for 30 mins in an instance
private static final int INSTANCE_DURATION_MILLIS = 45 * 60 * 1000;
private static final int INSTANCE_DURATION_TICKS = (int) floor(30 * 60 / 0.6);
@@ -124,7 +120,6 @@ public class GroundItemsPlugin extends Plugin
private static final int DEATH_DURATION_TICKS = (int) floor(60 * 60 / 0.6);
private static final int NORMAL_DURATION_MILLIS = 60 * 1000;
private static final int NORMAL_DURATION_TICKS = (int) floor(60 / 0.6);
// Ground item menu options
private static final int FIRST_OPTION = MenuAction.GROUND_ITEM_FIRST_OPTION.getId();
private static final int SECOND_OPTION = MenuAction.GROUND_ITEM_SECOND_OPTION.getId();
@@ -134,65 +129,45 @@ public class GroundItemsPlugin extends Plugin
private static final int EXAMINE_ITEM = MenuAction.EXAMINE_ITEM_GROUND.getId();
private static final int WALK = MenuAction.WALK.getId();
private static final int CAST_ON_ITEM = MenuAction.SPELL_CAST_ON_GROUND_ITEM.getId();
private static final String TELEGRAB_TEXT = ColorUtil.wrapWithColorTag("Telekinetic Grab", Color.GREEN) + ColorUtil.prependColorTag(" -> ", Color.WHITE);
private final Map<Integer, Color> priceChecks = new LinkedHashMap<>();
@Getter(AccessLevel.PACKAGE)
@Setter(AccessLevel.PACKAGE)
private Map.Entry<Rectangle, GroundItem> textBoxBounds;
@Getter(AccessLevel.PACKAGE)
@Setter(AccessLevel.PACKAGE)
private Map.Entry<Rectangle, GroundItem> hiddenBoxBounds;
@Getter(AccessLevel.PACKAGE)
@Setter(AccessLevel.PACKAGE)
private Map.Entry<Rectangle, GroundItem> highlightBoxBounds;
@Getter(AccessLevel.PACKAGE)
@Setter(AccessLevel.PACKAGE)
private boolean hotKeyPressed;
@Getter(AccessLevel.PACKAGE)
@Setter(AccessLevel.PACKAGE)
private boolean hideAll;
private List<String> hiddenItemList = new CopyOnWriteArrayList<>();
private List<String> highlightedItemsList = new CopyOnWriteArrayList<>();
@Inject
private GroundItemInputListener inputListener;
@Inject
private MouseManager mouseManager;
@Inject
private KeyManager keyManager;
@Inject
private Client client;
@Inject
private ItemManager itemManager;
@Inject
private OverlayManager overlayManager;
@Inject
private GroundItemsConfig config;
@Inject
private GroundItemsOverlay overlay;
@Inject
private Notifier notifier;
@Inject
private EventBus eventBus;
@Getter(AccessLevel.PUBLIC)
public static final Map<GroundItem.GroundItemKey, GroundItem> collectedGroundItems = new LinkedHashMap<>();
private final Map<Integer, Color> priceChecks = new LinkedHashMap<>();
private LoadingCache<String, Boolean> highlightedItems;
private LoadingCache<String, Boolean> hiddenItems;
@@ -446,7 +421,7 @@ public class GroundItemsPlugin extends Plugin
}
}
private void sendLootNotification(String itemName, String message)
private void sendLootNotification(String itemName, String message)
{
String notification = "[" + client.getLocalPlayer().getName() + "] " +
"Received a " + message + " item: " + itemName;
@@ -467,7 +442,7 @@ public class GroundItemsPlugin extends Plugin
{
int menuType = menuEntry.getType();
if (menuType == FIRST_OPTION || menuType == SECOND_OPTION || menuType == THIRD_OPTION
|| menuType == FOURTH_OPTION || menuType == FIFTH_OPTION || menuType == EXAMINE_ITEM)
|| menuType == FOURTH_OPTION || menuType == FIFTH_OPTION || menuType == EXAMINE_ITEM)
{
for (MenuEntryWithCount entryWCount : newEntries)
{
@@ -489,13 +464,13 @@ public class GroundItemsPlugin extends Plugin
{
final int aMenuType = a.getEntry().getType();
if (aMenuType == FIRST_OPTION || aMenuType == SECOND_OPTION || aMenuType == THIRD_OPTION
|| aMenuType == FOURTH_OPTION || aMenuType == FIFTH_OPTION || aMenuType == EXAMINE_ITEM
|| aMenuType == WALK)
|| aMenuType == FOURTH_OPTION || aMenuType == FIFTH_OPTION || aMenuType == EXAMINE_ITEM
|| aMenuType == WALK)
{ // only check for item related menu types, so we don't sort other stuff
final int bMenuType = b.getEntry().getType();
if (bMenuType == FIRST_OPTION || bMenuType == SECOND_OPTION || bMenuType == THIRD_OPTION
|| bMenuType == FOURTH_OPTION || bMenuType == FIFTH_OPTION || bMenuType == EXAMINE_ITEM
|| bMenuType == WALK)
|| bMenuType == FOURTH_OPTION || bMenuType == FIFTH_OPTION || bMenuType == EXAMINE_ITEM
|| bMenuType == WALK)
{
final MenuEntry aEntry = a.getEntry();
final int aId = aEntry.getIdentifier();
@@ -883,8 +858,8 @@ public class GroundItemsPlugin extends Plugin
// Explicit highlight takes priority over implicit hide
return isExplicitHidden || (!isExplicitHighlight && canBeHidden && underGe && underHa)
? this.hiddenColor
: null;
? this.hiddenColor
: null;
}
private int getGePriceFromItemId(int itemId)
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/PriceDisplayMode.java
+1 -1
View File
@@ -34,5 +34,5 @@ public enum PriceDisplayMode
HA,
GE,
BOTH,
OFF;
OFF
}
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/config/ValueCalculationMode.java
+1 -1
View File
@@ -34,5 +34,5 @@ public enum ValueCalculationMode
{
HA, // calc highlight by HA value
GE, // calc by GE
HIGHEST;
HIGHEST
}
runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java
+19 -37
View File
@@ -77,10 +77,7 @@ public class GroundMarkerPlugin extends Plugin
{
private static final String CONFIG_GROUP = "groundMarker";
private static final String MARK = "Mark tile";
<<<<<<< HEAD
private static final Pattern GROUP_MATCHER = Pattern.compile(".*ark tile \\(Group (\\d)\\)");
=======
>>>>>>> Upstream/master
private static final String UNMARK = "Unmark tile";
private static final String WALK_HERE = "Walk here";
private static final String REGION_PREFIX = "region_";
@@ -302,53 +299,38 @@ public class GroundMarkerPlugin extends Plugin
if (hotKeyPressed && event.getOption().equals(WALK_HERE))
{
MenuEntry[] menuEntries = client.getMenuEntries();
int lastIndex = menuEntries.length;
menuEntries = Arrays.copyOf(menuEntries, lastIndex + 4);
int lastIndex = menuEntries.length;
menuEntries = Arrays.copyOf(menuEntries, lastIndex + 4);
final Tile tile = client.getSelectedSceneTile();
if (tile == null)
{
return;
}
final WorldPoint loc = WorldPoint.fromLocalInstance(client, tile.getLocalLocation());
final int regionId = loc.getRegionID();
final Tile tile = client.getSelectedSceneTile();
if (tile == null)
{
return;
}
final WorldPoint loc = WorldPoint.fromLocalInstance(client, tile.getLocalLocation());
final int regionId = loc.getRegionID();
for (int i = 4; i > 0; i--)
{
MenuEntry menuEntry = menuEntries[lastIndex] = new MenuEntry();
for (int i = 4; i > 0; i--)
{
MenuEntry menuEntry = menuEntries[lastIndex] = new MenuEntry();
final GroundMarkerPoint point = new GroundMarkerPoint(regionId, loc.getRegionX(), loc.getRegionY(), client.getPlane(), i);
final Optional<GroundMarkerPoint> stream = getPoints(regionId).stream().filter(x -> x.equals(point)).findAny();
final String option = (stream.isPresent() && stream.get().getGroup() == i) ? UNMARK : MARK;
menuEntry.setOption(ColorUtil.prependColorTag(Text.removeTags(option + (i == 1 ? "" : " (Group " + i + ")")), getColor(i)));
menuEntry.setTarget(event.getTarget());
menuEntry.setType(MenuAction.RUNELITE.getId());
<<<<<<< HEAD
lastIndex++;
}
=======
final WorldPoint worldPoint = WorldPoint.fromLocalInstance(client, client.getSelectedSceneTile().getLocalLocation());
final int regionId = worldPoint.getRegionID();
final GroundMarkerPoint point = new GroundMarkerPoint(regionId, worldPoint.getRegionX(), worldPoint.getRegionY(), client.getPlane(), config.markerColor());
menuEntry.setOption(getPoints(regionId).contains(point) ? UNMARK : MARK);
final GroundMarkerPoint point = new GroundMarkerPoint(regionId, loc.getRegionX(), loc.getRegionY(), client.getPlane(), i);
final Optional<GroundMarkerPoint> stream = getPoints(regionId).stream().filter(x -> x.equals(point)).findAny();
final String option = (stream.isPresent() && stream.get().getGroup() == i) ? UNMARK : MARK;
menuEntry.setOption(ColorUtil.prependColorTag(Text.removeTags(option + (i == 1 ? "" : " (Group " + i + ")")), getColor(i)));
menuEntry.setTarget(event.getTarget());
menuEntry.setType(MenuAction.RUNELITE.getId());
>>>>>>> Upstream/master
lastIndex++;
}
client.setMenuEntries(menuEntries);
}
}
private void onMenuOptionClicked(MenuOptionClicked event)
{
<<<<<<< HEAD
if (event.getMenuAction().getId() != MenuAction.RUNELITE.getId() || (!event.getOption().contains(MARK) && !event.getOption().contains(UNMARK)))
=======
if (event.getMenuAction().getId() != MenuAction.RUNELITE.getId() ||
!(event.getMenuOption().equals(MARK) || event.getMenuOption().equals(UNMARK)))
>>>>>>> Upstream/master
!(event.getOption().equals(MARK) || event.getOption().equals(UNMARK)))
{
return;
}
runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/HealthbarOverride.java
+6 -8
View File
@@ -53,14 +53,6 @@ enum HealthbarOverride implements SpriteOverride
FRONT_140PX(HEALTHBAR_DEFAULT_FRONT_140PX, "front_90px.png"),
FRONT_160PX(HEALTHBAR_DEFAULT_FRONT_160PX, "front_90px.png");
@Getter(AccessLevel.PUBLIC)
private final int spriteId;
private final String fileName;
@Getter(AccessLevel.PACKAGE)
private int padding = 1;
private static final Map<Integer, HealthbarOverride> MAP;
static
@@ -75,6 +67,12 @@ enum HealthbarOverride implements SpriteOverride
MAP = builder.build();
}
@Getter(AccessLevel.PUBLIC)
private final int spriteId;
private final String fileName;
@Getter(AccessLevel.PACKAGE)
private int padding = 1;
static HealthbarOverride get(int spriteID)
{
return MAP.get(spriteID);
runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
+2 -7
View File
@@ -34,13 +34,13 @@ import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.HealthBar;
import net.runelite.api.SpriteID;
import net.runelite.api.Sprite;
import net.runelite.api.SpriteID;
import net.runelite.api.events.BeforeMenuRender;
import net.runelite.api.events.ClientTick;
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.PostHealthBar;
import net.runelite.api.events.WidgetPositioned;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.callback.ClientThread;
@@ -129,12 +129,7 @@ public class InterfaceStylesPlugin extends Plugin
}
}
<<<<<<< HEAD
private void onWidgetPositioned(WidgetPositioned widgetPositioned)
=======
@Subscribe
public void onClientTick(ClientTick event)
>>>>>>> Upstream/master
{
adjustWidgetDimensions();
}
runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
-17
View File
@@ -137,11 +137,6 @@ public class LootTrackerPlugin extends Plugin
private static final String HERBIBOAR_LOOTED_MESSAGE = "You harvest herbs from the herbiboar, whereupon it escapes.";
private static final String HERBIBOR_EVENT = "Herbiboar";
// Hespori loot handling
private static final String HESPORI_LOOTED_MESSAGE = "You have successfully cleared this patch for new crops.";
private static final String HESPORI_EVENT = "Hespori";
private static final int HESPORI_REGION = 5021;
// Chest loot handling
private static final String CHEST_LOOTED_MESSAGE = "You find some treasure in the chest!";
private static final Pattern LARRAN_LOOTED_PATTERN = Pattern.compile("You have opened Larran's (big|small) chest .*");
@@ -689,16 +684,8 @@ public class LootTrackerPlugin extends Plugin
return;
}
<<<<<<< HEAD
// Remove all tags
final String chatMessage = Text.removeTags(message);
=======
if (HESPORI_REGION == client.getLocalPlayer().getWorldLocation().getRegionID() && message.equals(HESPORI_LOOTED_MESSAGE))
{
eventType = HESPORI_EVENT;
takeInventorySnapshot();
}
>>>>>>> Upstream/master
// Check if message is for a clue scroll reward
final Matcher m = CLUE_SCROLL_PATTERN.matcher(chatMessage);
@@ -775,7 +762,6 @@ public class LootTrackerPlugin extends Plugin
public void onItemContainerChanged(ItemContainerChanged event)
{
<<<<<<< HEAD
if (pvpDeath && RESPAWN_REGIONS.contains(client.getLocalPlayer().getWorldLocation().getRegionID()))
{
Multiset snapshot;
@@ -822,9 +808,6 @@ public class LootTrackerPlugin extends Plugin
}
if (eventType != null && (CHEST_EVENT_TYPES.containsValue(eventType) || HERBIBOR_EVENT.equals(eventType)))
=======
if (eventType != null && (CHEST_EVENT_TYPES.containsValue(eventType) || HERBIBOR_EVENT.equals(eventType) || HESPORI_EVENT.equals(eventType)))
>>>>>>> Upstream/master
{
if (event.getItemContainer() != client.getItemContainer(InventoryID.INVENTORY))
{
runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java
+72 -73
View File
@@ -291,6 +291,78 @@ public class AlchemyRoom extends MTARoom
&& player.getWorldLocation().getPlane() == 2;
}
@Override
public void under(Graphics2D graphics)
{
if (!getConfig().alchemy() || best == null || !inside())
{
return;
}
boolean found = false;
for (Cupboard cupboard : cupboards)
{
if (cupboard == null)
{
continue;
}
GameObject object = cupboard.gameObject;
AlchemyItem alchemyItem = cupboard.alchemyItem;
if (alchemyItem == AlchemyItem.EMPTY)
{
continue;
}
if (alchemyItem.equals(best))
{
client.setHintArrow(object.getWorldLocation());
found = true;
}
BufferedImage image = itemManager.getImage(alchemyItem.getId());
Point canvasLoc = Perspective.getCanvasImageLocation(client, object.getLocalLocation(), image, IMAGE_Z_OFFSET);
if (canvasLoc != null)
{
graphics.drawImage(image, canvasLoc.getX(), canvasLoc.getY(), null);
}
}
if (!found && suggestion != null)
{
client.setHintArrow(suggestion.gameObject.getWorldLocation());
}
}
@Override
public void over(Graphics2D graphics)
{
if (!inside() || !config.alchemy() || best == null)
{
return;
}
Widget inventory = client.getWidget(WidgetInfo.INVENTORY);
if (inventory.isHidden())
{
return;
}
for (WidgetItem item : inventory.getWidgetItems())
{
if (item.getId() != best.getId())
{
continue;
}
drawItem(graphics, item);
}
}
private AlchemyItem getBest()
{
for (int i = 0; i < INFO_LENGTH; i++)
@@ -357,53 +429,6 @@ public class AlchemyRoom extends MTARoom
}
}
@Override
public void under(Graphics2D graphics)
{
if (!getConfig().alchemy() || best == null || !inside())
{
return;
}
boolean found = false;
for (Cupboard cupboard : cupboards)
{
if (cupboard == null)
{
continue;
}
GameObject object = cupboard.gameObject;
AlchemyItem alchemyItem = cupboard.alchemyItem;
if (alchemyItem == AlchemyItem.EMPTY)
{
continue;
}
if (alchemyItem.equals(best))
{
client.setHintArrow(object.getWorldLocation());
found = true;
}
BufferedImage image = itemManager.getImage(alchemyItem.getId());
Point canvasLoc = Perspective.getCanvasImageLocation(client, object.getLocalLocation(), image, IMAGE_Z_OFFSET);
if (canvasLoc != null)
{
graphics.drawImage(image, canvasLoc.getX(), canvasLoc.getY(), null);
}
}
if (!found && suggestion != null)
{
client.setHintArrow(suggestion.gameObject.getWorldLocation());
}
}
private Cupboard getSuggestion()
{
// check if a cupboard has the best item in it
@@ -443,32 +468,6 @@ public class AlchemyRoom extends MTARoom
return nearest;
}
@Override
public void over(Graphics2D graphics)
{
if (!inside() || !config.alchemy() || best == null)
{
return;
}
Widget inventory = client.getWidget(WidgetInfo.INVENTORY);
if (inventory.isHidden())
{
return;
}
for (WidgetItem item : inventory.getWidgetItems())
{
if (item.getId() != best.getId())
{
continue;
}
drawItem(graphics, item);
}
}
private void drawItem(Graphics2D graphics, WidgetItem item)
{
Rectangle bounds = item.getCanvasBounds();
runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java
+3 -147
View File
@@ -1,4 +1,3 @@
<<<<<<< HEAD
/*
* Copyright (c) 2018, Jasper Ketelaar <Jasper0781@gmail.com>
* All rights reserved.
@@ -31,10 +30,10 @@ import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.Item;
import net.runelite.api.ItemID;
import net.runelite.api.Player;
import net.runelite.api.Tile;
import net.runelite.api.TileItem;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged;
@@ -122,7 +121,7 @@ public class EnchantmentRoom extends MTARoom
private void onItemSpawned(ItemSpawned itemSpawned)
{
final Item item = itemSpawned.getItem();
final TileItem item = itemSpawned.getItem();
final Tile tile = itemSpawned.getTile();
if (item.getId() == ItemID.DRAGONSTONE_6903)
@@ -135,7 +134,7 @@ public class EnchantmentRoom extends MTARoom
private void onItemDespawned(ItemDespawned itemDespawned)
{
final Item item = itemDespawned.getItem();
final TileItem item = itemDespawned.getItem();
final Tile tile = itemDespawned.getTile();
if (item.getId() == ItemID.DRAGONSTONE_6903)
@@ -164,146 +163,3 @@ public class EnchantmentRoom extends MTARoom
&& player.getWorldLocation().getPlane() == 0;
}
}
=======
/*
* Copyright (c) 2018, Jasper Ketelaar <Jasper0781@gmail.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.mta.enchantment;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.ItemID;
import net.runelite.api.Player;
import net.runelite.api.Tile;
import net.runelite.api.TileItem;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.ItemDespawned;
import net.runelite.api.events.ItemSpawned;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.mta.MTAConfig;
import net.runelite.client.plugins.mta.MTARoom;
@Slf4j
public class EnchantmentRoom extends MTARoom
{
private static final int MTA_ENCHANT_REGION = 13462;
private final Client client;
private final List<WorldPoint> dragonstones = new ArrayList<>();
@Inject
private EnchantmentRoom(MTAConfig config, Client client)
{
super(config);
this.client = client;
}
@Subscribe
public void onGameStateChanged(GameStateChanged gameStateChanged)
{
if (gameStateChanged.getGameState() == GameState.LOADING)
{
dragonstones.clear();
}
}
@Subscribe
public void onGameTick(GameTick event)
{
if (!inside() || !config.enchantment())
{
return;
}
WorldPoint nearest = findNearestStone();
if (nearest != null)
{
client.setHintArrow(nearest);
}
else
{
client.clearHintArrow();
}
}
private WorldPoint findNearestStone()
{
WorldPoint nearest = null;
double dist = Double.MAX_VALUE;
WorldPoint local = client.getLocalPlayer().getWorldLocation();
for (WorldPoint worldPoint : dragonstones)
{
double currDist = local.distanceTo(worldPoint);
if (nearest == null || currDist < dist)
{
dist = currDist;
nearest = worldPoint;
}
}
return nearest;
}
@Subscribe
public void onItemSpawned(ItemSpawned itemSpawned)
{
final TileItem item = itemSpawned.getItem();
final Tile tile = itemSpawned.getTile();
if (item.getId() == ItemID.DRAGONSTONE_6903)
{
WorldPoint location = tile.getWorldLocation();
log.debug("Adding dragonstone at {}", location);
dragonstones.add(location);
}
}
@Subscribe
public void onItemDespawned(ItemDespawned itemDespawned)
{
final TileItem item = itemDespawned.getItem();
final Tile tile = itemDespawned.getTile();
if (item.getId() == ItemID.DRAGONSTONE_6903)
{
WorldPoint location = tile.getWorldLocation();
log.debug("Removed dragonstone at {}", location);
dragonstones.remove(location);
}
}
@Override
public boolean inside()
{
Player player = client.getLocalPlayer();
return player != null && player.getWorldLocation().getRegionID() == MTA_ENCHANT_REGION
&& player.getWorldLocation().getPlane() == 0;
}
}
>>>>>>> Upstream/master
runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java
+1 -3
View File
@@ -47,10 +47,8 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
public class GraveyardRoom extends MTARoom
{
private static final int MTA_GRAVEYARD_REGION = 13462;
static final int MIN_SCORE = 16;
private static final int MTA_GRAVEYARD_REGION = 13462;
private final Client client;
private final MTAPlugin plugin;
private final ItemManager itemManager;
runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java
+12 -12
View File
@@ -93,6 +93,11 @@ public class TelekineticRoom extends MTARoom
addSubscriptions();
}
private static int manhattan(WorldPoint point1, WorldPoint point2)
{
return Math.abs(point1.getX() - point2.getX()) + Math.abs(point2.getY() - point1.getY());
}
private void addSubscriptions()
{
eventBus.subscribe(GameTick.class, this, this::onGameTick);
@@ -142,8 +147,8 @@ public class TelekineticRoom extends MTARoom
private void onGameTick(GameTick event)
{
if (!config.telekinetic()
|| !inside()
|| client.getGameState() != GameState.LOGGED_IN)
|| !inside()
|| client.getGameState() != GameState.LOGGED_IN)
{
maze = null;
moves.clear();
@@ -285,11 +290,6 @@ public class TelekineticRoom extends MTARoom
return nearest(areaNext, nearestAfter);
}
private static int manhattan(WorldPoint point1, WorldPoint point2)
{
return Math.abs(point1.getX() - point2.getX()) + Math.abs(point2.getY() - point1.getY());
}
private WorldPoint nearest(WorldArea area, WorldPoint worldPoint)
{
int dist = Integer.MAX_VALUE;
@@ -372,7 +372,7 @@ public class TelekineticRoom extends MTARoom
WorldPoint nghbWorld = WorldPoint.fromLocal(client, neighbour);
if (!nghbWorld.equals(next)
&& !closed.contains(nghbWorld))
&& !closed.contains(nghbWorld))
{
int score = scores.get(next) + 1;
@@ -424,10 +424,10 @@ public class TelekineticRoom extends MTARoom
private LocalPoint[] neighbours(LocalPoint point)
{
return new LocalPoint[]
{
neighbour(point, Direction.NORTH), neighbour(point, Direction.SOUTH),
neighbour(point, Direction.EAST), neighbour(point, Direction.WEST)
};
{
neighbour(point, Direction.NORTH), neighbour(point, Direction.SOUTH),
neighbour(point, Direction.EAST), neighbour(point, Direction.WEST)
};
}
private LocalPoint neighbour(LocalPoint point, Direction direction)
runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
+1 -15
View File
@@ -87,11 +87,7 @@ public class NpcIndicatorsPlugin extends Plugin
// Option added to NPC menu
private static final String TAG = "Tag";
<<<<<<< HEAD
private static final String UNTAG = "Untag";
=======
private static final String UNTAG = "Un-tag";
>>>>>>> Upstream/master
private static final Set<MenuAction> NPC_MENU_ACTIONS = ImmutableSet.of(MenuAction.NPC_FIRST_OPTION, MenuAction.NPC_SECOND_OPTION,
MenuAction.NPC_THIRD_OPTION, MenuAction.NPC_FOURTH_OPTION, MenuAction.NPC_FIFTH_OPTION);
@@ -320,11 +316,7 @@ public class NpcIndicatorsPlugin extends Plugin
// Add tag option
menuEntries = Arrays.copyOf(menuEntries, menuEntries.length + 1);
final MenuEntry tagEntry = menuEntries[menuEntries.length - 1] = new MenuEntry();
<<<<<<< HEAD
tagEntry.setOption(npcTags.contains(event.getIdentifier()) ? UNTAG : TAG);
=======
tagEntry.setOption(highlightedNpcs.stream().anyMatch(npc -> npc.getIndex() == event.getIdentifier()) ? UNTAG : TAG);
>>>>>>> Upstream/master
tagEntry.setTarget(event.getTarget());
tagEntry.setParam0(event.getActionParam0());
tagEntry.setParam1(event.getActionParam1());
@@ -336,14 +328,8 @@ public class NpcIndicatorsPlugin extends Plugin
private void onMenuOptionClicked(MenuOptionClicked click)
{
<<<<<<< HEAD
if (click.getMenuAction() != MenuAction.RUNELITE
|| (!click.getOption().equals(TAG)
&& !click.getOption().equals(UNTAG)))
=======
if (click.getMenuAction() != MenuAction.RUNELITE ||
!(click.getMenuOption().equals(TAG) || click.getMenuOption().equals(UNTAG)))
>>>>>>> Upstream/master
!(click.getOption().equals(TAG) || click.getOption().equals(UNTAG)))
{
return;
}
runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java
+1 -46
View File
@@ -252,48 +252,8 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
MenuEntry[] menuEntries = client.getMenuEntries();
menuEntries = Arrays.copyOf(menuEntries, menuEntries.length + 1);
MenuEntry menuEntry = menuEntries[menuEntries.length - 1] = new MenuEntry();
<<<<<<< HEAD
String option = MARK;
Scene scene = client.getScene();
Tile[][][] tiles = scene.getTiles();
final int x = event.getActionParam0();
final int y = event.getActionParam1();
final int z = client.getPlane();
final Tile tile = tiles[z][x][y];
final TileObject object = findTileObject(tile, event.getIdentifier());
if (object != null)
{
final ObjectDefinition objectDefinition = client.getObjectDefinition(object.getId());
final String name = objectDefinition.getName();
if (!Strings.isNullOrEmpty(name))
{
final WorldPoint loc = WorldPoint.fromLocalInstance(client, tile.getLocalLocation());
final int regionId = loc.getRegionID();
final ObjectPoint point = new ObjectPoint(
name,
regionId,
loc.getX() & (REGION_SIZE - 1),
loc.getY() & (REGION_SIZE - 1),
client.getPlane());
final Set<ObjectPoint> objectPoints = points.get(regionId);
if (objectPoints != null && objectPoints.contains(point))
{
option = UNMARK;
}
}
}
menuEntry.setOption(option);
=======
menuEntry.setOption(objects.contains(findTileObject(tile, event.getIdentifier())) ? UNMARK : MARK);
>>>>>>> Upstream/master
menuEntry.setTarget(event.getTarget());
menuEntry.setParam0(event.getActionParam0());
menuEntry.setParam1(event.getActionParam1());
@@ -305,12 +265,7 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
private void onMenuOptionClicked(MenuOptionClicked event)
{
if (event.getMenuAction() != MenuAction.RUNELITE
<<<<<<< HEAD
|| (!event.getOption().equals(MARK)
&& !event.getOption().equals(UNMARK)))
=======
|| !(event.getMenuOption().equals(MARK) || event.getMenuOption().equals(UNMARK)))
>>>>>>> Upstream/master
|| !(event.getOption().equals(MARK) || event.getOption().equals(UNMARK)))
{
return;
}
runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
+3 -3
View File
@@ -114,9 +114,9 @@ public class TimersPlugin extends Plugin
private static final int VENOM_VALUE_CUTOFF = -40; // Antivenom < -40 =< Antipoison < 0
private static final int POISON_TICK_LENGTH = 30;
private static final Pattern DEADMAN_HALF_TELEBLOCK_PATTERN = Pattern.compile("<col=4f006f>A Tele Block spell has been cast on you by (.+)\\. It will expire in 1 minute, 15 seconds\\.</col>");
private static final Pattern FULL_TELEBLOCK_PATTERN = Pattern.compile("<col=4f006f>A Tele Block spell has been cast on you by (.+)\\. It will expire in 5 minutes, 0 seconds\\.</col>");
private static final Pattern HALF_TELEBLOCK_PATTERN = Pattern.compile("<col=4f006f>A Tele Block spell has been cast on you by (.+)\\. It will expire in 2 minutes, 30 seconds\\.</col>");
private static final Pattern DEADMAN_HALF_TELEBLOCK_PATTERN = Pattern.compile("<col=4f006f>A Tele Block spell has been cast on you by (.+). It will expire in 1 minute, 15 seconds.</col>");
private static final Pattern FULL_TELEBLOCK_PATTERN = Pattern.compile("<col=4f006f>A Tele Block spell has been cast on you by (.+). It will expire in 5 minutes, 0 seconds.</col>");
private static final Pattern HALF_TELEBLOCK_PATTERN = Pattern.compile("<col=4f006f>A Tele Block spell has been cast on you by (.+). It will expire in 2 minutes, 30 seconds.</col>");
private TimerTimer freezeTimer;
private int freezeTime = -1; // time frozen, in game ticks
runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class ClientLoader
{
try
{
URL localInjected = new File("./injected-client/target/injected-client-" + RuneLiteAPI.getVersion() + ".jar").toURI().toURL();
URL localInjected = new File("./injected-client/build/libs/injected-client-" + RuneLiteAPI.getVersion() + ".jar").toURI().toURL();
log.info("Using local injected-client");
URLClassLoader classLoader = new URLClassLoader(new URL[]{localInjected});
Class<?> clientClass = classLoader.loadClass("client");
runelite-client/src/main/resources/item_variations.json
+32 -266
View File
@@ -174,13 +174,7 @@
"vial": [
229,
2389,
2390,
23839,
23879
],
"pestle and mortar": [
233,
23865
2390
],
"unicorn horn": [
237,
@@ -192,8 +186,6 @@
],
"key": [
275,
293,
298,
423,
1543,
1544,
@@ -238,6 +230,10 @@
21057,
21058
],
"a key": [
293,
298
],
"glarials urn": [
296,
297
@@ -256,8 +252,7 @@
357,
367,
369,
20854,
23873
20854
],
"shark": [
385,
@@ -661,7 +656,7 @@
8987,
9665
],
"bronze fire arrow": [
"bronze fire arrows": [
598,
942
],
@@ -1342,12 +1337,7 @@
23179,
23180,
23181,
23182,
23770,
23814,
23815,
23816,
23817
23182
],
"radimus notes": [
714,
@@ -1615,10 +1605,6 @@
11046,
20587
],
"flier": [
956,
23670
],
"skull": [
964,
965
@@ -2145,14 +2131,17 @@
1481,
1482,
1483,
1484,
23812
1484
],
"paladins badge": [
1488,
1489,
1490
],
"a magic scroll": [
1505,
6949
],
"logs": [
1511,
2511
@@ -2672,8 +2661,7 @@
2380,
2381,
2382,
2383,
23802
2383
],
"silverlight key": [
2399,
@@ -2782,23 +2770,23 @@
2529,
17152
],
"iron fire arrow": [
"iron fire arrows": [
2532,
2533
],
"steel fire arrow": [
"steel fire arrows": [
2534,
2535
],
"mithril fire arrow": [
"mithril fire arrows": [
2536,
2537
],
"adamant fire arrow": [
"adamant fire arrows": [
2538,
2539
],
"rune fire arrow": [
"rune fire arrows": [
2540,
2541
],
@@ -3443,10 +3431,6 @@
4041,
4042
],
"explosive potion": [
4045,
23818
],
"decorative sword": [
4068,
4503,
@@ -3611,7 +3595,6 @@
],
"crystal bow": [
4212,
4213,
4214,
4215,
4216,
@@ -3632,14 +3615,7 @@
11755,
11756,
11757,
11758,
16888,
16889,
23901,
23902,
23903,
23983,
23985
11758
],
"crystal shield": [
4224,
@@ -3653,7 +3629,6 @@
4232,
4233,
4234,
4235,
11759,
11760,
11761,
@@ -3664,11 +3639,7 @@
11766,
11767,
11768,
11769,
16890,
16891,
23991,
23993
11769
],
"nettle tea": [
4239,
@@ -4615,13 +4586,16 @@
6065,
10621
],
"mourner trousers": [
6066,
6067
],
"teleport crystal": [
6099,
6100,
6101,
6102,
13102,
23904
13102
],
"ghostly boots": [
6106,
@@ -4869,40 +4843,13 @@
6617,
10618
],
"hand mirror": [
6639,
23775
],
"red crystal": [
6640,
23776
],
"yellow crystal": [
6641,
23777
],
"green crystal": [
6642,
23778,
23783
],
"cyan crystal": [
6643,
22366,
23779
],
"blue crystal": [
6644,
23780
],
"magenta crystal": [
6645,
23781
22366
],
"fractured crystal": [
6646,
6647,
23784
6647
],
"newly made crystal": [
6651,
@@ -7294,7 +7241,7 @@
11229,
20389
],
"dragon fire arrow": [
"dragon fire arrows": [
11217,
11222
],
@@ -7773,8 +7720,7 @@
],
"dragon pickaxe": [
11920,
12797,
23677
12797
],
"malediction ward": [
11924,
@@ -8195,14 +8141,7 @@
13098,
13099,
13100,
13101,
16892,
16893,
23895,
23896,
23897,
23987,
23989
13101
],
"vetion jr": [
13179,
@@ -8659,12 +8598,6 @@
20781,
21059
],
"corrupted helm": [
20838,
23840,
23841,
23842
],
"dragon thrownaxe": [
20849,
21207
@@ -8847,7 +8780,7 @@
21334,
21336
],
"amethyst fire arrow": [
"amethyst fire arrows": [
21328,
21330
],
@@ -9302,172 +9235,5 @@
"giant egg sac": [
23517,
23520
],
"crystal seedling": [
23655,
23657
],
"crystal axe": [
23673,
23675,
23862
],
"crystal pickaxe": [
23680,
23682,
23863
],
"divine super combat potion": [
23685,
23688,
23691,
23694
],
"divine super attack potion": [
23697,
23700,
23703,
23706
],
"divine super strength potion": [
23709,
23712,
23715,
23718
],
"divine super defence potion": [
23721,
23724,
23727,
23730
],
"divine ranging potion": [
23733,
23736,
23739,
23742
],
"divine magic potion": [
23745,
23748,
23751,
23754
],
"crystal harpoon": [
23762,
23764,
23864
],
"crystal dust": [
23804,
23867,
23964
],
"crystal seed": [
23808,
23810
],
"weapon frame": [
23834,
23871
],
"grym leaf": [
23835,
23875
],
"linum tirinum": [
23836,
23876
],
"phren bark": [
23838,
23878
],
"corrupted body": [
23843,
23844,
23845
],
"corrupted legs": [
23846,
23847,
23848
],
"corrupted halberd": [
23849,
23850,
23851
],
"corrupted staff": [
23852,
23853,
23854
],
"corrupted bow": [
23855,
23856,
23857
],
"egniol potion": [
23882,
23883,
23884,
23885
],
"crystal helm": [
23886,
23887,
23888,
23971,
23973
],
"crystal body": [
23889,
23890,
23891,
23975,
23977
],
"crystal legs": [
23892,
23893,
23894,
23979,
23981
],
"crystal staff": [
23898,
23899,
23900
],
"crystal crown": [
23911,
23913,
23915,
23917,
23919,
23921,
23923,
23925
],
"blade of saeldor": [
23995,
23997
],
"elven top": [
24009,
24015,
24021,
24027
],
"elven skirt": [
24012,
24018
],
"memoriam crystal": [
24030,
24031,
24032,
24033
]
}
runelite-client/src/main/scripts/QuestListShowProgress.hash
+1 -1
View File
@@ -1 +1 @@
A6B3A7BFE7B688A08F69B91A7FD5C7184D71147D3DAF74B1262369D85DBB3A03
4D9A96A7D57F6B9661273FB645A0510DD0F02C8A9C2E133772065F8AB588614D
runelite-client/src/main/scripts/QuestListShowProgress.rs2asm
+41 -28
View File
@@ -77,14 +77,14 @@ LABEL60:
iload 5
iload 6
if_icmplt LABEL64
jump LABEL108
jump LABEL119
LABEL64:
iload 1
iload 5
cc_find
iconst 1
if_icmpeq LABEL70
jump LABEL103
jump LABEL114
LABEL70:
iload 5
invoke 1358
@@ -96,7 +96,7 @@ LABEL70:
LABEL77:
iconst 901389
istore 4
jump LABEL89
jump LABEL100
LABEL80:
iload 3
iconst 0
@@ -105,11 +105,24 @@ LABEL80:
LABEL84:
iconst 16776960
istore 4
jump LABEL89
jump LABEL100
LABEL87:
iconst 105
iconst 74
iconst 2099
iload 5
enum
iconst 603
if_icmpeq LABEL95
jump LABEL98
LABEL95:
iconst 10461087
istore 4
jump LABEL100
LABEL98:
iconst 16711680
istore 4
LABEL89:
LABEL100:
iload 4
cc_setcolour
iconst 85
@@ -124,54 +137,54 @@ LABEL89:
iload 4
sconst "Iii"
cc_setonmouseleave
LABEL103:
LABEL114:
iload 5
iconst 1
add
istore 5
jump LABEL60
LABEL108:
LABEL119:
iconst 0
invoke 2265
istore 6
istore 5
LABEL112:
LABEL123:
iload 5
iload 6
if_icmplt LABEL116
jump LABEL160
LABEL116:
if_icmplt LABEL127
jump LABEL171
LABEL127:
iload 2
iload 5
cc_find
iconst 1
if_icmpeq LABEL122
jump LABEL155
LABEL122:
if_icmpeq LABEL133
jump LABEL166
LABEL133:
iload 5
invoke 1359
istore 3
iload 3
iconst 2
if_icmpeq LABEL129
jump LABEL132
LABEL129:
if_icmpeq LABEL140
jump LABEL143
LABEL140:
iconst 901389
istore 4
jump LABEL141
LABEL132:
jump LABEL152
LABEL143:
iload 3
iconst 0
if_icmpeq LABEL136
jump LABEL139
LABEL136:
if_icmpeq LABEL147
jump LABEL150
LABEL147:
iconst 16776960
istore 4
jump LABEL141
LABEL139:
jump LABEL152
LABEL150:
iconst 16711680
istore 4
LABEL141:
LABEL152:
iload 4
cc_setcolour
iconst 85
@@ -186,13 +199,13 @@ LABEL141:
iload 4
sconst "Iii"
cc_setonmouseleave
LABEL155:
LABEL166:
iload 5
iconst 1
add
istore 5
jump LABEL112
LABEL160:
jump LABEL123
LABEL171:
sconst "questProgressUpdated"
runelite_callback
return
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
+4 -4
View File
@@ -122,7 +122,7 @@ import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSEnumDefinition;
import net.runelite.rs.api.RSFriendSystem;
import net.runelite.rs.api.RSFriendsList;
import net.runelite.rs.api.RSGroundItem;
import net.runelite.rs.api.RSTileItem;
import net.runelite.rs.api.RSIgnoreList;
import net.runelite.rs.api.RSIndexedSprite;
import net.runelite.rs.api.RSItemContainer;
@@ -180,7 +180,7 @@ public abstract class RSClientMixin implements RSClient
private static int oldMenuEntryCount;
@Inject
private static RSGroundItem lastItemDespawn;
private static RSTileItem lastItemDespawn;
@Inject
private boolean gpu;
@@ -1489,14 +1489,14 @@ public abstract class RSClientMixin implements RSClient
@Inject
@Override
public RSGroundItem getLastItemDespawn()
public RSTileItem getLastItemDespawn()
{
return lastItemDespawn;
}
@Inject
@Override
public void setLastItemDespawn(RSGroundItem lastItemDespawn)
public void setLastItemDespawn(RSTileItem lastItemDespawn)
{
RSClientMixin.lastItemDespawn = lastItemDespawn;
}
runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java
+2 -2
View File
@@ -33,7 +33,7 @@ import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Replace;
import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSGroundItem;
import net.runelite.rs.api.RSTileItem;
import net.runelite.rs.api.RSItemContainer;
@Mixin(RSItemContainer.class)
@@ -58,7 +58,7 @@ public abstract class RSItemContainerMixin implements RSItemContainer
for (int i = 0; i < itemIds.length; ++i)
{
RSGroundItem item = client.createItem();
RSTileItem item = client.createItem();
item.setId(itemIds[i]);
item.setQuantity(stackSizes[i]);
items[i] = item;
runelite-mixins/src/main/java/net/runelite/mixins/RSSceneMixin.java
+2 -2
View File
@@ -38,7 +38,7 @@ import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSBoundaryObject;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSFloorDecoration;
import net.runelite.rs.api.RSGroundItemPile;
import net.runelite.rs.api.RSTileItemPile;
import net.runelite.rs.api.RSScene;
import net.runelite.rs.api.RSTile;
import net.runelite.rs.api.RSTileModel;
@@ -418,7 +418,7 @@ public abstract class RSSceneMixin implements RSScene
Tile tile = getTiles()[plane][x][y];
if (tile != null)
{
RSGroundItemPile itemLayer = (RSGroundItemPile) tile.getItemLayer();
RSTileItemPile itemLayer = (RSTileItemPile) tile.getItemLayer();
if (itemLayer != null)
{
itemLayer.setPlane(plane);
runelite-mixins/src/main/java/net/runelite/mixins/RSGroundItemMixin.java → runelite-mixins/src/main/java/net/runelite/mixins/RSTileItemMixin.java
+4 -4
View File
@@ -7,10 +7,10 @@ import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSGroundItem;
import net.runelite.rs.api.RSTileItem;
@Mixin(RSGroundItem.class)
public abstract class RSGroundItemMixin implements RSGroundItem
@Mixin(RSTileItem.class)
public abstract class RSTileItemMixin implements RSTileItem
{
@Shadow("client")
private static RSClient client;
@@ -22,7 +22,7 @@ public abstract class RSGroundItemMixin implements RSGroundItem
private int rl$sceneY = -1;
@Inject
RSGroundItemMixin()
RSTileItemMixin()
{
}
runelite-mixins/src/main/java/net/runelite/mixins/RSGroundItemPileMixin.java → runelite-mixins/src/main/java/net/runelite/mixins/RSTileItemPileMixin.java
+3 -3
View File
@@ -5,10 +5,10 @@ import net.runelite.api.Model;
import net.runelite.api.Renderable;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.rs.api.RSGroundItemPile;
import net.runelite.rs.api.RSTileItemPile;
@Mixin(RSGroundItemPile.class)
public abstract class RSGroundItemPileMixin implements RSGroundItemPile
@Mixin(RSTileItemPile.class)
public abstract class RSTileItemPileMixin implements RSTileItemPile
{
@Inject
private int itemLayerPlane;
runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java
+149 -149
View File
@@ -24,16 +24,18 @@
*/
package net.runelite.mixins;
import java.util.ArrayList;
import java.util.List;
import net.runelite.api.CollisionData;
import net.runelite.api.CollisionDataFlag;
import net.runelite.api.Constants;
import net.runelite.api.DecorativeObject;
import net.runelite.api.GroundObject;
import net.runelite.api.Item;
import net.runelite.api.ItemLayer;
import net.runelite.api.Node;
import net.runelite.api.Point;
import net.runelite.api.Tile;
import net.runelite.api.TileItem;
import net.runelite.api.WallObject;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint;
@@ -51,8 +53,6 @@ import net.runelite.api.events.ItemSpawned;
import net.runelite.api.events.WallObjectChanged;
import net.runelite.api.events.WallObjectDespawned;
import net.runelite.api.events.WallObjectSpawned;
import java.util.ArrayList;
import java.util.List;
import net.runelite.api.mixins.FieldHook;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
@@ -62,12 +62,12 @@ import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSEntity;
import net.runelite.rs.api.RSGameObject;
import net.runelite.rs.api.RSGraphicsObject;
import net.runelite.rs.api.RSGroundItem;
import net.runelite.rs.api.RSGroundItemPile;
import net.runelite.rs.api.RSTileItemPile;
import net.runelite.rs.api.RSNode;
import net.runelite.rs.api.RSNodeDeque;
import net.runelite.rs.api.RSProjectile;
import net.runelite.rs.api.RSTile;
import net.runelite.rs.api.RSTileItem;
import org.slf4j.Logger;
@Mixin(RSTile.class)
@@ -115,6 +115,142 @@ public abstract class RSTileMixin implements RSTile
return LocalPoint.fromScene(getX(), getY());
}
@Inject
@Override
public boolean hasLineOfSightTo(Tile other)
{
// Thanks to Henke for this method :)
if (this.getPlane() != other.getPlane())
{
return false;
}
CollisionData[] collisionData = client.getCollisionMaps();
if (collisionData == null)
{
return false;
}
int z = this.getPlane();
int[][] collisionDataFlags = collisionData[z].getFlags();
Point p1 = this.getSceneLocation();
Point p2 = other.getSceneLocation();
if (p1.getX() == p2.getX() && p1.getY() == p2.getY())
{
return true;
}
int dx = p2.getX() - p1.getX();
int dy = p2.getY() - p1.getY();
int dxAbs = Math.abs(dx);
int dyAbs = Math.abs(dy);
int xFlags = CollisionDataFlag.BLOCK_LINE_OF_SIGHT_FULL;
int yFlags = CollisionDataFlag.BLOCK_LINE_OF_SIGHT_FULL;
if (dx < 0)
{
xFlags |= CollisionDataFlag.BLOCK_LINE_OF_SIGHT_EAST;
}
else
{
xFlags |= CollisionDataFlag.BLOCK_LINE_OF_SIGHT_WEST;
}
if (dy < 0)
{
yFlags |= CollisionDataFlag.BLOCK_LINE_OF_SIGHT_NORTH;
}
else
{
yFlags |= CollisionDataFlag.BLOCK_LINE_OF_SIGHT_SOUTH;
}
if (dxAbs > dyAbs)
{
int x = p1.getX();
int yBig = p1.getY() << 16; // The y position is represented as a bigger number to handle rounding
int slope = (dy << 16) / dxAbs;
yBig += 0x8000; // Add half of a tile
if (dy < 0)
{
yBig--; // For correct rounding
}
int direction = dx < 0 ? -1 : 1;
while (x != p2.getX())
{
x += direction;
int y = yBig >>> 16;
if ((collisionDataFlags[x][y] & xFlags) != 0)
{
// Collision while traveling on the x axis
return false;
}
yBig += slope;
int nextY = yBig >>> 16;
if (nextY != y && (collisionDataFlags[x][nextY] & yFlags) != 0)
{
// Collision while traveling on the y axis
return false;
}
}
}
else
{
int y = p1.getY();
int xBig = p1.getX() << 16; // The x position is represented as a bigger number to handle rounding
int slope = (dx << 16) / dyAbs;
xBig += 0x8000; // Add half of a tile
if (dx < 0)
{
xBig--; // For correct rounding
}
int direction = dy < 0 ? -1 : 1;
while (y != p2.getY())
{
y += direction;
int x = xBig >>> 16;
if ((collisionDataFlags[x][y] & yFlags) != 0)
{
// Collision while traveling on the y axis
return false;
}
xBig += slope;
int nextX = xBig >>> 16;
if (nextX != x && (collisionDataFlags[nextX][y] & xFlags) != 0)
{
// Collision while traveling on the x axis
return false;
}
}
}
// No collision
return true;
}
@Inject
@Override
public List<TileItem> getGroundItems()
{
ItemLayer layer = this.getItemLayer();
if (layer == null)
{
return null;
}
List<TileItem> result = new ArrayList<TileItem>();
Node node = layer.getBottom();
while (node instanceof TileItem)
{
result.add((TileItem) node);
node = node.getNext();
}
return result;
}
@FieldHook("boundaryObject")
@Inject
public void wallObjectChanged(int idx)
@@ -318,7 +454,7 @@ public abstract class RSTileMixin implements RSTile
}
}
@FieldHook("groundItemPile")
@FieldHook("tileItemPile")
@Inject
public void itemLayerChanged(int idx)
{
@@ -338,7 +474,7 @@ public abstract class RSTileMixin implements RSTile
RSNode head = oldQueue.getHead();
for (RSNode cur = head.getNext(); cur != head; cur = cur.getNext())
{
RSGroundItem item = (RSGroundItem) cur;
RSTileItem item = (RSTileItem) cur;
ItemDespawned itemDespawned = new ItemDespawned(this, item);
client.getCallbacks().post(ItemDespawned.class, itemDespawned);
}
@@ -346,13 +482,13 @@ public abstract class RSTileMixin implements RSTile
lastGroundItems[z][x][y] = newQueue;
}
RSGroundItem lastUnlink = client.getLastItemDespawn();
RSTileItem lastUnlink = client.getLastItemDespawn();
if (lastUnlink != null)
{
client.setLastItemDespawn(null);
}
RSGroundItemPile itemLayer = (RSGroundItemPile) getItemLayer();
RSTileItemPile itemLayer = (RSTileItemPile) getItemLayer();
if (itemLayer == null)
{
if (lastUnlink != null)
@@ -382,7 +518,7 @@ public abstract class RSTileMixin implements RSTile
boolean forward = false;
if (head != previous)
{
RSGroundItem prev = (RSGroundItem) previous;
RSTileItem prev = (RSTileItem) previous;
if (x != prev.getX() || y != prev.getY())
{
current = prev;
@@ -392,7 +528,7 @@ public abstract class RSTileMixin implements RSTile
RSNode next = head.getNext();
if (current == null && head != next)
{
RSGroundItem n = (RSGroundItem) next;
RSTileItem n = (RSTileItem) next;
if (x != n.getX() || y != n.getY())
{
current = n;
@@ -413,7 +549,7 @@ public abstract class RSTileMixin implements RSTile
do
{
RSGroundItem item = (RSGroundItem) current;
RSTileItem item = (RSTileItem) current;
item.setX(x);
item.setY(y);
@@ -424,142 +560,6 @@ public abstract class RSTileMixin implements RSTile
// Send spawn events for anything on this tile which is at the wrong location, which happens
// when the scene base changes
} while (current != head && (((RSGroundItem) current).getX() != x || ((RSGroundItem) current).getY() != y));
}
@Inject
@Override
public boolean hasLineOfSightTo(Tile other)
{
// Thanks to Henke for this method :)
if (this.getPlane() != other.getPlane())
{
return false;
}
CollisionData[] collisionData = client.getCollisionMaps();
if (collisionData == null)
{
return false;
}
int z = this.getPlane();
int[][] collisionDataFlags = collisionData[z].getFlags();
Point p1 = this.getSceneLocation();
Point p2 = other.getSceneLocation();
if (p1.getX() == p2.getX() && p1.getY() == p2.getY())
{
return true;
}
int dx = p2.getX() - p1.getX();
int dy = p2.getY() - p1.getY();
int dxAbs = Math.abs(dx);
int dyAbs = Math.abs(dy);
int xFlags = CollisionDataFlag.BLOCK_LINE_OF_SIGHT_FULL;
int yFlags = CollisionDataFlag.BLOCK_LINE_OF_SIGHT_FULL;
if (dx < 0)
{
xFlags |= CollisionDataFlag.BLOCK_LINE_OF_SIGHT_EAST;
}
else
{
xFlags |= CollisionDataFlag.BLOCK_LINE_OF_SIGHT_WEST;
}
if (dy < 0)
{
yFlags |= CollisionDataFlag.BLOCK_LINE_OF_SIGHT_NORTH;
}
else
{
yFlags |= CollisionDataFlag.BLOCK_LINE_OF_SIGHT_SOUTH;
}
if (dxAbs > dyAbs)
{
int x = p1.getX();
int yBig = p1.getY() << 16; // The y position is represented as a bigger number to handle rounding
int slope = (dy << 16) / dxAbs;
yBig += 0x8000; // Add half of a tile
if (dy < 0)
{
yBig--; // For correct rounding
}
int direction = dx < 0 ? -1 : 1;
while (x != p2.getX())
{
x += direction;
int y = yBig >>> 16;
if ((collisionDataFlags[x][y] & xFlags) != 0)
{
// Collision while traveling on the x axis
return false;
}
yBig += slope;
int nextY = yBig >>> 16;
if (nextY != y && (collisionDataFlags[x][nextY] & yFlags) != 0)
{
// Collision while traveling on the y axis
return false;
}
}
}
else
{
int y = p1.getY();
int xBig = p1.getX() << 16; // The x position is represented as a bigger number to handle rounding
int slope = (dx << 16) / dyAbs;
xBig += 0x8000; // Add half of a tile
if (dx < 0)
{
xBig--; // For correct rounding
}
int direction = dy < 0 ? -1 : 1;
while (y != p2.getY())
{
y += direction;
int x = xBig >>> 16;
if ((collisionDataFlags[x][y] & yFlags) != 0)
{
// Collision while traveling on the y axis
return false;
}
xBig += slope;
int nextX = xBig >>> 16;
if (nextX != x && (collisionDataFlags[nextX][y] & xFlags) != 0)
{
// Collision while traveling on the x axis
return false;
}
}
}
// No collision
return true;
}
@Inject
@Override
public List<Item> getGroundItems()
{
ItemLayer layer = this.getItemLayer();
if (layer == null)
{
return null;
}
List<Item> result = new ArrayList<Item>();
Node node = layer.getBottom();
while (node instanceof Item)
{
result.add((Item) node);
node = node.getNext();
}
return result;
} while (current != head && (((RSTileItem) current).getX() != x || ((RSTileItem) current).getY() != y));
}
}
runelite-mixins/src/main/java/net/runelite/mixins/RSTileObjectMixin.java
+2 -2
View File
@@ -15,14 +15,14 @@ import net.runelite.rs.api.RSBoundaryObject;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSFloorDecoration;
import net.runelite.rs.api.RSGameObject;
import net.runelite.rs.api.RSGroundItemPile;
import net.runelite.rs.api.RSTileItemPile;
import net.runelite.rs.api.RSWallDecoration;
@Mixins({
@Mixin(RSWallDecoration.class),
@Mixin(RSGameObject.class),
@Mixin(RSFloorDecoration.class),
@Mixin(RSGroundItemPile.class),
@Mixin(RSTileItemPile.class),
@Mixin(RSBoundaryObject.class)
})
public abstract class RSTileObjectMixin implements TileObject
runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
+3 -3
View File
@@ -609,7 +609,7 @@ public interface RSClient extends RSGameShell, Client
void setObjectDefinitionLowDetail(boolean lowDetail);
@Construct
RSGroundItem createItem();
RSTileItem createItem();
@Import("Interpreter_intStackSize")
@Override
@@ -833,9 +833,9 @@ public interface RSClient extends RSGameShell, Client
@Override
int getOculusOrbFocalPointY();
RSGroundItem getLastItemDespawn();
RSTileItem getLastItemDespawn();
void setLastItemDespawn(RSGroundItem lastItemDespawn);
void setLastItemDespawn(RSTileItem lastItemDespawn);
@Construct
RSWidget createWidget();
runescape-api/src/main/java/net/runelite/rs/api/RSTile.java
+1 -1
View File
@@ -16,7 +16,7 @@ public interface RSTile extends Tile
@Override
GameObject[] getGameObjects();
@Import("groundItemPile")
@Import("tileItemPile")
@Override
ItemLayer getItemLayer();
runescape-api/src/main/java/net/runelite/rs/api/RSGroundItem.java → runescape-api/src/main/java/net/runelite/rs/api/RSTileItem.java
+2 -2
View File
@@ -1,10 +1,10 @@
package net.runelite.rs.api;
import net.runelite.api.Item;
import net.runelite.api.Tile;
import net.runelite.api.TileItem;
import net.runelite.mapping.Import;
public interface RSGroundItem extends RSEntity, Item
public interface RSTileItem extends RSEntity, TileItem, Item
{
@Import("id")
@Override
runescape-api/src/main/java/net/runelite/rs/api/RSGroundItemPile.java → runescape-api/src/main/java/net/runelite/rs/api/RSTileItemPile.java
+1 -1
View File
@@ -3,7 +3,7 @@ package net.runelite.rs.api;
import net.runelite.api.ItemLayer;
import net.runelite.mapping.Import;
public interface RSGroundItemPile extends ItemLayer
public interface RSTileItemPile extends ItemLayer
{
@Import("x")
int getX();
runescape-client/src/main/java/BufferedSource.java
+3 -3
View File
@@ -255,9 +255,9 @@ public class BufferedSource implements Runnable {
GrandExchangeOfferWorldComparator.leftTitleSprite = BuddyRankComparator.convertJpgToSprite(var4);
NPC.rightTitleSprite = GrandExchangeOfferWorldComparator.leftTitleSprite.mirrorHorizontally();
if ((Client.worldProperties & 536870912) != 0) {
GroundItem.logoSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", "");
TileItem.logoSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", "");
} else {
GroundItem.logoSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "logo", "");
TileItem.logoSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "logo", "");
}
Login.titleboxSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", "");
@@ -315,7 +315,7 @@ public class BufferedSource implements Runnable {
ScriptEvent.loginBoxCenter = Login.loginBoxX + 180;
GrandExchangeOfferWorldComparator.leftTitleSprite.drawAt(Login.xPadding, 0);
NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
GroundItem.logoSprite.drawAt(Login.xPadding + 382 - GroundItem.logoSprite.subWidth / 2, 18);
TileItem.logoSprite.drawAt(Login.xPadding + 382 - TileItem.logoSprite.subWidth / 2, 18);
}
}
}
runescape-client/src/main/java/Client.java
+1 -1
View File
@@ -3722,7 +3722,7 @@ public final class Client extends GameShell implements Usernamed {
if (ServerPacket.field2161 == var1.serverPacket) {
var16 = var3.method5532();
GroundItemPile.method2764(var16);
TileItemPile.method2764(var16);
field888[++field671 - 1 & 31] = var16 & 32767;
var1.serverPacket = null;
return true;
runescape-client/src/main/java/ClientPreferences.java
+1 -1
View File
@@ -266,7 +266,7 @@ public class ClientPreferences {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Message var15 = GroundItem.method2049(var10, var4);
Message var15 = TileItem.method2049(var10, var4);
if (var15 != null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.count;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.cycle;
runescape-client/src/main/java/FloorOverlayDefinition.java
+4 -4
View File
@@ -259,10 +259,10 @@ public class FloorOverlayDefinition extends DualNode {
int var4 = var0 & var2 - 1;
int var5 = var1 / var2;
int var6 = var1 & var2 - 1;
int var7 = GroundItemPile.method2765(var3, var5);
int var8 = GroundItemPile.method2765(var3 + 1, var5);
int var9 = GroundItemPile.method2765(var3, var5 + 1);
int var10 = GroundItemPile.method2765(var3 + 1, var5 + 1);
int var7 = TileItemPile.method2765(var3, var5);
int var8 = TileItemPile.method2765(var3 + 1, var5);
int var9 = TileItemPile.method2765(var3, var5 + 1);
int var10 = TileItemPile.method2765(var3 + 1, var5 + 1);
int var11 = class4.method49(var7, var8, var4, var2);
int var12 = class4.method49(var9, var10, var4, var2);
return class4.method49(var11, var12, var6, var2);
runescape-client/src/main/java/Frames.java
+4 -4
View File
@@ -216,10 +216,10 @@ public class Frames extends DualNode {
ModelData0.field1871 = (var11 + var15) / 2;
ViewportMouse.field1745 = (var12 + var14) / 2;
ViewportMouse.field1746 = (var16 + var17) / 2;
GroundItem.field1242 = (var15 - var11) / 2;
TileItem.field1242 = (var15 - var11) / 2;
GrandExchangeEvent.field48 = (var14 - var12) / 2;
Canvas.field422 = (var17 - var16) / 2;
ScriptFrame.field527 = Math.abs(GroundItem.field1242);
ScriptFrame.field527 = Math.abs(TileItem.field1242);
ViewportMouse.field1741 = Math.abs(GrandExchangeEvent.field48);
MenuAction.field1160 = Math.abs(Canvas.field422);
}
@@ -245,9 +245,9 @@ public class Frames extends DualNode {
if (Math.abs(var13 * GrandExchangeEvent.field48 - var12 * Canvas.field422) > var17 * ViewportMouse.field1741 + var16 * MenuAction.field1160) {
return false;
}
if (Math.abs(var11 * Canvas.field422 - var13 * GroundItem.field1242) > var8 * MenuAction.field1160 + var17 * ScriptFrame.field527) {
if (Math.abs(var11 * Canvas.field422 - var13 * TileItem.field1242) > var8 * MenuAction.field1160 + var17 * ScriptFrame.field527) {
return false;
}
return Math.abs(var12 * GroundItem.field1242 - var11 * GrandExchangeEvent.field48) <= var16 * ScriptFrame.field527 + var8 * ViewportMouse.field1741;
return Math.abs(var12 * TileItem.field1242 - var11 * GrandExchangeEvent.field48) <= var16 * ScriptFrame.field527 + var8 * ViewportMouse.field1741;
}
}
runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
+6 -6
View File
@@ -142,10 +142,10 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
scene.removeGroundItemPile(class42.plane, var0, var1);
} else {
long var3 = -99999999L;
GroundItem var5 = null;
TileItem var5 = null;
GroundItem var6;
for (var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) {
TileItem var6;
for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) {
ItemDefinition var7 = WorldMapArea.getItemDefinition(var6.id);
long var8 = (long)var7.price;
if (var7.isStackable == 1) {
@@ -162,10 +162,10 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
scene.removeGroundItemPile(class42.plane, var0, var1);
} else {
var2.addLast(var5);
GroundItem var12 = null;
GroundItem var11 = null;
TileItem var12 = null;
TileItem var11 = null;
for (var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) {
for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) {
if (var5.id != var6.id) {
if (var12 == null) {
var12 = var6;
runescape-client/src/main/java/Messages.java
+1 -1
View File
@@ -413,7 +413,7 @@ public class Messages {
var16 = Client.getWidgetChild(var1, var0);
if (var16 != null) {
WorldMapID.method542();
GroundItem.method2053(var1, var0, HealthBar.method1957(class268.getWidgetClickMask(var16)), var16.itemId);
TileItem.method2053(var1, var0, HealthBar.method1957(class268.getWidgetClickMask(var16)), var16.itemId);
Client.isItemSelected = 0;
Client.selectedSpellActionName = FontName.method5318(var16);
if (Client.selectedSpellActionName == null) {
runescape-client/src/main/java/MusicPatch.java
+2 -2
View File
@@ -357,7 +357,7 @@ public class MusicPatch extends Node {
var32 = var41 * (var30 - var44) + (var30 - var44) / 2;
for (var33 = var44; var33 < var30; ++var33) {
var34 = GroundItemPile.method2767(var32, var30 - var44);
var34 = TileItemPile.method2767(var32, var30 - var44);
this.field2476[var33] = (byte)(var34 * this.field2476[var33] + 32 >> 6);
var32 += var31 - var41;
}
@@ -405,7 +405,7 @@ public class MusicPatch extends Node {
var32 = var47 * (var30 - var44) + (var30 - var44) / 2;
for (var33 = var44; var33 < var30; ++var33) {
var34 = GroundItemPile.method2767(var32, var30 - var44);
var34 = TileItemPile.method2767(var32, var30 - var44);
int var35 = var34 + (this.field2477[var33] & 255);
if (var35 < 0) {
var35 = 0;
runescape-client/src/main/java/RouteStrategy.java
+1 -1
View File
@@ -58,7 +58,7 @@ public abstract class RouteStrategy {
class197.FloorUnderlayDefinition_clearCached();
FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear();
KitDefinition.KitDefinition_cached.clear();
GroundItemPile.ObjectDefinition_clearCached();
TileItemPile.ObjectDefinition_clearCached();
AbstractWorldMapIcon.NpcDefinition_clearCached();
ItemDefinition.ItemDefinition_cached.clear();
ItemDefinition.ItemDefinition_cachedModels.clear();
runescape-client/src/main/java/Scene.java
+5 -5
View File
@@ -383,7 +383,7 @@ public class Scene {
)
@Export("newGroundItemPile")
public void newGroundItemPile(int var1, int var2, int var3, int var4, Entity var5, long var6, Entity var8, Entity var9) {
GroundItemPile var10 = new GroundItemPile();
TileItemPile var10 = new TileItemPile();
var10.first = var5;
var10.x = var2 * 128 + 64;
var10.y = var3 * 128 + 64;
@@ -410,7 +410,7 @@ public class Scene {
this.tiles[var1][var2][var3] = new Tile(var1, var2, var3);
}
this.tiles[var1][var2][var3].groundItemPile = var10;
this.tiles[var1][var2][var3].tileItemPile = var10;
}
@ObfuscatedName("c")
@@ -713,7 +713,7 @@ public class Scene {
public void removeGroundItemPile(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3];
if (var4 != null) {
var4.groundItemPile = null;
var4.tileItemPile = null;
}
}
@@ -1470,7 +1470,7 @@ public class Scene {
var22.entity.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x * 4096 - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y * 4096 - Scene_cameraZ, var22.tag);
}
GroundItemPile var23 = var3.groundItemPile;
TileItemPile var23 = var3.tileItemPile;
if (var23 != null && var23.height == 0) {
if (var23.second != null) {
var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 4096 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag);
@@ -1688,7 +1688,7 @@ public class Scene {
var3.drawSecondary = false;
--tileUpdateCount;
GroundItemPile var32 = var3.groundItemPile;
TileItemPile var32 = var3.tileItemPile;
if (var32 != null && var32.height != 0) {
if (var32.second != null) {
var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 4096 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag);
runescape-client/src/main/java/Tile.java
+2 -2
View File
@@ -71,8 +71,8 @@ public final class Tile extends Node {
@ObfuscatedSignature(
signature = "Ldc;"
)
@Export("groundItemPile")
GroundItemPile groundItemPile;
@Export("tileItemPile")
TileItemPile tileItemPile;
@ObfuscatedName("m")
@ObfuscatedGetter(
intValue = 52989903
runescape-client/src/main/java/TileItem.java
+87
View File
@@ -0,0 +1,87 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ch")
@Implements("TileItem")
public final class TileItem extends Entity {
@ObfuscatedName("i")
@ObfuscatedGetter(
intValue = 1900937269
)
static int field1242;
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "Llx;"
)
@Export("logoSprite")
static IndexedSprite logoSprite;
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = 1946972179
)
@Export("id")
int id;
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = -1304382567
)
@Export("quantity")
int quantity;
TileItem() {
}
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(I)Ldm;",
garbageValue = "759381421"
)
@Export("getModel")
protected final Model getModel() {
return WorldMapArea.getItemDefinition(this.id).getModel(this.quantity);
}
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "(Lhp;B)V",
garbageValue = "97"
)
public static void method2054(AbstractArchive var0) {
StructDefinition.StructDefinition_archive = var0;
}
@ObfuscatedName("p")
@ObfuscatedSignature(
signature = "(III)Lbj;",
garbageValue = "308740376"
)
static Message method2049(int var0, int var1) {
ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0);
return var2.getMessage(var1);
}
@ObfuscatedName("hs")
@ObfuscatedSignature(
signature = "(IIIII)V",
garbageValue = "96373324"
)
static void method2053(int var0, int var1, int var2, int var3) {
Widget var4 = Client.getWidgetChild(var0, var1);
if (var4 != null && var4.onTargetEnter != null) {
ScriptEvent var5 = new ScriptEvent();
var5.widget = var4;
var5.args = var4.onTargetEnter;
LoginPacket.runScriptEvent(var5);
}
Client.field812 = var3;
Client.isSpellSelected = true;
WorldMapEvent.field359 = var0;
Client.field848 = var1;
WorldMapCacheName.selectedSpellFlags = var2;
Strings.method4120(var4);
}
}
runescape-client/src/main/java/TileItemPile.java
+109
View File
@@ -0,0 +1,109 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("dc")
@Implements("TileItemPile")
public final class TileItemPile
{
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = -706647707
)
@Export("tileHeight")
int tileHeight;
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = -1749434399
)
@Export("x")
int x;
@ObfuscatedName("e")
@ObfuscatedGetter(
intValue = 1687183849
)
@Export("y")
int y;
@ObfuscatedName("p")
@ObfuscatedSignature(
signature = "Leo;"
)
@Export("first")
Entity first;
@ObfuscatedName("k")
@ObfuscatedSignature(
signature = "Leo;"
)
@Export("second")
Entity second;
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "Leo;"
)
@Export("third")
Entity third;
@ObfuscatedName("b")
@ObfuscatedGetter(
longValue = -6836359089398778317L
)
@Export("tag")
long tag;
@ObfuscatedName("i")
@ObfuscatedGetter(
intValue = -1167512637
)
@Export("height")
int height;
TileItemPile() {
}
@ObfuscatedName("k")
@ObfuscatedSignature(
signature = "(III)I",
garbageValue = "-989207473"
)
public static int method2767(int var0, int var1) {
int var2 = var0 >>> 31;
return (var0 + var2) / var1 - var2;
}
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "(IB)V",
garbageValue = "-23"
)
static void method2764(int var0) {
ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
if (var1 != null) {
var1.remove();
}
}
@ObfuscatedName("v")
@ObfuscatedSignature(
signature = "(III)I",
garbageValue = "1314012151"
)
static final int method2765(int var0, int var1) {
int var2 = MouseHandler.method1021(var0 - 1, var1 - 1) + MouseHandler.method1021(1 + var0, var1 - 1) + MouseHandler.method1021(var0 - 1, 1 + var1) + MouseHandler.method1021(1 + var0, 1 + var1);
int var3 = MouseHandler.method1021(var0 - 1, var1) + MouseHandler.method1021(var0 + 1, var1) + MouseHandler.method1021(var0, var1 - 1) + MouseHandler.method1021(var0, var1 + 1);
int var4 = MouseHandler.method1021(var0, var1);
return var2 / 16 + var3 / 8 + var4 / 4;
}
@ObfuscatedName("y")
@ObfuscatedSignature(
signature = "(B)V",
garbageValue = "76"
)
@Export("ObjectDefinition_clearCached")
public static void ObjectDefinition_clearCached() {
ObjectDefinition.ObjectDefinition_cached.clear();
ObjectDefinition.ObjectDefinition_cachedModelData.clear();
ObjectDefinition.ObjectDefinition_cachedEntities.clear();
ObjectDefinition.ObjectDefinition_cachedModels.clear();
}
}
runescape-client/src/main/java/Timer.java
+2 -2
View File
@@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jr")
@Implements("Timer")
@Implements("Timer") //GroundItem
public class Timer {
@ObfuscatedName("q")
@ObfuscatedGetter(
@@ -427,7 +427,7 @@ public class Timer {
ObjectDefinition.ObjectDefinition_modelsArchive = var2;
ObjectDefinition.ObjectDefinition_isLowDetail = var34;
FaceNormal.setNpcDefinitionArchives(class215.archive2, NPCDefinition.archive7);
GroundItem.method2054(class215.archive2);
TileItem.method2054(class215.archive2);
Archive var27 = class215.archive2;
Archive var5 = NPCDefinition.archive7;
boolean var6 = Client.isMembersWorld;
runescape-client/src/main/java/VarbitDefinition.java
+3 -3
View File
@@ -150,7 +150,7 @@ public class VarbitDefinition extends DualNode {
Login.worldSelectOpen = false;
GrandExchangeOfferWorldComparator.leftTitleSprite.drawAt(Login.xPadding, 0);
NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
GroundItem.logoSprite.drawAt(Login.xPadding + 382 - GroundItem.logoSprite.subWidth / 2, 18);
TileItem.logoSprite.drawAt(Login.xPadding + 382 - TileItem.logoSprite.subWidth / 2, 18);
break;
}
@@ -160,7 +160,7 @@ public class VarbitDefinition extends DualNode {
Login.worldSelectOpen = false;
GrandExchangeOfferWorldComparator.leftTitleSprite.drawAt(Login.xPadding, 0);
NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
GroundItem.logoSprite.drawAt(Login.xPadding + 382 - GroundItem.logoSprite.subWidth / 2, 18);
TileItem.logoSprite.drawAt(Login.xPadding + 382 - TileItem.logoSprite.subWidth / 2, 18);
} else {
if (Login.worldSelectPage > 0 && Login.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= Login.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= ParamDefinition.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= ParamDefinition.canvasHeight / 2 + 50) {
--Login.worldSelectPage;
@@ -177,7 +177,7 @@ public class VarbitDefinition extends DualNode {
Login.worldSelectOpen = false;
GrandExchangeOfferWorldComparator.leftTitleSprite.drawAt(Login.xPadding, 0);
NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
GroundItem.logoSprite.drawAt(Login.xPadding + 382 - GroundItem.logoSprite.subWidth / 2, 18);
TileItem.logoSprite.drawAt(Login.xPadding + 382 - TileItem.logoSprite.subWidth / 2, 18);
break;
}
runescape-client/src/main/java/class1.java
+4 -4
View File
@@ -137,7 +137,7 @@ final class class1 implements class0 {
}
} else {
GroundItem var32;
TileItem var32;
if (class185.field2321 == var0) {
var2 = var1.method5722();
var3 = (var2 >> 4 & 7) + DefaultsGroup.field3819;
@@ -146,7 +146,7 @@ final class class1 implements class0 {
if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) {
NodeDeque var31 = Client.groundItems[class42.plane][var3][var4];
if (var31 != null) {
for (var32 = (GroundItem)var31.last(); var32 != null; var32 = (GroundItem)var31.previous()) {
for (var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) {
if ((var5 & 32767) == var32.id) {
var32.remove();
break;
@@ -204,7 +204,7 @@ final class class1 implements class0 {
if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) {
NodeDeque var42 = Client.groundItems[class42.plane][var6][var7];
if (var42 != null) {
for (GroundItem var34 = (GroundItem)var42.last(); var34 != null; var34 = (GroundItem)var42.previous()) {
for (TileItem var34 = (TileItem)var42.last(); var34 != null; var34 = (TileItem)var42.previous()) {
if ((var2 & 32767) == var34.id && var4 == var34.quantity) {
var34.quantity = var3;
break;
@@ -222,7 +222,7 @@ final class class1 implements class0 {
var5 = (var4 >> 4 & 7) + DefaultsGroup.field3819;
var6 = (var4 & 7) + ChatChannel.field1306;
if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
var32 = new GroundItem();
var32 = new TileItem();
var32.id = var3;
var32.quantity = var2;
if (Client.groundItems[class42.plane][var5][var6] == null) {
runescape-client/src/main/java/class189.java
+1 -1
View File
@@ -23,7 +23,7 @@ public class class189 {
} else {
GrandExchangeOfferWorldComparator.leftTitleSprite.drawAt(Login.xPadding, 0);
NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
GroundItem.logoSprite.drawAt(Login.xPadding + 382 - GroundItem.logoSprite.subWidth / 2, 18);
TileItem.logoSprite.drawAt(Login.xPadding + 382 - TileItem.logoSprite.subWidth / 2, 18);
int var4;
if (Client.gameState == 0 || Client.gameState == 5) {
byte var3 = 20;
runescape-client/src/main/java/class2.java
+1 -1
View File
@@ -253,7 +253,7 @@ final class class2 implements class0 {
Messages.method2163(var20 + 1, var9.id, var9.childIndex, var9.itemId, "");
} else if (var20 == 10) {
WorldMapID.method542();
GroundItem.method2053(var9.id, var9.childIndex, HealthBar.method1957(class268.getWidgetClickMask(var9)), var9.itemId);
TileItem.method2053(var9.id, var9.childIndex, HealthBar.method1957(class268.getWidgetClickMask(var9)), var9.itemId);
Client.selectedSpellActionName = FontName.method5318(var9);
if (Client.selectedSpellActionName == null) {
Client.selectedSpellActionName = "null";
runescape-client/src/main/java/class65.java
+1 -1
View File
@@ -340,7 +340,7 @@ public class class65 extends RouteStrategy {
if (var17 == 3) {
NodeDeque var33 = Client.groundItems[class42.plane][var15][var16];
if (var33 != null) {
for (GroundItem var37 = (GroundItem)var33.first(); var37 != null; var37 = (GroundItem)var33.next()) {
for (TileItem var37 = (TileItem)var33.first(); var37 != null; var37 = (TileItem)var33.next()) {
ItemDefinition var35 = WorldMapArea.getItemDefinition(var37.id);
if (Client.isItemSelected == 1) {
class188.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ClientPreferences.colorStartTag(16748608) + var35.name, 16, var37.id, var15, var16);
runescape-client/src/main/java/class96.java
+1 -1
View File
@@ -400,7 +400,7 @@ public class class96 {
Login.runesSprite = null;
GrandExchangeOfferWorldComparator.leftTitleSprite = null;
NPC.rightTitleSprite = null;
GroundItem.logoSprite = null;
TileItem.logoSprite = null;
Login.title_muteSprite = null;
Login.options_buttons_0Sprite = null;
Decimator.options_buttons_2Sprite = null;