From 671ef69db698d19c81bdbd56dec823f38cf27e33 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 21 Jul 2021 14:33:42 -0400 Subject: [PATCH 01/20] chat commands: use script event for loading col log pets --- .../main/java/net/runelite/api/ScriptID.java | 3 + .../chatcommands/ChatCommandsPlugin.java | 81 ++++++++++--------- .../chatcommands/ChatCommandsPluginTest.java | 18 ++--- 3 files changed, 54 insertions(+), 48 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/ScriptID.java b/runelite-api/src/main/java/net/runelite/api/ScriptID.java index 846bd76b1f..dbde2ad2a4 100644 --- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java +++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java @@ -364,4 +364,7 @@ public final class ScriptID */ @ScriptArguments(integer = 6) public static final int SETTINGS_ZOOM_SLIDER_ONDRAG = 3896; + + @ScriptArguments(integer = 6) + public static final int COLLECTION_DRAW_LIST = 2730; } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index fe8b03cd26..61faf69878 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -56,18 +56,19 @@ import net.runelite.api.IndexedSprite; import net.runelite.api.ItemComposition; import net.runelite.api.MessageNode; import net.runelite.api.Player; +import net.runelite.api.ScriptID; import net.runelite.api.VarPlayer; import net.runelite.api.Varbits; import net.runelite.api.WorldType; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.events.ScriptPostFired; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.vars.AccountType; import net.runelite.api.widgets.Widget; import static net.runelite.api.widgets.WidgetID.ADVENTURE_LOG_ID; -import static net.runelite.api.widgets.WidgetID.COLLECTION_LOG_ID; import static net.runelite.api.widgets.WidgetID.GENERIC_SCROLL_GROUP_ID; import static net.runelite.api.widgets.WidgetID.KILL_LOGS_GROUP_ID; import net.runelite.api.widgets.WidgetInfo; @@ -155,7 +156,6 @@ public class ChatCommandsPlugin extends Plugin private boolean bossLogLoaded; private boolean advLogLoaded; private boolean scrollInterfaceLoaded; - private boolean collectionLogLoaded; private String pohOwner; private HiscoreEndpoint hiscoreEndpoint; // hiscore endpoint for current player private String lastBossKill; @@ -599,39 +599,6 @@ public class ChatCommandsPlugin extends Plugin } } - if (collectionLogLoaded && (pohOwner == null || pohOwner.equals(client.getLocalPlayer().getName()))) - { - collectionLogLoaded = false; - - Widget collectionLogEntryHeader = client.getWidget(WidgetInfo.COLLECTION_LOG_ENTRY_HEADER); - if (collectionLogEntryHeader != null && collectionLogEntryHeader.getChildren() != null) - { - Widget entryTitle = collectionLogEntryHeader.getChild(COL_LOG_ENTRY_HEADER_TITLE_INDEX); - // Make sure that the player is looking in the All Pets tab of the collection log - if (entryTitle.getText().equals("All Pets")) - { - Widget collectionLogEntryItems = client.getWidget(WidgetInfo.COLLECTION_LOG_ENTRY_ITEMS); - if (collectionLogEntryItems != null && collectionLogEntryItems.getChildren() != null) - { - List petList = new ArrayList<>(); - for (Widget child : collectionLogEntryItems.getChildren()) - { - if (child.getOpacity() == 0) - { - Pet pet = Pet.findPet(Text.removeTags(child.getName())); - if (pet != null) - { - petList.add(pet); - } - } - } - - setPetList(petList); - } - } - } - } - if (bossLogLoaded && (pohOwner == null || pohOwner.equals(client.getLocalPlayer().getName()))) { bossLogLoaded = false; @@ -700,6 +667,47 @@ public class ChatCommandsPlugin extends Plugin } } + @Subscribe + public void onScriptPostFired(ScriptPostFired scriptPostFired) + { + if (scriptPostFired.getScriptId() != ScriptID.COLLECTION_DRAW_LIST) + { + return; + } + + if (pohOwner == null || pohOwner.equals(client.getLocalPlayer().getName())) + { + Widget collectionLogEntryHeader = client.getWidget(WidgetInfo.COLLECTION_LOG_ENTRY_HEADER); + if (collectionLogEntryHeader != null && collectionLogEntryHeader.getChildren() != null) + { + Widget entryTitle = collectionLogEntryHeader.getChild(COL_LOG_ENTRY_HEADER_TITLE_INDEX); + // Make sure that the player is looking in the All Pets tab of the collection log + if (entryTitle.getText().equals("All Pets")) + { + Widget collectionLogEntryItems = client.getWidget(WidgetInfo.COLLECTION_LOG_ENTRY_ITEMS); + if (collectionLogEntryItems != null && collectionLogEntryItems.getChildren() != null) + { + List petList = new ArrayList<>(); + for (Widget child : collectionLogEntryItems.getChildren()) + { + if (child.getOpacity() == 0) + { + Pet pet = Pet.findPet(Text.removeTags(child.getName())); + if (pet != null) + { + petList.add(pet); + } + } + } + + setPetList(petList); + log.debug("Loaded {} pets", petList.size()); + } + } + } + } + } + @Subscribe public void onWidgetLoaded(WidgetLoaded widget) { @@ -708,9 +716,6 @@ public class ChatCommandsPlugin extends Plugin case ADVENTURE_LOG_ID: advLogLoaded = true; break; - case COLLECTION_LOG_ID: - collectionLogLoaded = true; - break; case KILL_LOGS_GROUP_ID: bossLogLoaded = true; break; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java index 0f2b4da035..0bd4dcac5a 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java @@ -39,12 +39,13 @@ import static net.runelite.api.ChatMessageType.TRADE; import net.runelite.api.Client; import net.runelite.api.MessageNode; import net.runelite.api.Player; +import net.runelite.api.ScriptID; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameTick; +import net.runelite.api.events.ScriptPostFired; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.Widget; import static net.runelite.api.widgets.WidgetID.ADVENTURE_LOG_ID; -import static net.runelite.api.widgets.WidgetID.COLLECTION_LOG_ID; import static net.runelite.api.widgets.WidgetID.GENERIC_SCROLL_GROUP_ID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.chat.ChatCommandManager; @@ -986,9 +987,8 @@ public class ChatCommandsPluginTest when(logEntryItemsWidget.getChildren()).thenReturn(logPetEntriesWidget); - WidgetLoaded logEvent = new WidgetLoaded(); - logEvent.setGroupId(COLLECTION_LOG_ID); - chatCommandsPlugin.onWidgetLoaded(logEvent); + ScriptPostFired scriptPostFired = new ScriptPostFired(ScriptID.COLLECTION_DRAW_LIST); + chatCommandsPlugin.onScriptPostFired(scriptPostFired); chatCommandsPlugin.onGameTick(new GameTick()); @@ -1024,9 +1024,8 @@ public class ChatCommandsPluginTest when(logEntryItemsWidget.getChildren()).thenReturn(logPetEntriesWidget); - WidgetLoaded logEvent = new WidgetLoaded(); - logEvent.setGroupId(COLLECTION_LOG_ID); - chatCommandsPlugin.onWidgetLoaded(logEvent); + ScriptPostFired scriptPostFired = new ScriptPostFired(ScriptID.COLLECTION_DRAW_LIST); + chatCommandsPlugin.onScriptPostFired(scriptPostFired); chatCommandsPlugin.onGameTick(new GameTick()); @@ -1062,9 +1061,8 @@ public class ChatCommandsPluginTest when(logEntryItemsWidget.getChildren()).thenReturn(logPetEntriesWidget); - WidgetLoaded logEvent = new WidgetLoaded(); - logEvent.setGroupId(COLLECTION_LOG_ID); - chatCommandsPlugin.onWidgetLoaded(logEvent); + ScriptPostFired scriptPostFired = new ScriptPostFired(ScriptID.COLLECTION_DRAW_LIST); + chatCommandsPlugin.onScriptPostFired(scriptPostFired); chatCommandsPlugin.onGameTick(new GameTick()); From 21748c60f8eddc3844b01d925af0154279a0c6d9 Mon Sep 17 00:00:00 2001 From: Illya Myshakov <35241874+IllyaMyshakov@users.noreply.github.com> Date: Wed, 21 Jul 2021 18:25:00 -0400 Subject: [PATCH 02/20] chat commands: use rl format message for pets Co-authored-by: Illya Myshakov --- .../client/plugins/chatcommands/ChatCommandsPlugin.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index 61faf69878..d9f458d008 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -1199,7 +1199,9 @@ public class ChatCommandsPlugin extends Plugin return; } - ChatMessageBuilder responseBuilder = new ChatMessageBuilder().append("Pets: ") + ChatMessageBuilder responseBuilder = new ChatMessageBuilder() + .append(ChatColorType.NORMAL) + .append("Pets: ") .append("(" + playerPetList.size() + ")"); // Append pets that the player owns @@ -1216,7 +1218,8 @@ public class ChatCommandsPlugin extends Plugin log.debug("Setting response {}", response); final MessageNode messageNode = chatMessage.getMessageNode(); - messageNode.setValue(response); + messageNode.setRuneLiteFormatMessage(response); + chatMessageManager.update(messageNode); client.refreshChat(); } From 5e323c234a261faab209fcd9237fa798fcd6b350 Mon Sep 17 00:00:00 2001 From: ThePharros <18340303+ThePharros@users.noreply.github.com> Date: Thu, 22 Jul 2021 14:48:23 -0400 Subject: [PATCH 03/20] menu swapper: add desert amulet 4 --- .../MenuEntrySwapperConfig.java | 18 ++++++++++++++++++ .../MenuEntrySwapperPlugin.java | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java index 07eef368c3..f234f1b045 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java @@ -106,6 +106,13 @@ public interface MenuEntrySwapperConfig extends Config MOUNT_KARUULM, } + enum DesertAmuletMode + { + WEAR, + NARDAH, + KALPHITE_CAVE, + } + @ConfigItem( position = -2, keyName = "shiftClickCustomization", @@ -514,6 +521,17 @@ public interface MenuEntrySwapperConfig extends Config return MorytaniaLegsMode.WEAR; } + @ConfigItem( + keyName = "swapDesertAmulet", + name = "Desert Amulet", + description = "Swap Wear with the Nardah or Kalphite Cave teleport on Desert Amulet 4.", + section = itemSection + ) + default DesertAmuletMode swapDesertAmuletMode() + { + return DesertAmuletMode.WEAR; + } + @ConfigItem( keyName = "swapAbyssTeleport", name = "Teleport to Abyss", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index 11e6596bea..4ba7dd1558 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -69,6 +69,7 @@ import net.runelite.client.menus.WidgetMenuOption; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import static net.runelite.client.plugins.menuentryswapper.MenuEntrySwapperConfig.ArdougneCloakMode; +import static net.runelite.client.plugins.menuentryswapper.MenuEntrySwapperConfig.DesertAmuletMode; import static net.runelite.client.plugins.menuentryswapper.MenuEntrySwapperConfig.KaramjaGlovesMode; import static net.runelite.client.plugins.menuentryswapper.MenuEntrySwapperConfig.MorytaniaLegsMode; import static net.runelite.client.plugins.menuentryswapper.MenuEntrySwapperConfig.RadasBlessingMode; @@ -373,6 +374,9 @@ public class MenuEntrySwapperPlugin extends Plugin swap("wear", "ecto teleport", () -> config.swapMorytaniaLegsMode() == MorytaniaLegsMode.ECTOFUNTUS); swap("wear", "burgh teleport", () -> config.swapMorytaniaLegsMode() == MorytaniaLegsMode.BURGH_DE_ROTT); + swap("wear", "nardah", () -> config.swapDesertAmuletMode() == DesertAmuletMode.NARDAH); + swap("wear", "kalphite cave", () -> config.swapDesertAmuletMode() == DesertAmuletMode.KALPHITE_CAVE); + swap("bury", "use", config::swapBones); swap("wield", "battlestaff", "use", config::swapBattlestaves); From c5514740e4a84fa0c0d559e08de20acf32041b20 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 23 Jul 2021 16:09:13 -0400 Subject: [PATCH 04/20] clues: fix Shayzien Infirmary clue challenge --- .../runelite/client/plugins/cluescrolls/clues/AnagramClue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java index 56c4a846e9..0cf1dfb6af 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java @@ -126,7 +126,7 @@ public class AnagramClue extends ClueScroll implements TextClueScroll, NpcClueSc new AnagramClue("O BIRDZ A ZANY EN PC", "Cap'n Izzy No-Beard", new WorldPoint(2807, 3191, 0), "Brimhaven Agility Arena", "How many Banana Trees are there in the plantation?", "33"), new AnagramClue("OK CO", "Cook", new WorldPoint(3207, 3214, 0), "Ground floor of Lumbridge Castle", "How many cannons does Lumbridge Castle have?", "9"), new AnagramClue("OR ZINC FUMES WARD", "Wizard Frumscone", new WorldPoint(2594, 3086, 0), "Downstairs in the Wizards' Guild"), - new AnagramClue("OUR OWN NEEDS", "Nurse Wooned", new WorldPoint(1511, 3619, 0), "Shayzien Infirmary", "How many wounded soldiers are in the camp?", "16"), + new AnagramClue("OUR OWN NEEDS", "Nurse Wooned", new WorldPoint(1511, 3619, 0), "Shayzien Infirmary", "How many wounded soldiers are there in the camp?", "16"), new AnagramClue("PACINNG A TAIE", "Captain Ginea", new WorldPoint(1504, 3632, 0), "Tent east of Shayzien Encampment war tent", "1 soldier can deal with 6 lizardmen. How many soldiers do we need for an army of 678 lizardmen?", "113"), new AnagramClue("PEAK REFLEX", "Flax keeper", new WorldPoint(2744, 3444, 0), "Flax field south of Seers Village", "If I have 1014 flax, and I spin a third of them into bowstring, how many flax do I have left?", "676"), new AnagramClue("PEATY PERT", "Party Pete", new WorldPoint(3047, 3376, 0), "Falador Party Room"), From a627181455898ae7cf85bd3ba7de53692fa03f7b Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Thu, 22 Jul 2021 11:02:36 +0100 Subject: [PATCH 05/20] ground items: make loot beams work with only show loot --- .../client/plugins/grounditems/GroundItemsPlugin.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java index a9e479885e..655ae55fc7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java @@ -392,6 +392,13 @@ public class GroundItemsPlugin extends Plugin } } } + + // Since the loot can potentially be over multiple tiles, make sure to process lootbeams on all those tiles + items.stream() + .map(ItemStack::getLocation) + .map(l -> WorldPoint.fromLocal(client, l)) + .distinct() + .forEach(this::handleLootbeam); } private GroundItem buildGroundItem(final Tile tile, final TileItem item) From 63b1aee5497556b544c38cda83b58cd358005f0c Mon Sep 17 00:00:00 2001 From: Vetricci <81270549+Vetricci@users.noreply.github.com> Date: Thu, 22 Jul 2021 19:24:38 -0500 Subject: [PATCH 06/20] item mapping: add combat achievement slayer helm variants --- .../src/main/java/net/runelite/client/game/ItemMapping.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 64abeeee52..5fed9ae49a 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 @@ -229,7 +229,8 @@ public enum ItemMapping SLAYER_HELMET, SLAYER_HELMET_I, BLACK_SLAYER_HELMET, BLACK_SLAYER_HELMET_I, PURPLE_SLAYER_HELMET, PURPLE_SLAYER_HELMET_I, RED_SLAYER_HELMET, RED_SLAYER_HELMET_I, GREEN_SLAYER_HELMET, GREEN_SLAYER_HELMET_I, TURQUOISE_SLAYER_HELMET, TURQUOISE_SLAYER_HELMET_I, TWISTED_SLAYER_HELMET, TWISTED_SLAYER_HELMET_I, HYDRA_SLAYER_HELMET, HYDRA_SLAYER_HELMET_I, SLAYER_HELMET_I_25177, BLACK_SLAYER_HELMET_I_25179, GREEN_SLAYER_HELMET_I_25181, RED_SLAYER_HELMET_I_25183, PURPLE_SLAYER_HELMET_I_25185, TURQUOISE_SLAYER_HELMET_I_25187, HYDRA_SLAYER_HELMET_I_25189, TWISTED_SLAYER_HELMET_I_25191, - 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), + 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), From 7854c6f096492d0208b82f3b501e839502ac3aea Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 23 Jul 2021 17:19:39 -0400 Subject: [PATCH 07/20] chat commands: fix parsing nightmare nb --- .../plugins/chatcommands/ChatCommandsPlugin.java | 2 +- .../chatcommands/ChatCommandsPluginTest.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index d9f458d008..11dab4a780 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -115,7 +115,7 @@ public class ChatCommandsPlugin extends Plugin private static final Pattern TOB_WAVE_PB_PATTERN = Pattern.compile("Theatre of Blood wave completion time: (?[0-9:]+(?:\\.[0-9]+)?) \\(new personal best\\)"); private static final Pattern TOB_WAVE_DURATION_PATTERN = Pattern.compile("Theatre of Blood wave completion time: [0-9:.]+\\. Personal best: (?[0-9:]+(?:\\.[0-9]+)?)"); private static final Pattern KILL_DURATION_PATTERN = Pattern.compile("(?i)^(?:(?:Fight |Lap |Challenge |Corrupted challenge )?duration:|Subdued in) [0-9:.]+\\. Personal best: (?:)?(?[0-9:]+(?:\\.[0-9]+)?)"); - private static final Pattern NEW_PB_PATTERN = Pattern.compile("(?i)^(?:(?:Fight |Lap |Challenge |Corrupted challenge )?duration:|Subdued in) (?[0-9:]+(?:\\.[0-9]+)?) \\(new personal best\\)"); + private static final Pattern NEW_PB_PATTERN = Pattern.compile("(?i)(?:(?:Fight |Lap |Challenge |Corrupted challenge )?duration:|Subdued in) (?[0-9:]+(?:\\.[0-9]+)?) \\(new personal best\\)"); private static final Pattern DUEL_ARENA_WINS_PATTERN = Pattern.compile("You (were defeated|won)! You have(?: now)? won (\\d+) duels?"); private static final Pattern DUEL_ARENA_LOSSES_PATTERN = Pattern.compile("You have(?: now)? lost (\\d+) duels?"); private static final Pattern ADVENTURE_LOG_TITLE_PATTERN = Pattern.compile("The Exploits of (.+)"); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java index 0bd4dcac5a..5daeb49aca 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java @@ -958,6 +958,19 @@ public class ChatCommandsPluginTest verify(configManager).setRSProfileConfiguration("personalbest", "tempoross", 5 * 60 + 42.6); } + @Test + public void testNightmarePb() + { + ChatMessage chatMessage = new ChatMessage(null, GAMEMESSAGE, "", "Your Nightmare kill count is: 1130", null, 0); + chatCommandsPlugin.onChatMessage(chatMessage); + + chatMessage = new ChatMessage(null, GAMEMESSAGE, "", "Team size: 5 players Fight duration: 3:28 (new personal best)", null, 0); + chatCommandsPlugin.onChatMessage(chatMessage); + + verify(configManager).setRSProfileConfiguration("killcount", "nightmare", 1130); + verify(configManager).setRSProfileConfiguration("personalbest", "nightmare", 3 * 60 + 28.0); + } + @Test public void testPlayerPetList() { From c1ad57b785b36247876abb8d27a7601dfccf4b5c Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Fri, 23 Jul 2021 19:22:19 -0700 Subject: [PATCH 08/20] Revert "XpInfoBox: Give stats panel equal column widths" This reverts commit e57f6d0d6e4ba4619d5fb433d07c980b9d8e5652. --- .../java/net/runelite/client/plugins/xptracker/XpInfoBox.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java index ea65fd3468..5d41b055c6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java @@ -29,7 +29,6 @@ package net.runelite.client.plugins.xptracker; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; -import java.awt.GridLayout; import java.math.RoundingMode; import java.text.DecimalFormat; import java.util.ArrayList; @@ -54,6 +53,7 @@ import net.runelite.api.Skill; import net.runelite.api.WorldType; import net.runelite.client.game.SkillIconManager; import net.runelite.client.ui.ColorScheme; +import net.runelite.client.ui.DynamicGridLayout; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.SkillColor; import net.runelite.client.ui.components.MouseDragEventForwarder; @@ -190,7 +190,7 @@ class XpInfoBox extends JPanel headerPanel.setBackground(ColorScheme.DARKER_GRAY_COLOR); headerPanel.setLayout(new BorderLayout()); - statsPanel.setLayout(new GridLayout(2, 2)); + statsPanel.setLayout(new DynamicGridLayout(2, 2)); statsPanel.setBackground(ColorScheme.DARKER_GRAY_COLOR); statsPanel.setBorder(new EmptyBorder(9, 2, 9, 2)); From b9e772be549649275a8ebde9d94869b8416d69d2 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 25 Jul 2021 19:51:56 -0400 Subject: [PATCH 09/20] api: remove many unused projectile ids --- .../java/net/runelite/api/ProjectileID.java | 51 ------------------- 1 file changed, 51 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/ProjectileID.java b/runelite-api/src/main/java/net/runelite/api/ProjectileID.java index a3ed93ce81..1c1f82ae76 100644 --- a/runelite-api/src/main/java/net/runelite/api/ProjectileID.java +++ b/runelite-api/src/main/java/net/runelite/api/ProjectileID.java @@ -33,57 +33,6 @@ public class ProjectileID { public static final int CANNONBALL = 53; public static final int GRANITE_CANNONBALL = 1443; - public static final int TELEKINETIC_SPELL = 143; - - public static final int LIZARDMAN_SHAMAN_AOE = 1293; - public static final int CRAZY_ARCHAEOLOGIST_AOE = 1260; - public static final int ICE_DEMON_RANGED_AOE = 1324; - public static final int ICE_DEMON_ICE_BARRAGE_AOE = 366; - public static final int VASA_AWAKEN_AOE = 1327; - public static final int VASA_RANGED_AOE = 1329; - public static final int TEKTON_METEOR_AOE = 660; - - public static final int OLM_FALLING_CRYSTAL_AOE = -1; //please help - public static final int OLM_BURNING_AOE = -1; - - public static final int VORKATH_BOMB_AOE = 1481; - public static final int VORKATH_POISON_POOL_AOE = 1483; - public static final int VORKATH_TICK_FIRE_AOE = 1482; - public static final int VORKATH_SPAWN_AOE = 1484; - - public static final int GALVEK_MINE = 1495; - public static final int GALVEK_BOMB = 1491; - - public static final int DAWN_FREEZE = 1445; - public static final int DUSK_CEILING = 1435; - - public static final int VETION_LIGHTNING = 280; - - public static final int CHAOS_FANATIC_AOE = 551; //for lack of a better word - - public static final int CORPOREAL_BEAST_AOE = 315; - public static final int CORPOREAL_BEAST_DARK_CORE_AOE = 319; - - public static final int WINTERTODT_SNOW_FALL_AOE = 501; - - public static final int DEMONIC_GORILLA_RANGED = 1302; - public static final int DEMONIC_GORILLA_MAGIC = 1304; - public static final int DEMONIC_GORILLA_BOULDER = 856; - - /** - * missing: marble gargoyle, superior dark beast - */ - - /** - * non AOE, regular projectiles - */ - public static final int VORKATH_DRAGONBREATH = 393; - public static final int VORKATH_RANGED = 1477; - public static final int VORKATH_MAGIC = 1479; - public static final int VORKATH_PRAYER_DISABLE = 1471; - public static final int VORKATH_VENOM = 1470; - public static final int VORKATH_ICE = 350; - public static final int ZALCANO_PROJECTILE_FIREBALL = 1728; } From e716b93f5be3ee878278947cae654a7904a67e67 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Sun, 25 Jul 2021 13:02:20 +0100 Subject: [PATCH 10/20] roof removal: fix some roof bleed in Prifddinas --- .../plugins/roofremoval/overrides.jsonc | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc b/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc index 17d5c6140d..cdecb9b49b 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc @@ -143,6 +143,14 @@ "ry2": 48, "z1": 2, "z2": 2 + }, + { + "rx1": 53, + "ry1": 44, + "rx2": 53, + "ry2": 47, + "z1": 0, + "z2": 0 } ], "13151":[ // Prif NE @@ -275,6 +283,38 @@ "ry2": 52, "z1": 2, "z2": 2 + }, + { + "rx1": 46, + "ry1": 52, + "rx2": 46, + "ry2": 52, + "z1": 0, + "z2": 0 + }, + { + "rx1": 40, + "ry1": 47, + "rx2": 40, + "ry2": 47, + "z1": 0, + "z2": 0 + }, + { + "rx1": 40, + "ry1": 26, + "rx2": 40, + "ry2": 26, + "z1": 0, + "z2": 0 + }, + { + "rx1": 53, + "ry1": 22, + "rx2": 53, + "ry2": 25, + "z1": 0, + "z2": 0 } ], "13150": [ // Prif SE From a695f61c204add5cfce2c1dd8e9b0185104de0af Mon Sep 17 00:00:00 2001 From: Vetricci <81270549+Vetricci@users.noreply.github.com> Date: Tue, 27 Jul 2021 09:13:42 +0100 Subject: [PATCH 11/20] roof removal: fix Varrock Castle gallery --- .../runelite/client/plugins/roofremoval/overrides.jsonc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc b/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc index cdecb9b49b..16472cd7f6 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc @@ -459,6 +459,14 @@ "ry2": 11, "z1": 0, "z2": 0 + }, + { + "rx1": 20, + "ry1": 23, + "rx2": 26, + "ry2": 34, + "z1": 1, + "z2": 1 } ], "12852": [ // South Varrock From d825f252a9e5ff33de661012eee7b39e7b503411 Mon Sep 17 00:00:00 2001 From: Vetricci <81270549+Vetricci@users.noreply.github.com> Date: Tue, 27 Jul 2021 09:20:15 +0100 Subject: [PATCH 12/20] roof removal: fix eastern Dark Beast area --- .../client/plugins/roofremoval/overrides.jsonc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc b/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc index 16472cd7f6..467c7380d4 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc @@ -2461,5 +2461,15 @@ "z1": 0, "z2": 1 } + ], + "8008": [ // Temple of Light Dungeon + { + "rx1": 34, + "ry1": 45, + "rx2": 54, + "ry2": 60, + "z1": 0, + "z2": 0 + } ] } From 852308d5d126ff03210e8b25da27cb2f8ca835d9 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Tue, 27 Jul 2021 10:02:55 +0100 Subject: [PATCH 13/20] roof removal: add overrides for Mage Arena --- .../plugins/roofremoval/overrides.jsonc | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc b/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc index 467c7380d4..2a15555b05 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc @@ -2471,5 +2471,87 @@ "z1": 0, "z2": 0 } + ], + "12349": [ // Mage Arena + { + "rx1": 31, + "ry1": 48, + "rx2": 36, + "ry2": 53, + "z1": 0, + "z2": 0 + }, + { + "rx1": 23, + "ry1": 8, + "rx2": 44, + "ry2": 50, + "z1": 0, + "z2": 0 + }, + { + "rx1": 10, + "ry1": 18, + "rx2": 56, + "ry2": 37, + "z1": 0, + "z2": 0 + }, + { + "rx1": 12, + "ry1": 16, + "rx2": 54, + "ry2": 40, + "z1": 0, + "z2": 0 + }, + { + "rx1": 14, + "ry1": 14, + "rx2": 52, + "ry2": 42, + "z1": 0, + "z2": 0 + }, + { + "rx1": 16, + "ry1": 12, + "rx2": 50, + "ry2": 44, + "z1": 0, + "z2": 0 + }, + { + "rx1": 18, + "ry1": 10, + "rx2": 48, + "ry2": 46, + "z1": 0, + "z2": 0 + }, + { + "rx1": 20, + "ry1": 8, + "rx2": 46, + "ry2": 48, + "z1": 0, + "z2": 0 + }, + { + "rx1": 55, + "ry1": 38, + "rx2": 55, + "ry2": 38, + "z1": 0, + "z2": 0 + }, + { + "rx1": 24, + "ry1": 51, + "rx2": 24, + "ry2": 51, + "z1": 0, + "z2": 0 + } ] } From fd57c7759a27aae3b4602810f7926180af959ef0 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Tue, 27 Jul 2021 16:51:43 +0100 Subject: [PATCH 14/20] roof removal: add overrides for Lighthouse during Horror from the Deep --- .../plugins/roofremoval/overrides.jsonc | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc b/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc index 2a15555b05..200d6b8b8d 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc @@ -1967,7 +1967,25 @@ "z1": 1, "z2": 2 }, - { // Lighthouse clockwork + { + "rx1": 12, + "ry1": 51, + "rx2": 13, + "ry2": 52, + "z1": 0, + "z2": 1 + } + ], + "9799": [ // Lighthouse (During Horror from the Deep) + { + "rx1": 9, + "ry1": 53, + "rx2": 16, + "ry2": 60, + "z1": 1, + "z2": 2 + }, + { "rx1": 12, "ry1": 51, "rx2": 13, From b205ad430945cc001ed41d90b5fb1e96830a02d7 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 28 Jul 2021 10:33:34 +0000 Subject: [PATCH 15/20] Update 198 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f23bb14f8c..87742143fa 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ true - 197 + 198 From e39ca5a86210d6cf952ddd9eeb412664dc3e7683 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 28 Jul 2021 10:31:57 +0000 Subject: [PATCH 16/20] Update Item IDs to 2021-07-28-rev198 --- runelite-api/src/main/java/net/runelite/api/ItemID.java | 6 ++++++ runelite-api/src/main/java/net/runelite/api/NullItemID.java | 1 + 2 files changed, 7 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index 3de3edeaf3..679a763aee 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -12022,5 +12022,11 @@ public final class ItemID public static final int CORRUPTED_ESCAPE_CRYSTAL = 25959; public static final int CRYSTAL_PADDLEFISH = 25960; public static final int ESCAPE_CRYSTAL = 25961; + public static final int CRYPT_KEY = 25963; + public static final int RANIS_HEAD = 25964; + public static final int STRANGE_SPIDER_EGGS = 25965; + public static final int SULPHURIC_ACID = 25966; + public static final int STICKY_NOTE = 25967; + public static final int HESPORI_BARK = 25968; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java index 877196148b..88ea88234f 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -13729,5 +13729,6 @@ public final class NullItemID public static final int NULL_25954 = 25954; public static final int NULL_25955 = 25955; public static final int NULL_25957 = 25957; + public static final int NULL_25962 = 25962; /* This file is automatically generated. Do not edit. */ } From 7d8eb58aef6f09a8f38cc338ea2335a077a58974 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 28 Jul 2021 10:31:58 +0000 Subject: [PATCH 17/20] Update Object IDs to 2021-07-28-rev198 --- .../java/net/runelite/api/NullObjectID.java | 247 +++++++++++++++++- .../main/java/net/runelite/api/ObjectID.java | 46 +++- 2 files changed, 289 insertions(+), 4 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index 5af135a544..f753cecd92 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -15711,6 +15711,8 @@ public final class NullObjectID public static final int NULL_33090 = 33090; public static final int NULL_33091 = 33091; public static final int NULL_33110 = 33110; + public static final int NULL_33111 = 33111; + public static final int NULL_33112 = 33112; public static final int NULL_33130 = 33130; public static final int NULL_33131 = 33131; public static final int NULL_33132 = 33132; @@ -15934,7 +15936,6 @@ public final class NullObjectID public static final int NULL_34058 = 34058; public static final int NULL_34059 = 34059; public static final int NULL_34317 = 34317; - public static final int NULL_34318 = 34318; public static final int NULL_34320 = 34320; public static final int NULL_34321 = 34321; public static final int NULL_34322 = 34322; @@ -20208,7 +20209,6 @@ public final class NullObjectID public static final int NULL_41407 = 41407; public static final int NULL_41411 = 41411; public static final int NULL_41419 = 41419; - public static final int NULL_41430 = 41430; public static final int NULL_41432 = 41432; public static final int NULL_41433 = 41433; public static final int NULL_41437 = 41437; @@ -20745,5 +20745,248 @@ public final class NullObjectID public static final int NULL_42504 = 42504; public static final int NULL_42505 = 42505; public static final int NULL_42514 = 42514; + public static final int NULL_42521 = 42521; + public static final int NULL_42522 = 42522; + public static final int NULL_42525 = 42525; + public static final int NULL_42526 = 42526; + public static final int NULL_42527 = 42527; + public static final int NULL_42528 = 42528; + public static final int NULL_42530 = 42530; + public static final int NULL_42533 = 42533; + public static final int NULL_42534 = 42534; + public static final int NULL_42535 = 42535; + public static final int NULL_42536 = 42536; + public static final int NULL_42537 = 42537; + public static final int NULL_42538 = 42538; + public static final int NULL_42539 = 42539; + public static final int NULL_42540 = 42540; + public static final int NULL_42541 = 42541; + public static final int NULL_42542 = 42542; + public static final int NULL_42543 = 42543; + public static final int NULL_42544 = 42544; + public static final int NULL_42545 = 42545; + public static final int NULL_42546 = 42546; + public static final int NULL_42547 = 42547; + public static final int NULL_42548 = 42548; + public static final int NULL_42549 = 42549; + public static final int NULL_42550 = 42550; + public static final int NULL_42551 = 42551; + public static final int NULL_42552 = 42552; + public static final int NULL_42553 = 42553; + public static final int NULL_42554 = 42554; + public static final int NULL_42555 = 42555; + public static final int NULL_42556 = 42556; + public static final int NULL_42557 = 42557; + public static final int NULL_42558 = 42558; + public static final int NULL_42559 = 42559; + public static final int NULL_42560 = 42560; + public static final int NULL_42561 = 42561; + public static final int NULL_42562 = 42562; + public static final int NULL_42563 = 42563; + public static final int NULL_42564 = 42564; + public static final int NULL_42565 = 42565; + public static final int NULL_42566 = 42566; + public static final int NULL_42567 = 42567; + public static final int NULL_42568 = 42568; + public static final int NULL_42569 = 42569; + public static final int NULL_42570 = 42570; + public static final int NULL_42571 = 42571; + public static final int NULL_42572 = 42572; + public static final int NULL_42573 = 42573; + public static final int NULL_42574 = 42574; + public static final int NULL_42575 = 42575; + public static final int NULL_42576 = 42576; + public static final int NULL_42577 = 42577; + public static final int NULL_42578 = 42578; + public static final int NULL_42579 = 42579; + public static final int NULL_42580 = 42580; + public static final int NULL_42581 = 42581; + public static final int NULL_42596 = 42596; + public static final int NULL_42597 = 42597; + public static final int NULL_42598 = 42598; + public static final int NULL_42599 = 42599; + public static final int NULL_42600 = 42600; + public static final int NULL_42607 = 42607; + public static final int NULL_42608 = 42608; + public static final int NULL_42609 = 42609; + public static final int NULL_42610 = 42610; + public static final int NULL_42611 = 42611; + public static final int NULL_42612 = 42612; + public static final int NULL_42613 = 42613; + public static final int NULL_42614 = 42614; + public static final int NULL_42615 = 42615; + public static final int NULL_42616 = 42616; + public static final int NULL_42617 = 42617; + public static final int NULL_42618 = 42618; + public static final int NULL_42619 = 42619; + public static final int NULL_42620 = 42620; + public static final int NULL_42621 = 42621; + public static final int NULL_42622 = 42622; + public static final int NULL_42623 = 42623; + public static final int NULL_42624 = 42624; + public static final int NULL_42625 = 42625; + public static final int NULL_42626 = 42626; + public static final int NULL_42627 = 42627; + public static final int NULL_42628 = 42628; + public static final int NULL_42634 = 42634; + public static final int NULL_42635 = 42635; + public static final int NULL_42636 = 42636; + public static final int NULL_42637 = 42637; + public static final int NULL_42638 = 42638; + public static final int NULL_42639 = 42639; + public static final int NULL_42640 = 42640; + public static final int NULL_42647 = 42647; + public static final int NULL_42648 = 42648; + public static final int NULL_42650 = 42650; + public static final int NULL_42651 = 42651; + public static final int NULL_42652 = 42652; + public static final int NULL_42653 = 42653; + public static final int NULL_42654 = 42654; + public static final int NULL_42655 = 42655; + public static final int NULL_42656 = 42656; + public static final int NULL_42657 = 42657; + public static final int NULL_42658 = 42658; + public static final int NULL_42659 = 42659; + public static final int NULL_42660 = 42660; + public static final int NULL_42661 = 42661; + public static final int NULL_42662 = 42662; + public static final int NULL_42663 = 42663; + public static final int NULL_42664 = 42664; + public static final int NULL_42665 = 42665; + public static final int NULL_42666 = 42666; + public static final int NULL_42667 = 42667; + public static final int NULL_42668 = 42668; + public static final int NULL_42669 = 42669; + public static final int NULL_42670 = 42670; + public static final int NULL_42671 = 42671; + public static final int NULL_42672 = 42672; + public static final int NULL_42673 = 42673; + public static final int NULL_42674 = 42674; + public static final int NULL_42675 = 42675; + public static final int NULL_42676 = 42676; + public static final int NULL_42677 = 42677; + public static final int NULL_42678 = 42678; + public static final int NULL_42679 = 42679; + public static final int NULL_42680 = 42680; + public static final int NULL_42681 = 42681; + public static final int NULL_42682 = 42682; + public static final int NULL_42683 = 42683; + public static final int NULL_42684 = 42684; + public static final int NULL_42685 = 42685; + public static final int NULL_42686 = 42686; + public static final int NULL_42687 = 42687; + public static final int NULL_42688 = 42688; + public static final int NULL_42689 = 42689; + public static final int NULL_42690 = 42690; + public static final int NULL_42691 = 42691; + public static final int NULL_42692 = 42692; + public static final int NULL_42693 = 42693; + public static final int NULL_42694 = 42694; + public static final int NULL_42695 = 42695; + public static final int NULL_42696 = 42696; + public static final int NULL_42697 = 42697; + public static final int NULL_42698 = 42698; + public static final int NULL_42699 = 42699; + public static final int NULL_42700 = 42700; + public static final int NULL_42701 = 42701; + public static final int NULL_42702 = 42702; + public static final int NULL_42703 = 42703; + public static final int NULL_42704 = 42704; + public static final int NULL_42705 = 42705; + public static final int NULL_42706 = 42706; + public static final int NULL_42707 = 42707; + public static final int NULL_42708 = 42708; + public static final int NULL_42709 = 42709; + public static final int NULL_42710 = 42710; + public static final int NULL_42711 = 42711; + public static final int NULL_42712 = 42712; + public static final int NULL_42713 = 42713; + public static final int NULL_42714 = 42714; + public static final int NULL_42715 = 42715; + public static final int NULL_42716 = 42716; + public static final int NULL_42717 = 42717; + public static final int NULL_42718 = 42718; + public static final int NULL_42719 = 42719; + public static final int NULL_42720 = 42720; + public static final int NULL_42721 = 42721; + public static final int NULL_42722 = 42722; + public static final int NULL_42723 = 42723; + public static final int NULL_42724 = 42724; + public static final int NULL_42725 = 42725; + public static final int NULL_42726 = 42726; + public static final int NULL_42727 = 42727; + public static final int NULL_42728 = 42728; + public static final int NULL_42729 = 42729; + public static final int NULL_42730 = 42730; + public static final int NULL_42731 = 42731; + public static final int NULL_42732 = 42732; + public static final int NULL_42733 = 42733; + public static final int NULL_42734 = 42734; + public static final int NULL_42735 = 42735; + public static final int NULL_42736 = 42736; + public static final int NULL_42737 = 42737; + public static final int NULL_42738 = 42738; + public static final int NULL_42739 = 42739; + public static final int NULL_42740 = 42740; + public static final int NULL_42741 = 42741; + public static final int NULL_42742 = 42742; + public static final int NULL_42743 = 42743; + public static final int NULL_42744 = 42744; + public static final int NULL_42745 = 42745; + public static final int NULL_42746 = 42746; + public static final int NULL_42747 = 42747; + public static final int NULL_42748 = 42748; + public static final int NULL_42749 = 42749; + public static final int NULL_42750 = 42750; + public static final int NULL_42751 = 42751; + public static final int NULL_42752 = 42752; + public static final int NULL_42753 = 42753; + public static final int NULL_42754 = 42754; + public static final int NULL_42755 = 42755; + public static final int NULL_42756 = 42756; + public static final int NULL_42757 = 42757; + public static final int NULL_42758 = 42758; + public static final int NULL_42759 = 42759; + public static final int NULL_42760 = 42760; + public static final int NULL_42761 = 42761; + public static final int NULL_42762 = 42762; + public static final int NULL_42763 = 42763; + public static final int NULL_42764 = 42764; + public static final int NULL_42765 = 42765; + public static final int NULL_42766 = 42766; + public static final int NULL_42767 = 42767; + public static final int NULL_42768 = 42768; + public static final int NULL_42769 = 42769; + public static final int NULL_42770 = 42770; + public static final int NULL_42771 = 42771; + public static final int NULL_42772 = 42772; + public static final int NULL_42773 = 42773; + public static final int NULL_42774 = 42774; + public static final int NULL_42775 = 42775; + public static final int NULL_42776 = 42776; + public static final int NULL_42777 = 42777; + public static final int NULL_42778 = 42778; + public static final int NULL_42779 = 42779; + public static final int NULL_42780 = 42780; + public static final int NULL_42781 = 42781; + public static final int NULL_42782 = 42782; + public static final int NULL_42783 = 42783; + public static final int NULL_42784 = 42784; + public static final int NULL_42785 = 42785; + public static final int NULL_42786 = 42786; + public static final int NULL_42787 = 42787; + public static final int NULL_42788 = 42788; + public static final int NULL_42789 = 42789; + public static final int NULL_42790 = 42790; + public static final int NULL_42791 = 42791; + public static final int NULL_42792 = 42792; + public static final int NULL_42793 = 42793; + public static final int NULL_42794 = 42794; + public static final int NULL_42795 = 42795; + public static final int NULL_42796 = 42796; + public static final int NULL_42797 = 42797; + public static final int NULL_42798 = 42798; + public static final int NULL_42799 = 42799; + public static final int NULL_42800 = 42800; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index fa4f49d8f9..4cdc64ad5d 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -17388,8 +17388,6 @@ public final class ObjectID public static final int SEERS_VILLAGE_PORTAL_33107 = 33107; public static final int YANILLE_WATCHTOWER_PORTAL_33108 = 33108; public static final int YANILLE_PORTAL_33109 = 33109; - public static final int ARENA_33111 = 33111; - public static final int ARENA_33112 = 33112; public static final int FORMIDABLE_PASSAGE = 33113; public static final int DEADMAN_SUPPLY_CHEST_33114 = 33114; public static final int DEADMAN_SUPPLY_CHEST_33115 = 33115; @@ -21755,5 +21753,49 @@ public final class ObjectID public static final int ROCKS_42511 = 42511; public static final int ROCKS_42512 = 42512; public static final int ROCKS_42513 = 42513; + public static final int DOOR_42515 = 42515; + public static final int BARRIER_42516 = 42516; + public static final int ARENA_42517 = 42517; + public static final int ARENA_42518 = 42518; + public static final int ARENA_42519 = 42519; + public static final int ARENA_42520 = 42520; + public static final int STAIRCASE_42523 = 42523; + public static final int DOOR_42524 = 42524; + public static final int GATE_42529 = 42529; + public static final int COFFIN_42531 = 42531; + public static final int COFFIN_42532 = 42532; + public static final int CANDLES_42582 = 42582; + public static final int CANDLES_42583 = 42583; + public static final int CANDLES_42584 = 42584; + public static final int CANDLES_42585 = 42585; + public static final int CANDLES_42586 = 42586; + public static final int CANDLES_42587 = 42587; + public static final int STEPPING_STONE_42588 = 42588; + public static final int STEPPING_STONE_42589 = 42589; + public static final int STRANGE_PLANT = 42590; + public static final int HESPORI_42591 = 42591; + public static final int HESPORI_42592 = 42592; + public static final int HESPORI_42593 = 42593; + public static final int CAVE_42594 = 42594; + public static final int CAVE_42595 = 42595; + public static final int EGG_SAC_42601 = 42601; + public static final int EGG_SAC_42602 = 42602; + public static final int EGG_SAC_42603 = 42603; + public static final int EGG_SAC_42604 = 42604; + public static final int SKELETON_42605 = 42605; + public static final int SKELETON_42606 = 42606; + public static final int WEB_SACK = 42629; + public static final int WEB_SACK_42630 = 42630; + public static final int WEB_SACK_42631 = 42631; + public static final int WEB_SACK_42632 = 42632; + public static final int WEB_SACK_42633 = 42633; + public static final int SPIDER_EGGS = 42641; + public static final int SPIDER_EGGS_42642 = 42642; + public static final int SPIDER_EGGS_42643 = 42643; + public static final int SPIDER_EGGS_42644 = 42644; + public static final int SPIDER_EGGS_42645 = 42645; + public static final int SPIDER_EGGS_42646 = 42646; + public static final int TREE_42649 = 42649; + public static final int BENCH_42801 = 42801; /* This file is automatically generated. Do not edit. */ } From 7a60a11ee3a89e001a526e01ca4844f2fb698b5a Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 28 Jul 2021 10:31:58 +0000 Subject: [PATCH 18/20] Update NPC IDs to 2021-07-28-rev198 --- .../src/main/java/net/runelite/api/NpcID.java | 27 +++++++++++++++++++ .../main/java/net/runelite/api/NullNpcID.java | 6 +++++ 2 files changed, 33 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index 84c1d60367..e87336fd5d 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -9426,5 +9426,32 @@ public final class NpcID public static final int SRARACHA_11159 = 11159; public static final int SRARACHA_11160 = 11160; public static final int DUSTY_ALIV = 11161; + public static final int MYSTERIOUS_STRANGER_11162 = 11162; + public static final int VYREWATCH_11169 = 11169; + public static final int VYREWATCH_11170 = 11170; + public static final int VYREWATCH_11171 = 11171; + public static final int VYREWATCH_11172 = 11172; + public static final int VYREWATCH_11173 = 11173; + public static final int SPIDER_11174 = 11174; + public static final int SPIDER_11175 = 11175; + public static final int SPIDER_11176 = 11176; + public static final int RANIS_DRAKAN_11177 = 11177; + public static final int VERZIK_VITUR_11178 = 11178; + public static final int VERZIK_VITUR_11179 = 11179; + public static final int VULCAN_ORVOROS = 11180; + public static final int NYLOCAS_QUEEN = 11181; + public static final int NYLOCAS = 11182; + public static final int THE_MAIDEN_OF_SUGADINTI_11183 = 11183; + public static final int PESTILENT_BLOAT_11184 = 11184; + public static final int NYLOCAS_VASILIAS_11185 = 11185; + public static final int SOTETSEG_11186 = 11186; + public static final int XARPUS_11187 = 11187; + public static final int NYLOCAS_ATHANATOS_11188 = 11188; + public static final int NYLOCAS_ISCHYROS_11189 = 11189; + public static final int NYLOCAS_TOXOBOLOS_11190 = 11190; + public static final int NYLOCAS_HAGIOS_11191 = 11191; + public static final int HESPORI_11192 = 11192; + public static final int FLOWER_11193 = 11193; + public static final int FLOWER_11194 = 11194; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java index 3568e7a309..187bb360d8 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java @@ -1719,5 +1719,11 @@ public final class NullNpcID public static final int NULL_11149 = 11149; public static final int NULL_11150 = 11150; public static final int NULL_11151 = 11151; + public static final int NULL_11163 = 11163; + public static final int NULL_11164 = 11164; + public static final int NULL_11165 = 11165; + public static final int NULL_11166 = 11166; + public static final int NULL_11167 = 11167; + public static final int NULL_11168 = 11168; /* This file is automatically generated. Do not edit. */ } From 202750177052acb049b5fe2487efe97b38102708 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 28 Jul 2021 10:46:19 +0000 Subject: [PATCH 19/20] Release 1.7.18 --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 004c34a6b2..4fb30a8d1a 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.18-SNAPSHOT + 1.7.18 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 8072700c4d..6b863d5816 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.18-SNAPSHOT + 1.7.18 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index eb001ccd38..b29751c606 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.18-SNAPSHOT + 1.7.18 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index fddcfd54a6..8b7085943e 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.18-SNAPSHOT + 1.7.18 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 341f190df2..eb97ac514a 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.18-SNAPSHOT + 1.7.18 Web Service diff --git a/pom.xml b/pom.xml index 87742143fa..40f0688ced 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.18-SNAPSHOT + 1.7.18 pom RuneLite @@ -61,7 +61,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - HEAD + runelite-parent-1.7.18 diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 5ea1dc527a..c6ea4284b4 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.18-SNAPSHOT + 1.7.18 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 6fea6c3c4c..f9142d5a17 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.18-SNAPSHOT + 1.7.18 client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index f2650ea6f5..98a9c67fd8 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.7.18-SNAPSHOT + 1.7.18 jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index a43d526f3a..0ee03f704f 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.18-SNAPSHOT + 1.7.18 script-assembler-plugin From 55e3c675f3e2661716ee4fa598d6005092ce384c Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 28 Jul 2021 10:46:23 +0000 Subject: [PATCH 20/20] Bump for 1.7.19-SNAPSHOT --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 4fb30a8d1a..18081c2cb9 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.18 + 1.7.19-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 6b863d5816..f93c0269bc 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.18 + 1.7.19-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index b29751c606..3aa68da721 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.18 + 1.7.19-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 8b7085943e..73d15a2422 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.18 + 1.7.19-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index eb97ac514a..219188f988 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.18 + 1.7.19-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index 40f0688ced..c37c06d19f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.18 + 1.7.19-SNAPSHOT pom RuneLite @@ -61,7 +61,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.7.18 + HEAD diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index c6ea4284b4..cbfa69f9b4 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.18 + 1.7.19-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index f9142d5a17..448af7397f 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.18 + 1.7.19-SNAPSHOT client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index 98a9c67fd8..669a40c793 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.7.18 + 1.7.19-SNAPSHOT jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 0ee03f704f..c2aed3e403 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.18 + 1.7.19-SNAPSHOT script-assembler-plugin