diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java index 7e45fd6a649..d4c86cc3688 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java @@ -36,7 +36,8 @@ public enum Skin DEFAULT("Default"), AROUND_2005("2005"), AROUND_2006("2006", AROUND_2005), - AROUND_2010("2010"); + AROUND_2010("2010"), + MOBILE("Mobile"); private String name; private Skin extendSkin; 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 6c6ce35b514..99215904ab6 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 @@ -31,6 +31,7 @@ import static net.runelite.client.plugins.interfacestyles.Skin.AROUND_2005; import static net.runelite.client.plugins.interfacestyles.Skin.AROUND_2006; import static net.runelite.client.plugins.interfacestyles.Skin.AROUND_2010; +import static net.runelite.client.plugins.interfacestyles.Skin.MOBILE; @Getter enum SpriteOverride @@ -53,7 +54,7 @@ enum SpriteOverride TAB_CLAN_CHAT(SpriteID.TAB_FRIENDS_CHAT, AROUND_2005, AROUND_2010), TAB_FRIENDS(SpriteID.TAB_FRIENDS, AROUND_2005, AROUND_2010), TAB_IGNORES(SpriteID.TAB_IGNORES, AROUND_2005, AROUND_2010), - TAB_LOGOUT(SpriteID.TAB_LOGOUT, AROUND_2005, AROUND_2010), + TAB_LOGOUT(SpriteID.TAB_LOGOUT, AROUND_2005, AROUND_2010, MOBILE), TAB_OPTIONS(SpriteID.TAB_OPTIONS, AROUND_2005, AROUND_2010), TAB_EMOTES(SpriteID.TAB_EMOTES, AROUND_2005, AROUND_2010), TAB_MUSIC(SpriteID.TAB_MUSIC, AROUND_2005, AROUND_2010), @@ -96,13 +97,13 @@ enum SpriteOverride WINDOW_CLOSE_BUTTON_RED_X_HOVERED(SpriteID.WINDOW_CLOSE_BUTTON_RED_X_HOVERED, AROUND_2010), WINDOW_CLOSE_BUTTON_BROWN_X(SpriteID.WINDOW_CLOSE_BUTTON_BROWN_X, AROUND_2010), WINDOW_CLOSE_BUTTON_BROWN_X_HOVERED(SpriteID.WINDOW_CLOSE_BUTTON_BROWN_X_HOVERED, AROUND_2010), - MINIMAP_ORB_FRAME(SpriteID.MINIMAP_ORB_FRAME, AROUND_2010), - MINIMAP_ORB_FRAME_HOVERED(SpriteID.MINIMAP_ORB_FRAME_HOVERED, AROUND_2010), + MINIMAP_ORB_FRAME(SpriteID.MINIMAP_ORB_FRAME, AROUND_2010, MOBILE), + MINIMAP_ORB_FRAME_HOVERED(SpriteID.MINIMAP_ORB_FRAME_HOVERED, AROUND_2010, MOBILE), MINIMAP_ORB_XP(SpriteID.MINIMAP_ORB_XP, AROUND_2010), MINIMAP_ORB_XP_ACTIVATED(SpriteID.MINIMAP_ORB_XP_ACTIVATED, AROUND_2010), MINIMAP_ORB_XP_HOVERED(SpriteID.MINIMAP_ORB_XP_HOVERED, AROUND_2010), MINIMAP_ORB_XP_ACTIVATED_HOVERED(SpriteID.MINIMAP_ORB_XP_ACTIVATED_HOVERED, AROUND_2010), - MINIMAP_ORB_WORLD_MAP_FRAME(SpriteID.MINIMAP_ORB_WORLD_MAP_FRAME, AROUND_2010), + MINIMAP_ORB_WORLD_MAP_FRAME(SpriteID.MINIMAP_ORB_WORLD_MAP_FRAME, AROUND_2010, MOBILE), MINIMAP_ORB_WORLD_MAP_PLANET(SpriteID.MINIMAP_ORB_WORLD_MAP_PLANET, AROUND_2010), //CHATBOX(SpriteID.CHATBOX, AROUND_2005, AROUND_2006), @@ -122,11 +123,11 @@ enum SpriteOverride SCROLLBAR_THUMB_BOTTOM(SpriteID.SCROLLBAR_THUMB_BOTTOM, AROUND_2005), SCROLLBAR_THUMB_MIDDLE_DARK(SpriteID.SCROLLBAR_THUMB_MIDDLE_DARK, AROUND_2005), - TAB_STONE_TOP_LEFT_SELECTED(SpriteID.TAB_STONE_TOP_LEFT_SELECTED, AROUND_2010), - TAB_STONE_TOP_RIGHT_SELECTED(SpriteID.TAB_STONE_TOP_RIGHT_SELECTED, AROUND_2010), + TAB_STONE_TOP_LEFT_SELECTED(SpriteID.TAB_STONE_TOP_LEFT_SELECTED, AROUND_2010, MOBILE), + TAB_STONE_TOP_RIGHT_SELECTED(SpriteID.TAB_STONE_TOP_RIGHT_SELECTED, AROUND_2010, MOBILE), TAB_STONE_BOTTOM_LEFT_SELECTED(SpriteID.TAB_STONE_BOTTOM_LEFT_SELECTED, AROUND_2010), TAB_STONE_BOTTOM_RIGHT_SELECTED(SpriteID.TAB_STONE_BOTTOM_RIGHT_SELECTED, AROUND_2010), - TAB_STONE_MIDDLE_SELECTED(SpriteID.TAB_STONE_MIDDLE_SELECTED, AROUND_2010), + TAB_STONE_MIDDLE_SELECTED(SpriteID.TAB_STONE_MIDDLE_SELECTED, AROUND_2010, MOBILE), FIXED_MODE_SIDE_PANEL_BACKGROUND(SpriteID.FIXED_MODE_SIDE_PANEL_BACKGROUND, AROUND_2005, AROUND_2006), FIXED_MODE_TABS_ROW_BOTTOM(SpriteID.FIXED_MODE_TABS_ROW_BOTTOM, AROUND_2005, AROUND_2006, AROUND_2010), @@ -143,13 +144,13 @@ enum SpriteOverride FIXED_MODE_MINIMAP_FRAME_BOTTOM(SpriteID.FIXED_MODE_MINIMAP_FRAME_BOTTOM, AROUND_2005, AROUND_2006), FIXED_MODE_TOP_RIGHT_CORNER(SpriteID.FIXED_MODE_TOP_RIGHT_CORNER, AROUND_2005, AROUND_2006), - RESIZEABLE_MODE_TABS_TOP_ROW(SpriteID.RESIZEABLE_MODE_TABS_TOP_ROW, AROUND_2010), - RESIZEABLE_MODE_TABS_BOTTOM_ROW(SpriteID.RESIZEABLE_MODE_TABS_BOTTOM_ROW, AROUND_2010), + RESIZEABLE_MODE_TABS_TOP_ROW(SpriteID.RESIZEABLE_MODE_TABS_TOP_ROW, AROUND_2010, MOBILE), + RESIZEABLE_MODE_TABS_BOTTOM_ROW(SpriteID.RESIZEABLE_MODE_TABS_BOTTOM_ROW, AROUND_2010, MOBILE), RESIZEABLE_MODE_SIDE_PANEL_EDGE_LEFT(SpriteID.RESIZEABLE_MODE_SIDE_PANEL_EDGE_LEFT, AROUND_2010), RESIZEABLE_MODE_SIDE_PANEL_EDGE_RIGHT(SpriteID.RESIZEABLE_MODE_SIDE_PANEL_EDGE_RIGHT, AROUND_2010), - RESIZEABLE_MODE_MINIMAP_AND_COMPASS_FRAME(SpriteID.RESIZEABLE_MODE_MINIMAP_AND_COMPASS_FRAME, AROUND_2010), - RESIZEABLE_MODE_TAB_STONE_MIDDLE(SpriteID.RESIZEABLE_MODE_TAB_STONE_MIDDLE, AROUND_2010), - RESIZEABLE_MODE_TAB_STONE_MIDDLE_SELECTED(SpriteID.RESIZEABLE_MODE_TAB_STONE_MIDDLE_SELECTED, AROUND_2010); + RESIZEABLE_MODE_MINIMAP_AND_COMPASS_FRAME(SpriteID.RESIZEABLE_MODE_MINIMAP_AND_COMPASS_FRAME, AROUND_2010, MOBILE), + RESIZEABLE_MODE_TAB_STONE_MIDDLE(SpriteID.RESIZEABLE_MODE_TAB_STONE_MIDDLE, AROUND_2010, MOBILE), + RESIZEABLE_MODE_TAB_STONE_MIDDLE_SELECTED(SpriteID.RESIZEABLE_MODE_TAB_STONE_MIDDLE_SELECTED, AROUND_2010, MOBILE); private final int spriteID; private final Skin[] skin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java index 36df9095690..11f6d09ba4b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java @@ -185,7 +185,10 @@ enum WidgetOffset FIXED_2006_EMOTES_HIGHLIGHT(Skin.AROUND_2006, ComponentID.FIXED_VIEWPORT_EMOTES_TAB, 178, null, 30, 37), FIXED_2006_EMOTES_ICON(Skin.AROUND_2006, ComponentID.FIXED_VIEWPORT_EMOTES_ICON, 177, null, null, null), FIXED_2006_MUSIC_HIGHLIGHT(Skin.AROUND_2006, ComponentID.FIXED_VIEWPORT_MUSIC_TAB, 206, null, 33, 36), - FIXED_2006_MUSIC_ICON(Skin.AROUND_2006, ComponentID.FIXED_VIEWPORT_MUSIC_ICON, 202, -1, null, null); + FIXED_2006_MUSIC_ICON(Skin.AROUND_2006, ComponentID.FIXED_VIEWPORT_MUSIC_ICON, 202, -1, null, null), + + RESIZABLE_MOBILE_QUESTS_HIGHLIGHT(Skin.MOBILE, ComponentID.RESIZABLE_VIEWPORT_QUESTS_TAB, null, null, 33, null), + FIXED_MOBILE_QUESTS_HIGHLIGHT(Skin.MOBILE, ComponentID.FIXED_VIEWPORT_QUESTS_TAB, null, null, 33, null); private final Skin skin; @Component diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1026.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1026.png new file mode 100644 index 00000000000..066cdb7b02c Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1026.png differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1027.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1027.png new file mode 100644 index 00000000000..a6a0df1607e Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1027.png differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1030.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1030.png new file mode 100644 index 00000000000..79709de2396 Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1030.png differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1071.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1071.png new file mode 100644 index 00000000000..11f2b763058 Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1071.png differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1072.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1072.png new file mode 100644 index 00000000000..905701a102c Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1072.png differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1173.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1173.png new file mode 100644 index 00000000000..7b267c967bc Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1173.png differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1174.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1174.png new file mode 100644 index 00000000000..b90f3f2f2c7 Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1174.png differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1177.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1177.png new file mode 100644 index 00000000000..12cc5dc469b Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1177.png differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1180.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1180.png new file mode 100644 index 00000000000..47af8cee989 Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1180.png differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1181.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1181.png new file mode 100644 index 00000000000..79709de2396 Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1181.png differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1438.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1438.png new file mode 100644 index 00000000000..5466ec8d776 Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/1438.png differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/907.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/907.png new file mode 100644 index 00000000000..aa73a818e25 Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/mobile/907.png differ