From 0c2a253718839dd68076a25402d55b06db90b5e3 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 5 Jun 2019 20:59:53 -0400 Subject: [PATCH 1/3] music list plugin: invalidate tracks and filter state on widget reload This was keeping references to the old widget tracks, and having the filter incorrectly applied. --- .../client/plugins/musiclist/MusicListPlugin.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java index 737bddbcc1..ab38b515f9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java @@ -75,7 +75,7 @@ public class MusicListPlugin extends Plugin private Collection tracks; - private MusicState currentMusicFilter; + private MusicState currentMusicFilter = MusicState.ALL; @Override protected void startUp() @@ -100,6 +100,7 @@ public class MusicListPlugin extends Plugin { if (gameStateChanged.getGameState() == GameState.LOGIN_SCREEN) { + // Reset music filter on logout currentMusicFilter = MusicState.ALL; tracks = null; } @@ -110,6 +111,10 @@ public class MusicListPlugin extends Plugin { if (widgetLoaded.getGroupId() == WidgetID.MUSIC_GROUP_ID) { + tracks = null; + // Reset filter state as the widget has been reloaded. + // It is too early here to call updateFilter() + currentMusicFilter = MusicState.ALL; addMusicButtons(); } } @@ -140,7 +145,7 @@ public class MusicListPlugin extends Plugin musicSearchButton.revalidate(); musicFilterButton = header.createChild(-1, WidgetType.GRAPHIC); - musicFilterButton.setSpriteId(SpriteID.MINIMAP_ORB_HITPOINTS); + musicFilterButton.setSpriteId(SpriteID.MINIMAP_ORB_PRAYER); musicFilterButton.setOriginalWidth(15); musicFilterButton.setOriginalHeight(15); musicFilterButton.setXPositionMode(WidgetPositionMode.ABSOLUTE_RIGHT); From 7f70523f8028e2f1182f39953c6f2ce15f4a39b8 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 6 Jun 2019 11:28:49 +0000 Subject: [PATCH 2/3] [maven-release-plugin] prepare release runelite-parent-1.5.26 --- 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 ++-- protocol-api/pom.xml | 2 +- protocol/pom.xml | 2 +- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-mixins/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- runescape-api/pom.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 64c481e76e..978ca0c6e3 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26-SNAPSHOT + 1.5.26 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index ac51e66b60..2863bf965e 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.26-SNAPSHOT + 1.5.26 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 7d8dcdc50c..da761c9d0a 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26-SNAPSHOT + 1.5.26 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 15c03eac36..487d2bb0a4 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.26-SNAPSHOT + 1.5.26 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 7b44773033..062dd5aeaf 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.26-SNAPSHOT + 1.5.26 Web Service diff --git a/pom.xml b/pom.xml index 6945299616..5a18b1bf83 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.26-SNAPSHOT + 1.5.26 pom RuneLite @@ -59,7 +59,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - HEAD + runelite-parent-1.5.26 diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index 7a47b77618..f183e892b6 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26-SNAPSHOT + 1.5.26 protocol-api diff --git a/protocol/pom.xml b/protocol/pom.xml index 995b2d62ad..38b61252c2 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26-SNAPSHOT + 1.5.26 protocol diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 37c849d760..08333590ad 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26-SNAPSHOT + 1.5.26 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 54af5f8af3..5d78269604 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26-SNAPSHOT + 1.5.26 client diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml index 76f1de5792..81b72b030b 100644 --- a/runelite-mixins/pom.xml +++ b/runelite-mixins/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26-SNAPSHOT + 1.5.26 mixins diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index e4c9962294..a999f25e59 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26-SNAPSHOT + 1.5.26 script-assembler-plugin diff --git a/runescape-api/pom.xml b/runescape-api/pom.xml index f7bd6163c5..2d54b8f830 100644 --- a/runescape-api/pom.xml +++ b/runescape-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26-SNAPSHOT + 1.5.26 net.runelite.rs From 72468f251cdc174ce2cd64c607e4411dc69a6ca0 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 6 Jun 2019 11:28:55 +0000 Subject: [PATCH 3/3] [maven-release-plugin] prepare for next development iteration --- 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 ++-- protocol-api/pom.xml | 2 +- protocol/pom.xml | 2 +- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-mixins/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- runescape-api/pom.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 978ca0c6e3..b38cde63a8 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26 + 1.5.27-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 2863bf965e..1b5c9aeb3e 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.26 + 1.5.27-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index da761c9d0a..99b8c5d74a 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26 + 1.5.27-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 487d2bb0a4..8416e66087 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.26 + 1.5.27-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 062dd5aeaf..7e0f8c90f6 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.26 + 1.5.27-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index 5a18b1bf83..3ff666086c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.26 + 1.5.27-SNAPSHOT pom RuneLite @@ -59,7 +59,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.5.26 + HEAD diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index f183e892b6..b1a76077d7 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26 + 1.5.27-SNAPSHOT protocol-api diff --git a/protocol/pom.xml b/protocol/pom.xml index 38b61252c2..722766e9a3 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26 + 1.5.27-SNAPSHOT protocol diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 08333590ad..13d29bba94 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26 + 1.5.27-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 5d78269604..35edb85818 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26 + 1.5.27-SNAPSHOT client diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml index 81b72b030b..9f03b75640 100644 --- a/runelite-mixins/pom.xml +++ b/runelite-mixins/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26 + 1.5.27-SNAPSHOT mixins diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index a999f25e59..eb035101c6 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26 + 1.5.27-SNAPSHOT script-assembler-plugin diff --git a/runescape-api/pom.xml b/runescape-api/pom.xml index 2d54b8f830..bcbaaa1171 100644 --- a/runescape-api/pom.xml +++ b/runescape-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.26 + 1.5.27-SNAPSHOT net.runelite.rs