ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
sdburns1998
2019-06-06 16:05:32 +02:00
parent 417c11122a 72468f251c
commit b85e5f6df7
17 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cache-client/pom.xml
View File

@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
</parent> </parent>
<artifactId>cache-client</artifactId> <artifactId>cache-client</artifactId>

2
cache-updater/pom.xml
View File

@@ -28,7 +28,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
</parent> </parent>
<name>Cache Updater</name> <name>Cache Updater</name>

2
cache/pom.xml vendored
View File

@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
</parent> </parent>
<artifactId>cache</artifactId> <artifactId>cache</artifactId>

2
extended-mixin-processor/pom.xml
View File

@@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
extended-mixins/pom.xml
View File

@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
</parent> </parent>
<artifactId>extended-mixins</artifactId> <artifactId>extended-mixins</artifactId>

2
http-api/pom.xml
View File

@@ -28,7 +28,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
</parent> </parent>
<name>Web API</name> <name>Web API</name>

2
http-service/pom.xml
View File

@@ -28,7 +28,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
</parent> </parent>
<name>Web Service</name> <name>Web Service</name>

2
pom.xml
View File

@@ -28,7 +28,7 @@
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>RuneLite</name> <name>RuneLite</name>

2
protocol-api/pom.xml
View File

@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
</parent> </parent>
<artifactId>protocol-api</artifactId> <artifactId>protocol-api</artifactId>

2
protocol/pom.xml
View File

@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
</parent> </parent>
<artifactId>protocol</artifactId> <artifactId>protocol</artifactId>

2
runelite-api/pom.xml
View File

@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
</parent> </parent>
<artifactId>runelite-api</artifactId> <artifactId>runelite-api</artifactId>

2
runelite-client/pom.xml
View File

@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
</parent> </parent>
<artifactId>client</artifactId> <artifactId>client</artifactId>

9
runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java
View File

@@ -75,7 +75,7 @@ public class MusicListPlugin extends Plugin
private Collection<Widget> tracks; private Collection<Widget> tracks;
private MusicState currentMusicFilter; private MusicState currentMusicFilter = MusicState.ALL;
@Override @Override
protected void startUp() protected void startUp()
@@ -100,6 +100,7 @@ public class MusicListPlugin extends Plugin
{ {
if (gameStateChanged.getGameState() == GameState.LOGIN_SCREEN) if (gameStateChanged.getGameState() == GameState.LOGIN_SCREEN)
{ {
// Reset music filter on logout
currentMusicFilter = MusicState.ALL; currentMusicFilter = MusicState.ALL;
tracks = null; tracks = null;
} }
@@ -110,6 +111,10 @@ public class MusicListPlugin extends Plugin
{ {
if (widgetLoaded.getGroupId() == WidgetID.MUSIC_GROUP_ID) 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(); addMusicButtons();
} }
} }
@@ -140,7 +145,7 @@ public class MusicListPlugin extends Plugin
musicSearchButton.revalidate(); musicSearchButton.revalidate();
musicFilterButton = header.createChild(-1, WidgetType.GRAPHIC); musicFilterButton = header.createChild(-1, WidgetType.GRAPHIC);
musicFilterButton.setSpriteId(SpriteID.MINIMAP_ORB_HITPOINTS); musicFilterButton.setSpriteId(SpriteID.MINIMAP_ORB_PRAYER);
musicFilterButton.setOriginalWidth(15); musicFilterButton.setOriginalWidth(15);
musicFilterButton.setOriginalHeight(15); musicFilterButton.setOriginalHeight(15);
musicFilterButton.setXPositionMode(WidgetPositionMode.ABSOLUTE_RIGHT); musicFilterButton.setXPositionMode(WidgetPositionMode.ABSOLUTE_RIGHT);

2
runelite-mixins/pom.xml
View File

@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
</parent> </parent>
<artifactId>mixins</artifactId> <artifactId>mixins</artifactId>

2
runelite-plugin-archetype/pom.xml
View File

@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
</parent> </parent>
<artifactId>runelite-plugin-archetype</artifactId> <artifactId>runelite-plugin-archetype</artifactId>

2
runelite-script-assembler-plugin/pom.xml
View File

@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
</parent> </parent>
<artifactId>script-assembler-plugin</artifactId> <artifactId>script-assembler-plugin</artifactId>

2
runescape-api/pom.xml
View File

@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.27-SNAPSHOT</version>
</parent> </parent>
<groupId>net.runelite.rs</groupId> <groupId>net.runelite.rs</groupId>