From 0d40a0a130ac4b4e553de7ce9cd68cff0fc200c1 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 23 Aug 2018 09:28:34 -0400 Subject: [PATCH] Fix friend and ignore widget id changes Also update interface styles plugin for new sprite ids --- .../java/net/runelite/api/widgets/WidgetID.java | 16 ++++++++-------- .../plugins/interfacestyles/SpriteOverride.java | 4 ++-- .../interfacestyles/2005/{904.png => 781.png} | Bin .../interfacestyles/2005/{905.png => 782.png} | Bin .../interfacestyles/2010/{904.png => 781.png} | Bin .../interfacestyles/2010/{905.png => 782.png} | Bin 6 files changed, 10 insertions(+), 10 deletions(-) rename runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2005/{904.png => 781.png} (100%) rename runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2005/{905.png => 782.png} (100%) rename runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/{904.png => 781.png} (100%) rename runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/{905.png => 782.png} (100%) 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 819976dcdf..5125a60d23 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 @@ -269,15 +269,15 @@ public class WidgetID static final int MINIMAP = 3; static final int MINIMAP_DRAW_AREA = 8; static final int CLAN_CHAT_TAB = 31; - static final int FRIENDS_TAB = 32; - static final int IGNORES_TAB = 33; + static final int FRIENDS_TAB = 33; + static final int IGNORES_TAB = 32; static final int LOGOUT_TAB = 34; static final int OPTIONS_TAB = 35; static final int EMOTES_TAB = 36; static final int MUSIC_TAB = 37; static final int CLAN_CHAT_ICON = 38; - static final int FRIENDS_ICON = 39; - static final int IGNORES_ICON = 40; + static final int FRIENDS_ICON = 40; + static final int IGNORES_ICON = 39; static final int LOGOUT_ICON = 41; static final int OPTIONS_ICON = 42; static final int EMOTES_ICON = 43; @@ -304,15 +304,15 @@ public class WidgetID static class ResizableViewport { static final int CLAN_CHAT_TAB = 35; - static final int FRIENDS_TAB = 36; - static final int IGNORES_TAB = 37; + static final int FRIENDS_TAB = 37; + static final int IGNORES_TAB = 36; static final int LOGOUT_TAB = 38; static final int OPTIONS_TAB = 39; static final int EMOTES_TAB = 40; static final int MUSIC_TAB = 41; static final int CLAN_CHAT_ICON = 42; - static final int FRIENDS_ICON = 43; - static final int IGNORES_ICON = 44; + static final int FRIENDS_ICON = 44; + static final int IGNORES_ICON = 43; static final int LOGOUT_ICON = 45; static final int OPTIONS_ICON = 46; static final int EMOTES_ICON = 47; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java index 8196284d3e..41356437aa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java @@ -48,8 +48,8 @@ enum SpriteOverride TAB_MAGIC_SPELLBOOK_LUNAR(SpriteID.TAB_MAGIC_SPELLBOOK_LUNAR_1583, AROUND_2005), TAB_MAGIC_SPELLBOOK_ARCEUUS(SpriteID.TAB_MAGIC_SPELLBOOK_ARCEUUS_1584, AROUND_2005), TAB_CLAN_CHAT(SpriteID.TAB_CLAN_CHAT, AROUND_2005, AROUND_2010), - TAB_FRIENDS(SpriteID.TAB_FRIENDS, AROUND_2005, AROUND_2010), - TAB_IGNORES(SpriteID.TAB_IGNORES, AROUND_2005, AROUND_2010), + TAB_FRIENDS(SpriteID.RS2_TAB_FRIENDS, AROUND_2005, AROUND_2010), + TAB_IGNORES(SpriteID.RS2_TAB_IGNORES, AROUND_2005, AROUND_2010), TAB_LOGOUT(SpriteID.TAB_LOGOUT, AROUND_2005, AROUND_2010), TAB_OPTIONS(SpriteID.TAB_OPTIONS, AROUND_2005, AROUND_2010), TAB_EMOTES(SpriteID.TAB_EMOTES, AROUND_2005, AROUND_2010), diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2005/904.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2005/781.png similarity index 100% rename from runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2005/904.png rename to runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2005/781.png diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2005/905.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2005/782.png similarity index 100% rename from runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2005/905.png rename to runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2005/782.png diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/904.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/781.png similarity index 100% rename from runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/904.png rename to runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/781.png diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/905.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/782.png similarity index 100% rename from runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/905.png rename to runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/782.png