From af5ae4ab20c50a925fa0166311bcb0f66984fa10 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Tue, 26 Apr 2022 22:14:21 -0600 Subject: [PATCH] rl-client: update ID references to 2022-4-27 --- .../net/runelite/client/game/ItemMapping.java | 9 ----- .../plugins/cluescrolls/clues/EmoteClue.java | 2 +- .../plugins/itemcharges/ItemWithCharge.java | 8 ----- .../pyramidplunder/PyramidPlunderPlugin.java | 36 ++++++++----------- .../client/game/ItemVariationMappingTest.java | 5 --- 5 files changed, 16 insertions(+), 44 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java index 63dd7ad33b..141163f81d 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java @@ -250,15 +250,6 @@ public enum ItemMapping BLACK_MASK_I_25276, BLACK_MASK_1_I_25275, BLACK_MASK_2_I_25274, BLACK_MASK_3_I_25273, BLACK_MASK_4_I_25272, BLACK_MASK_5_I_25271, BLACK_MASK_6_I_25270, BLACK_MASK_7_I_25269, BLACK_MASK_8_I_25268, BLACK_MASK_9_I_25267, BLACK_MASK_10_I_25266, TZTOK_SLAYER_HELMET, TZTOK_SLAYER_HELMET_I, TZTOK_SLAYER_HELMET_I_25902, VAMPYRIC_SLAYER_HELMET, VAMPYRIC_SLAYER_HELMET_I, VAMPYRIC_SLAYER_HELMET_I_25908, TZKAL_SLAYER_HELMET, TZKAL_SLAYER_HELMET_I, TZKAL_SLAYER_HELMET_I_25914), - // Pharaoh's Sceptres - ITEM_PHARAOHS_SCEPTRE_1(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_1), - ITEM_PHARAOHS_SCEPTRE_2(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_2), - ITEM_PHARAOHS_SCEPTRE_4(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_4), - ITEM_PHARAOHS_SCEPTRE_5(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_5), - ITEM_PHARAOHS_SCEPTRE_6(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_6), - ITEM_PHARAOHS_SCEPTRE_7(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_7), - ITEM_PHARAOHS_SCEPTRE_8(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_8), - // Revertible items ITEM_HYDRA_LEATHER(HYDRA_LEATHER, FEROCIOUS_GLOVES), ITEM_HYDRA_TAIL(HYDRA_TAIL, BONECRUSHER_NECKLACE), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java index 8a83cd8bac..530c618291 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java @@ -204,7 +204,7 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu new EmoteClue("Wave in the Falador gem store. Equip a Mithril pickaxe, Black platebody and an Iron Kiteshield.", "Falador", NEAR_HERQUINS_SHOP_IN_FALADOR, new WorldPoint(2945, 3335, 0), WAVE, item(MITHRIL_PICKAXE), item(BLACK_PLATEBODY), item(IRON_KITESHIELD)), new EmoteClue("Wave on Mudskipper Point. Equip a black cape, leather chaps and a steel mace.", "Mudskipper Point", MUDSKIPPER_POINT, new WorldPoint(2989, 3110, 0), WAVE, item(BLACK_CAPE), item(LEATHER_CHAPS), item(STEEL_MACE)), new EmoteClue("Wave on the northern wall of Castle Drakan. Beware of double agents! Wear a dragon sq shield, splitbark body and any boater.", "Castle Drakan", NORTHERN_WALL_OF_CASTLE_DRAKAN, new WorldPoint(3562, 3379, 0), DOUBLE_AGENT_141, WAVE, any("Dragon sq shield", item(DRAGON_SQ_SHIELD), item(DRAGON_SQ_SHIELD_G)), item(SPLITBARK_BODY), any("Any boater", item(RED_BOATER), item(ORANGE_BOATER), item(GREEN_BOATER), item(BLUE_BOATER), item(BLACK_BOATER), item(PINK_BOATER), item(PURPLE_BOATER), item(WHITE_BOATER))), - new EmoteClue("Yawn in the 7th room of Pyramid Plunder. Beware of double agents! Equip a pharaoh sceptre and a full set of menaphite robes.", "Pyramid Plunder", _7TH_CHAMBER_OF_JALSAVRAH, new WorldPoint(1944, 4427, 0), DOUBLE_AGENT_141, YAWN, any("Pharaoh's sceptre", item(PHARAOHS_SCEPTRE), item(PHARAOHS_SCEPTRE_1), item(PHARAOHS_SCEPTRE_2), item(PHARAOHS_SCEPTRE_3), item(PHARAOHS_SCEPTRE_4), item(PHARAOHS_SCEPTRE_5), item(PHARAOHS_SCEPTRE_6), item(PHARAOHS_SCEPTRE_7), item(PHARAOHS_SCEPTRE_8)), any("Full set of menaphite robes", all(item(MENAPHITE_PURPLE_HAT), item(MENAPHITE_PURPLE_TOP), range(MENAPHITE_PURPLE_ROBE, MENAPHITE_PURPLE_KILT)), all(item(MENAPHITE_RED_HAT), item(MENAPHITE_RED_TOP), range(MENAPHITE_RED_ROBE, MENAPHITE_RED_KILT)))), + new EmoteClue("Yawn in the 7th room of Pyramid Plunder. Beware of double agents! Equip a pharaoh sceptre and a full set of menaphite robes.", "Pyramid Plunder", _7TH_CHAMBER_OF_JALSAVRAH, new WorldPoint(1944, 4427, 0), DOUBLE_AGENT_141, YAWN, any("Pharaoh's sceptre", item(PHARAOHS_SCEPTRE), item(PHARAOHS_SCEPTRE), item(PHARAOHS_SCEPTRE_9045), item(PHARAOHS_SCEPTRE_9046), item(PHARAOHS_SCEPTRE_9047), item(PHARAOHS_SCEPTRE_9048), item(PHARAOHS_SCEPTRE_9049), item(PHARAOHS_SCEPTRE_9050), item(PHARAOHS_SCEPTRE_9051), item(PHARAOHS_SCEPTRE_13074), item(PHARAOHS_SCEPTRE_13075), item(PHARAOHS_SCEPTRE_13077), item(PHARAOHS_SCEPTRE_13078), item(PHARAOHS_SCEPTRE_16176), item(PHARAOHS_SCEPTRE_21445), item(PHARAOHS_SCEPTRE_21446), item(PHARAOHS_SCEPTRE_26948), item(PHARAOHS_SCEPTRE_26950)), any("Full set of menaphite robes", all(item(MENAPHITE_PURPLE_HAT), item(MENAPHITE_PURPLE_TOP), range(MENAPHITE_PURPLE_ROBE, MENAPHITE_PURPLE_KILT)), all(item(MENAPHITE_RED_HAT), item(MENAPHITE_RED_TOP), range(MENAPHITE_RED_ROBE, MENAPHITE_RED_KILT)))), new EmoteClue("Yawn in the Varrock library. Equip a green gnome robe top, HAM robe bottom and an iron warhammer.", "Varrock Castle", VARROCK_PALACE_LIBRARY, new WorldPoint(3209, 3492, 0), YAWN, item(GREEN_ROBE_TOP), item(HAM_ROBE), item(IRON_WARHAMMER)), new EmoteClue("Yawn in Draynor Marketplace. Equip studded leather chaps, an iron kiteshield and a steel longsword.", "Draynor", DRAYNOR_VILLAGE_MARKET, new WorldPoint(3083, 3253, 0), YAWN, item(STUDDED_CHAPS), item(IRON_KITESHIELD), item(STEEL_LONGSWORD)), new EmoteClue("Yawn in the Castle Wars lobby. Shrug before you talk to me. Equip a ruby amulet, a mithril scimitar and a Wilderness cape.", "Castle Wars", CASTLE_WARS_BANK, new WorldPoint(2440, 3092, 0), YAWN, SHRUG, item(RUBY_AMULET), item(MITHRIL_SCIMITAR), range("Any team cape", TEAM1_CAPE, TEAM50_CAPE)), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java index 65ee2123a1..733440c6d0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java @@ -266,14 +266,6 @@ enum ItemWithCharge PASSAGE3(TELEPORT, NECKLACE_OF_PASSAGE3, 3), PASSAGE4(TELEPORT, NECKLACE_OF_PASSAGE4, 4), PASSAGE5(TELEPORT, NECKLACE_OF_PASSAGE5, 5), - PHARAO1(TELEPORT, PHARAOHS_SCEPTRE_1, 1), - PHARAO2(TELEPORT, PHARAOHS_SCEPTRE_2, 2), - PHARAO3(TELEPORT, PHARAOHS_SCEPTRE_3, 3), - PHARAO4(TELEPORT, PHARAOHS_SCEPTRE_4, 4), - PHARAO5(TELEPORT, PHARAOHS_SCEPTRE_5, 5), - PHARAO6(TELEPORT, PHARAOHS_SCEPTRE_6, 6), - PHARAO7(TELEPORT, PHARAOHS_SCEPTRE_7, 7), - PHARAO8(TELEPORT, PHARAOHS_SCEPTRE_8, 8), PRAYER1(POTION, PRAYER_POTION1, 1), PRAYER2(POTION, PRAYER_POTION2, 2), PRAYER3(POTION, PRAYER_POTION3, 3), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java index 97b3490d28..7a53a7f919 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java @@ -37,15 +37,9 @@ import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.GameState; -import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE; -import static net.runelite.api.NullObjectID.*; -import static net.runelite.api.ObjectID.GRAND_GOLD_CHEST; -import static net.runelite.api.ObjectID.SARCOPHAGUS_21255; -import static net.runelite.api.ObjectID.SPEARTRAP_21280; -import static net.runelite.api.ObjectID.TOMB_DOOR_20948; -import static net.runelite.api.ObjectID.URN_21261; -import static net.runelite.api.ObjectID.URN_21262; -import static net.runelite.api.ObjectID.URN_21263; +import net.runelite.api.ItemID; +import net.runelite.api.NullObjectID; +import net.runelite.api.ObjectID; import net.runelite.api.Tile; import net.runelite.api.TileObject; import net.runelite.api.Varbits; @@ -78,21 +72,21 @@ public class PyramidPlunderPlugin extends Plugin private static final Duration PYRAMID_PLUNDER_DURATION = Duration.of(501, RSTimeUnit.GAME_TICKS); private static final int PYRAMID_PLUNDER_REGION = 7749; - static final Set TOMB_DOOR_WALL_IDS = ImmutableSet.of(NULL_26618, NULL_26619, NULL_26620, NULL_26621); - static final int TOMB_DOOR_CLOSED_ID = TOMB_DOOR_20948; + static final Set TOMB_DOOR_WALL_IDS = ImmutableSet.of(NullObjectID.NULL_26618, NullObjectID.NULL_26619, NullObjectID.NULL_26620, NullObjectID.NULL_26621); + static final int TOMB_DOOR_CLOSED_ID = ObjectID.TOMB_DOOR_20948; - static final int SPEARTRAP_ID = SPEARTRAP_21280; + static final int SPEARTRAP_ID = ObjectID.SPEARTRAP; - static final Set URN_IDS = ImmutableSet.of(NULL_26580, NULL_26600, NULL_26601, NULL_26602, - NULL_26603, NULL_26604, NULL_26605, NULL_26606, NULL_26607, NULL_26608, NULL_26609, NULL_26610, NULL_26611, - NULL_26612, NULL_26613); - static final Set URN_CLOSED_IDS = ImmutableSet.of(URN_21261, URN_21262, URN_21263); + static final Set URN_IDS = ImmutableSet.of(NullObjectID.NULL_26580, NullObjectID.NULL_26600, NullObjectID.NULL_26601, NullObjectID.NULL_26602, + NullObjectID.NULL_26603, NullObjectID.NULL_26604, NullObjectID.NULL_26605, NullObjectID.NULL_26606, NullObjectID.NULL_26607, NullObjectID.NULL_26608, + NullObjectID.NULL_26609, NullObjectID.NULL_26610, NullObjectID.NULL_26611, NullObjectID.NULL_26612, NullObjectID.NULL_26613); + static final Set URN_CLOSED_IDS = ImmutableSet.of(ObjectID.URN_21261, ObjectID.URN_21262, ObjectID.URN_21263); - static final int GRAND_GOLD_CHEST_ID = NULL_26616; - static final int GRAND_GOLD_CHEST_CLOSED_ID = GRAND_GOLD_CHEST; + static final int GRAND_GOLD_CHEST_ID = NullObjectID.NULL_26616; + static final int GRAND_GOLD_CHEST_CLOSED_ID = ObjectID.GRAND_GOLD_CHEST; - static final int SARCOPHAGUS_ID = NULL_26626; - static final int SARCOPHAGUS_CLOSED_ID = SARCOPHAGUS_21255; + static final int SARCOPHAGUS_ID = NullObjectID.NULL_26626; + static final int SARCOPHAGUS_CLOSED_ID = ObjectID.SARCOPHAGUS_21255; @Inject private Client client; @@ -173,7 +167,7 @@ public class PyramidPlunderPlugin extends Plugin { int ppTimer = client.getVarbitValue(Varbits.PYRAMID_PLUNDER_TIMER); Duration remaining = PYRAMID_PLUNDER_DURATION.minus(ppTimer, RSTimeUnit.GAME_TICKS); - timer = new PyramidPlunderTimer(remaining, itemManager.getImage(PHARAOHS_SCEPTRE), this, + timer = new PyramidPlunderTimer(remaining, itemManager.getImage(ItemID.PHARAOHS_SCEPTRE), this, config, client); infoBoxManager.addInfoBox(timer); } diff --git a/runelite-client/src/test/java/net/runelite/client/game/ItemVariationMappingTest.java b/runelite-client/src/test/java/net/runelite/client/game/ItemVariationMappingTest.java index 64d4ec9454..8939556e93 100644 --- a/runelite-client/src/test/java/net/runelite/client/game/ItemVariationMappingTest.java +++ b/runelite-client/src/test/java/net/runelite/client/game/ItemVariationMappingTest.java @@ -217,11 +217,6 @@ public class ItemVariationMappingTest put(ORANGES5, ORANGES1); put(OVERLOAD_1, OVERLOAD_4); put(OVERLOAD_2, OVERLOAD_4); - put(PHARAOHS_SCEPTRE_3, PHARAOHS_SCEPTRE_3); - put(PHARAOHS_SCEPTRE_4, PHARAOHS_SCEPTRE_3); - put(PHARAOHS_SCEPTRE_5, PHARAOHS_SCEPTRE_3); - put(PHARAOHS_SCEPTRE_6, PHARAOHS_SCEPTRE_3); - put(PHARAOHS_SCEPTRE_7, PHARAOHS_SCEPTRE_3); put(PRAEL_BAT_1, PRAEL_BAT_1); put(PRAYER_CAPET, PRAYER_CAPE); put(PRAYER_ENHANCE_1_20965, PRAYER_ENHANCE_1);