From 41245f7f89856e4735a2e3867491c08402580181 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 16 Nov 2020 22:12:58 -0500 Subject: [PATCH 1/8] api: add method to remove game objects from scene --- runelite-api/src/main/java/net/runelite/api/Scene.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/Scene.java b/runelite-api/src/main/java/net/runelite/api/Scene.java index 53cc8fcb15..e051ca1b7e 100644 --- a/runelite-api/src/main/java/net/runelite/api/Scene.java +++ b/runelite-api/src/main/java/net/runelite/api/Scene.java @@ -38,4 +38,10 @@ public interface Scene int getDrawDistance(); void setDrawDistance(int drawDistance); + + /** + * Remove a game object from the scene + * @param gameObject + */ + void removeGameObject(GameObject gameObject); } From d2f742ffb199cd131d29d20b5918af4f131620fb Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 18 Nov 2020 11:31:40 +0000 Subject: [PATCH 2/8] Update Item IDs to 2020-11-18-rev192 --- .../main/java/net/runelite/api/ItemID.java | 15 ++++++--------- .../java/net/runelite/api/NullItemID.java | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) 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 67557b873c..cca4b72841 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -4544,15 +4544,6 @@ public final class ItemID public static final int EMPTY_SPICE_SHAKER = 7496; public static final int DIRTY_BLAST = 7497; public static final int ANTIQUE_LAMP_7498 = 7498; - public static final int EVIL_DAVE = 7499; - public static final int DWARF_7500 = 7500; - public static final int GOBLINS = 7501; - public static final int LUMBRIDGE_GUIDE = 7502; - public static final int MONKEY_7503 = 7503; - public static final int OSMAN = 7504; - public static final int PIRATE_PETE = 7505; - public static final int SIR_AMIK_VARZE = 7506; - public static final int SKRACH = 7507; public static final int ASGOLDIAN_ALE = 7508; public static final int DWARVEN_ROCK_CAKE = 7509; public static final int DWARVEN_ROCK_CAKE_7510 = 7510; @@ -11550,5 +11541,11 @@ public final class ItemID public static final int TRAILBLAZER_PICKAXE_25112 = 25112; public static final int TRAILBLAZER_HARPOON_25114 = 25114; public static final int LEAGUE_TOMATO = 25117; + public static final int BEEKEEPERS_HAT = 25129; + public static final int BEEKEEPERS_TOP = 25131; + public static final int BEEKEEPERS_LEGS = 25133; + public static final int BEEKEEPERS_GLOVES = 25135; + public static final int BEEKEEPERS_BOOTS = 25137; + public static final int BONE_FRAGMENTS = 25139; /* 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 c9f155f9a7..158ae3fb3b 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -2841,6 +2841,15 @@ public final class NullItemID public static final int NULL_7452 = 7452; public static final int NULL_7467 = 7467; public static final int NULL_7469 = 7469; + public static final int NULL_7499 = 7499; + public static final int NULL_7500 = 7500; + public static final int NULL_7501 = 7501; + public static final int NULL_7502 = 7502; + public static final int NULL_7503 = 7503; + public static final int NULL_7504 = 7504; + public static final int NULL_7505 = 7505; + public static final int NULL_7506 = 7506; + public static final int NULL_7507 = 7507; public static final int NULL_7522 = 7522; public static final int NULL_7549 = 7549; public static final int NULL_7551 = 7551; @@ -13368,5 +13377,15 @@ public final class NullItemID public static final int NULL_25126 = 25126; public static final int NULL_25127 = 25127; public static final int NULL_25128 = 25128; + public static final int NULL_25130 = 25130; + public static final int NULL_25132 = 25132; + public static final int NULL_25134 = 25134; + public static final int NULL_25136 = 25136; + public static final int NULL_25138 = 25138; + public static final int NULL_25140 = 25140; + public static final int NULL_25141 = 25141; + public static final int NULL_25142 = 25142; + public static final int NULL_25143 = 25143; + public static final int NULL_25144 = 25144; /* This file is automatically generated. Do not edit. */ } From df1ffeb3bc83affcfa57e173e8b5719b1fde45ca Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 18 Nov 2020 11:31:40 +0000 Subject: [PATCH 3/8] Update Item variations to 2020-11-18-rev192 --- runelite-client/src/main/resources/item_variations.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index b5bec4195e..704d0fb2f8 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -3336,7 +3336,6 @@ ], "monkey": [ 4033, - 7503, 8942, 19556 ], @@ -4107,10 +4106,6 @@ 5050, 5052 ], - "dwarf": [ - 5054, - 7500 - ], "dwarven battleaxe": [ 5056, 5057, From e281a49ed3829a7fed34a52716f0b484391305fe Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 18 Nov 2020 11:31:41 +0000 Subject: [PATCH 4/8] Update NPC IDs to 2020-11-18-rev192 --- .../src/main/java/net/runelite/api/NpcID.java | 44 +++++++++++++++++-- .../main/java/net/runelite/api/NullNpcID.java | 4 ++ 2 files changed, 44 insertions(+), 4 deletions(-) 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 61f8fec18d..55a7703203 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -5704,10 +5704,6 @@ public final class NpcID public static final int GNOME_WOMAN = 6086; public static final int GNOME_WOMAN_6087 = 6087; public static final int CAPTAIN_ERRDO = 6088; - public static final int CAPTAIN_DALBUR = 6089; - public static final int CAPTAIN_BLEEMADGE = 6090; - public static final int CAPTAIN_ERRDO_6091 = 6091; - public static final int CAPTAIN_KLEMFOODLE = 6092; public static final int GNOME_6094 = 6094; public static final int GNOME_6095 = 6095; public static final int GNOME_6096 = 6096; @@ -8828,10 +8824,50 @@ public final class NpcID public static final int SPIDER_10442 = 10442; public static final int SPIDER_10443 = 10443; public static final int BEES = 10444; + public static final int GNORMADIUM_AVLAFRIM_10445 = 10445; + public static final int GNORMADIUM_AVLAFRIM_10446 = 10446; + public static final int GNORMADIUM_AVLAFRIM_10447 = 10447; + public static final int GNORMADIUM_AVLAFRIM_10448 = 10448; public static final int EVE_10449 = 10449; + public static final int GNORMADIUM_AVLAFRIM_10450 = 10450; + public static final int GNORMADIUM_AVLAFRIM_10451 = 10451; + public static final int CAPTAIN_DALBUR = 10452; + public static final int CAPTAIN_DALBUR_10453 = 10453; + public static final int CAPTAIN_DALBUR_10454 = 10454; + public static final int CAPTAIN_DALBUR_10455 = 10455; + public static final int CAPTAIN_DALBUR_10456 = 10456; + public static final int CAPTAIN_DALBUR_10457 = 10457; + public static final int CAPTAIN_DALBUR_10458 = 10458; + public static final int CAPTAIN_BLEEMADGE = 10459; public static final int JACKOLANTERN = 10460; + public static final int CAPTAIN_BLEEMADGE_10461 = 10461; + public static final int CAPTAIN_BLEEMADGE_10462 = 10462; + public static final int CAPTAIN_BLEEMADGE_10463 = 10463; + public static final int CAPTAIN_BLEEMADGE_10464 = 10464; + public static final int CAPTAIN_BLEEMADGE_10465 = 10465; + public static final int CAPTAIN_BLEEMADGE_10466 = 10466; + public static final int CAPTAIN_ERRDO_10467 = 10467; + public static final int CAPTAIN_ERRDO_10468 = 10468; + public static final int CAPTAIN_ERRDO_10469 = 10469; + public static final int CAPTAIN_ERRDO_10470 = 10470; + public static final int CAPTAIN_ERRDO_10471 = 10471; + public static final int CAPTAIN_ERRDO_10472 = 10472; + public static final int CAPTAIN_ERRDO_10473 = 10473; public static final int LEAGUES_ASSISTANT = 10476; public static final int THESSALIA = 10477; public static final int THESSALIA_10478 = 10478; + public static final int CAPTAIN_KLEMFOODLE = 10479; + public static final int CAPTAIN_KLEMFOODLE_10480 = 10480; + public static final int CAPTAIN_KLEMFOODLE_10481 = 10481; + public static final int CAPTAIN_KLEMFOODLE_10482 = 10482; + public static final int CAPTAIN_KLEMFOODLE_10483 = 10483; + public static final int CAPTAIN_KLEMFOODLE_10484 = 10484; + public static final int CAPTAIN_KLEMFOODLE_10485 = 10485; + public static final int CAPTAIN_SHORACKS_10486 = 10486; + public static final int CAPTAIN_SHORACKS_10487 = 10487; + public static final int CAPTAIN_SHORACKS_10488 = 10488; + public static final int CAPTAIN_SHORACKS_10489 = 10489; + public static final int CAPTAIN_SHORACKS_10490 = 10490; + public static final int CAPTAIN_SHORACKS_10491 = 10491; /* 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 d01e542110..44075d54de 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java @@ -381,6 +381,10 @@ public final class NullNpcID public static final int NULL_5903 = 5903; public static final int NULL_5930 = 5930; public static final int NULL_5953 = 5953; + public static final int NULL_6089 = 6089; + public static final int NULL_6090 = 6090; + public static final int NULL_6091 = 6091; + public static final int NULL_6092 = 6092; public static final int NULL_6093 = 6093; public static final int NULL_6104 = 6104; public static final int NULL_6105 = 6105; From 1f9dd0d5754b35f3c3e9f988300505bd074cb606 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Wed, 18 Nov 2020 05:11:15 -0700 Subject: [PATCH 5/8] rl-api: update friends chat rank sprite ids --- .../main/java/net/runelite/api/SpriteID.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/SpriteID.java b/runelite-api/src/main/java/net/runelite/api/SpriteID.java index f102b5ec76..ec1d72deff 100644 --- a/runelite-api/src/main/java/net/runelite/api/SpriteID.java +++ b/runelite-api/src/main/java/net/runelite/api/SpriteID.java @@ -977,15 +977,6 @@ public final class SpriteID public static final int STASH_UNITS_SLANTED_TAB_EDGE_LEFT_HOVERED = 1001; public static final int STASH_UNITS_SLANTED_TAB_MIDDLE_HOVERED = 1002; public static final int STASH_UNITS_SLANTED_TAB_EDGE_RIGHT_HOVERED = 1003; - public static final int FRIENDS_CHAT_RANK_SMILEY_FRIEND = 1004; - public static final int FRIENDS_CHAT_RANK_CROWN_JAGEX_MODERATOR = 1005; - public static final int FRIENDS_CHAT_RANK_KEY_CHANNEL_OWNER = 1006; - public static final int FRIENDS_CHAT_RANK_GOLD_STAR_GENERAL = 1007; - public static final int FRIENDS_CHAT_RANK_SILVER_STAR_CAPTAIN = 1008; - public static final int FRIENDS_CHAT_RANK_BRONZE_STAR_LIEUTENANT = 1009; - public static final int FRIENDS_CHAT_RANK_TRIPLE_CHEVRON_SERGEANT = 1010; - public static final int FRIENDS_CHAT_RANK_DOUBLE_CHEVRON_CORPORAL = 1011; - public static final int FRIENDS_CHAT_RANK_SINGLE_CHEVRON_RECRUIT = 1012; public static final int UNKNOWN_BUTTON_METAL_CORNERS = 1013; public static final int UNKNOWN_BUTTON_METAL_CORNERS_HOVERED = 1014; public static final int UNKNOWN_SLANTED_TAB_LONG = 1015; @@ -1591,4 +1582,13 @@ public final class SpriteID public static final int HEALTHBAR_DEFAULT_BACK_160PX = 2191; public static final int WIKI_DESELECTED = 2420; public static final int WIKI_SELECTED = 2421; + public static final int FRIENDS_CHAT_RANK_SMILEY_FRIEND = 2825; + public static final int FRIENDS_CHAT_RANK_CROWN_JAGEX_MODERATOR = 2826; + public static final int FRIENDS_CHAT_RANK_KEY_CHANNEL_OWNER = 2827; + public static final int FRIENDS_CHAT_RANK_GOLD_STAR_GENERAL = 2828; + public static final int FRIENDS_CHAT_RANK_SILVER_STAR_CAPTAIN = 2829; + public static final int FRIENDS_CHAT_RANK_BRONZE_STAR_LIEUTENANT = 2830; + public static final int FRIENDS_CHAT_RANK_TRIPLE_CHEVRON_SERGEANT = 2831; + public static final int FRIENDS_CHAT_RANK_DOUBLE_CHEVRON_CORPORAL = 2832; + public static final int FRIENDS_CHAT_RANK_SINGLE_CHEVRON_RECRUIT = 2833; } From 32510746c66efca73fef8e4bbcdb7534bd772e0f Mon Sep 17 00:00:00 2001 From: Max Weber Date: Wed, 18 Nov 2020 05:11:51 -0700 Subject: [PATCH 6/8] rl-api,rl-client: update friends chat kick cs2 id Yes the hash didn't change, but the ID did --- runelite-api/src/main/java/net/runelite/api/ScriptID.java | 2 +- runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm | 2 +- 2 files changed, 2 insertions(+), 2 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 2ad014aacd..b5d1bb0fbc 100644 --- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java +++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java @@ -191,7 +191,7 @@ public final class ScriptID * */ @ScriptArguments(string = 1) - public static final int FRIENDS_CHAT_SEND_KICK = 215; + public static final int FRIENDS_CHAT_SEND_KICK = 3764; /** * Builds the widget that holds all of the players inside a friends chat diff --git a/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm b/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm index f94d189442..5dc390b9fe 100644 --- a/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm +++ b/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm @@ -1,4 +1,4 @@ -.id 215 +.id 3764 .int_stack_count 0 .string_stack_count 1 .int_var_count 0 From bec42bdaf2ae29ba92bebb95466d6c3ae933bc05 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 18 Nov 2020 12:46:59 +0000 Subject: [PATCH 7/8] Release 1.6.32 --- 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-script-assembler-plugin/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 53c26e7144..880806bd13 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.32-SNAPSHOT + 1.6.32 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index a13cfc42c2..e20fce76a9 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.32-SNAPSHOT + 1.6.32 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 3a7aef269b..8ea62d9579 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.32-SNAPSHOT + 1.6.32 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 4b796c3420..d6e492fec7 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.32-SNAPSHOT + 1.6.32 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 59907580ec..8c30211b37 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.32-SNAPSHOT + 1.6.32 Web Service diff --git a/pom.xml b/pom.xml index 28c93c25d3..95378c76f0 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.32-SNAPSHOT + 1.6.32 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.6.32 diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 237343cec7..90df7dc7b1 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.32-SNAPSHOT + 1.6.32 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index ee28986187..1f81e5ce46 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.32-SNAPSHOT + 1.6.32 client diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index b2124d85aa..1a83bcd30d 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.32-SNAPSHOT + 1.6.32 script-assembler-plugin From ea024ee7569860bb678b2ca655ce2e174b2bfc45 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 18 Nov 2020 12:47:08 +0000 Subject: [PATCH 8/8] Bump for 1.6.33-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-script-assembler-plugin/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 880806bd13..00b52e85cf 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.32 + 1.6.33-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index e20fce76a9..0b245b847f 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.32 + 1.6.33-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 8ea62d9579..982d5222c8 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.32 + 1.6.33-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index d6e492fec7..288ab73034 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.32 + 1.6.33-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 8c30211b37..6844981f82 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.32 + 1.6.33-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index 95378c76f0..27477cc8c3 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.32 + 1.6.33-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.6.32 + HEAD diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 90df7dc7b1..791d706c78 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.32 + 1.6.33-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 1f81e5ce46..a73e4c5192 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.32 + 1.6.33-SNAPSHOT client diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 1a83bcd30d..0c468b5907 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.32 + 1.6.33-SNAPSHOT script-assembler-plugin