From 8a5b00f5e5b9960b5d8e09a7e46c11f2eb8c4ae2 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 19 Jan 2021 11:58:07 -0700 Subject: [PATCH 1/7] Update Object IDs to 2021-1-20 --- .../main/java/net/runelite/api/NullObjectID.java | 10 ++++++++-- .../src/main/java/net/runelite/api/ObjectID.java | 15 ++++++++++++--- 2 files changed, 20 insertions(+), 5 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 1df3543f9f..950d22e579 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -19978,8 +19978,6 @@ public final class NullObjectID public static final int NULL_40730 = 40730; public static final int NULL_40740 = 40740; public static final int NULL_40743 = 40743; - public static final int NULL_40745 = 40745; - public static final int NULL_40746 = 40746; public static final int NULL_40747 = 40747; public static final int NULL_40748 = 40748; public static final int NULL_40749 = 40749; @@ -20090,5 +20088,13 @@ public final class NullObjectID public static final int NULL_41020 = 41020; public static final int NULL_41021 = 41021; public static final int NULL_41022 = 41022; + public static final int NULL_41191 = 41191; + public static final int NULL_41192 = 41192; + public static final int NULL_41193 = 41193; + public static final int NULL_41194 = 41194; + public static final int NULL_41195 = 41195; + public static final int NULL_41196 = 41196; + public static final int NULL_41197 = 41197; + public static final int NULL_41198 = 41198; /* 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 076045bc19..153313b119 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -20709,9 +20709,6 @@ public final class ObjectID public static final int EXPLOSIVE_POTION_TABLE_40467 = 40467; public static final int POTION_OF_POWER_TABLE_40468 = 40468; public static final int POTION_OF_POWER_TABLE_40469 = 40469; - public static final int BLUE_BARRIER_40470 = 40470; - public static final int RED_BARRIER_40471 = 40471; - public static final int BALANCE_PORTAL = 40472; public static final int BANK_CHEST_40473 = 40473; public static final int SOUL_WARS_PORTAL = 40474; public static final int SOUL_WARS_PORTAL_40475 = 40475; @@ -20753,6 +20750,8 @@ public final class ObjectID public static final int CHEST_40741 = 40741; public static final int LOCKED_CHEST_40742 = 40742; public static final int BARREL_40744 = 40744; + public static final int LADDER_40745 = 40745; + public static final int LADDER_40746 = 40746; public static final int TREE_40750 = 40750; public static final int TREE_STUMP_40751 = 40751; public static final int TREE_40752 = 40752; @@ -21079,5 +21078,15 @@ public final class ObjectID public static final int ORNATE_LEAGUE_STATUE = 41180; public static final int TRAILBLAZER_GLOBE = 41181; public static final int LEAGUE_ACCOMPLISHMENT_SCROLL = 41182; + public static final int ANCIENT_BRAZIER = 41183; + public static final int ANCIENT_BRAZIER_41184 = 41184; + public static final int ANCIENT_BRAZIER_41185 = 41185; + public static final int ANCIENT_BRAZIER_41186 = 41186; + public static final int ANCIENT_BRAZIER_41187 = 41187; + public static final int ANCIENT_BRAZIER_41188 = 41188; + public static final int ANCIENT_BRAZIER_41189 = 41189; + public static final int ANCIENT_BRAZIER_41190 = 41190; + public static final int BARRIER_41199 = 41199; + public static final int BARRIER_41200 = 41200; /* This file is automatically generated. Do not edit. */ } From 1bec513137495ad7f7ec8ca976fe51009cf263ca Mon Sep 17 00:00:00 2001 From: Max Weber Date: Tue, 19 Jan 2021 23:10:35 -0700 Subject: [PATCH 2/7] Update widget ids to 2021-1-20 --- .../net/runelite/api/widgets/WidgetID.java | 27 +++++++------------ .../net/runelite/api/widgets/WidgetInfo.java | 12 --------- .../client/plugins/barbarianassault/Role.java | 10 +++---- 3 files changed, 13 insertions(+), 36 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 9440c5d979..00b0a517c4 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -605,30 +605,21 @@ public class WidgetID { static class ATK { - static final int CALL_TEXT = 8; - static final int TO_CALL_WIDGET = 9; - static final int TO_CALL = 10; - static final int ROLE_SPRITE = 11; - static final int ROLE = 12; + static final int ROLE_SPRITE = 12; + static final int ROLE = 13; } static class HLR { - static final int TEAMMATE1 = 18; - static final int TEAMMATE2 = 22; - static final int TEAMMATE3 = 26; - static final int TEAMMATE4 = 30; + static final int TEAMMATE1 = 19; + static final int TEAMMATE2 = 23; + static final int TEAMMATE3 = 27; + static final int TEAMMATE4 = 31; } - static final int CORRECT_STYLE = 3; - static final int CURRENT_WAVE_WIDGET = 4; - static final int CURRENT_WAVE = 5; - static final int CALL_WIDGET = 6; - static final int CALL_TEXT = 7; - static final int TO_CALL_WIDGET = 8; - static final int TO_CALL = 9; - static final int ROLE_SPRITE = 10; - static final int ROLE = 11; + static final int ROLE_SPRITE = 11; + static final int ROLE = 12; + static final int REWARD_TEXT = 57; } diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index 1fb5a8b7aa..123a118843 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -371,9 +371,6 @@ public enum WidgetInfo CHATBOX_TAB_CLAN(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_CLAN), CHATBOX_TAB_TRADE(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_TRADE), - BA_HEAL_WAVE_TEXT(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.CURRENT_WAVE), - BA_HEAL_CALL_TEXT(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.TO_CALL), - BA_HEAL_LISTEN_TEXT(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.CORRECT_STYLE), BA_HEAL_ROLE_TEXT(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.ROLE), BA_HEAL_ROLE_SPRITE(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.ROLE_SPRITE), @@ -382,21 +379,12 @@ public enum WidgetInfo BA_HEAL_TEAMMATE3(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.HLR.TEAMMATE3), BA_HEAL_TEAMMATE4(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.HLR.TEAMMATE4), - BA_COLL_WAVE_TEXT(WidgetID.BA_COLLECTOR_GROUP_ID, WidgetID.BarbarianAssault.CURRENT_WAVE), - BA_COLL_CALL_TEXT(WidgetID.BA_COLLECTOR_GROUP_ID, WidgetID.BarbarianAssault.TO_CALL), - BA_COLL_LISTEN_TEXT(WidgetID.BA_COLLECTOR_GROUP_ID, WidgetID.BarbarianAssault.CORRECT_STYLE), BA_COLL_ROLE_TEXT(WidgetID.BA_COLLECTOR_GROUP_ID, WidgetID.BarbarianAssault.ROLE), BA_COLL_ROLE_SPRITE(WidgetID.BA_COLLECTOR_GROUP_ID, WidgetID.BarbarianAssault.ROLE_SPRITE), - BA_ATK_WAVE_TEXT(WidgetID.BA_ATTACKER_GROUP_ID, WidgetID.BarbarianAssault.CURRENT_WAVE), - BA_ATK_CALL_TEXT(WidgetID.BA_ATTACKER_GROUP_ID, WidgetID.BarbarianAssault.ATK.TO_CALL), - BA_ATK_LISTEN_TEXT(WidgetID.BA_ATTACKER_GROUP_ID, WidgetID.BarbarianAssault.CORRECT_STYLE), BA_ATK_ROLE_TEXT(WidgetID.BA_ATTACKER_GROUP_ID, WidgetID.BarbarianAssault.ATK.ROLE), BA_ATK_ROLE_SPRITE(WidgetID.BA_ATTACKER_GROUP_ID, WidgetID.BarbarianAssault.ATK.ROLE_SPRITE), - BA_DEF_WAVE_TEXT(WidgetID.BA_DEFENDER_GROUP_ID, WidgetID.BarbarianAssault.CURRENT_WAVE), - BA_DEF_CALL_TEXT(WidgetID.BA_DEFENDER_GROUP_ID, WidgetID.BarbarianAssault.TO_CALL), - BA_DEF_LISTEN_TEXT(WidgetID.BA_DEFENDER_GROUP_ID, WidgetID.BarbarianAssault.CORRECT_STYLE), BA_DEF_ROLE_TEXT(WidgetID.BA_DEFENDER_GROUP_ID, WidgetID.BarbarianAssault.ROLE), BA_DEF_ROLE_SPRITE(WidgetID.BA_DEFENDER_GROUP_ID, WidgetID.BarbarianAssault.ROLE_SPRITE), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java index a8fd8b656c..609322eac5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java @@ -32,13 +32,11 @@ import net.runelite.api.widgets.WidgetInfo; @Getter enum Role { - ATTACKER(WidgetInfo.BA_ATK_LISTEN_TEXT, WidgetInfo.BA_ATK_CALL_TEXT, WidgetInfo.BA_ATK_ROLE_TEXT, WidgetInfo.BA_ATK_ROLE_SPRITE), - DEFENDER(WidgetInfo.BA_DEF_LISTEN_TEXT, WidgetInfo.BA_DEF_CALL_TEXT, WidgetInfo.BA_DEF_ROLE_TEXT, WidgetInfo.BA_DEF_ROLE_SPRITE), - COLLECTOR(WidgetInfo.BA_COLL_LISTEN_TEXT, WidgetInfo.BA_COLL_CALL_TEXT, WidgetInfo.BA_COLL_ROLE_TEXT, WidgetInfo.BA_COLL_ROLE_SPRITE), - HEALER(WidgetInfo.BA_HEAL_LISTEN_TEXT, WidgetInfo.BA_HEAL_CALL_TEXT, WidgetInfo.BA_HEAL_ROLE_TEXT, WidgetInfo.BA_HEAL_ROLE_SPRITE); + ATTACKER(WidgetInfo.BA_ATK_ROLE_TEXT, WidgetInfo.BA_ATK_ROLE_SPRITE), + DEFENDER(WidgetInfo.BA_DEF_ROLE_TEXT, WidgetInfo.BA_DEF_ROLE_SPRITE), + COLLECTOR(WidgetInfo.BA_COLL_ROLE_TEXT, WidgetInfo.BA_COLL_ROLE_SPRITE), + HEALER(WidgetInfo.BA_HEAL_ROLE_TEXT, WidgetInfo.BA_HEAL_ROLE_SPRITE); - private final WidgetInfo listen; - private final WidgetInfo call; private final WidgetInfo roleText; private final WidgetInfo roleSprite; From 83790baf4107a8a8f829191508d4d7978caabb2f Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 20 Jan 2021 15:44:34 +0000 Subject: [PATCH 3/7] Release 1.6.37 --- 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 69f343d321..fd6dce1377 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.37-SNAPSHOT + 1.6.37 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 810ceddb04..1141a27c2a 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.37-SNAPSHOT + 1.6.37 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index dcd1892fc5..aa83ed2bbd 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.37-SNAPSHOT + 1.6.37 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 859446c8a6..d22241326e 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.37-SNAPSHOT + 1.6.37 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 2d5940328a..f54984ccf1 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.37-SNAPSHOT + 1.6.37 Web Service diff --git a/pom.xml b/pom.xml index 32a884b1b1..4a947b417e 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.37-SNAPSHOT + 1.6.37 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.37 diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index c2ea427d12..42004bfc9b 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.37-SNAPSHOT + 1.6.37 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 5e411feb19..b35ef6d49d 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.37-SNAPSHOT + 1.6.37 client diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 0195a635c4..fdc8c80d6e 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.37-SNAPSHOT + 1.6.37 script-assembler-plugin From bc3a95d7ab254e9b053ad7ead49ae67a082e8278 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 20 Jan 2021 15:44:45 +0000 Subject: [PATCH 4/7] Bump for 1.6.38-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 fd6dce1377..64e289637a 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.37 + 1.6.38-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 1141a27c2a..84680ae2ef 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.37 + 1.6.38-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index aa83ed2bbd..2493a298c3 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.37 + 1.6.38-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index d22241326e..44a54972f9 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.37 + 1.6.38-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index f54984ccf1..0a5a66948a 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.37 + 1.6.38-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index 4a947b417e..39f5f6f422 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.37 + 1.6.38-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.37 + HEAD diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 42004bfc9b..5a035ea6c7 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.37 + 1.6.38-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index b35ef6d49d..a135e51f11 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.37 + 1.6.38-SNAPSHOT client diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index fdc8c80d6e..ff8e50ba3c 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.37 + 1.6.38-SNAPSHOT script-assembler-plugin From 97343fbd098036455d6917129a9fa752b2b73201 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 20 Jan 2021 18:02:01 -0500 Subject: [PATCH 5/7] client: update discord dependency version The osx native has been rebuilt to support older osx versions --- runelite-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index a135e51f11..c29447cebb 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -220,7 +220,7 @@ net.runelite discord - 1.3 + 1.4 net.runelite From 857ac274fff200157467961d99fa2f741fe53341 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 20 Jan 2021 18:25:40 -0500 Subject: [PATCH 6/7] client: rename jogl/gluegen osx natives artifacts gradle does not look at classifiers when doing dependency conflict resolution, causing it to not correctly handle having multiple dependencies of differing versions and classifiers. It picks the highest version of any of the dependencies with the same groupId and artifactId and uses that for every other dependency regardless of classifier. This renames the osx natives artifacts to have a unique artifact name to workaround this issue --- runelite-client/pom.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index c29447cebb..682c6625f8 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -141,9 +141,8 @@ net.runelite.jogl - jogl-all + jogl-all-natives-macosx 2.4.0-rc-20210117 - natives-macosx-universal runtime @@ -174,9 +173,8 @@ net.runelite.gluegen - gluegen-rt + gluegen-rt-natives-macosx 2.4.0-rc-20210117 - natives-macosx-universal runtime From 532ab45399daf0f70049a56705ca7a8624a17940 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 21 Jan 2021 23:54:29 +0100 Subject: [PATCH 7/7] menu entry swapper: Add Spria to NPC Contact swap (#13070) This commit also reformats the NPC Contact swap list to match the ingame dialog. --- .../plugins/menuentryswapper/MenuEntrySwapperPlugin.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 86487392eb..b72c138391 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 @@ -311,9 +311,10 @@ public class MenuEntrySwapperPlugin extends Plugin swap("view offer", "abort offer", () -> shiftModifier() && config.swapGEAbort()); Arrays.asList( - "honest jimmy", "bert the sandman", "advisor ghrim", "dark mage", "lanthus", "turael", "mazchna", "vannaka", - "chaeldar", "nieve", "steve", "duradel", "krystilia", "konar", "murphy", "cyrisus", "smoggy", "ginea", "watson", - "barbarian guard", "amy", "random" + "honest jimmy", "bert the sandman", "advisor ghrim", "dark mage", "lanthus", "spria", "turael", + "mazchna", "vannaka", "chaeldar", "nieve", "steve", "duradel", "krystilia", "konar", + "murphy", "cyrisus", "smoggy", "ginea", "watson", "barbarian guard", "amy", + "random" ).forEach(npc -> swap("cast", "npc contact", npc, () -> shiftModifier() && config.swapNpcContact())); swap("value", "buy 1", () -> shiftModifier() && config.shopBuy() == BuyMode.BUY_1);