From ae8210b64483e45016c6f28246bcdcf89ad02cf0 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 23 Jan 2020 11:33:07 +0000 Subject: [PATCH 1/7] Update Item IDs to 2020-01-23-rev182 --- runelite-api/src/main/java/net/runelite/api/ItemID.java | 8 ++++++++ .../src/main/java/net/runelite/api/NullItemID.java | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index 9465efdb86..c8eef7401a 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -11384,5 +11384,13 @@ public final class ItemID public static final int TWISTED_TELEPORT_SCROLL = 24460; public static final int TWISTED_BLUEPRINTS = 24463; public static final int TWISTED_HORNS = 24466; + public static final int TWISTED_RELICHUNTER_T1_ARMOUR_SET = 24469; + public static final int TWISTED_RELICHUNTER_T2_ARMOUR_SET = 24472; + public static final int TWISTED_RELICHUNTER_T3_ARMOUR_SET = 24475; + public static final int OPEN_HERB_SACK = 24478; + public static final int SPICE_RACK = 24479; + public static final int OPENED_COAL_BAG = 24480; + public static final int OPENED_GEM_BAG = 24481; + public static final int OPEN_SEED_BOX = 24482; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java index 261cb73dc0..0b4a9ee880 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -12874,5 +12874,11 @@ public final class NullItemID public static final int NULL_24465 = 24465; public static final int NULL_24467 = 24467; public static final int NULL_24468 = 24468; + public static final int NULL_24470 = 24470; + public static final int NULL_24471 = 24471; + public static final int NULL_24473 = 24473; + public static final int NULL_24474 = 24474; + public static final int NULL_24476 = 24476; + public static final int NULL_24477 = 24477; /* This file is automatically generated. Do not edit. */ } From 342d36d014fba2c031d4c175b3af96afb4ee6b54 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 23 Jan 2020 11:33:08 +0000 Subject: [PATCH 2/7] Update Item variations to 2020-01-23-rev182 --- runelite-client/src/main/resources/item_variations.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 82d9c9443a..0a9609c18f 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -9676,5 +9676,10 @@ 24438, 24439, 24440 + ], + "twisted relichunter armour set": [ + 24469, + 24472, + 24475 ] } \ No newline at end of file From 1748c92bc4e5a6e3d8c59a97733476f209aba207 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 23 Jan 2020 11:33:08 +0000 Subject: [PATCH 3/7] Update Object IDs to 2020-01-23-rev182 --- runelite-api/src/main/java/net/runelite/api/ObjectID.java | 2 ++ 1 file changed, 2 insertions(+) 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 9a71d7f886..0b40375559 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -19534,5 +19534,7 @@ public final class ObjectID public static final int DOOR_HOTSPOT_37617 = 37617; public static final int DOOR_HOTSPOT_37618 = 37618; public static final int WINDOW_SPACE_37619 = 37619; + public static final int SPICE_RACK = 37620; + public static final int SPICE_RACK_37621 = 37621; /* This file is automatically generated. Do not edit. */ } From 0ed9675e30e67fa58b7d8a141a346d7dc779fefc Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 23 Jan 2020 11:33:12 +0000 Subject: [PATCH 4/7] Update Widget IDs to 2020-01-23-rev182 --- .../src/main/java/net/runelite/api/widgets/WidgetID.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 35843d7901..d155904e7b 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 @@ -155,7 +155,7 @@ public class WidgetID static final int SEARCH = 24; static final int SURFACE_SELECTOR = 32; static final int TOOLTIP = 38; - static final int OPTION = 43; + static final int OPTION = 46; } static class SlayerRewards @@ -837,9 +837,9 @@ public class WidgetID static class Options { - static final int MUSIC_SLIDER = 44; - static final int SOUND_EFFECT_SLIDER = 50; - static final int AREA_SOUND_SLIDER = 56; + static final int MUSIC_SLIDER = 41; + static final int SOUND_EFFECT_SLIDER = 46; + static final int AREA_SOUND_SLIDER = 51; } static class AchievementDiary From 05f2117b8f60026b7822129c7777246e3b4b2976 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 23 Jan 2020 11:33:12 +0000 Subject: [PATCH 5/7] Update Scripts to 2020-01-23-rev182 Updated script does not assemble CommandScript.rs2asm --- .../src/main/scripts/CommandScript.hash | 2 +- .../src/main/scripts/CommandScript.rs2asm | 130 ++++++++++-------- 2 files changed, 72 insertions(+), 60 deletions(-) diff --git a/runelite-client/src/main/scripts/CommandScript.hash b/runelite-client/src/main/scripts/CommandScript.hash index c278c005ee..aba3b74962 100644 --- a/runelite-client/src/main/scripts/CommandScript.hash +++ b/runelite-client/src/main/scripts/CommandScript.hash @@ -1 +1 @@ -2F7E219C24E4725FA8F3BCDD9F2A640666CC589B514FEBD9F5938B207F06C0EB \ No newline at end of file +1E915795AFAA25E3ABE595EEAC55423C3E5E9E5CE2582AD1A5AAEC91647CC124 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/CommandScript.rs2asm b/runelite-client/src/main/scripts/CommandScript.rs2asm index 0dc4503c95..bba4e32f51 100644 --- a/runelite-client/src/main/scripts/CommandScript.rs2asm +++ b/runelite-client/src/main/scripts/CommandScript.rs2asm @@ -39,7 +39,7 @@ LABEL20: if_icmpeq LABEL31 iconst 0 ; Modified to enable clanchat input sconst "clanchatInput" - runelite_callback + runelite_callback iconst 1 if_icmpeq LABEL31 ; Compare to 1 jump LABEL37 @@ -82,13 +82,13 @@ LABEL58: iload 0 iconst 84 if_icmpeq LABEL62 - jump LABEL179 + jump LABEL189 LABEL62: invoke 1984 iload 2 iconst 0 if_icmpgt LABEL67 - jump LABEL178 + jump LABEL188 LABEL67: get_varc_string 335 sconst "/" @@ -146,7 +146,7 @@ LABEL108: iconst 0 invoke 96 LABEL111: - jump LABEL174 + jump LABEL184 LABEL112: get_varc_string 335 sconst "::" @@ -154,12 +154,12 @@ LABEL112: string_indexof_string iconst 0 if_icmpeq LABEL119 - jump LABEL171 + jump LABEL181 LABEL119: iload 2 iconst 2 if_icmpgt LABEL123 - jump LABEL167 + jump LABEL177 LABEL123: get_varc_string 335 sconst "::toggleroof" @@ -185,23 +185,35 @@ LABEL139: sconst "Roofs are now all hidden." mes LABEL143: - jump LABEL166 + jump LABEL176 LABEL144: get_varc_string 335 - sconst "::bank" + sconst "::wiki" iconst 0 string_indexof_string iconst 0 if_icmpeq LABEL151 sconst "runeliteCommand" ; load callback name runelite_callback ; invoke callback - jump LABEL155 + jump LABEL154 LABEL151: + get_varc_string 335 + invoke 3299 + jump LABEL176 +LABEL154: + get_varc_string 335 + sconst "::bank" + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL161 + jump LABEL165 +LABEL161: sconst "Hey, everyone, I just tried to do something very silly!" iconst 0 invoke 96 - jump LABEL166 -LABEL155: + jump LABEL176 +LABEL165: get_varc_string 335 invoke 224 set_varc_string 335 @@ -213,42 +225,28 @@ LABEL155: iload 2 substring docheat -LABEL166: - jump LABEL170 -LABEL167: +LABEL176: + jump LABEL180 +LABEL177: get_varc_string 335 iconst 0 invoke 96 -LABEL170: - jump LABEL174 -LABEL171: +LABEL180: + jump LABEL184 +LABEL181: get_varc_string 335 iconst 0 invoke 96 -LABEL174: +LABEL184: get_varc_string 335 invoke 77 sconst "" set_varc_string 335 -LABEL178: - jump LABEL247 -LABEL179: - iload 0 - iconst 104 - if_icmpeq LABEL183 - jump LABEL189 -LABEL183: - iload 3 - iconst 1 - if_icmpeq LABEL187 - jump LABEL188 -LABEL187: - invoke 75 LABEL188: - jump LABEL247 + jump LABEL257 LABEL189: iload 0 - iconst 105 + iconst 104 if_icmpeq LABEL193 jump LABEL199 LABEL193: @@ -257,38 +255,52 @@ LABEL193: if_icmpeq LABEL197 jump LABEL198 LABEL197: - invoke 76 + invoke 75 LABEL198: - jump LABEL247 + jump LABEL257 LABEL199: iload 0 - iconst 80 + iconst 105 if_icmpeq LABEL203 - jump LABEL241 + jump LABEL209 LABEL203: + iload 3 + iconst 1 + if_icmpeq LABEL207 + jump LABEL208 +LABEL207: + invoke 76 +LABEL208: + jump LABEL257 +LABEL209: + iload 0 + iconst 80 + if_icmpeq LABEL213 + jump LABEL251 +LABEL213: get_varc_string 356 string_length iconst 0 - if_icmpgt LABEL208 - jump LABEL228 -LABEL208: + if_icmpgt LABEL218 + jump LABEL238 +LABEL218: get_varc_string 356 friend_test iconst 1 - if_icmpeq LABEL213 - jump LABEL216 -LABEL213: + if_icmpeq LABEL223 + jump LABEL226 +LABEL223: get_varc_string 356 invoke 107 return -LABEL216: +LABEL226: get_varc_int 60 clientclock - if_icmpgt LABEL220 - jump LABEL221 -LABEL220: + if_icmpgt LABEL230 + jump LABEL231 +LABEL230: return -LABEL221: +LABEL231: clientclock iconst 50 add @@ -296,14 +308,14 @@ LABEL221: sconst "That player was not found on your Friends list." mes return -LABEL228: +LABEL238: get_varc_int 60 clientclock - if_icmpgt LABEL232 - jump LABEL233 -LABEL232: + if_icmpgt LABEL242 + jump LABEL243 +LABEL242: return -LABEL233: +LABEL243: clientclock iconst 50 add @@ -311,8 +323,8 @@ LABEL233: sconst "You haven't received any messages to which you can reply." mes return - jump LABEL247 -LABEL241: + jump LABEL257 +LABEL251: get_varc_string 335 iconst 0 iload 0 @@ -324,9 +336,9 @@ LABEL241: runelite_callback ; if_icmpeq SKIPSETVARC ; skip setting varc with input set_varc_string 335 - jump LABEL247 ; jump over SKIPSETVARC + jump LABEL257 ; jump over SKIPSETVARC SKIPSETVARC: - pop_string ; pop message -LABEL247: + pop_string ; pop message +LABEL257: invoke 223 return From 2b077f4364b2f45a774a12778bbdd5fc26aab006 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Thu, 23 Jan 2020 04:50:42 -0700 Subject: [PATCH 6/7] wiki: Remove quest and diary links These are added to the vanilla client --- .../client/plugins/wiki/WikiPlugin.java | 53 ------------------- 1 file changed, 53 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java index 3c14556492..e135b1eefa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.wiki; -import com.google.common.primitives.Ints; import java.util.Arrays; import java.util.stream.Stream; import javax.inject.Inject; @@ -362,58 +361,6 @@ public class WikiPlugin extends Plugin } } - if (Ints.contains(QUESTLIST_WIDGET_IDS, widgetID) - && ((wikiSelected && widgetIndex != -1) || "Read Journal:".equals(event.getOption()))) - { - Widget w = getWidget(widgetID, widgetIndex); - String target = w.getName(); - menuEntries = Arrays.copyOf(menuEntries, menuEntries.length + 2); - - MenuEntry menuEntry = menuEntries[menuEntries.length - 1] = new MenuEntry(); - menuEntry.setTarget(target); - menuEntry.setOption(MENUOP_GUIDE); - menuEntry.setParam0(widgetIndex); - menuEntry.setParam1(widgetID); - menuEntry.setType(MenuAction.RUNELITE.getId()); - - menuEntry = menuEntries[menuEntries.length - 2] = new MenuEntry(); - menuEntry.setTarget(target); - menuEntry.setOption(MENUOP_QUICKGUIDE); - menuEntry.setParam0(widgetIndex); - menuEntry.setParam1(widgetID); - menuEntry.setType(MenuAction.RUNELITE.getId()); - - client.setMenuEntries(menuEntries); - } - - if (widgetID == WidgetInfo.ACHIEVEMENT_DIARY_CONTAINER.getId()) - { - Widget w = getWidget(widgetID, widgetIndex); - if (w.getActions() == null) - { - return; - } - - String action = Stream.of(w.getActions()) - .filter(s -> s != null && !s.isEmpty()) - .findFirst().orElse(null); - if (action == null) - { - return; - } - - menuEntries = Arrays.copyOf(menuEntries, menuEntries.length + 1); - - MenuEntry menuEntry = menuEntries[menuEntries.length - 1] = new MenuEntry(); - menuEntry.setTarget(action.replace("Open ", "").replace("Journal", "Diary")); - menuEntry.setOption(MENUOP_WIKI); - menuEntry.setParam0(widgetIndex); - menuEntry.setParam1(widgetID); - menuEntry.setType(MenuAction.RUNELITE.getId()); - - client.setMenuEntries(menuEntries); - } - if (WidgetInfo.TO_GROUP(widgetID) == WidgetInfo.SKILLS_CONTAINER.getGroupId()) { Widget w = getWidget(widgetID, widgetIndex); From 32c8c497bda4c7256b86705df93c7c1ee11e18ae Mon Sep 17 00:00:00 2001 From: Max Weber Date: Thu, 23 Jan 2020 04:58:17 -0700 Subject: [PATCH 7/7] wiki: Use jagex's sprite, but hide their wiki banner Ours has more functionality (lookuping items in interfaces, and a predictive search interface) --- .../main/java/net/runelite/api/SpriteID.java | 2 + .../net/runelite/api/widgets/WidgetID.java | 1 + .../net/runelite/api/widgets/WidgetInfo.java | 1 + .../client/plugins/wiki/WikiPlugin.java | 37 +++++++++++---- .../client/plugins/wiki/WikiSprite.java | 44 ------------------ .../wiki/fixed_mode_minimap_clickmask.png | Bin 654 -> 0 bytes .../net/runelite/client/plugins/wiki/wiki.png | Bin 3092 -> 0 bytes .../client/plugins/wiki/wiki_selected.png | Bin 3025 -> 0 bytes 8 files changed, 33 insertions(+), 52 deletions(-) delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSprite.java delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/wiki/fixed_mode_minimap_clickmask.png delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/wiki/wiki.png delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/wiki/wiki_selected.png diff --git a/runelite-api/src/main/java/net/runelite/api/SpriteID.java b/runelite-api/src/main/java/net/runelite/api/SpriteID.java index 962089c146..8e4373ba71 100644 --- a/runelite-api/src/main/java/net/runelite/api/SpriteID.java +++ b/runelite-api/src/main/java/net/runelite/api/SpriteID.java @@ -1589,4 +1589,6 @@ public final class SpriteID public static final int HEALTHBAR_DEFAULT_BACK_140PX = 2189; public static final int HEALTHBAR_DEFAULT_FRONT_160PX = 2190; public static final int HEALTHBAR_DEFAULT_BACK_160PX = 2191; + public static final int WIKI_DESELECTED = 2420; + public static final int WIKI_SELECTED = 2421; } 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 d155904e7b..a97f9b7124 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 @@ -306,6 +306,7 @@ public class WidgetID static final int RUN_ORB_TEXT = 23; static final int SPEC_ORB = 28; static final int WORLDMAP_ORB = 41; + static final int WIKI_BANNER = 43; } static class LoginClickToPlayScreen 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 a1354618f8..770895b1ed 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 @@ -155,6 +155,7 @@ public enum WidgetInfo MINIMAP_HEALTH_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.HEALTH_ORB), MINIMAP_SPEC_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.SPEC_ORB), MINIMAP_WORLDMAP_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WORLDMAP_ORB), + MINIMAP_WIKI_BANNER(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WIKI_BANNER), LOGIN_CLICK_TO_PLAY_SCREEN(WidgetID.LOGIN_CLICK_TO_PLAY_GROUP_ID, 0), LOGIN_CLICK_TO_PLAY_SCREEN_MESSAGE_OF_THE_DAY(WidgetID.LOGIN_CLICK_TO_PLAY_GROUP_ID, WidgetID.LoginClickToPlayScreen.MESSAGE_OF_THE_DAY), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java index e135b1eefa..9458d5077f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java @@ -35,9 +35,11 @@ import net.runelite.api.MenuEntry; import net.runelite.api.NPC; import net.runelite.api.NPCComposition; import net.runelite.api.ObjectComposition; +import net.runelite.api.SpriteID; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOptionClicked; +import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.JavaScriptCallback; import net.runelite.api.widgets.Widget; @@ -105,14 +107,12 @@ public class WikiPlugin extends Plugin @Override public void startUp() { - spriteManager.addSpriteOverrides(WikiSprite.values()); clientThread.invokeLater(this::addWidgets); } @Override public void shutDown() { - spriteManager.removeSpriteOverrides(WikiSprite.values()); clientThread.invokeLater(() -> { Widget minimapOrbs = client.getWidget(WidgetInfo.MINIMAP_ORBS); @@ -127,6 +127,12 @@ public class WikiPlugin extends Plugin } children[0] = null; + Widget vanilla = client.getWidget(WidgetInfo.MINIMAP_WIKI_BANNER); + if (vanilla != null) + { + vanilla.setHidden(false); + } + onDeselect(); client.setSpellSelected(false); }); @@ -149,14 +155,20 @@ public class WikiPlugin extends Plugin return; } + Widget vanilla = client.getWidget(WidgetInfo.MINIMAP_WIKI_BANNER); + if (vanilla != null) + { + vanilla.setHidden(true); + } + icon = minimapOrbs.createChild(0, WidgetType.GRAPHIC); - icon.setSpriteId(WikiSprite.WIKI_ICON.getSpriteId()); + icon.setSpriteId(SpriteID.WIKI_DESELECTED); icon.setOriginalX(0); - icon.setOriginalY(2); + icon.setOriginalY(0); icon.setXPositionMode(WidgetPositionMode.ABSOLUTE_RIGHT); icon.setYPositionMode(WidgetPositionMode.ABSOLUTE_BOTTOM); - icon.setOriginalWidth(42); - icon.setOriginalHeight(16); + icon.setOriginalWidth(40); + icon.setOriginalHeight(14); icon.setTargetVerb("Lookup"); icon.setName("Wiki"); icon.setClickMask(WidgetConfig.USE_GROUND_ITEM | WidgetConfig.USE_ITEM | WidgetConfig.USE_NPC @@ -165,7 +177,7 @@ public class WikiPlugin extends Plugin icon.setOnTargetEnterListener((JavaScriptCallback) ev -> { wikiSelected = true; - icon.setSpriteId(WikiSprite.WIKI_SELECTED_ICON.getSpriteId()); + icon.setSpriteId(SpriteID.WIKI_SELECTED); client.setAllWidgetsAreOpTargetable(true); }); icon.setAction(5, "Search"); // Start at option 5 so the target op is ontop @@ -183,6 +195,15 @@ public class WikiPlugin extends Plugin icon.revalidate(); } + @Subscribe + private void onWidgetHiddenChanged(WidgetHiddenChanged ev) + { + if (ev.getWidget().getId() == WidgetInfo.MINIMAP_WIKI_BANNER.getId()) + { + ev.getWidget().setHidden(true); + } + } + private void onDeselect() { client.setAllWidgetsAreOpTargetable(false); @@ -190,7 +211,7 @@ public class WikiPlugin extends Plugin wikiSelected = false; if (icon != null) { - icon.setSpriteId(WikiSprite.WIKI_ICON.getSpriteId()); + icon.setSpriteId(SpriteID.WIKI_DESELECTED); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSprite.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSprite.java deleted file mode 100644 index 188d54837b..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSprite.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2018 Abex - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.wiki; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import net.runelite.api.SpriteID; -import net.runelite.client.game.SpriteOverride; - -@RequiredArgsConstructor -public enum WikiSprite implements SpriteOverride -{ - WIKI_ICON(-300, "wiki.png"), - WIKI_SELECTED_ICON(-301, "wiki_selected.png"), - FIXED_MODE_MINIMAP_CLICKMASK(SpriteID.MINIMAP_CLICK_MASK, "fixed_mode_minimap_clickmask.png"); - - @Getter - private final int spriteId; - - @Getter - private final String fileName; -} diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/wiki/fixed_mode_minimap_clickmask.png b/runelite-client/src/main/resources/net/runelite/client/plugins/wiki/fixed_mode_minimap_clickmask.png deleted file mode 100644 index ba5a23c151ace7ac3e7ae774066ffc82b91c66ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 654 zcmeAS@N?(olHy`uVBq!ia0vp^lYn>z2OE&&f3V>NkYY)9^mSxl*x1kgCy^D%=PdAu zEM{QfI|Ravq8eTeKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`ILp{?J_XwcLOgx@0 zjv*CsZ*My0-F6URb^QIWy)1!+No13$if&`FVW@+C+TZ(mc0jP-%3_II33u6Q#=A{- zvmCx3)H9v;J7K!id7~R4ha=f$XIY5yT+PsuSamVPAY}2%gcWYV2LpPSH7%6#Wpy^4 z#nqN&f~)|n<8(qW?{m8wOOF-HzX^K0lXdsihJDS>Jsr~xRN@XbRB$RY0lh&CXn0;* z_m_8Gk@O_Tk5isb$UCTLx+r=>H17+L;hTBPt`>kCX2T`7>L8ftX$nb}WLp@(!^3o1;Djul z{-*XUgZ^K~zgLU=pDyJyHTkCW_3*`!(;oluj0xv`zE9?eaiOp2ylBgo@FQQZH0(Rg zxW{PS(=Uv7kC)D|o0l5nBK!T#js~kYHwzg{Z%BT8_G*RkqqA27(~rzvz4%<0c^La# z(fl=hR@(O>WJ|()HvYN$!?X56q@gSC;|$!iq@gcJ{t7z1IeC@Tv5UVpq#qA4?OFUa z@qEwAED875kLQW*cLHg6VEpL%ibR>0pI`G&jEwnsHTL)xP>6fF`njxgN@xNAE|mj6 diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/wiki/wiki.png b/runelite-client/src/main/resources/net/runelite/client/plugins/wiki/wiki.png deleted file mode 100644 index ef2ff20ff0d56badacfabd605f90a2e8a4ad39e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3092 zcmcIm30Mxa46!9fH5jwbZ(M#Btkgk&>#X1u*ym&-64S_9g}c79tem!A~?W! zAjb%ZhzR0=g5tylWx-)p@L&`L2R$(tFF7>xB1fP?y6U>-v9rvsTTJDfup=4E5gnr0FKKMYX?a|m3`gm_<` z2i^fyAb4vc0}xQ?R6G+TQW#{AO1HvO$rL7u%p_500GYxjGuSi`Kl&kHvngO9+tYE? z=v>$vhagg^(z38RcpB^RM8R4GC~ z5yyDAr-O7r>AT`Zw?}l5NfS7cdHog%Mu@< zF`gf`Kqw&dLAnqCK?)OK3g|EZ(wJDNLK>4V#(!a$rzE1_PiHDH_vbGO%!6#7eBf5u?k<3)wvS zBoX6>y~&0InkB&@2sB*L1UuN}Bg!1Rb_utpxDMDtoDGuCpPlZup~<7se%m+e8nt*y6Q(}P zBF7U~wxvF?k1-6{+r9geVO&6cz=ac%pfu%9otd-p4g&gy$J~>Oq1u4CRe8qu<1>?o ze)?%jY<$BU|1*`g?%Uei!XoS1o1%XCeJ~Ao^*K^>Xx_?$Ss*;=j z7bDNO$7Z4gPn}za^R6Guhy~p16ZON^KJ*-_Nu%weh|DTl6|(dhuz+(@Ou=;Qr*TR=!CWpY+(hpR(z$Byu1KUv+d4UV9vA zkGi~0mR(n^47{Kndp9B56Wl|8sUyuD9Xp-tqz7uAYqbWWSzMiiwUKhE=c_!v=%rvxZGS3Jm6_;M>1BQ@$q!dJsvmNqVU13W34*&g>E{#e{2Cg zqNhEPuQjvFaVL5dY{TUTD!U?Q&Yh_j>ycb=e8}7Xf^v0ODpxt_>emCCLlCCU;p6e| zy|#P#cLoJtiEQfUWtYr7s8(C<(k)CY+EUbaJ2v4Cu8R%l&b2 z)!N@fg0-UqlA;ezIviurSQ^=vt=(Y-yV>Cu_EJxn$Z@Uwj$8emleeGHUToW6R8ri0 z)i37Jw$9Sl0nuU~y&r!+diOi&&I%QMYWQ2X1lztBb?v4VEZ=(}d7<~5YD>z_6ue!$ z?c18fnyzV2E10UIV8ahjC#mft9@_lF=3z6-@W<)7(-mO}MwNne(>j1yzun~Ng2MFh^xsmZqs0_f_! zlOO2!?KE%gt=n<9cZ*(Nf1~OChKv(SZkPu^UFQ#^yh~Yhvan`dsLHp-=-dioPdX~~ zI}FdJ?f%=Hs0#(J9+e>uo6h)347jCeMZe)JtthMYDYn9;Ez;Z~`3+0G6*))hH`hgX zdZ?e75pQ$2&a2%gzno6*bWG6`$HNLXlnml-<>0QQF&Sk?MCOO+nvaq&$ujYTdtCPE9p?yH~ALf0np8x;= diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/wiki/wiki_selected.png b/runelite-client/src/main/resources/net/runelite/client/plugins/wiki/wiki_selected.png deleted file mode 100644 index 80838fb5c4f5f4406f0570212fb7e9825664b7ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3025 zcmcIm3s@6Z8V#VxLoA?(unHkytCq=|yh;>EKq5pbusp;ElbHzwl1#`1608)#7b=1l z7b>(A5d|Mu1XNg-mx9=86(4AqsuZo7x+se%MHJi#uXVfXy8C^bFO!+M_uO;O`Tzgk zn{7eMms(jkS`Y{XE0Mo27{4#VFKaVX{5P8PXcvAnSNTU`1cK#E!(~Ls|7s3_V0uy( z8lj002l60PK?Y$|f{=9z6^ih!P}5rsR`)>l#T!8O$ezdx)uGl>mvA z`L9zWA?uchLhIroE=*donCPkF;RFgq0}^!#xf0{)_@q%@9{y}-rjUrE5KTOvMdi|&?nFA3#->o&6dD7d(s)!BkHIC5e@OUjYFNq( z7W$3Pg}?Dhu^NqvN1D#p z#m8j#q#G4aphiFqst!d_`9z|ECRm690dYaNObMe}Y@tEVI2;jz8iY^6bH)K^G=ROb7rOY!JZP5GoyHND!uER2M#8h(d{m;2Fk`6)lWHILBms zc#ssLO1MlZz~$1|02^Y$0GGkWtx6eeiB!U1Nm$YewiRj_zHUJI>#PPe;I~nIC*>-g&+yzPjVS? zv^IGlWLOe>5@e_a1SX9)%ia*?_cJs`tBpl)(sxwJ7z{(D8ZD?sykqc`{D&H(yiGa= zCcRrY6JgOk*dBOBIS2x9U?u|qsS*(2a6LF|CY#HZcpwwT{|~~)Lkh)$$`}OSTPdXf z-OBrw`df1F`^ER)=itp&D25GnthOk>FT2sc*EU}~iK9*Uj&69IJWBAF$-@Xy;!#rL zN6nE-3u+03Da|6Gcc_0`M{cUWByv`pYr2_@i;r7|wT;kc(=Ia?q1&zuGm?+7%{DKg z(AwO_+pW0u)}Jy?9JKNH&ZLuuT)N5Ax4>1m$hv+2W>zWw^D@^i~nsl}z!r0%oZpG?Us zGRkq_C400Upfs7z3+rq;*3#42Z*;g)9ouXz7A@3ZoFc!jOjQcWru=Sbnps!Amw zef3>8pPcOv?YVchJEy!tMBL=j^>-KX?ymX8seE}8=Z;%#?qc1uvi-%jNsqUZYDzzH zNO3$Va*VznH#ILf#r$E|A<*^bORE))#ZFLB`i!XC+8d$;r)p-HmIQkdiWaEjTHuU$ z_=@G7r-OxQl#&6~jc+#D8`tHpB)2p9%cPY1b1MG2IKcSEu)6ox0q4)Ra(C-SIG!1V z<+a9P4Nj-ILj_lb^79`mHpr?R=86vo1nsYB(DN4>cjWHzZhvliZJ}+*@_lAo>?|Uj zRCIPquIG*idK`7f-LA5OeR@x`&Z^qkS$}W1BhV(+NL|t3G!*wd&~jGV zGU`*$d23q-zs<;LaZJc<*gB$O<&4x;mCVggD7;{EKH{;1Ywm5gV}jXFUR;o=ho9#nx9x&(tK;XPwR*I=3q6HaUKSdCDb^c83e957z3cJm>k6KDr=vT{hpn@rSaz zKv_6>nmBUmU}C=8+3dp7J1)K>VV&B9!ZpbHgL#8c{;Qa&aGi6SV)^kXME9)q)&b<*;&D21yBDzHf(18@$Hs5ro#o9 z+y6%P=F=UjpTuJ=$wQ^*?mW%1hK~3Abo_@PVRj|dwr24s+ZEBzAM_5?1v?$s9{6bS zXL~wtnSW3gS}Waj-Zo~C__MeTYJ6c;&s`DlaiHVQS^EnDYb}eC_E761(lu zwEE6JZl<>$PLF%KcZxoF{Vu3?$K|e6+t1U0%F2561Fy)lTV`Af_}XiFTKcS<3v`gk=-Jp>yYA}UD2Um(w#Qn z++5zj8z)pIB{j_r!hT(g0B06!)@7Lq+&_0 fO4qLVCVkjy5t=M<8GgCO@TXhkyIgq8Cp!Hfq9Brt