Merge branch 'master' of https://github.com/Im2be/runelite

.gitignore

@@ -20,4 +20,6 @@ classes/artifacts/client_jar/client.jar
 .gradle/
 runelite-client/src/main/resources/runelite/*
 runelite-client/dependencies.txt
-.staging/
+.staging/
+.vscode
+.factorypath

buildSrc/src/main/kotlin/Dependencies.kt

@@ -25,9 +25,9 @@
 
 object ProjectVersions {
     const val launcherVersion = "2.0.4"
-    const val rlVersion = "1.5.44-SNAPSHOT"
+    const val rlVersion = "1.6.1"
 
-    const val openosrsVersion = "2.1.19-SNAPSHOT"
+    const val openosrsVersion = "2.1.19"
 
     const val rsversion = 187
     const val cacheversion = 165

cache/cache.gradle.kts

@@ -46,9 +46,12 @@ dependencies {
     implementation(Libraries.apacheCommonsCompress)
     implementation(Libraries.slf4jApi)
 
+    testAnnotationProcessor(Libraries.lombok)
+
+    testCompileOnly(Libraries.lombok)
+
     testImplementation(Libraries.junit)
     testImplementation(group = "net.runelite.rs", name = "cache", version = "${ProjectVersions.cacheversion}")
-    testImplementation(Libraries.slf4jSimple)
 }
 
 tasks {

cache/src/main/java/net/runelite/cache/ConfigType.java

@@ -36,6 +36,7 @@ public enum ConfigType
 	ENUM(8),
 	NPC(9),
 	ITEM(10),
+	PARAMS(11),
 	SEQUENCE(12),
 	SPOTANIM(13),
 	VARBIT(14),

cache/src/main/java/net/runelite/cache/definitions/ParamDefinition.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2020, Adam <Adam@sigterm.info>
+ * 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.cache.definitions;
+
+import lombok.Data;
+import net.runelite.cache.util.ScriptVarType;
+
+@Data
+public class ParamDefinition
+{
+	private ScriptVarType type;
+	private boolean isMembers = true;
+	private int defaultInt;
+	private String defaultString;
+}

cache/src/main/java/net/runelite/cache/definitions/loaders/ParamLoader.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2020, Adam <Adam@sigterm.info>
+ * 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.cache.definitions.loaders;
+
+import net.runelite.cache.definitions.ParamDefinition;
+import net.runelite.cache.io.InputStream;
+import net.runelite.cache.util.ScriptVarType;
+
+public class ParamLoader
+{
+	public ParamDefinition load(byte[] data)
+	{
+		ParamDefinition def = new ParamDefinition();
+		InputStream b = new InputStream(data);
+
+		for (; ; )
+		{
+			int opcode = b.readUnsignedByte();
+
+			switch (opcode)
+			{
+				case 0:
+					return def;
+				case 1:
+				{
+					int idx = b.readByte();
+					def.setType(ScriptVarType.forCharKey((char) idx));
+					break;
+				}
+				case 2:
+					def.setDefaultInt(b.readInt());
+					break;
+				case 4:
+					def.setMembers(false);
+					break;
+				case 5:
+					def.setDefaultString(b.readString());
+					break;
+			}
+		}
+	}
+}

cache/src/test/java/net/runelite/cache/ParamDumper.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2020, Adam <Adam@sigterm.info>
+ * 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.cache;
+
+import com.google.common.io.Files;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import lombok.extern.slf4j.Slf4j;
+import net.runelite.cache.definitions.ParamDefinition;
+import net.runelite.cache.definitions.loaders.ParamLoader;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.ArchiveFiles;
+import net.runelite.cache.fs.FSFile;
+import net.runelite.cache.fs.Index;
+import net.runelite.cache.fs.Storage;
+import net.runelite.cache.fs.Store;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+@Slf4j
+public class ParamDumper
+{
+	private Gson gson = new GsonBuilder().setPrettyPrinting().create();
+
+	@Rule
+	public TemporaryFolder folder = StoreLocation.getTemporaryFolder();
+
+	@Test
+	@Ignore
+	public void test() throws IOException
+	{
+		File dumpDir = folder.newFolder();
+		int count = 0;
+
+		try (Store store = new Store(StoreLocation.LOCATION))
+		{
+			store.load();
+
+			Storage storage = store.getStorage();
+			Index index = store.getIndex(IndexType.CONFIGS);
+			Archive archive = index.getArchive(ConfigType.PARAMS.getId());
+
+			ParamLoader loader = new ParamLoader();
+
+			byte[] archiveData = storage.loadArchive(archive);
+			ArchiveFiles files = archive.getFiles(archiveData);
+
+			for (FSFile file : files.getFiles())
+			{
+				byte[] b = file.getContents();
+
+				ParamDefinition def = loader.load(b);
+
+				Files.asCharSink(new File(dumpDir, file.getFileId() + ".json"), Charset.defaultCharset()).write(gson.toJson(def));
+				++count;
+			}
+		}
+
+		log.info("Dumped {} params to {}", count, dumpDir);
+	}
+}

http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResult.java

@@ -203,7 +203,7 @@ public class HiscoreResult
 				return chaosElemental;
 			case CHAOS_FANATIC:
 				return chaosFanatic;
-			case COMMMANDER_ZILYANA:
+			case COMMANDER_ZILYANA:
 				return commanderZilyana;
 			case CORPOREAL_BEAST:
 				return corporealBeast;

http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResultBuilder.java

@@ -94,8 +94,8 @@ class HiscoreResultBuilder
 			hiscoreResult.setAlchemicalHydra(skills.get(index++));
 			hiscoreResult.setBarrowsChests(skills.get(index++));
 			hiscoreResult.setBryophyta(skills.get(index++));
-//			hiscoreResult.setCallisto(skills.get(index++));
+			hiscoreResult.setCallisto(skills.get(index++));
-//			hiscoreResult.setCerberus(skills.get(index++));
+			hiscoreResult.setCerberus(skills.get(index++));
 			hiscoreResult.setChambersOfXeric(skills.get(index++));
 			hiscoreResult.setChambersOfXericChallengeMode(skills.get(index++));
 			hiscoreResult.setChaosElemental(skills.get(index++));

http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java

@@ -26,89 +26,93 @@ package net.runelite.http.api.hiscore;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import static net.runelite.http.api.hiscore.HiscoreSkillType.SKILL;
+import static net.runelite.http.api.hiscore.HiscoreSkillType.ACTIVITY;
+import static net.runelite.http.api.hiscore.HiscoreSkillType.BOSS;
 
 @AllArgsConstructor
 @Getter
 public enum HiscoreSkill
 {
-	OVERALL("Overall"),
+	OVERALL("Overall", HiscoreSkillType.OVERALL),
-	ATTACK("Attack"),
+	ATTACK("Attack", SKILL),
-	DEFENCE("Defence"),
+	DEFENCE("Defence", SKILL),
-	STRENGTH("Strength"),
+	STRENGTH("Strength", SKILL),
-	HITPOINTS("Hitpoints"),
+	HITPOINTS("Hitpoints", SKILL),
-	RANGED("Ranged"),
+	RANGED("Ranged", SKILL),
-	PRAYER("Prayer"),
+	PRAYER("Prayer", SKILL),
-	MAGIC("Magic"),
+	MAGIC("Magic", SKILL),
-	COOKING("Cooking"),
+	COOKING("Cooking", SKILL),
-	WOODCUTTING("Woodcutting"),
+	WOODCUTTING("Woodcutting", SKILL),
-	FLETCHING("Fletching"),
+	FLETCHING("Fletching", SKILL),
-	FISHING("Fishing"),
+	FISHING("Fishing", SKILL),
-	FIREMAKING("Firemaking"),
+	FIREMAKING("Firemaking", SKILL),
-	CRAFTING("Crafting"),
+	CRAFTING("Crafting", SKILL),
-	SMITHING("Smithing"),
+	SMITHING("Smithing", SKILL),
-	MINING("Mining"),
+	MINING("Mining", SKILL),
-	HERBLORE("Herblore"),
+	HERBLORE("Herblore", SKILL),
-	AGILITY("Agility"),
+	AGILITY("Agility", SKILL),
-	THIEVING("Thieving"),
+	THIEVING("Thieving", SKILL),
-	SLAYER("Slayer"),
+	SLAYER("Slayer", SKILL),
-	FARMING("Farming"),
+	FARMING("Farming", SKILL),
-	RUNECRAFT("Runecraft"),
+	RUNECRAFT("Runecraft", SKILL),
-	HUNTER("Hunter"),
+	HUNTER("Hunter", SKILL),
-	CONSTRUCTION("Construction"),
+	CONSTRUCTION("Construction", SKILL),
-	LEAGUE_POINTS("League Points"),
+	LEAGUE_POINTS("League Points", ACTIVITY),
-	BOUNTY_HUNTER_HUNTER("Bounty Hunter - Hunter"),
+	BOUNTY_HUNTER_HUNTER("Bounty Hunter - Hunter", ACTIVITY),
-	BOUNTY_HUNTER_ROGUE("Bounty Hunter - Rogue"),
+	BOUNTY_HUNTER_ROGUE("Bounty Hunter - Rogue", ACTIVITY),
-	CLUE_SCROLL_ALL("Clue Scrolls (all)"),
+	CLUE_SCROLL_ALL("Clue Scrolls (all)", ACTIVITY),
-	CLUE_SCROLL_BEGINNER("Clue Scrolls (beginner)"),
+	CLUE_SCROLL_BEGINNER("Clue Scrolls (beginner)", ACTIVITY),
-	CLUE_SCROLL_EASY("Clue Scrolls (easy)"),
+	CLUE_SCROLL_EASY("Clue Scrolls (easy)", ACTIVITY),
-	CLUE_SCROLL_MEDIUM("Clue Scrolls (medium)"),
+	CLUE_SCROLL_MEDIUM("Clue Scrolls (medium)", ACTIVITY),
-	CLUE_SCROLL_HARD("Clue Scrolls (hard)"),
+	CLUE_SCROLL_HARD("Clue Scrolls (hard)", ACTIVITY),
-	CLUE_SCROLL_ELITE("Clue Scrolls (elite)"),
+	CLUE_SCROLL_ELITE("Clue Scrolls (elite)", ACTIVITY),
-	CLUE_SCROLL_MASTER("Clue Scrolls (master)"),
+	CLUE_SCROLL_MASTER("Clue Scrolls (master)", ACTIVITY),
-	LAST_MAN_STANDING("Last Man Standing"),
+	LAST_MAN_STANDING("Last Man Standing", ACTIVITY),
-	ABYSSAL_SIRE("Abyssal Sire"),
+	ABYSSAL_SIRE("Abyssal Sire", BOSS),
-	ALCHEMICAL_HYDRA("Alchemical Hydra"),
+	ALCHEMICAL_HYDRA("Alchemical Hydra", BOSS),
-	BARROWS_CHESTS("Barrows Chests"),
+	BARROWS_CHESTS("Barrows Chests", BOSS),
-	BRYOPHYTA("Bryophyta"),
+	BRYOPHYTA("Bryophyta", BOSS),
-	CALLISTO("Callisto"),
+	CALLISTO("Callisto", BOSS),
-	CERBERUS("Cerberus"),
+	CERBERUS("Cerberus", BOSS),
-	CHAMBERS_OF_XERIC("Chambers of Xeric"),
+	CHAMBERS_OF_XERIC("Chambers of Xeric", BOSS),
-	CHAMBERS_OF_XERIC_CHALLENGE_MODE("Chambers of Xeric: Challenge Mode"),
+	CHAMBERS_OF_XERIC_CHALLENGE_MODE("Chambers of Xeric: Challenge Mode", BOSS),
-	CHAOS_ELEMENTAL("Chaos Elemental"),
+	CHAOS_ELEMENTAL("Chaos Elemental", BOSS),
-	CHAOS_FANATIC("Chaos Fanatic"),
+	CHAOS_FANATIC("Chaos Fanatic", BOSS),
-	COMMMANDER_ZILYANA("Commander Zilyana"),
+	COMMANDER_ZILYANA("Commander Zilyana", BOSS),
-	CORPOREAL_BEAST("Corporeal Beast"),
+	CORPOREAL_BEAST("Corporeal Beast", BOSS),
-	CRAZY_ARCHAEOLOGIST("Crazy Archaeologist"),
+	CRAZY_ARCHAEOLOGIST("Crazy Archaeologist", BOSS),
-	DAGANNOTH_PRIME("Dagannoth Prime"),
+	DAGANNOTH_PRIME("Dagannoth Prime", BOSS),
-	DAGANNOTH_REX("Dagannoth Rex"),
+	DAGANNOTH_REX("Dagannoth Rex", BOSS),
-	DAGANNOTH_SUPREME("Dagannoth Supreme"),
+	DAGANNOTH_SUPREME("Dagannoth Supreme", BOSS),
-	DERANGED_ARCHAEOLOGIST("Deranged Archaeologist"),
+	DERANGED_ARCHAEOLOGIST("Deranged Archaeologist", BOSS),
-	GENERAL_GRAARDOR("General Graardor"),
+	GENERAL_GRAARDOR("General Graardor", BOSS),
-	GIANT_MOLE("Giant Mole"),
+	GIANT_MOLE("Giant Mole", BOSS),
-	GROTESQUE_GUARDIANS("Grotesque Guardians"),
+	GROTESQUE_GUARDIANS("Grotesque Guardians", BOSS),
-	HESPORI("Hespori"),
+	HESPORI("Hespori", BOSS),
-	KALPHITE_QUEEN("Kalphite Queen"),
+	KALPHITE_QUEEN("Kalphite Queen", BOSS),
-	KING_BLACK_DRAGON("King Black Dragon"),
+	KING_BLACK_DRAGON("King Black Dragon", BOSS),
-	KRAKEN("Kraken"),
+	KRAKEN("Kraken", BOSS),
-	KREEARRA("Kree'Arra"),
+	KREEARRA("Kree'Arra", BOSS),
-	KRIL_TSUTSAROTH("K'ril Tsutsaroth"),
+	KRIL_TSUTSAROTH("K'ril Tsutsaroth", BOSS),
-	MIMIC("Mimic"),
+	MIMIC("Mimic", BOSS),
-	OBOR("Obor"),
+	OBOR("Obor", BOSS),
-	SARACHNIS("Sarachnis"),
+	SARACHNIS("Sarachnis", BOSS),
-	SCORPIA("Scorpia"),
+	SCORPIA("Scorpia", BOSS),
-	SKOTIZO("Skotizo"),
+	SKOTIZO("Skotizo", BOSS),
-	THE_GAUNTLET("The Gauntlet"),
+	THE_GAUNTLET("The Gauntlet", BOSS),
-	THE_CORRUPTED_GAUNTLET("The Corrupted Gauntlet"),
+	THE_CORRUPTED_GAUNTLET("The Corrupted Gauntlet", BOSS),
-	THEATRE_OF_BLOOD("Theatre of Blood"),
+	THEATRE_OF_BLOOD("Theatre of Blood", BOSS),
-	THERMONUCLEAR_SMOKE_DEVIL("Thermonuclear Smoke Devil"),
+	THERMONUCLEAR_SMOKE_DEVIL("Thermonuclear Smoke Devil", BOSS),
-	TZKAL_ZUK("TzKal-Zuk"),
+	TZKAL_ZUK("TzKal-Zuk", BOSS),
-	TZTOK_JAD("TzTok-Jad"),
+	TZTOK_JAD("TzTok-Jad", BOSS),
-	VENENATIS("Venenatis"),
+	VENENATIS("Venenatis", BOSS),
-	VETION("Vet'ion"),
+	VETION("Vet'ion", BOSS),
-	VORKATH("Vorkath"),
+	VORKATH("Vorkath", BOSS),
-	WINTERTODT("Wintertodt"),
+	WINTERTODT("Wintertodt", BOSS),
-	ZALCANO("Zalcano"),
+	ZALCANO("Zalcano", BOSS),
-	ZULRAH("Zulrah");
+	ZULRAH("Zulrah", BOSS);
 
 	private final String name;
+	private final HiscoreSkillType type;
 }

http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkillType.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2019, Bram91 <https://github.com/bram91>
+ * 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.http.api.hiscore;
+
+public enum HiscoreSkillType
+{
+	OVERALL,
+	SKILL,
+	ACTIVITY,
+	BOSS
+}

http-service/src/main/java/net/runelite/http/service/feed/FeedController.java

@@ -27,7 +27,6 @@ package net.runelite.http.service.feed;
 import com.google.common.hash.HashCode;
 import com.google.common.hash.Hasher;
 import com.google.common.hash.Hashing;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -92,27 +91,27 @@ public class FeedController
 		{
 			items.addAll(blogService.getBlogPosts());
 		}
-		catch (IOException e)
+		catch (Exception e)
 		{
-			log.warn(e.getMessage());
+			log.warn("unable to fetch blogs", e);
 		}
 
 		try
 		{
 			items.addAll(twitterService.getTweets());
 		}
-		catch (IOException e)
+		catch (Exception e)
 		{
-			log.warn(e.getMessage());
+			log.warn("unable to fetch tweets", e);
 		}
 
 		try
 		{
 			items.addAll(osrsNewsService.getNews());
 		}
-		catch (IOException e)
+		catch (Exception e)
 		{
-			log.warn(e.getMessage());
+			log.warn("unable to fetch news", e);
 		}
 
 		memoizedFeed = new MemoizedFeed(new FeedResult(items));

http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java

@@ -37,40 +37,83 @@ import org.junit.Test;
 public class HiscoreServiceTest
 {
 	private static final String RESPONSE = "654683,705,1304518\n"
-			+ "679419,50,107181\n"
+		+ "679419,50,107181\n"
-			+ "550667,48,85764\n"
+		+ "550667,48,85764\n"
-			+ "861497,50,101366\n"
+		+ "861497,50,101366\n"
-			+ "891591,48,87843\n"
+		+ "891591,48,87843\n"
-			+ "-1,1,4\n"
+		+ "-1,1,4\n"
-			+ "840255,27,10073\n"
+		+ "840255,27,10073\n"
-			+ "1371912,10,1310\n"
+		+ "1371912,10,1310\n"
-			+ "432193,56,199795\n"
+		+ "432193,56,199795\n"
-			+ "495638,56,198304\n"
+		+ "495638,56,198304\n"
-			+ "514466,37,27502\n"
+		+ "514466,37,27502\n"
-			+ "456981,54,159727\n"
+		+ "456981,54,159727\n"
-			+ "459159,49,93010\n"
+		+ "459159,49,93010\n"
-			+ "1028855,8,823\n"
+		+ "1028855,8,823\n"
-			+ "862906,29,12749\n"
+		+ "862906,29,12749\n"
-			+ "795020,31,16097\n"
+		+ "795020,31,16097\n"
-			+ "673591,5,495\n"
+		+ "673591,5,495\n"
-			+ "352676,51,112259\n"
+		+ "352676,51,112259\n"
-			+ "428419,40,37235\n"
+		+ "428419,40,37235\n"
-			+ "461887,43,51971\n"
+		+ "461887,43,51971\n"
-			+ "598582,1,10\n"
+		+ "598582,1,10\n"
-			+ "638177,1,0\n"
+		+ "638177,1,0\n"
-			+ "516239,9,1000\n"
+		+ "516239,9,1000\n"
-			+ "492790,1,0\n"
+		+ "492790,1,0\n"
-			+ "2,2460\n" // leagues
+		+ "2,2460\n" // leagues
-			+ "-1,-1\n"
+		+ "-1,-1\n"
-			+ "73,1738\n"
+		+ "73,1738\n"
-			+ "531,1432\n"
+		+ "531,1432\n"
-			+ "324,212\n"
+		+ "324,212\n"
-			+ "8008,131\n"
+		+ "8008,131\n"
-			+ "1337,911\n"
+		+ "1337,911\n"
-			+ "42,14113\n"
+		+ "42,14113\n"
-			+ "1,777\n"
+		+ "1,777\n"
-			+ "254,92\n"
+		+ "254,92\n"
-			+ "-1,-1\n"; // lms
+		+ "-1,-1\n" // lms
+		+ "24870,37\n"
+		+ "15020,388\n"
+		+ "50463,147\n"
+		+ "-1,-1\n"
+		+ "92357,1\n"
+		+ "22758,637\n"
+		+ "22744,107\n"
+		+ "-1,-1\n"
+		+ "20150,17\n"
+		+ "29400,18\n"
+		+ "13465,172\n"
+		+ "1889,581\n"
+		+ "42891,11\n"
+		+ "1624,1957\n"
+		+ "1243,2465\n"
+		+ "1548,2020\n"
+		+ "-1,-1\n"
+		+ "16781,327\n"
+		+ "19004,149\n"
+		+ "-1,-1\n"
+		+ "72046,5\n"
+		+ "5158,374\n"
+		+ "20902,279\n"
+		+ "702,6495\n"
+		+ "10170,184\n"
+		+ "8064,202\n"
+		+ "6936,2\n"
+		+ "-1,-1\n"
+		+ "-1,-1\n"
+		+ "19779,22\n"
+		+ "58283,10\n"
+		+ "-1,-1\n"
+		+ "-1,-1\n"
+		+ "-1,-1\n"
+		+ "29347,130\n"
+		+ "723,4\n"
+		+ "1264,38\n"
+		+ "44595,4\n"
+		+ "24820,4\n"
+		+ "12116,782\n"
+		+ "2299,724\n"
+		+ "19301,62\n"
+		+ "1498,5847\n";
 
 	private final MockWebServer server = new MockWebServer();
 
@@ -107,6 +150,8 @@ public class HiscoreServiceTest
 		Assert.assertEquals(254, result.getClueScrollMaster().getRank());
 		Assert.assertEquals(-1, result.getLastManStanding().getLevel());
 		Assert.assertEquals(2460, result.getLeaguePoints().getLevel());
+		Assert.assertEquals(37, result.getAbyssalSire().getLevel());
+		Assert.assertEquals(92357, result.getCallisto().getRank());
+		Assert.assertEquals(5847, result.getZulrah().getLevel());
 	}
-
 }

runelite-api/src/main/java/net/runelite/api/ItemID.java

@@ -11367,5 +11367,20 @@ public final class ItemID
 	public static final int VOLATILE_NIGHTMARE_STAFF = 24424;
 	public static final int ELDRITCH_NIGHTMARE_STAFF = 24425;
 	public static final int CABBAGE_24426 = 24426;
+	public static final int GREEN_GINGERBREAD_SHIELD = 24428;
+	public static final int RED_GINGERBREAD_SHIELD = 24430;
+	public static final int BLUE_GINGERBREAD_SHIELD = 24431;
+	public static final int FESTIVE_CINNAMON_STICK = 24432;
+	public static final int FESTIVE_GINGER_POWDER = 24433;
+	public static final int FESTIVE_EGG = 24434;
+	public static final int FESTIVE_POT = 24435;
+	public static final int FESTIVE_FLOUR = 24436;
+	public static final int GINGERBREAD_SHIELD = 24437;
+	public static final int ICED_GINGERBREAD_SHIELD = 24438;
+	public static final int ICED_GINGERBREAD_SHIELD_24439 = 24439;
+	public static final int ICED_GINGERBREAD_SHIELD_24440 = 24440;
+	public static final int SCAPERUNE_TELEPORT = 24441;
+	public static final int BAKERY_STORAGE_KEY = 24442;
+	public static final int GINGERBREAD_GNOME = 24443;
 	/* This file is automatically generated. Do not edit. */
 }

runelite-api/src/main/java/net/runelite/api/NpcID.java

@@ -98,7 +98,8 @@ public final class NpcID
 	public static final int GHOST_95 = 95;
 	public static final int GHOST_96 = 96;
 	public static final int GHOST_97 = 97;
-	public static final int DEATH_WING = 99;
+	public static final int GHOST_98 = 98;
+	public static final int GHOST_99 = 99;
 	public static final int ROCK_CRAB = 100;
 	public static final int ROCKS = 101;
 	public static final int ROCK_CRAB_102 = 102;
@@ -459,9 +460,9 @@ public final class NpcID
 	public static final int SKELETAL_WYVERN_468 = 468;
 	public static final int KILLERWATT = 469;
 	public static final int KILLERWATT_470 = 470;
-	public static final int DARK_WIZARD = 472;
+	public static final int GHOST_472 = 472;
-	public static final int INVRIGAR_THE_NECROMANCER = 473;
+	public static final int GHOST_473 = 473;
-	public static final int DARK_WIZARD_474 = 474;
+	public static final int GHOST_474 = 474;
 	public static final int HOLE_IN_THE_WALL = 475;
 	public static final int WALL_BEAST = 476;
 	public static final int GIANT_FROG = 477;
@@ -491,32 +492,34 @@ public final class NpcID
 	public static final int VANESSA = 502;
 	public static final int RICHARD = 503;
 	public static final int ALICE = 504;
-	public static final int MUGGER = 505;
+	public static final int GHOST_505 = 505;
-	public static final int WITCH = 506;
+	public static final int GHOST_506 = 506;
-	public static final int WITCH_507 = 507;
+	public static final int GHOST_507 = 507;
-	public static final int BLACK_KNIGHT = 508;
+	public static final int SOULLESS = 508;
-	public static final int BLACK_KNIGHT_509 = 509;
+	public static final int DEATH_WING = 509;
-	public static final int HIGHWAYMAN = 510;
+	public static final int DARK_WIZARD = 510;
-	public static final int HIGHWAYMAN_511 = 511;
+	public static final int INVRIGAR_THE_NECROMANCER = 511;
-	public static final int CHAOS_DRUID = 512;
+	public static final int DARK_WIZARD_512 = 512;
-	public static final int PIRATE = 513;
+	public static final int MUGGER = 513;
-	public static final int PIRATE_514 = 514;
+	public static final int WITCH = 514;
-	public static final int PIRATE_515 = 515;
+	public static final int WITCH_515 = 515;
-	public static final int PIRATE_516 = 516;
+	public static final int BLACK_KNIGHT = 516;
-	public static final int THUG = 517;
+	public static final int BLACK_KNIGHT_517 = 517;
-	public static final int ROGUE = 518;
+	public static final int HIGHWAYMAN = 518;
-	public static final int MONK_OF_ZAMORAK = 519;
+	public static final int HIGHWAYMAN_519 = 519;
-	public static final int MONK_OF_ZAMORAK_520 = 520;
+	public static final int CHAOS_DRUID = 520;
-	public static final int MONK_OF_ZAMORAK_521 = 521;
+	public static final int PIRATE = 521;
-	public static final int TRIBESMAN = 522;
+	public static final int PIRATE_522 = 522;
-	public static final int DARK_WARRIOR = 523;
+	public static final int PIRATE_523 = 523;
-	public static final int CHAOS_DRUID_WARRIOR = 524;
+	public static final int PIRATE_524 = 524;
-	public static final int NECROMANCER = 525;
+	public static final int THUG = 525;
-	public static final int BANDIT = 526;
+	public static final int ROGUE = 526;
-	public static final int GUARD_BANDIT = 527;
+	public static final int MONK_OF_ZAMORAK = 527;
-	public static final int BARBARIAN_GUARD = 528;
+	public static final int MONK_OF_ZAMORAK_528 = 528;
-	public static final int PORTAL = 530;
+	public static final int MONK_OF_ZAMORAK_529 = 529;
-	public static final int PORTAL_532 = 532;
+	public static final int TRIBESMAN = 530;
+	public static final int DARK_WARRIOR = 531;
+	public static final int CHAOS_DRUID_WARRIOR = 532;
 	public static final int FUNGI = 533;
 	public static final int THESSALIA = 534;
 	public static final int FUNGI_535 = 535;
@@ -672,7 +675,7 @@ public final class NpcID
 	public static final int BARTENDER = 687;
 	public static final int EBLIS = 688;
 	public static final int EBLIS_689 = 689;
-	public static final int BANDIT_690 = 690;
+	public static final int BANDIT = 690;
 	public static final int BANDIT_691 = 691;
 	public static final int BANDIT_692 = 692;
 	public static final int BANDIT_693 = 693;
@@ -986,16 +989,10 @@ public final class NpcID
 	public static final int RAT_1021 = 1021;
 	public static final int RAT_1022 = 1022;
 	public static final int ZYGOMITE_1024 = 1024;
-	public static final int BANKER_1027 = 1027;
+	public static final int NECROMANCER = 1025;
-	public static final int BANKER_1028 = 1028;
+	public static final int BANDIT_1026 = 1026;
-	public static final int BANKER_1029 = 1029;
+	public static final int GUARD_BANDIT = 1027;
-	public static final int BANKER_1030 = 1030;
+	public static final int BARBARIAN_GUARD = 1028;
-	public static final int BANKER_1031 = 1031;
-	public static final int BANKER_1032 = 1032;
-	public static final int BANKER_1033 = 1033;
-	public static final int BANKER_1034 = 1034;
-	public static final int BANKER_1035 = 1035;
-	public static final int BANKER_1036 = 1036;
 	public static final int SNAKE = 1037;
 	public static final int MONKEY_1038 = 1038;
 	public static final int ALBINO_BAT = 1039;
@@ -1258,13 +1255,6 @@ public final class NpcID
 	public static final int HARI = 1325;
 	public static final int BARFY_BILL = 1326;
 	public static final int TYRAS_GUARD_1327 = 1327;
-	public static final int TRADER_STAN = 1328;
-	public static final int TRADER_CREWMEMBER = 1329;
-	public static final int TRADER_CREWMEMBER_1330 = 1330;
-	public static final int TRADER_CREWMEMBER_1331 = 1331;
-	public static final int TRADER_CREWMEMBER_1332 = 1332;
-	public static final int TRADER_CREWMEMBER_1333 = 1333;
-	public static final int TRADER_CREWMEMBER_1334 = 1334;
 	public static final int JACK_SEAGULL = 1335;
 	public static final int LONGBOW_BEN = 1336;
 	public static final int AHAB = 1337;
@@ -1525,10 +1515,12 @@ public final class NpcID
 	public static final int BATTLE_MAGE = 1610;
 	public static final int BATTLE_MAGE_1611 = 1611;
 	public static final int BATTLE_MAGE_1612 = 1612;
+	public static final int BANKER_1613 = 1613;
 	public static final int PHIALS = 1614;
 	public static final int BANKNOTE_EXCHANGE_MERCHANT = 1615;
 	public static final int HIGH_PRIESTESS_ZULHARCINQA = 1616;
 	public static final int PRIESTESS_ZULGWENWYNIG = 1617;
+	public static final int BANKER_1618 = 1618;
 	public static final int CAT_1619 = 1619;
 	public static final int CAT_1620 = 1620;
 	public static final int CAT_1621 = 1621;
@@ -1543,6 +1535,8 @@ public final class NpcID
 	public static final int LAZY_CAT_1630 = 1630;
 	public static final int LAZY_CAT_1631 = 1631;
 	public static final int LAZY_HELLCAT = 1632;
+	public static final int BANKER_1633 = 1633;
+	public static final int BANKER_1634 = 1634;
 	public static final int BABY_IMPLING = 1635;
 	public static final int YOUNG_IMPLING = 1636;
 	public static final int GOURMET_IMPLING = 1637;
@@ -1647,7 +1641,7 @@ public final class NpcID
 	public static final int BRAWLER_1736 = 1736;
 	public static final int BRAWLER_1737 = 1737;
 	public static final int BRAWLER_1738 = 1738;
-	public static final int PORTAL_1739 = 1739;
+	public static final int PORTAL = 1739;
 	public static final int PORTAL_1740 = 1740;
 	public static final int PORTAL_1741 = 1741;
 	public static final int PORTAL_1742 = 1742;
@@ -2882,44 +2876,33 @@ public final class NpcID
 	public static final int GOBLIN_3074 = 3074;
 	public static final int GOBLIN_3075 = 3075;
 	public static final int GOBLIN_3076 = 3076;
-	public static final int HANS = 3077;
+	public static final int PORTAL_3086 = 3086;
-	public static final int MAN_3078 = 3078;
+	public static final int PORTAL_3088 = 3088;
-	public static final int MAN_3079 = 3079;
+	public static final int BANKER_3089 = 3089;
-	public static final int MAN_3080 = 3080;
+	public static final int BANKER_3090 = 3090;
-	public static final int MAN_3081 = 3081;
+	public static final int BANKER_3091 = 3091;
-	public static final int MAN_3082 = 3082;
+	public static final int BANKER_3092 = 3092;
-	public static final int WOMAN_3083 = 3083;
+	public static final int BANKER_3093 = 3093;
-	public static final int WOMAN_3084 = 3084;
+	public static final int BANKER_3094 = 3094;
-	public static final int WOMAN_3085 = 3085;
+	public static final int CHIEF_SERVANT = 3095;
-	public static final int FARMER = 3086;
+	public static final int TAXIDERMIST = 3096;
-	public static final int FARMER_3087 = 3087;
+	public static final int ESTATE_AGENT = 3097;
-	public static final int FARMER_3088 = 3088;
+	public static final int STONEMASON = 3098;
-	public static final int FARMER_3089 = 3089;
-	public static final int FARMER_3090 = 3090;
-	public static final int FARMER_3091 = 3091;
-	public static final int THIEF_3092 = 3092;
-	public static final int THIEF_3093 = 3093;
-	public static final int GUARD_3094 = 3094;
-	public static final int TRAMP_3095 = 3095;
-	public static final int BARBARIAN_3096 = 3096;
-	public static final int WIZARD_3097 = 3097;
-	public static final int DRUID = 3098;
 	public static final int HELLPUPPY_3099 = 3099;
-	public static final int WARRIOR_WOMAN = 3100;
+	public static final int SIR_RENITEE = 3100;
-	public static final int MAN_3101 = 3101;
+	public static final int SAWMILL_OPERATOR = 3101;
-	public static final int BARBARIAN_3102 = 3102;
+	public static final int GARDEN_SUPPLIER = 3102;
-	public static final int ALKHARID_WARRIOR = 3103;
+	public static final int GARDEN_SUPPLIER_3103 = 3103;
-	public static final int PALADIN_3104 = 3104;
+	public static final int HANS = 3105;
-	public static final int PALADIN_3105 = 3105;
+	public static final int MAN_3106 = 3106;
-	public static final int HERO = 3106;
+	public static final int MAN_3107 = 3107;
-	public static final int FORESTER = 3107;
+	public static final int MAN_3108 = 3108;
-	public static final int KNIGHT_OF_ARDOUGNE = 3108;
 	public static final int MAN_3109 = 3109;
-	public static final int WOMAN_3110 = 3110;
+	public static final int MAN_3110 = 3110;
-	public static final int KNIGHT_OF_ARDOUGNE_3111 = 3111;
+	public static final int WOMAN_3111 = 3111;
-	public static final int ARCHER_3112 = 3112;
+	public static final int WOMAN_3112 = 3112;
-	public static final int ZOO_KEEPER = 3113;
+	public static final int WOMAN_3113 = 3113;
-	public static final int CHUCK = 3114;
+	public static final int FARMER = 3114;
 	public static final int FARID_MORRISANE_ORES_AND_BARS = 3115;
 	public static final int TZKIH_3116 = 3116;
 	public static final int TZKIH_3117 = 3117;
@@ -3039,26 +3022,26 @@ public final class NpcID
 	public static final int TREE = 3240;
 	public static final int BLANDEBIR = 3241;
 	public static final int METARIALUS = 3242;
-	public static final int BARMAN_3243 = 3243;
+	public static final int FARMER_3243 = 3243;
-	public static final int PRIEST_3244 = 3244;
+	public static final int FARMER_3244 = 3244;
-	public static final int GUARD_3245 = 3245;
+	public static final int FARMER_3245 = 3245;
 	public static final int WIZARD_FRUMSCONE = 3246;
 	public static final int WIZARD_AKUTHA = 3247;
 	public static final int WIZARD_DISTENTOR = 3248;
 	public static final int WIZARD_SININA = 3249;
-	public static final int DOOR_MAN = 3250;
+	public static final int FARMER_3250 = 3250;
-	public static final int WATCHMAN = 3251;
+	public static final int FARMER_3251 = 3251;
-	public static final int SOLDIER = 3252;
+	public static final int THIEF_3252 = 3252;
-	public static final int WYSON_THE_GARDENER = 3253;
+	public static final int THIEF_3253 = 3253;
-	public static final int SIGBERT_THE_ADVENTURER = 3254;
+	public static final int GUARD_3254 = 3254;
-	public static final int SHIPYARD_WORKER_3255 = 3255;
+	public static final int TRAMP_3255 = 3255;
-	public static final int SHIPYARD_WORKER_3256 = 3256;
+	public static final int BARBARIAN_3256 = 3256;
-	public static final int MASTER_FARMER = 3257;
+	public static final int WIZARD_3257 = 3257;
-	public static final int MASTER_FARMER_3258 = 3258;
+	public static final int DRUID = 3258;
-	public static final int MARKET_GUARD_3259 = 3259;
+	public static final int DRUID_3259 = 3259;
-	public static final int MAN_3260 = 3260;
+	public static final int WARRIOR_WOMAN = 3260;
-	public static final int GEE = 3261;
+	public static final int MAN_3261 = 3261;
-	public static final int DONIE = 3262;
+	public static final int BARBARIAN_3262 = 3262;
 	public static final int DRUNKEN_MAN = 3263;
 	public static final int MAN_3264 = 3264;
 	public static final int MAN_3265 = 3265;
@@ -3088,6 +3071,19 @@ public final class NpcID
 	public static final int HOBGOBLIN_3289 = 3289;
 	public static final int FROG_3290 = 3290;
 	public static final int POSTIE_PETE = 3291;
+	public static final int ALKHARID_WARRIOR = 3292;
+	public static final int PALADIN_3293 = 3293;
+	public static final int PALADIN_3294 = 3294;
+	public static final int HERO = 3295;
+	public static final int FORESTER = 3296;
+	public static final int KNIGHT_OF_ARDOUGNE = 3297;
+	public static final int MAN_3298 = 3298;
+	public static final int WOMAN_3299 = 3299;
+	public static final int KNIGHT_OF_ARDOUGNE_3300 = 3300;
+	public static final int ARCHER_3301 = 3301;
+	public static final int ZOO_KEEPER = 3302;
+	public static final int CHUCK = 3303;
+	public static final int BARMAN_3304 = 3304;
 	public static final int MASTER_CHEF = 3305;
 	public static final int HENJA = 3306;
 	public static final int COMBAT_INSTRUCTOR = 3307;
@@ -3837,7 +3833,7 @@ public final class NpcID
 	public static final int DENULTH = 4083;
 	public static final int SERGEANT = 4084;
 	public static final int SERGEANT_4085 = 4085;
-	public static final int SOLDIER_4086 = 4086;
+	public static final int SOLDIER = 4086;
 	public static final int SOLDIER_4087 = 4087;
 	public static final int SOLDIER_4088 = 4088;
 	public static final int SOLDIER_4089 = 4089;
@@ -5067,13 +5063,13 @@ public final class NpcID
 	public static final int COMBAT_STONE_5414 = 5414;
 	public static final int COMBAT_STONE_5415 = 5415;
 	public static final int COMBAT_STONE_5416 = 5416;
-	public static final int CHIEF_SERVANT = 5417;
+	public static final int PRIEST_5417 = 5417;
-	public static final int TAXIDERMIST = 5418;
+	public static final int GUARD_5418 = 5418;
-	public static final int ESTATE_AGENT = 5419;
+	public static final int DOOR_MAN = 5419;
-	public static final int STONEMASON = 5420;
+	public static final int WATCHMAN = 5420;
-	public static final int SIR_RENITEE = 5421;
+	public static final int SOLDIER_5421 = 5421;
-	public static final int SAWMILL_OPERATOR = 5422;
+	public static final int WYSON_THE_GARDENER = 5422;
-	public static final int GARDEN_SUPPLIER = 5423;
+	public static final int SIGBERT_THE_ADVENTURER = 5423;
 	public static final int CAPT_ARNAV = 5426;
 	public static final int FLIPPA = 5427;
 	public static final int TILT = 5428;
@@ -5104,7 +5100,7 @@ public final class NpcID
 	public static final int THUMPY = 5454;
 	public static final int THOMDRIL = 5455;
 	public static final int KENDALL = 5456;
-	public static final int DRUID_5457 = 5457;
+	public static final int SHIPYARD_WORKER_5457 = 5457;
 	public static final int SUSPECT_5458 = 5458;
 	public static final int SUSPECT_5459 = 5459;
 	public static final int SUSPECT_5460 = 5460;
@@ -5365,6 +5361,10 @@ public final class NpcID
 	public static final int SHEEP_5726 = 5726;
 	public static final int RABBIT_5727 = 5727;
 	public static final int IMP_5728 = 5728;
+	public static final int SHIPYARD_WORKER_5729 = 5729;
+	public static final int MASTER_FARMER = 5730;
+	public static final int MASTER_FARMER_5731 = 5731;
+	public static final int MARKET_GUARD_5732 = 5732;
 	public static final int ELNOCK_INQUISITOR = 5734;
 	public static final int IMPLING = 5735;
 	public static final int FAIRY_AERYKA = 5736;
@@ -6160,14 +6160,10 @@ public final class NpcID
 	public static final int AWOWOGEI_6812 = 6812;
 	public static final int MONKEY_ARCHER_6813 = 6813;
 	public static final int LAMMY_LANGLE = 6814;
-	public static final int GHOST_6815 = 6815;
+	public static final int MAN_6815 = 6815;
-	public static final int GHOST_6816 = 6816;
+	public static final int GEE = 6816;
-	public static final int GHOST_6817 = 6817;
+	public static final int DONIE = 6817;
-	public static final int GHOST_6818 = 6818;
+	public static final int MAN_6818 = 6818;
-	public static final int GHOST_6819 = 6819;
-	public static final int GHOST_6820 = 6820;
-	public static final int GHOST_6821 = 6821;
-	public static final int GHOST_6822 = 6822;
 	public static final int TOWN_CRIER_6823 = 6823;
 	public static final int GIANT_BAT_6824 = 6824;
 	public static final int ROD_FISHING_SPOT_6825 = 6825;
@@ -6818,7 +6814,6 @@ public final class NpcID
 	public static final int TEKTON_ENRAGED_7544 = 7544;
 	public static final int TEKTON_7545 = 7545;
 	public static final int BARTENDER_7546 = 7546;
-	public static final int MAN_7547 = 7547;
 	public static final int SCAVENGER_BEAST = 7548;
 	public static final int SCAVENGER_BEAST_7549 = 7549;
 	public static final int GREAT_OLM_RIGHT_CLAW = 7550;
@@ -7650,7 +7645,6 @@ public final class NpcID
 	public static final int TORMENTED_SOUL_8513 = 8513;
 	public static final int TRAPPED_SOUL = 8514;
 	public static final int ALYSSA = 8515;
-	public static final int GARDEN_SUPPLIER_8516 = 8516;
 	public static final int IKKLE_HYDRA_8517 = 8517;
 	public static final int IKKLE_HYDRA_8518 = 8518;
 	public static final int IKKLE_HYDRA_8519 = 8519;
@@ -7822,7 +7816,6 @@ public final class NpcID
 	public static final int SMOLCANO = 8731;
 	public static final int MUGGER_8732 = 8732;
 	public static final int CRAB_8733 = 8733;
-	public static final int SOULLESS = 8734;
 	public static final int MOSS_GIANT_8736 = 8736;
 	public static final int YOUNGLLEF_8737 = 8737;
 	public static final int CORRUPTED_YOUNGLLEF_8738 = 8738;
@@ -8318,5 +8311,89 @@ public final class NpcID
 	public static final int TYPHOR_9296 = 9296;
 	public static final int VRITRA = 9297;
 	public static final int MAZ = 9298;
+	public static final int TRADER_STAN = 9299;
+	public static final int TRADER_STAN_9300 = 9300;
+	public static final int TRADER_STAN_9301 = 9301;
+	public static final int TRADER_STAN_9302 = 9302;
+	public static final int TRADER_STAN_9303 = 9303;
+	public static final int TRADER_STAN_9304 = 9304;
+	public static final int TRADER_STAN_9305 = 9305;
+	public static final int TRADER_STAN_9307 = 9307;
+	public static final int TRADER_STAN_9308 = 9308;
+	public static final int TRADER_STAN_9309 = 9309;
+	public static final int TRADER_STAN_9310 = 9310;
+	public static final int TRADER_STAN_9311 = 9311;
+	public static final int TRADER_CREWMEMBER = 9312;
+	public static final int TRADER_CREWMEMBER_9313 = 9313;
+	public static final int TRADER_CREWMEMBER_9314 = 9314;
+	public static final int TRADER_CREWMEMBER_9315 = 9315;
+	public static final int TRADER_CREWMEMBER_9316 = 9316;
+	public static final int TRADER_CREWMEMBER_9317 = 9317;
+	public static final int TRADER_CREWMEMBER_9318 = 9318;
+	public static final int TRADER_CREWMEMBER_9319 = 9319;
+	public static final int TRADER_CREWMEMBER_9320 = 9320;
+	public static final int TRADER_CREWMEMBER_9321 = 9321;
+	public static final int TRADER_CREWMEMBER_9322 = 9322;
+	public static final int TRADER_CREWMEMBER_9323 = 9323;
+	public static final int TRADER_CREWMEMBER_9324 = 9324;
+	public static final int TRADER_CREWMEMBER_9325 = 9325;
+	public static final int TRADER_CREWMEMBER_9326 = 9326;
+	public static final int TRADER_CREWMEMBER_9327 = 9327;
+	public static final int TRADER_CREWMEMBER_9328 = 9328;
+	public static final int TRADER_CREWMEMBER_9329 = 9329;
+	public static final int TRADER_CREWMEMBER_9330 = 9330;
+	public static final int TRADER_CREWMEMBER_9331 = 9331;
+	public static final int TRADER_CREWMEMBER_9332 = 9332;
+	public static final int TRADER_CREWMEMBER_9333 = 9333;
+	public static final int TRADER_CREWMEMBER_9334 = 9334;
+	public static final int TRADER_CREWMEMBER_9335 = 9335;
+	public static final int TRADER_CREWMEMBER_9336 = 9336;
+	public static final int TRADER_CREWMEMBER_9337 = 9337;
+	public static final int TRADER_CREWMEMBER_9338 = 9338;
+	public static final int TRADER_CREWMEMBER_9339 = 9339;
+	public static final int TRADER_CREWMEMBER_9340 = 9340;
+	public static final int TRADER_CREWMEMBER_9341 = 9341;
+	public static final int TRADER_CREWMEMBER_9342 = 9342;
+	public static final int TRADER_CREWMEMBER_9343 = 9343;
+	public static final int TRADER_CREWMEMBER_9344 = 9344;
+	public static final int TRADER_CREWMEMBER_9345 = 9345;
+	public static final int TRADER_CREWMEMBER_9346 = 9346;
+	public static final int TRADER_CREWMEMBER_9347 = 9347;
+	public static final int TRADER_CREWMEMBER_9348 = 9348;
+	public static final int TRADER_CREWMEMBER_9349 = 9349;
+	public static final int TRADER_CREWMEMBER_9350 = 9350;
+	public static final int TRADER_CREWMEMBER_9351 = 9351;
+	public static final int TRADER_CREWMEMBER_9352 = 9352;
+	public static final int TRADER_CREWMEMBER_9353 = 9353;
+	public static final int TRADER_CREWMEMBER_9354 = 9354;
+	public static final int TRADER_CREWMEMBER_9355 = 9355;
+	public static final int TRADER_CREWMEMBER_9356 = 9356;
+	public static final int TRADER_CREWMEMBER_9357 = 9357;
+	public static final int TRADER_CREWMEMBER_9358 = 9358;
+	public static final int TRADER_CREWMEMBER_9359 = 9359;
+	public static final int TRADER_CREWMEMBER_9360 = 9360;
+	public static final int TRADER_CREWMEMBER_9361 = 9361;
+	public static final int TRADER_CREWMEMBER_9362 = 9362;
+	public static final int TRADER_CREWMEMBER_9363 = 9363;
+	public static final int TRADER_CREWMEMBER_9364 = 9364;
+	public static final int TRADER_CREWMEMBER_9365 = 9365;
+	public static final int TRADER_CREWMEMBER_9366 = 9366;
+	public static final int TRADER_CREWMEMBER_9367 = 9367;
+	public static final int TRADER_CREWMEMBER_9368 = 9368;
+	public static final int TRADER_CREWMEMBER_9369 = 9369;
+	public static final int TRADER_CREWMEMBER_9370 = 9370;
+	public static final int TRADER_CREWMEMBER_9371 = 9371;
+	public static final int TRADER_CREWMEMBER_9372 = 9372;
+	public static final int TRADER_CREWMEMBER_9373 = 9373;
+	public static final int TRADER_CREWMEMBER_9374 = 9374;
+	public static final int TRADER_CREWMEMBER_9375 = 9375;
+	public static final int TRADER_CREWMEMBER_9376 = 9376;
+	public static final int TRADER_CREWMEMBER_9377 = 9377;
+	public static final int TRADER_CREWMEMBER_9378 = 9378;
+	public static final int TRADER_CREWMEMBER_9379 = 9379;
+	public static final int TRADER_CREWMEMBER_9380 = 9380;
+	public static final int TRADER_CREWMEMBER_9381 = 9381;
+	public static final int TRADER_CREWMEMBER_9382 = 9382;
+	public static final int TRADER_CREWMEMBER_9383 = 9383;
 	/* This file is automatically generated. Do not edit. */
 }

runelite-api/src/main/java/net/runelite/api/NullItemID.java

@@ -12852,5 +12852,6 @@ public final class NullItemID
 	public static final int NULL_24414 = 24414;
 	public static final int NULL_24415 = 24415;
 	public static final int NULL_24427 = 24427;
+	public static final int NULL_24429 = 24429;
 	/* This file is automatically generated. Do not edit. */
 }

runelite-api/src/main/java/net/runelite/api/NullObjectID.java

@@ -12856,7 +12856,6 @@ public final class NullObjectID
 	public static final int NULL_27103 = 27103;
 	public static final int NULL_27104 = 27104;
 	public static final int NULL_27105 = 27105;
-	public static final int NULL_27106 = 27106;
 	public static final int NULL_27111 = 27111;
 	public static final int NULL_27112 = 27112;
 	public static final int NULL_27113 = 27113;

runelite-api/src/main/java/net/runelite/api/ObjectID.java

@@ -14234,7 +14234,6 @@ public final class ObjectID
 	public static final int LIGHT_27093 = 27093;
 	public static final int CLAN_CUP_PORTAL = 27095;
 	public static final int EXIT_PORTAL_27096 = 27096;
-	public static final int ANTISANTA = 27097;
 	public static final int SOFA = 27098;
 	public static final int CRATE_27100 = 27100;
 	public static final int CRATES_27101 = 27101;

runelite-api/src/main/java/net/runelite/api/queries/EquipmentItemQuery.java

@@ -1,99 +1,99 @@
-/*
+///*
- * Copyright (c) 2017, Devin French <https://github.com/devinfrench>
+// * Copyright (c) 2017, Devin French <https://github.com/devinfrench>
- * All rights reserved.
+// * All rights reserved.
- *
+// *
- * Redistribution and use in source and binary forms, with or without
+// * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+// * modification, are permitted provided that the following conditions are met:
- *
+// *
- * 1. Redistributions of source code must retain the above copyright notice, this
+// * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
+// *    list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
+// * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
+// *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
+// *    and/or other materials provided with the distribution.
- *
+// *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// * 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
+// * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+// * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+// * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// * 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
+// * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// */
-package net.runelite.api.queries;
+//package net.runelite.api.queries;
-
+//
-import java.awt.Rectangle;
+//import java.awt.Rectangle;
-import java.util.ArrayList;
+//import java.util.ArrayList;
-import java.util.Arrays;
+//import java.util.Arrays;
-import java.util.Collection;
+//import java.util.Collection;
-import java.util.Objects;
+//import java.util.Objects;
-import java.util.stream.Collectors;
+//import java.util.stream.Collectors;
-import net.runelite.api.Client;
+//import net.runelite.api.Client;
-import net.runelite.api.QueryResults;
+//import net.runelite.api.QueryResults;
-import net.runelite.api.widgets.Widget;
+//import net.runelite.api.widgets.Widget;
-import net.runelite.api.widgets.WidgetInfo;
+//import net.runelite.api.widgets.WidgetInfo;
-import net.runelite.api.widgets.WidgetItem;
+//import net.runelite.api.widgets.WidgetItem;
-
+//
-public class EquipmentItemQuery extends WidgetItemQuery
+//public class EquipmentItemQuery extends WidgetItemQuery
-{
+//{
-	private static final WidgetInfo[] ALL_EQUIPMENT_WIDGET_INFOS =
+//	private static final WidgetInfo[] ALL_EQUIPMENT_WIDGET_INFOS =
-		{
+//		{
-			WidgetInfo.EQUIPMENT_HELMET,
+//			WidgetInfo.EQUIPMENT_HELMET,
-			WidgetInfo.EQUIPMENT_CAPE,
+//			WidgetInfo.EQUIPMENT_CAPE,
-			WidgetInfo.EQUIPMENT_AMULET,
+//			WidgetInfo.EQUIPMENT_AMULET,
-			WidgetInfo.EQUIPMENT_WEAPON,
+//			WidgetInfo.EQUIPMENT_WEAPON,
-			WidgetInfo.EQUIPMENT_BODY,
+//			WidgetInfo.EQUIPMENT_BODY,
-			WidgetInfo.EQUIPMENT_SHIELD,
+//			WidgetInfo.EQUIPMENT_SHIELD,
-			WidgetInfo.EQUIPMENT_LEGS,
+//			WidgetInfo.EQUIPMENT_LEGS,
-			WidgetInfo.EQUIPMENT_GLOVES,
+//			WidgetInfo.EQUIPMENT_GLOVES,
-			WidgetInfo.EQUIPMENT_BOOTS,
+//			WidgetInfo.EQUIPMENT_BOOTS,
-			WidgetInfo.EQUIPMENT_RING,
+//			WidgetInfo.EQUIPMENT_RING,
-			WidgetInfo.EQUIPMENT_AMMO,
+//			WidgetInfo.EQUIPMENT_AMMO,
-		};
+//		};
-
+//
-	private final Collection<WidgetInfo> slots = new ArrayList<>();
+//	private final Collection<WidgetInfo> slots = new ArrayList<>();
-
+//
-	public EquipmentItemQuery slotEquals(WidgetInfo... slotWidgetInfo)
+//	public EquipmentItemQuery slotEquals(WidgetInfo... slotWidgetInfo)
-	{
+//	{
-		slots.addAll(Arrays.asList(slotWidgetInfo));
+//		slots.addAll(Arrays.asList(slotWidgetInfo));
-		return this;
+//		return this;
-	}
+//	}
-
+//
-	@Override
+//	@Override
-	public QueryResults<WidgetItem> result(Client client)
+//	public QueryResults<WidgetItem> result(Client client)
-	{
+//	{
-		Collection<WidgetItem> widgetItems = getEquippedItems(client);
+//		Collection<WidgetItem> widgetItems = getEquippedItems(client);
-		return new QueryResults<>(widgetItems.stream()
+//		return new QueryResults<>(widgetItems.stream()
-			.filter(Objects::nonNull)
+//			.filter(Objects::nonNull)
-			.filter(predicate)
+//			.filter(predicate)
-			.collect(Collectors.toList()));
+//			.collect(Collectors.toList()));
-	}
+//	}
-
+//
-	private Collection<WidgetItem> getEquippedItems(Client client)
+//	private Collection<WidgetItem> getEquippedItems(Client client)
-	{
+//	{
-		Collection<WidgetItem> widgetItems = new ArrayList<>();
+//		Collection<WidgetItem> widgetItems = new ArrayList<>();
-		Widget equipment = client.getWidget(WidgetInfo.EQUIPMENT);
+//		Widget equipment = client.getWidget(WidgetInfo.EQUIPMENT);
-		if (equipment != null && !equipment.isHidden())
+//		if (equipment != null && !equipment.isHidden())
-		{
+//		{
-			if (slots.isEmpty())
+//			if (slots.isEmpty())
-			{
+//			{
-				slots.addAll(Arrays.asList(ALL_EQUIPMENT_WIDGET_INFOS));
+//				slots.addAll(Arrays.asList(ALL_EQUIPMENT_WIDGET_INFOS));
-			}
+//			}
-			for (WidgetInfo slot : slots)
+//			for (WidgetInfo slot : slots)
-			{
+//			{
-				Widget parentWidget = client.getWidget(slot);
+//				Widget parentWidget = client.getWidget(slot);
-				Widget itemWidget = parentWidget.getChild(1);
+//				Widget itemWidget = parentWidget.getChild(1);
-				// Check if background icon is hidden. if hidden, item is equipped.
+//				// Check if background icon is hidden. if hidden, item is equipped.
-				boolean equipped = parentWidget.getChild(2).isSelfHidden();
+//				boolean equipped = parentWidget.getChild(2).isSelfHidden();
-				// set bounds to same size as default inventory
+//				// set bounds to same size as default inventory
-				Rectangle bounds = itemWidget.getBounds();
+//				Rectangle bounds = itemWidget.getBounds();
-				bounds.setBounds(bounds.x - 1, bounds.y - 1, 32, 32);
+//				bounds.setBounds(bounds.x - 1, bounds.y - 1, 32, 32);
-				// Index is set to 0 because there is no set in stone order of equipment slots
+//				// Index is set to 0 because there is no set in stone order of equipment slots
-				widgetItems.add(new WidgetItem(equipped ? itemWidget.getItemId() : -1, itemWidget.getItemQuantity(), 0, bounds, itemWidget));
+//				widgetItems.add(new WidgetItem(equipped ? itemWidget.getItemId() : -1, itemWidget.getItemQuantity(), 0, bounds, itemWidget));
-			}
+//			}
-		}
+//		}
-		return widgetItems;
+//		return widgetItems;
-	}
+//	}
-}
+//}

runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java

@@ -264,14 +264,14 @@ public class WidgetID
 		static final int BANK_CONTAINER = 1;
 		static final int INVENTORY_ITEM_CONTAINER = 3;
 		static final int BANK_TITLE_BAR = 4;
-		static final int CONTENT_CONTAINER = 10;
+		static final int CONTENT_CONTAINER = 9;
-		static final int TAB_CONTAINER = 11;
+		static final int TAB_CONTAINER = 10;
-		static final int ITEM_CONTAINER = 13;
+		static final int ITEM_CONTAINER = 12;
-		static final int SEARCH_BUTTON_BACKGROUND = 40;
+		static final int SEARCH_BUTTON_BACKGROUND = 39;
-		static final int DEPOSIT_INVENTORY = 42;
+		static final int DEPOSIT_INVENTORY = 41;
-		static final int DEPOSIT_EQUIPMENT = 44;
+		static final int DEPOSIT_EQUIPMENT = 43;
-		static final int INCINERATOR = 46;
+		static final int INCINERATOR = 45;
-		static final int INCINERATOR_CONFIRM = 47;
+		static final int INCINERATOR_CONFIRM = 46;
 	}
 
 	static class GrandExchange
@@ -315,17 +315,6 @@ public class WidgetID
 
 	static class Equipment
 	{
-		static final int HELMET = 6;
-		static final int CAPE = 7;
-		static final int AMULET = 8;
-		static final int WEAPON = 9;
-		static final int BODY = 10;
-		static final int SHIELD = 11;
-		static final int LEGS = 12;
-		static final int GLOVES = 13;
-		static final int BOOTS = 14;
-		static final int RING = 15;
-		static final int AMMO = 16;
 		static final int INVENTORY_ITEM_CONTAINER = 0;
 	}
 

runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java

@@ -45,6 +45,7 @@ public enum WidgetInfo
 
 	INVENTORY(WidgetID.INVENTORY_GROUP_ID, 0),
 	FRIENDS_LIST(WidgetID.FRIENDS_LIST_GROUP_ID, 0),
+	IGNORE_LIST(WidgetID.IGNORE_LIST_GROUP_ID, 0),
 	CLAN_CHAT(WidgetID.CLAN_CHAT_GROUP_ID, 0),
 	RAIDING_PARTY(WidgetID.RAIDING_PARTY_GROUP_ID, 0),
 
@@ -62,18 +63,6 @@ public enum WidgetInfo
 	EQUIPMENT(WidgetID.EQUIPMENT_GROUP_ID, 0),
 	EQUIPMENT_INVENTORY_ITEMS_CONTAINER(WidgetID.EQUIPMENT_INVENTORY_GROUP_ID, WidgetID.Equipment.INVENTORY_ITEM_CONTAINER),
 
-	EQUIPMENT_HELMET(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.HELMET),
-	EQUIPMENT_CAPE(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.CAPE),
-	EQUIPMENT_AMULET(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.AMULET),
-	EQUIPMENT_WEAPON(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.WEAPON),
-	EQUIPMENT_BODY(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.BODY),
-	EQUIPMENT_SHIELD(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.SHIELD),
-	EQUIPMENT_LEGS(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.LEGS),
-	EQUIPMENT_GLOVES(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.GLOVES),
-	EQUIPMENT_BOOTS(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.BOOTS),
-	EQUIPMENT_RING(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.RING),
-	EQUIPMENT_AMMO(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.AMMO),
-
 	EMOTE_WINDOW(WidgetID.EMOTES_GROUP_ID, WidgetID.Emotes.EMOTE_WINDOW),
 	EMOTE_CONTAINER(WidgetID.EMOTES_GROUP_ID, WidgetID.Emotes.EMOTE_CONTAINER),
 	EMOTE_SCROLLBAR(WidgetID.EMOTES_GROUP_ID, WidgetID.Emotes.EMOTE_SCROLLBAR),

runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java

@@ -153,7 +153,7 @@ public class ChatMessageManager
 			messageNode.setName(ColorUtil.wrapWithColorTag(messageNode.getName(), usernameColor));
 		}
 
-		String sender = chatMessage.getSender();
+		String sender = messageNode.getSender();
 		if (senderColor != null && !Strings.isNullOrEmpty(sender))
 		{
 			messageNode.setSender(ColorUtil.wrapWithColorTag(sender, senderColor));

runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java

@@ -29,9 +29,11 @@ import net.runelite.api.Constants;
 import net.runelite.client.Notifier;
 import net.runelite.client.ui.ContainableFrame;
 
-@ConfigGroup("runelite")
+@ConfigGroup(RuneLiteConfig.GROUP_NAME)
 public interface RuneLiteConfig extends Config
 {
+	String GROUP_NAME = "runelite";
+
 	@ConfigTitleSection(
 		keyName = "uiTitle",
 		name = "User interface",

runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java

@@ -880,19 +880,21 @@ public class TabInterface
 			--maxTabs;
 		}
 
-		if (currentTabIndex + direction >= tabManager.size() || currentTabIndex + direction < 0)
+		int proposedIndex = currentTabIndex + direction;
+		int numTabs = tabManager.size() + 1;
+
+		if (proposedIndex >= numTabs || proposedIndex < 0)
 		{
 			currentTabIndex = 0;
 		}
-
+		else if (numTabs - proposedIndex >= maxTabs)
-		if ((tabManager.size() - (currentTabIndex + direction) >= maxTabs) && (currentTabIndex + direction > -1))
 		{
-			currentTabIndex += direction;
+			currentTabIndex = proposedIndex;
 		}
-		else if (maxTabs < tabManager.size() && tabManager.size() - (currentTabIndex + direction) < maxTabs)
+		else if (maxTabs < numTabs && numTabs - proposedIndex < maxTabs)
 		{
 			// Edge case when only 1 tab displays instead of up to maxTabs when one is deleted at the end of the list
-			currentTabIndex += direction;
+			currentTabIndex = proposedIndex;
 			scrollTab(-1);
 		}
 
@@ -973,7 +975,7 @@ public class TabInterface
 	{
 		int y = bounds.y + MARGIN + BUTTON_HEIGHT;
 
-		if (maxTabs >= tabManager.size())
+		if (maxTabs > tabManager.size())
 		{
 			currentTabIndex = 0;
 		}
@@ -999,6 +1001,8 @@ public class TabInterface
 			y += TAB_HEIGHT + MARGIN;
 		}
 
+		updateWidget(newTab, y);
+
 		boolean hidden = !(tabManager.size() > 0);
 
 		upButton.setHidden(hidden);

runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraConfig.java

@@ -147,4 +147,15 @@ public interface CameraConfig extends Config
 	{
 		return false;
 	}
-}
+
+	@ConfigItem(
+		keyName = "compassLook",
+		name = "Compass options",
+		description = "Adds Look South, East, and West options to the compass",
+		position = 10
+	)
+	default boolean compassLook()
+	{
+		return true;
+	}
+}

runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java

@@ -30,13 +30,16 @@ import com.google.inject.Inject;
 import com.google.inject.Provides;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.util.Arrays;
 import javax.swing.SwingUtilities;
 import net.runelite.api.Client;
 import net.runelite.api.MenuEntry;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.ScriptID;
 import net.runelite.api.VarPlayer;
 import net.runelite.api.events.ClientTick;
 import net.runelite.api.events.FocusChanged;
+import net.runelite.api.events.MenuEntryAdded;
 import net.runelite.api.events.ScriptCallbackEvent;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.config.ConfigManager;
@@ -65,6 +68,10 @@ public class CameraPlugin extends Plugin implements KeyListener, MouseListener
 	 */
 	private static final int INNER_ZOOM_LIMIT = 1004;
 	private static final int DEFAULT_ZOOM_INCREMENT = 25;
+	private static final String LOOK_NORTH = "Look North";
+	private static final String LOOK_SOUTH = "Look South";
+	private static final String LOOK_EAST = "Look East";
+	private static final String LOOK_WEST = "Look West";
 
 	private boolean controlDown;
 	// flags used to store the mousedown states
@@ -96,6 +103,60 @@ public class CameraPlugin extends Plugin implements KeyListener, MouseListener
 		return configManager.getConfig(CameraConfig.class);
 	}
 
+	@Override
+	protected void startUp()
+	{
+		rightClick = false;
+		middleClick = false;
+		menuHasEntries = false;
+
+		client.setCameraPitchRelaxerEnabled(cameraConfig.relaxCameraPitch());
+		keyManager.registerKeyListener(this);
+		mouseManager.registerMouseListener(this);
+	}
+
+	@Override
+	protected void shutDown()
+	{
+		client.setCameraPitchRelaxerEnabled(false);
+		keyManager.unregisterKeyListener(this);
+		mouseManager.unregisterMouseListener(this);
+		controlDown = false;
+	}
+
+	@Subscribe
+	public void onMenuEntryAdded(MenuEntryAdded menuEntryAdded)
+	{
+		if (menuEntryAdded.getOpcode() == MenuOpcode.WIDGET_DEFAULT.getId() && menuEntryAdded.getOption().equals(LOOK_NORTH) && cameraConfig.compassLook())
+		{
+			MenuEntry[] menuEntries = client.getMenuEntries();
+			int len = menuEntries.length;
+			MenuEntry north = menuEntries[len - 1];
+
+			menuEntries = Arrays.copyOf(menuEntries, len + 3);
+
+			// The handling for these entries is done in ToplevelCompassOp.rs2asm
+			menuEntries[--len] = createCameraLookEntry(menuEntryAdded, 4, LOOK_WEST);
+			menuEntries[++len] = createCameraLookEntry(menuEntryAdded, 3, LOOK_EAST);
+			menuEntries[++len] = createCameraLookEntry(menuEntryAdded, 2, LOOK_SOUTH);
+			menuEntries[++len] = north;
+
+			client.setMenuEntries(menuEntries);
+		}
+	}
+
+	private MenuEntry createCameraLookEntry(MenuEntryAdded lookNorth, int identifier, String option)
+	{
+		MenuEntry m = new MenuEntry();
+		m.setOption(option);
+		m.setTarget(lookNorth.getTarget());
+		m.setIdentifier(identifier);
+		m.setOpcode(MenuOpcode.WIDGET_DEFAULT.getId());
+		m.setParam0(lookNorth.getParam0());
+		m.setParam1(lookNorth.getParam1());
+		return m;
+	}
+
 	@Subscribe
 	private void onScriptCallbackEvent(ScriptCallbackEvent event)
 	{
@@ -169,27 +230,6 @@ public class CameraPlugin extends Plugin implements KeyListener, MouseListener
 		}
 	}
 
-	@Override
-	protected void startUp()
-	{
-		rightClick = false;
-		middleClick = false;
-		menuHasEntries = false;
-
-		client.setCameraPitchRelaxerEnabled(cameraConfig.relaxCameraPitch());
-		keyManager.registerKeyListener(this);
-		mouseManager.registerMouseListener(this);
-	}
-
-	@Override
-	protected void shutDown()
-	{
-		client.setCameraPitchRelaxerEnabled(false);
-		keyManager.unregisterKeyListener(this);
-		mouseManager.unregisterMouseListener(this);
-		controlDown = false;
-	}
-
 	@Subscribe
 	private void onConfigChanged(ConfigChanged ev)
 	{

runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java

@@ -29,7 +29,9 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.ScriptID;
+import net.runelite.api.VarClientInt;
 import net.runelite.api.VarClientStr;
+import net.runelite.api.vars.InputType;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.input.KeyListener;
 
@@ -56,7 +58,11 @@ class ChatKeyboardListener implements KeyListener
 	{
 		if (chatCommandsConfig.clearSingleWord().matches(e))
 		{
-			String input = client.getVar(VarClientStr.CHATBOX_TYPED_TEXT);
+			int inputTye = client.getVar(VarClientInt.INPUT_TYPE);
+			String input = inputTye == InputType.NONE.getType()
+				? client.getVar(VarClientStr.CHATBOX_TYPED_TEXT)
+				: client.getVar(VarClientStr.INPUT_TEXT);
+
 			if (input != null)
 			{
 				// remove trailing space
@@ -77,20 +83,27 @@ class ChatKeyboardListener implements KeyListener
 					replacement = "";
 				}
 
-				clientThread.invoke(() ->
+				clientThread.invoke(() -> applyText(inputTye, replacement));
-				{
-					client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, replacement);
-					client.runScript(ScriptID.CHAT_PROMPT_INIT);
-				});
 			}
 		}
 		else if (chatCommandsConfig.clearChatBox().matches(e))
 		{
-			clientThread.invoke(() ->
+			int inputTye = client.getVar(VarClientInt.INPUT_TYPE);
-			{
+			clientThread.invoke(() -> applyText(inputTye, ""));
-				client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, "");
+		}
-				client.runScript(ScriptID.CHAT_PROMPT_INIT);
+	}
-			});
+
+	private void applyText(int inputType, String replacement)
+	{
+		if (inputType == InputType.NONE.getType())
+		{
+			client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, replacement);
+			client.runScript(ScriptID.CHAT_PROMPT_INIT);
+		}
+		else if (inputType == InputType.PRIVATE_MESSAGE.getType())
+		{
+			client.setVar(VarClientStr.INPUT_TEXT, replacement);
+			client.runScript(ScriptID.CHAT_TEXT_INPUT_REBUILD, "");
 		}
 	}
 

runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java

@@ -173,7 +173,7 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu
 		new EmoteClue("Yawn in Draynor Marketplace. Equip studded leather chaps, an iron kiteshield and a steel longsword.", "Draynor", DRAYNOR_VILLAGE_MARKET, new WorldPoint(3083, 3253, 0), YAWN, item(STUDDED_CHAPS), item(IRON_KITESHIELD), item(STEEL_LONGSWORD)),
 		new EmoteClue("Yawn in the Castle Wars lobby. Shrug before you talk to me. Equip a ruby amulet, a mithril scimitar and a Wilderness cape.", "Castle Wars", CASTLE_WARS_BANK, new WorldPoint(2440, 3092, 0), YAWN, SHRUG, item(RUBY_AMULET), item(MITHRIL_SCIMITAR), range("Any team cape", TEAM1_CAPE, TEAM50_CAPE)),
 		new EmoteClue("Yawn in the rogues' general store. Beware of double agents! Equip an adamant square shield, blue dragon vambraces and a rune pickaxe.", "Rogues general store", NOTERAZZOS_SHOP_IN_THE_WILDERNESS, new WorldPoint(3026, 3701, 0), YAWN, item(ADAMANT_SQ_SHIELD), item(BLUE_DHIDE_VAMB), item(RUNE_PICKAXE)),
-		new EmoteClue("Yawn at the top of Trollheim. Equip a lava battlestaff, black dragonhide vambraces and a mind shield.", "Trollheim Mountain", ON_TOP_OF_TROLLHEIM_MOUNTAIN, new WorldPoint(2887, 3676, 0), YAWN, item(LAVA_BATTLESTAFF), item(BLACK_DHIDE_VAMB), item(MIND_SHIELD)),
+		new EmoteClue("Yawn at the top of Trollheim. Equip a lava battlestaff, black dragonhide vambraces and a mind shield.", "Trollheim Mountain", ON_TOP_OF_TROLLHEIM_MOUNTAIN, new WorldPoint(2887, 3676, 0), YAWN, any("Lava battlestaff", item(LAVA_BATTLESTAFF), item(LAVA_BATTLESTAFF_21198)), item(BLACK_DHIDE_VAMB), item(MIND_SHIELD)),
 		new EmoteClue("Yawn in the centre of Arceuus library. Nod your head before you talk to me. Equip blue dragonhide vambraces, adamant boots and an adamant dagger.", "Arceuus library", ENTRANCE_OF_THE_ARCEUUS_LIBRARY, new WorldPoint(1632, 3807, 0), YAWN, YES, item(BLUE_DHIDE_VAMB), item(ADAMANT_BOOTS), item(ADAMANT_DAGGER)),
 		new EmoteClue("Swing a bullroarer at the top of the watchtower. Beware of double agents! Equip a dragon plateskirt, climbing boots and a dragon chainbody.", "Yanille watchtower", TOP_FLOOR_OF_THE_YANILLE_WATCHTOWER, new WorldPoint(2932, 4712, 0), BULL_ROARER, item(DRAGON_PLATESKIRT), item(CLIMBING_BOOTS), item(DRAGON_CHAINBODY_3140), item(ItemID.BULL_ROARER)),
 		new EmoteClue("Blow a raspberry at Gypsy Aris in her tent. Equip a gold ring and a gold necklace.", "Varrock", GYPSY_TENT_ENTRANCE, new WorldPoint(3203, 3424, 0), RASPBERRY, item(GOLD_RING), item(GOLD_NECKLACE)),

runelite-client/src/main/java/net/runelite/client/plugins/config/FixedWidthPanel.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017, Adam <Adam@sigterm.info>
+ * 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.config;
+
+import java.awt.Dimension;
+import javax.swing.JPanel;
+import net.runelite.client.ui.PluginPanel;
+
+class FixedWidthPanel extends JPanel
+{
+	@Override
+	public Dimension getPreferredSize()
+	{
+		return new Dimension(PluginPanel.PANEL_WIDTH, super.getPreferredSize().height);
+	}
+
+}

runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java

@@ -112,9 +112,9 @@ public class PluginListItem extends JPanel
 		CONFIG_ICON = new ImageIcon(configIcon);
 		ON_SWITCHER = new ImageIcon(ImageUtil.recolorImage(onSwitcher, ColorScheme.BRAND_BLUE));
 		ON_STAR = new ImageIcon(ImageUtil.recolorImage(onStar, ColorScheme.BRAND_BLUE));
-		CONFIG_ICON_HOVER = new ImageIcon(ImageUtil.grayscaleOffset(configIcon, -100));
+		CONFIG_ICON_HOVER = new ImageIcon(ImageUtil.luminanceOffset(configIcon, -100));
 		BufferedImage offSwitcherImage = ImageUtil.flipImage(
-			ImageUtil.grayscaleOffset(
+			ImageUtil.luminanceScale(
 				ImageUtil.grayscaleImage(onSwitcher),
 				0.61f
 			),
@@ -122,7 +122,7 @@ public class PluginListItem extends JPanel
 			false
 		);
 		OFF_SWITCHER = new ImageIcon(offSwitcherImage);
-		BufferedImage offStar = ImageUtil.grayscaleOffset(
+		BufferedImage offStar = ImageUtil.luminanceScale(
 			ImageUtil.grayscaleImage(onStar),
 			0.77f
 		);

runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java

@@ -37,6 +37,7 @@ import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
+import net.runelite.api.Constants;
 import net.runelite.api.ItemDefinition;
 import net.runelite.api.ItemID;
 import net.runelite.api.events.ChatMessage;
@@ -335,8 +336,8 @@ public class ExaminePlugin extends Plugin
 		// quantity is at least 1
 		quantity = Math.max(1, quantity);
 		int itemCompositionPrice = itemComposition.getPrice();
-		final int gePrice = itemManager.getItemPrice(id);
+		final long gePrice = itemManager.getItemPrice(id);
-		final int alchPrice = itemCompositionPrice <= 0 ? 0 : itemManager.getAlchValue(itemComposition);
+		final long alchPrice = itemCompositionPrice <= 0 ? 0 : Math.round(itemCompositionPrice * Constants.HIGH_ALCHEMY_MULTIPLIER);
 
 		if (gePrice > 0 || alchPrice > 0)
 		{

runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java

@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2017, Adam <Adam@sigterm.info>
  * Copyright (c) 2018, Psikoi <https://github.com/psikoi>
+ * Copyright (c) 2019, Bram91 <https://github.com/bram91>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,6 +26,7 @@
  */
 package net.runelite.client.plugins.hiscore;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import java.awt.Dimension;
@@ -37,9 +39,10 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.EnumSet;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -66,7 +69,9 @@ import net.runelite.http.api.hiscore.HiscoreEndpoint;
 import net.runelite.http.api.hiscore.HiscoreResult;
 import net.runelite.http.api.hiscore.HiscoreSkill;
 import static net.runelite.http.api.hiscore.HiscoreSkill.*;
+import net.runelite.http.api.hiscore.HiscoreSkillType;
 import net.runelite.http.api.hiscore.Skill;
+import org.apache.commons.lang3.StringUtils;
 
 @Slf4j
 @Singleton
@@ -89,6 +94,27 @@ public class HiscorePanel extends PluginPanel
 		CONSTRUCTION, HUNTER
 	);
 
+	/**
+	 * Bosses, ordered in the way they should be displayed in the panel.
+	 */
+	private static final List<HiscoreSkill> BOSSES = ImmutableList.of(
+		ABYSSAL_SIRE, ALCHEMICAL_HYDRA, BARROWS_CHESTS,
+		BRYOPHYTA, CALLISTO, CERBERUS,
+		CHAMBERS_OF_XERIC, CHAMBERS_OF_XERIC_CHALLENGE_MODE, CHAOS_ELEMENTAL,
+		CHAOS_FANATIC, COMMANDER_ZILYANA, CORPOREAL_BEAST,
+		DAGANNOTH_PRIME, DAGANNOTH_REX, DAGANNOTH_SUPREME,
+		CRAZY_ARCHAEOLOGIST, DERANGED_ARCHAEOLOGIST, GENERAL_GRAARDOR,
+		GIANT_MOLE, GROTESQUE_GUARDIANS, HESPORI,
+		KALPHITE_QUEEN, KING_BLACK_DRAGON, KRAKEN,
+		KREEARRA, KRIL_TSUTSAROTH, MIMIC,
+		OBOR, SARACHNIS, SCORPIA,
+		SKOTIZO, THE_GAUNTLET, THE_CORRUPTED_GAUNTLET,
+		THEATRE_OF_BLOOD, THERMONUCLEAR_SMOKE_DEVIL, TZKAL_ZUK,
+		TZTOK_JAD, VENENATIS, VETION,
+		VORKATH, WINTERTODT, ZALCANO,
+		ZULRAH
+	);
+
 	@Inject
 	ScheduledExecutorService executor;
 
@@ -100,7 +126,8 @@ public class HiscorePanel extends PluginPanel
 
 	private final IconTextField searchBar;
 
-	private final List<JLabel> skillLabels = new ArrayList<>();
+	// Not an enummap because we need null keys for combat
+	private final Map<HiscoreSkill, JLabel> skillLabels = new HashMap<>();
 
 	/* Container of all the selectable endpoints (ironman, deadman, etc) */
 	private final MaterialTabGroup tabGroup;
@@ -215,16 +242,15 @@ public class HiscorePanel extends PluginPanel
 		c.gridy++;
 
 		// Panel that holds skill icons
-		GridLayout stats = new GridLayout(8, 3);
 		JPanel statsPanel = new JPanel();
-		statsPanel.setLayout(stats);
+		statsPanel.setLayout(new GridLayout(8, 3));
 		statsPanel.setBackground(ColorScheme.DARKER_GRAY_COLOR);
 		statsPanel.setBorder(new EmptyBorder(5, 0, 5, 0));
 
 		// For each skill on the ingame skill panel, create a Label and add it to the UI
 		for (HiscoreSkill skill : SKILLS)
 		{
-			JPanel panel = makeSkillPanel(skill);
+			JPanel panel = makeHiscorePanel(skill);
 			statsPanel.add(panel);
 		}
 
@@ -232,11 +258,11 @@ public class HiscorePanel extends PluginPanel
 		c.gridy++;
 
 		JPanel totalPanel = new JPanel();
-		totalPanel.setBackground(ColorScheme.DARKER_GRAY_COLOR);
 		totalPanel.setLayout(new GridLayout(1, 2));
+		totalPanel.setBackground(ColorScheme.DARKER_GRAY_COLOR);
 
-		totalPanel.add(makeSkillPanel(null)); //combat has no hiscore skill, refered to as null
+		totalPanel.add(makeHiscorePanel(null)); //combat has no hiscore skill, referred to as null
-		totalPanel.add(makeSkillPanel(OVERALL));
+		totalPanel.add(makeHiscorePanel(OVERALL));
 
 		add(totalPanel, c);
 		c.gridy++;
@@ -247,14 +273,28 @@ public class HiscorePanel extends PluginPanel
 		minigamePanel.setLayout(new GridLayout(2, 3));
 		minigamePanel.setBackground(ColorScheme.DARKER_GRAY_COLOR);
 
-		minigamePanel.add(makeSkillPanel(CLUE_SCROLL_ALL));
+		minigamePanel.add(makeHiscorePanel(CLUE_SCROLL_ALL));
-		minigamePanel.add(makeSkillPanel(LEAGUE_POINTS));
+		minigamePanel.add(makeHiscorePanel(LEAGUE_POINTS));
-		minigamePanel.add(makeSkillPanel(LAST_MAN_STANDING));
+		minigamePanel.add(makeHiscorePanel(LAST_MAN_STANDING));
-		minigamePanel.add(makeSkillPanel(BOUNTY_HUNTER_ROGUE));
+		minigamePanel.add(makeHiscorePanel(BOUNTY_HUNTER_ROGUE));
-		minigamePanel.add(makeSkillPanel(BOUNTY_HUNTER_HUNTER));
+		minigamePanel.add(makeHiscorePanel(BOUNTY_HUNTER_HUNTER));
 
 		add(minigamePanel, c);
 		c.gridy++;
+
+		JPanel bossPanel = new JPanel();
+		bossPanel.setLayout(new GridLayout(0, 3));
+		bossPanel.setBackground(ColorScheme.DARKER_GRAY_COLOR);
+
+		// For each boss on the hi-scores, create a Label and add it to the UI
+		for (HiscoreSkill skill : BOSSES)
+		{
+			JPanel panel = makeHiscorePanel(skill);
+			bossPanel.add(panel);
+		}
+
+		add(bossPanel, c);
+		c.gridy++;
 	}
 
 	@Override
@@ -265,24 +305,29 @@ public class HiscorePanel extends PluginPanel
 	}
 
 	/* Builds a JPanel displaying an icon and level/number associated with it */
-	private JPanel makeSkillPanel(HiscoreSkill skill)
+	private JPanel makeHiscorePanel(HiscoreSkill skill)
 	{
+		HiscoreSkillType skillType = skill == null ? HiscoreSkillType.SKILL : skill.getType();
+
 		JLabel label = new JLabel();
 		label.setFont(FontManager.getRunescapeSmallFont());
-		label.setText("--");
+		label.setText(pad("--", skillType));
 
-		String skillName = (skill == null ? "combat" : skill.getName().toLowerCase());
+		String directory;
-		String directory = "/skill_icons";
+		if (skill == null || skill == OVERALL)
-		if (skillName.equals("combat") || skillName.equals("overall"))
 		{
-			// Cannot use SpriteManager as HiscorePlugin loads before a Client is available
+			directory = "/skill_icons/";
-			directory += "/";
+		}
+		else if (skill.getType() == HiscoreSkillType.BOSS)
+		{
+			directory = "bosses/";
 		}
 		else
 		{
-			directory += "_small/";
+			directory = "/skill_icons_small/";
 		}
 
+		String skillName = (skill == null ? "combat" : skill.name().toLowerCase());
 		String skillIcon = directory + skillName + ".png";
 		log.debug("Loading skill icon from {}", skillIcon);
 
@@ -294,8 +339,8 @@ public class HiscorePanel extends PluginPanel
 		JPanel skillPanel = new JPanel();
 		skillPanel.setBackground(ColorScheme.DARKER_GRAY_COLOR);
 		skillPanel.setBorder(new EmptyBorder(2, 0, 2, 0));
-		skillLabels.add(label);
+		skillLabels.put(skill, label);
-		skillPanel.add(skillLabels.get(skillLabels.size() - 1));
+		skillPanel.add(label);
 
 		return skillPanel;
 	}
@@ -330,9 +375,13 @@ public class HiscorePanel extends PluginPanel
 		searchBar.setIcon(IconTextField.Icon.LOADING_DARKER);
 		loading = true;
 
-		for (JLabel label : skillLabels)
+		for (Map.Entry<HiscoreSkill, JLabel> entry : skillLabels.entrySet())
 		{
-			label.setText("--");
+			HiscoreSkill skill = entry.getKey();
+			JLabel label = entry.getValue();
+			HiscoreSkillType skillType = skill == null ? HiscoreSkillType.SKILL : skill.getType();
+
+			label.setText(pad("--", skillType));
 			label.setToolTipText(null);
 		}
 
@@ -370,10 +419,10 @@ public class HiscorePanel extends PluginPanel
 		searchBar.setEditable(true);
 		loading = false;
 
-		int index = 0;
+		for (Map.Entry<HiscoreSkill, JLabel> entry : skillLabels.entrySet())
-		for (JLabel label : skillLabels)
 		{
-			HiscoreSkill skill = find(index);
+			HiscoreSkill skill = entry.getKey();
+			JLabel label = entry.getValue();
 			Skill s;
 
 			if (skill == null)
@@ -395,7 +444,7 @@ public class HiscorePanel extends PluginPanel
 			else if ((s = result.getSkill(skill)) != null)
 			{
 				final long exp = s.getExperience();
-				final boolean isSkill = SKILLS.contains(skill);
+				final boolean isSkill = skill.getType() == HiscoreSkillType.SKILL;
 				int level = -1;
 				if (plugin.isVirtualLevels() && isSkill && exp > -1L)
 				{
@@ -410,12 +459,11 @@ public class HiscorePanel extends PluginPanel
 
 				if (level != -1)
 				{
-					label.setText(Integer.toString(level));
+					label.setText(pad(formatLevel(level), skill.getType()));
 				}
 			}
 
 			label.setToolTipText(detailsHtml(result, skill));
-			index++;
 		}
 	}
 
@@ -429,37 +477,6 @@ public class HiscorePanel extends PluginPanel
 		this.searchBar.removeKeyListener(l);
 	}
 
-	/*
-		Returns a hiscore skill based on it's display order.
-	 */
-	private HiscoreSkill find(int index)
-	{
-		if (index < SKILLS.size())
-		{
-			return SKILLS.get(index);
-		}
-
-		switch (index - SKILLS.size())
-		{
-			case 0:
-				return null;
-			case 1:
-				return OVERALL;
-			case 2:
-				return CLUE_SCROLL_ALL;
-			case 3:
-				return LEAGUE_POINTS;
-			case 4:
-				return LAST_MAN_STANDING;
-			case 5:
-				return BOUNTY_HUNTER_ROGUE;
-			case 6:
-				return BOUNTY_HUNTER_HUNTER;
-		}
-
-		return null;
-	}
-
 	/*
 		Builds a html string to display on tooltip (when hovering a skill).
 	 */
@@ -556,36 +573,50 @@ public class HiscorePanel extends PluginPanel
 				}
 				default:
 				{
-					Skill requestedSkill = result.getSkill(skill);
+					if (skill.getType() == HiscoreSkillType.BOSS)
-					final long experience = requestedSkill.getExperience();
-
-					String rank = (requestedSkill.getRank() == -1) ? "Unranked" : QuantityFormatter.formatNumber(requestedSkill.getRank());
-					String exp = (experience == -1L) ? "Unranked" : QuantityFormatter.formatNumber(experience);
-					String remainingXp;
-					if (experience == -1L)
 					{
-						remainingXp = "Unranked";
+						Skill requestedSkill = result.getSkill(skill);
+						String rank = "Unranked";
+						String lvl = "0";
+						if (requestedSkill != null)
+						{
+							rank = (requestedSkill.getRank() == -1) ? "Unranked" : QuantityFormatter.formatNumber(requestedSkill.getRank());
+							lvl = (requestedSkill.getLevel() == -1 ? "0" : QuantityFormatter.formatNumber(requestedSkill.getLevel()));
+						}
+						content += "<p><span style = 'color:white'>Boss:</span> " + skill.getName() + "</p>";
+						content += "<p><span style = 'color:white'>Rank:</span> " + rank + "</p>";
+						content += "<p><span style = 'color:white'>KC:</span> " + lvl + "</p>";
 					}
 					else
 					{
-						int currentLevel = Experience.getLevelForXp((int) experience);
+						Skill requestedSkill = result.getSkill(skill);
-						remainingXp = (currentLevel + 1 <= Experience.MAX_VIRT_LEVEL) ? QuantityFormatter.formatNumber(Experience.getXpForLevel(currentLevel + 1) - experience) : "0";
+						final long experience = requestedSkill.getExperience();
+
+						String rank = (requestedSkill.getRank() == -1) ? "Unranked" : QuantityFormatter.formatNumber(requestedSkill.getRank());
+						String exp = (experience == -1L) ? "Unranked" : QuantityFormatter.formatNumber(experience);
+						String remainingXp;
+						if (experience == -1L)
+						{
+							remainingXp = "Unranked";
+						}
+						else
+						{
+							int currentLevel = Experience.getLevelForXp((int) experience);
+							remainingXp = (currentLevel + 1 <= Experience.MAX_VIRT_LEVEL) ? QuantityFormatter.formatNumber(Experience.getXpForLevel(currentLevel + 1) - experience) : "0";
+						}
+
+						content += "<p><span style = 'color:white'>Skill:</span> " + skill.getName() + "</p>";
+						content += "<p><span style = 'color:white'>Rank:</span> " + rank + "</p>";
+						content += "<p><span style = 'color:white'>Experience:</span> " + exp + "</p>";
+						content += "<p><span style = 'color:white'>Remaining XP:</span> " + remainingXp + "</p>";
 					}
-
-					content += "<p><span style = 'color:white'>Skill:</span> " + skill.getName() + "</p>";
-					content += "<p><span style = 'color:white'>Rank:</span> " + rank + "</p>";
-					content += "<p><span style = 'color:white'>Experience:</span> " + exp + "</p>";
-					content += "<p><span style = 'color:white'>Remaining XP:</span> " + remainingXp + "</p>";
-
 					break;
 				}
 			}
 		}
 
-		/**
+		// Add a html progress bar to the hover information
-		 * Adds a html progress bar to the hover information
+		if (skill != null && skill.getType() == HiscoreSkillType.SKILL)
-		 */
-		if (SKILLS.contains(skill))
 		{
 			long experience = 0;
 			if (skill != null)
@@ -644,4 +675,24 @@ public class HiscorePanel extends PluginPanel
 		}
 		return HiscoreEndpoint.NORMAL;
 	}
+
+	@VisibleForTesting
+	static String formatLevel(int level)
+	{
+		if (level < 10000)
+		{
+			return Integer.toString(level);
+		}
+		else
+		{
+			return (level / 1000) + "k";
+		}
+	}
+
+	private static String pad(String str, HiscoreSkillType type)
+	{
+		// Left pad label text to keep labels aligned
+		int pad = type == HiscoreSkillType.BOSS ? 4 : 2;
+		return StringUtils.leftPad(str, pad);
+	}
 }

runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java

@@ -70,7 +70,7 @@ public class HiscorePlugin extends Plugin
 {
 	private static final String LOOKUP = "Lookup";
 	private static final String KICK_OPTION = "Kick";
-	private static final ImmutableList<String> AFTER_OPTIONS = ImmutableList.of("Message", "Add ignore", "Remove friend", KICK_OPTION);
+	private static final ImmutableList<String> AFTER_OPTIONS = ImmutableList.of("Message", "Add ignore", "Remove friend", "Delete", KICK_OPTION);
 	private static final Pattern BOUNTY_PATTERN = Pattern.compile("<col=ff0000>You've been assigned a target: (.*)</col>");
 
 	// config
@@ -194,10 +194,11 @@ public class HiscorePlugin extends Plugin
 		String option = event.getOption();
 
 		if (groupId == WidgetInfo.FRIENDS_LIST.getGroupId() || groupId == WidgetInfo.CLAN_CHAT.getGroupId() ||
-			groupId == WidgetInfo.CHATBOX.getGroupId() && !KICK_OPTION.equals(option) || //prevent from adding for Kick option (interferes with the raiding party one)
+				groupId == WidgetInfo.CHATBOX.getGroupId() && !KICK_OPTION.equals(option) || //prevent from adding for Kick option (interferes with the raiding party one)
-			groupId == WidgetInfo.RAIDING_PARTY.getGroupId() || groupId == WidgetInfo.PRIVATE_CHAT_MESSAGE.getGroupId())
+				groupId == WidgetInfo.RAIDING_PARTY.getGroupId() || groupId == WidgetInfo.PRIVATE_CHAT_MESSAGE.getGroupId() ||
+				groupId == WidgetInfo.IGNORE_LIST.getGroupId())
 		{
-			if (!AFTER_OPTIONS.contains(option))
+			if (!AFTER_OPTIONS.contains(option) || (option.equals("Delete") && groupId != WidgetInfo.IGNORE_LIST.getGroupId()))
 			{
 				return;
 			}

runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java

@@ -120,7 +120,77 @@ enum ItemIdentification
 	RED_TOPAZ(Type.GEM, "Topaz", "T", ItemID.UNCUT_RED_TOPAZ, ItemID.RED_TOPAZ),
 	DRAGONSTONE(Type.GEM, "Dragon", "DR", ItemID.UNCUT_DRAGONSTONE, ItemID.DRAGONSTONE),
 	ONYX(Type.GEM, "Onyx", "ON", ItemID.UNCUT_ONYX, ItemID.ONYX),
-	ZENYTE(Type.GEM, "Zenyte", "Z", ItemID.UNCUT_ZENYTE, ItemID.ZENYTE);
+	ZENYTE(Type.GEM, "Zenyte", "Z", ItemID.UNCUT_ZENYTE, ItemID.ZENYTE),
+
+	// Potions
+	ATTACK(Type.POTION, "Att", "A", ItemID.ATTACK_POTION4, ItemID.ATTACK_POTION3, ItemID.ATTACK_POTION2, ItemID.ATTACK_POTION1),
+	STRENGTH(Type.POTION, "Str", "S", ItemID.STRENGTH_POTION4, ItemID.STRENGTH_POTION3, ItemID.STRENGTH_POTION2, ItemID.STRENGTH_POTION1),
+	DEFENCE(Type.POTION, "Def", "D", ItemID.DEFENCE_POTION4, ItemID.DEFENCE_POTION3, ItemID.DEFENCE_POTION2, ItemID.DEFENCE_POTION1),
+	COMBAT(Type.POTION, "Com", "D", ItemID.COMBAT_POTION4, ItemID.COMBAT_POTION3, ItemID.COMBAT_POTION2, ItemID.COMBAT_POTION1),
+	MAGIC(Type.POTION, "Magic", "M", ItemID.MAGIC_POTION4, ItemID.MAGIC_POTION3, ItemID.MAGIC_POTION2, ItemID.MAGIC_POTION1),
+	RANGING(Type.POTION, "Range", "R", ItemID.RANGING_POTION4, ItemID.RANGING_POTION3, ItemID.RANGING_POTION2, ItemID.RANGING_POTION1),
+	BASTION(Type.POTION, "Bastion", "B", ItemID.BASTION_POTION4, ItemID.BASTION_POTION3, ItemID.BASTION_POTION2, ItemID.BASTION_POTION1),
+	BATTLEMAGE(Type.POTION, "BatMage", "B.M", ItemID.BATTLEMAGE_POTION4, ItemID.BATTLEMAGE_POTION3, ItemID.BATTLEMAGE_POTION2, ItemID.BATTLEMAGE_POTION1),
+
+	SUPER_ATTACK(Type.POTION, "S.Att", "S.A", ItemID.SUPER_ATTACK4, ItemID.SUPER_ATTACK3, ItemID.SUPER_ATTACK2, ItemID.SUPER_ATTACK1),
+	SUPER_STRENGTH(Type.POTION, "S.Str", "S.S", ItemID.SUPER_STRENGTH4, ItemID.SUPER_STRENGTH3, ItemID.SUPER_STRENGTH2, ItemID.SUPER_STRENGTH1),
+	SUPER_DEFENCE(Type.POTION, "S.Def", "S.D", ItemID.SUPER_DEFENCE4, ItemID.SUPER_DEFENCE3, ItemID.SUPER_DEFENCE2, ItemID.SUPER_DEFENCE1),
+	SUPER_COMBAT(Type.POTION, "S.Com", "S.C", ItemID.SUPER_COMBAT_POTION4, ItemID.SUPER_COMBAT_POTION3, ItemID.SUPER_COMBAT_POTION2, ItemID.SUPER_COMBAT_POTION1),
+	SUPER_RANGING(Type.POTION, "S.Range", "S.Ra", ItemID.SUPER_RANGING_4, ItemID.SUPER_RANGING_3, ItemID.SUPER_RANGING_2, ItemID.SUPER_RANGING_1),
+	SUPER_MAGIC(Type.POTION, "S.Magic", "S.M", ItemID.SUPER_MAGIC_POTION_4, ItemID.SUPER_MAGIC_POTION_3, ItemID.SUPER_MAGIC_POTION_2, ItemID.SUPER_MAGIC_POTION_1),
+
+	DIVINE_SUPER_ATTACK(Type.POTION, "S.Att", "S.A", ItemID.DIVINE_SUPER_ATTACK_POTION4, ItemID.DIVINE_SUPER_ATTACK_POTION3, ItemID.DIVINE_SUPER_ATTACK_POTION2, ItemID.DIVINE_SUPER_ATTACK_POTION1),
+	DIVINE_SUPER_DEFENCE(Type.POTION, "S.Def", "S.D", ItemID.DIVINE_SUPER_DEFENCE_POTION4, ItemID.DIVINE_SUPER_DEFENCE_POTION3, ItemID.DIVINE_SUPER_DEFENCE_POTION2, ItemID.DIVINE_SUPER_DEFENCE_POTION1),
+	DIVINE_SUPER_STRENGTH(Type.POTION, "S.Str", "S.S", ItemID.DIVINE_SUPER_STRENGTH_POTION4, ItemID.DIVINE_SUPER_STRENGTH_POTION3, ItemID.DIVINE_SUPER_STRENGTH_POTION2, ItemID.DIVINE_SUPER_STRENGTH_POTION1),
+	DIVINE_SUPER_COMBAT(Type.POTION, "S.Com", "S.C", ItemID.DIVINE_SUPER_COMBAT_POTION4, ItemID.DIVINE_SUPER_COMBAT_POTION3, ItemID.DIVINE_SUPER_COMBAT_POTION2, ItemID.DIVINE_SUPER_COMBAT_POTION1),
+	DIVINE_RANGING(Type.POTION, "Range", "R", ItemID.DIVINE_RANGING_POTION4, ItemID.DIVINE_RANGING_POTION3, ItemID.DIVINE_RANGING_POTION2, ItemID.DIVINE_RANGING_POTION1),
+	DIVINE_MAGIC(Type.POTION, "Magic", "M", ItemID.DIVINE_MAGIC_POTION4, ItemID.DIVINE_MAGIC_POTION3, ItemID.DIVINE_MAGIC_POTION2, ItemID.DIVINE_MAGIC_POTION1),
+
+	RESTORE(Type.POTION, "Restore", "Re", ItemID.RESTORE_POTION4, ItemID.RESTORE_POTION3, ItemID.RESTORE_POTION2, ItemID.RESTORE_POTION1),
+	SUPER_RESTORE(Type.POTION, "S.Rest", "S.Re", ItemID.SUPER_RESTORE4, ItemID.SUPER_RESTORE3, ItemID.SUPER_RESTORE2, ItemID.SUPER_RESTORE1),
+	PRAYER(Type.POTION, "Prayer", "P", ItemID.PRAYER_POTION4, ItemID.PRAYER_POTION3, ItemID.PRAYER_POTION2, ItemID.PRAYER_POTION1),
+	ENERGY(Type.POTION, "Energy", "En", ItemID.ENERGY_POTION4, ItemID.ENERGY_POTION3, ItemID.ENERGY_POTION2, ItemID.ENERGY_POTION1),
+	SUPER_ENERGY(Type.POTION, "S.Energ", "S.En", ItemID.SUPER_ENERGY4, ItemID.SUPER_ENERGY3, ItemID.SUPER_ENERGY2, ItemID.SUPER_ENERGY1),
+	STAMINA(Type.POTION, "Stamina", "St", ItemID.STAMINA_POTION4, ItemID.STAMINA_POTION3, ItemID.STAMINA_POTION2, ItemID.STAMINA_POTION1),
+	OVERLOAD(Type.POTION, "Overloa", "OL", ItemID.OVERLOAD_4, ItemID.OVERLOAD_3, ItemID.OVERLOAD_2, ItemID.OVERLOAD_1),
+	ABSORPTION(Type.POTION, "Absorb", "Ab", ItemID.ABSORPTION_4, ItemID.ABSORPTION_3, ItemID.ABSORPTION_2, ItemID.ABSORPTION_1),
+
+	ZAMORAK_BREW(Type.POTION, "ZammyBr", "Za", ItemID.ZAMORAK_BREW4, ItemID.ZAMORAK_BREW3, ItemID.ZAMORAK_BREW2, ItemID.ZAMORAK_BREW1),
+	SARADOMIN_BREW(Type.POTION, "SaraBr", "Sa", ItemID.SARADOMIN_BREW4, ItemID.SARADOMIN_BREW3, ItemID.SARADOMIN_BREW2, ItemID.SARADOMIN_BREW1),
+
+	ANTIPOISON(Type.POTION, "AntiP", "AP", ItemID.ANTIPOISON4, ItemID.ANTIPOISON3, ItemID.ANTIPOISON2, ItemID.ANTIPOISON1),
+	SUPERANTIPOISON(Type.POTION, "S.AntiP", "S.AP", ItemID.SUPERANTIPOISON4, ItemID.SUPERANTIPOISON3, ItemID.SUPERANTIPOISON2, ItemID.SUPERANTIPOISON1),
+	ANTIDOTE_P(Type.POTION, "Antid+", "A+", ItemID.ANTIDOTE4, ItemID.ANTIDOTE3, ItemID.ANTIDOTE2, ItemID.ANTIDOTE1),
+	ANTIDOTE_PP(Type.POTION, "Antid++", "A++", ItemID.ANTIDOTE4_5952, ItemID.ANTIDOTE3_5954, ItemID.ANTIDOTE2_5956, ItemID.ANTIDOTE1_5958),
+	ANTIVENOM(Type.POTION, "Anti-V", "AV", ItemID.ANTIVENOM4, ItemID.ANTIVENOM3, ItemID.ANTIVENOM2, ItemID.ANTIVENOM1),
+	ANTIVENOM_P(Type.POTION, "Anti-V+", "AV+", ItemID.ANTIVENOM4_12913, ItemID.ANTIVENOM3_12915, ItemID.ANTIVENOM2_12917, ItemID.ANTIVENOM1_12919),
+
+	RELICYMS_BALM(Type.POTION, "Relicym", "R.B", ItemID.RELICYMS_BALM4, ItemID.RELICYMS_BALM3, ItemID.RELICYMS_BALM2, ItemID.RELICYMS_BALM1),
+	SANFEW_SERUM(Type.POTION, "Sanfew", "Sf", ItemID.SANFEW_SERUM4, ItemID.SANFEW_SERUM3, ItemID.SANFEW_SERUM2, ItemID.SANFEW_SERUM1),
+	ANTIFIRE(Type.POTION, "Antif", "Af", ItemID.ANTIFIRE_POTION4, ItemID.ANTIFIRE_POTION3, ItemID.ANTIFIRE_POTION2, ItemID.ANTIFIRE_POTION1),
+	EXTENDED_ANTIFIRE(Type.POTION, "E.Antif", "E.Af", ItemID.EXTENDED_ANTIFIRE4, ItemID.EXTENDED_ANTIFIRE3, ItemID.EXTENDED_ANTIFIRE2, ItemID.EXTENDED_ANTIFIRE1),
+	SUPER_ANTIFIRE(Type.POTION, "S.Antif", "S.Af", ItemID.SUPER_ANTIFIRE_POTION4, ItemID.SUPER_ANTIFIRE_POTION3, ItemID.SUPER_ANTIFIRE_POTION2, ItemID.SUPER_ANTIFIRE_POTION1),
+	EXTENDED_SUPER_ANTIFIRE(Type.POTION, "ES.Antif", "ES.Af", ItemID.EXTENDED_SUPER_ANTIFIRE4, ItemID.EXTENDED_SUPER_ANTIFIRE3, ItemID.EXTENDED_SUPER_ANTIFIRE2, ItemID.EXTENDED_SUPER_ANTIFIRE1),
+
+	SERUM_207(Type.POTION, "Ser207", "S7", ItemID.SERUM_207_4, ItemID.SERUM_207_3, ItemID.SERUM_207_2, ItemID.SERUM_207_1),
+	SERUM_208(Type.POTION, "Ser208", "S8", ItemID.SERUM_208_4, ItemID.SERUM_208_3, ItemID.SERUM_208_2, ItemID.SERUM_208_1),
+	COMPOST(Type.POTION, "Compost", "Cp", ItemID.COMPOST_POTION4, ItemID.COMPOST_POTION3, ItemID.COMPOST_POTION2, ItemID.COMPOST_POTION1),
+
+	// Unfinished Potions
+	GUAM_POTION(Type.POTION, "Guam", "G", ItemID.GUAM_POTION_UNF),
+	MARRENTILL_POTION(Type.POTION, "Marren", "M", ItemID.MARRENTILL_POTION_UNF),
+	TARROMIN_POTION(Type.POTION, "Tarro", "TAR", ItemID.TARROMIN_POTION_UNF),
+	HARRALANDER_POTION(Type.POTION, "Harra", "H", ItemID.HARRALANDER_POTION_UNF),
+	RANARR_POTION(Type.POTION, "Ranarr", "R", ItemID.RANARR_POTION_UNF),
+	TOADFLAX_POTION(Type.POTION, "Toad", "TOA", ItemID.TOADFLAX_POTION_UNF),
+	IRIT_POTION(Type.POTION, "Irit", "I", ItemID.IRIT_POTION_UNF),
+	AVANTOE_POTION(Type.POTION, "Avan", "A", ItemID.AVANTOE_POTION_UNF),
+	KWUARM_POTION(Type.POTION, "Kwuarm", "K", ItemID.KWUARM_POTION_UNF),
+	SNAPDRAGON_POTION(Type.POTION, "Snap", "S", ItemID.SNAPDRAGON_POTION_UNF),
+	CADANTINE_POTION(Type.POTION, "Cadan", "C", ItemID.CADANTINE_POTION_UNF),
+	LANTADYME_POTION(Type.POTION, "Lanta", "L", ItemID.LANTADYME_POTION_UNF),
+	DWARF_WEED_POTION(Type.POTION, "Dwarf", "D", ItemID.DWARF_WEED_POTION_UNF),
+	TORSTOL_POTION(Type.POTION, "Torstol", "TOR", ItemID.TORSTOL_POTION_UNF);
 
 	final Type type;
 	final String medName;
@@ -163,6 +233,7 @@ enum ItemIdentification
 		HERB,
 		SAPLING,
 		ORE,
-		GEM
+		GEM,
+		POTION
 	}
 }

runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationConfig.java

@@ -103,4 +103,14 @@ public interface ItemIdentificationConfig extends Config
 	{
 		return false;
 	}
+
+	@ConfigItem(
+		keyName = "showPotions",
+		name = "Potions",
+		description = "Show identification on Potions"
+	)
+	default boolean showPotions()
+	{
+		return false;
+	}
 }

runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java

@@ -98,6 +98,12 @@ class ItemIdentificationOverlay extends WidgetItemOverlay
 					return;
 				}
 				break;
+			case POTION:
+				if (!plugin.isShowPotions())
+				{
+					return;
+				}
+				break;
 		}
 
 		graphics.setFont(FontManager.getRunescapeSmallFont());

runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java

@@ -68,6 +68,8 @@ public class ItemIdentificationPlugin extends Plugin
 	private boolean showOres;
 	@Getter(AccessLevel.PACKAGE)
 	private boolean showGems;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showPotions;
 
 	@Provides
 	ItemIdentificationConfig getConfig(ConfigManager configManager)
@@ -108,5 +110,6 @@ public class ItemIdentificationPlugin extends Plugin
 		this.showSaplings = config.showSaplings();
 		this.showOres = config.showOres();
 		this.showGems = config.showGems();
+		this.showPotions = config.showPotions();
 	}
 }

runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java

@@ -236,7 +236,7 @@ class ItemPricesOverlay extends Overlay
 		if (gePrice > 0)
 		{
 			itemStringBuilder.append("EX: ")
-				.append(QuantityFormatter.quantityToStackSize(gePrice * qty))
+				.append(QuantityFormatter.quantityToStackSize((long) gePrice * qty))
 				.append(" gp");
 			if (plugin.isShowEA() && qty > 1)
 			{
@@ -253,7 +253,7 @@ class ItemPricesOverlay extends Overlay
 			}
 
 			itemStringBuilder.append("HA: ")
-				.append(QuantityFormatter.quantityToStackSize(haValue * qty))
+				.append(QuantityFormatter.quantityToStackSize((long) haValue * qty))
 				.append(" gp");
 			if (plugin.isShowEA() && qty > 1)
 			{
@@ -269,7 +269,7 @@ class ItemPricesOverlay extends Overlay
 
 			itemStringBuilder.append("</br>");
 			itemStringBuilder.append("HA Profit: ")
-				.append(ColorUtil.wrapWithColorTag(String.valueOf(haProfit * qty), haColor))
+				.append(ColorUtil.wrapWithColorTag(String.valueOf((long) haProfit * qty), haColor))
 				.append(" gp");
 			if (plugin.isShowEA() && qty > 1)
 			{

runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java

@@ -191,7 +191,7 @@ class ItemStatChanges
 		add(combo(2, boost(HITPOINTS, 5), heal(RUN_ENERGY, 5)), GUTHIX_REST1, GUTHIX_REST2, GUTHIX_REST3, GUTHIX_REST4);
 
 		// Misc/run energy
-		add(heal(RUN_ENERGY, 10), WHITE_TREE_FRUIT);
+		add(combo(food(3), range(heal(RUN_ENERGY, 5), heal(RUN_ENERGY, 10))), WHITE_TREE_FRUIT);
 		add(heal(RUN_ENERGY, 30), STRANGE_FRUIT);
 		add(heal(RUN_ENERGY, 50), MINT_CAKE);
 		add(combo(food(12), heal(RUN_ENERGY, 50)), GOUT_TUBER);

runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java

@@ -29,8 +29,6 @@ import com.google.inject.Inject;
 import java.awt.BorderLayout;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -51,7 +49,7 @@ import net.runelite.client.util.ImageUtil;
 class KourendLibraryPanel extends PluginPanel
 {
 	private static final ImageIcon RESET_ICON;
-	private static final ImageIcon RESET_CLICK_ICON;
+	private static final ImageIcon RESET_HOVER_ICON;
 
 	private final KourendLibraryConfig config;
 	private final Library library;
@@ -62,7 +60,7 @@ class KourendLibraryPanel extends PluginPanel
 	{
 		final BufferedImage resetIcon = ImageUtil.getResourceStreamFromClass(KourendLibraryPanel.class, "/util/reset.png");
 		RESET_ICON = new ImageIcon(resetIcon);
-		RESET_CLICK_ICON = new ImageIcon(ImageUtil.alphaOffset(resetIcon, -100));
+		RESET_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(resetIcon, -100));
 	}
 
 	@Inject
@@ -99,21 +97,11 @@ class KourendLibraryPanel extends PluginPanel
 			});
 
 		JButton reset = new JButton("Reset", RESET_ICON);
-		reset.addMouseListener(new MouseAdapter()
+		reset.setRolloverIcon(RESET_HOVER_ICON);
+		reset.addActionListener(ev ->
 		{
-			@Override
+			library.reset();
-			public void mousePressed(MouseEvent mouseEvent)
+			update();
-			{
-				reset.setIcon(RESET_CLICK_ICON);
-				library.reset();
-				update();
-			}
-
-			@Override
-			public void mouseReleased(MouseEvent mouseEvent)
-			{
-				reset.setIcon(RESET_ICON);
-			}
 		});
 
 		add(reset, BorderLayout.NORTH);

runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java

@@ -40,6 +40,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.AnimationID;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
+import net.runelite.api.GameState;
 import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
 import net.runelite.api.ItemContainer;
@@ -50,6 +51,7 @@ import net.runelite.api.Player;
 import net.runelite.api.coords.WorldPoint;
 import net.runelite.api.events.AnimationChanged;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.ItemContainerChanged;
 import net.runelite.api.events.MenuOptionClicked;
@@ -175,6 +177,7 @@ public class KourendLibraryPlugin extends Plugin
 		lastBookcaseClick = null;
 		lastBookcaseAnimatedOn = null;
 		playerBooks = null;
+		npcsToMark.clear();
 	}
 
 	@Subscribe
@@ -187,34 +190,31 @@ public class KourendLibraryPlugin extends Plugin
 
 		if (ev.getKey().equals("hideVarlamoreEnvoy"))
 		{
-			panel.reload();
+			SwingUtilities.invokeLater(panel::reload);
 		}
-
+		else if (ev.getKey().equals("hideButton"))
-		this.hideButton = config.hideButton();
-		this.hideDuplicateBook = config.hideDuplicateBook();
-		this.hideVarlamoreEnvoy = config.hideVarlamoreEnvoy();
-		this.showTutorialOverlay = config.showTutorialOverlay();
-
-		SwingUtilities.invokeLater(() ->
 		{
-			if (!this.hideButton)
+			SwingUtilities.invokeLater(() ->
 			{
-				clientToolbar.addNavigation(navButton);
+				if (!config.hideButton())
-			}
-			else
-			{
-				Player lp = client.getLocalPlayer();
-				boolean inRegion = lp != null && lp.getWorldLocation().getRegionID() == REGION;
-				if (inRegion)
 				{
 					clientToolbar.addNavigation(navButton);
 				}
 				else
 				{
-					clientToolbar.removeNavigation(navButton);
+					Player lp = client.getLocalPlayer();
+					boolean inRegion = lp != null && lp.getWorldLocation().getRegionID() == REGION;
+					if (inRegion)
+					{
+						clientToolbar.addNavigation(navButton);
+					}
+					else
+					{
+						clientToolbar.removeNavigation(navButton);
+					}
 				}
-			}
+			});
-		});
+		}
 	}
 
 	@Subscribe
@@ -250,7 +250,17 @@ public class KourendLibraryPlugin extends Plugin
 	}
 
 	@Subscribe
-	private void onGameTick(GameTick tick)
+	public void onGameStateChanged(GameStateChanged event)
+	{
+		if (event.getGameState() == GameState.LOGIN_SCREEN ||
+			event.getGameState() == GameState.HOPPING)
+		{
+			npcsToMark.clear();
+		}
+	}
+
+	@Subscribe
+	public void onGameTick(GameTick tick)
 	{
 		boolean inRegion = client.getLocalPlayer().getWorldLocation().getRegionID() == REGION;
 		if (this.hideButton && inRegion != buttonAttached)

runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java

@@ -130,21 +130,26 @@ class Library
 		}
 		else if (state != SolvedState.NO_DATA)
 		{
-			// We know all of the possible things in this shelf.
+			// Reset if the book we found isn't what we expected
-			if (book != null || bookcase.getPossibleBooks().stream().noneMatch(Book::isDarkManuscript))
+
+			if (book != null && !bookcase.getPossibleBooks().contains(book))
 			{
-				// Check to see if our guess is wrong
+				reset();
-				if (!bookcase.getPossibleBooks().contains(book))
-				{
-					reset();
-				}
 			}
 		}
 
-		// Everything is known, nothing to do
 		if (state == SolvedState.COMPLETE)
 		{
-			return;
+			// Reset if we found nothing when we expected something that wasn't a Dark Manuscript, since the layout has changed
+			if (book == null && !bookcase.getPossibleBooks().isEmpty() && bookcase.getPossibleBooks().stream().noneMatch(Book::isDarkManuscript))
+			{
+				reset();
+			}
+			else
+			{
+				// Everything is known, nothing to do
+				return;
+			}
 		}
 
 		log.debug("Setting bookcase {} to {}", bookcase.getIndex(), book);

runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/GEItemCollectMode.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2019, Rami <https://github.com/Rami-J>
+ * 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.menuentryswapper;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum GEItemCollectMode
+{
+	DEFAULT("Default"),
+	ITEMS("Collect-items"),
+	NOTES("Collect-notes"),
+	BANK("Bank");
+
+	private final String name;
+
+	@Override
+	public String toString()
+	{
+		return name;
+	}
+}

runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java

@@ -1,210 +0,0 @@
-/*
- * Copyright (c) 2019, Shaun Dreclin <https://github.com/ShaunDreclin>
- * 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.musicindicator;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import net.runelite.api.ChatMessageType;
-import net.runelite.api.Client;
-import net.runelite.api.EnumDefinition;
-import net.runelite.api.EnumID;
-import net.runelite.api.VarPlayer;
-import net.runelite.api.events.GameStateChanged;
-import net.runelite.api.events.GameTick;
-import net.runelite.api.events.VarbitChanged;
-import net.runelite.client.chat.ChatColorType;
-import net.runelite.client.chat.ChatMessageBuilder;
-import net.runelite.client.chat.ChatMessageManager;
-import net.runelite.client.chat.QueuedMessage;
-import net.runelite.client.eventbus.Subscribe;
-import net.runelite.client.plugins.Plugin;
-import net.runelite.client.plugins.PluginDescriptor;
-import net.runelite.client.plugins.PluginType;
-
-@PluginDescriptor(
-	name = "Music Track Indicator",
-	description = "Show chat notifications when unlocking music tracks",
-	type = PluginType.UTILITY,
-	enabledByDefault = false
-)
-@Singleton
-public class MusicIndicatorPlugin extends Plugin
-{
-	private static final List<VarPlayer> MUSIC_TRACK_VARPS = ImmutableList.of(
-		VarPlayer.MUSIC_TRACKS_UNLOCKED_1, VarPlayer.MUSIC_TRACKS_UNLOCKED_2, VarPlayer.MUSIC_TRACKS_UNLOCKED_3,
-		VarPlayer.MUSIC_TRACKS_UNLOCKED_4, VarPlayer.MUSIC_TRACKS_UNLOCKED_5, VarPlayer.MUSIC_TRACKS_UNLOCKED_6,
-		VarPlayer.MUSIC_TRACKS_UNLOCKED_7, VarPlayer.MUSIC_TRACKS_UNLOCKED_8, VarPlayer.MUSIC_TRACKS_UNLOCKED_9,
-		VarPlayer.MUSIC_TRACKS_UNLOCKED_10, VarPlayer.MUSIC_TRACKS_UNLOCKED_11, VarPlayer.MUSIC_TRACKS_UNLOCKED_12,
-		VarPlayer.MUSIC_TRACKS_UNLOCKED_13, VarPlayer.MUSIC_TRACKS_UNLOCKED_14, VarPlayer.MUSIC_TRACKS_UNLOCKED_15,
-		VarPlayer.MUSIC_TRACKS_UNLOCKED_16, VarPlayer.MUSIC_TRACKS_UNLOCKED_17, VarPlayer.MUSIC_TRACKS_UNLOCKED_18,
-		VarPlayer.MUSIC_TRACKS_UNLOCKED_19
-	);
-
-	private static final Map<Integer, VarPlayer> VARP_INDEX_TO_VARPLAYER = MUSIC_TRACK_VARPS.stream()
-		.collect(Collectors.collectingAndThen(Collectors.toMap(VarPlayer::getId, Function.identity()),
-			ImmutableMap::copyOf));
-
-	@Inject
-	private Client client;
-
-	@Inject
-	private ChatMessageManager chatMessageManager;
-
-	// Mapping of relevant varps to their values, used to compare against new values
-	private final Map<VarPlayer, Integer> musicTrackVarpValues = new HashMap<>();
-
-	private boolean loggingIn;
-
-	@Override
-	public void startUp()
-	{
-		loggingIn = true;
-	}
-
-	@Override
-	public void shutDown()
-	{
-		musicTrackVarpValues.clear();
-	}
-
-	@Subscribe
-	private void onGameStateChanged(GameStateChanged event)
-	{
-		switch (event.getGameState())
-		{
-			case LOGGING_IN:
-			case CONNECTION_LOST:
-			case HOPPING:
-				musicTrackVarpValues.clear();
-				loggingIn = true;
-		}
-	}
-
-	@Subscribe
-	private void onGameTick(GameTick event)
-	{
-		if (!loggingIn)
-		{
-			return;
-		}
-
-		loggingIn = false;
-
-		for (VarPlayer musicTrackVarp : MUSIC_TRACK_VARPS)
-		{
-			int value = client.getVar(musicTrackVarp);
-			musicTrackVarpValues.put(musicTrackVarp, value);
-		}
-	}
-
-	@Subscribe
-	private void onVarbitChanged(VarbitChanged event)
-	{
-		int idx = event.getIndex();
-
-		VarPlayer varPlayer = VARP_INDEX_TO_VARPLAYER.get(idx);
-		if (varPlayer == null)
-		{
-			return;
-		}
-
-		// Old varplayer values have not been initialized yet
-		if (musicTrackVarpValues.isEmpty())
-		{
-			return;
-		}
-
-		assert musicTrackVarpValues.containsKey(varPlayer);
-
-		int newValue = client.getVar(varPlayer);
-		int oldValue = musicTrackVarpValues.put(varPlayer, newValue);
-		int musicTracksUnlocked = ~oldValue & newValue;
-
-		if (musicTracksUnlocked == 0)
-		{
-			return;
-		}
-
-		final EnumDefinition names = client.getEnum(EnumID.MUSIC_TRACK_NAMES);
-		final int varpId = MUSIC_TRACK_VARPS.indexOf(varPlayer) + 1;
-
-		for (int bit = 0; bit < Integer.SIZE; ++bit)
-		{
-			if ((musicTracksUnlocked & (1 << bit)) == 0)
-			{
-				continue;
-			}
-
-			int musicTrackId = getTrackId(varpId, bit);
-			String musicTrackName = names.getStringValue(musicTrackId);
-
-			sendChatMessage("You have unlocked a new music track: " + musicTrackName + ".");
-		}
-	}
-
-	/**
-	 * Get the id for a track identified by the given varp and a bit index
-	 *
-	 * @param variableId
-	 * @param bit
-	 * @return
-	 */
-	private int getTrackId(int variableId, int bit)
-	{
-		// values are packed into a coordgrid
-		int packed = (variableId << 14) | bit;
-		EnumDefinition ids = client.getEnum(EnumID.MUSIC_TRACK_IDS);
-		for (int key : ids.getKeys())
-		{
-			int value = ids.getIntValue(key);
-			if (value == packed)
-			{
-				return key;
-			}
-		}
-		return -1;
-	}
-
-	private void sendChatMessage(String chatMessage)
-	{
-		final String message = new ChatMessageBuilder()
-			.append(ChatColorType.HIGHLIGHT)
-			.append(chatMessage)
-			.build();
-
-		chatMessageManager.queue(
-			QueuedMessage.builder()
-				.type(ChatMessageType.CONSOLE)
-				.runeLiteFormattedMessage(message)
-				.build());
-	}
-}

runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java

@@ -351,7 +351,7 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
 		{
 			if (worldPoint.getRegionX() == objectPoint.getRegionX()
 					&& worldPoint.getRegionY() == objectPoint.getRegionY()
-					&& object.getPlane() == objectPoint.getZ())
+					&& worldPoint.getPlane() == objectPoint.getZ())
 			{
 				// Transform object to get the name which matches against what we've stored
 				ObjectDefinition objectDefinition = getObjectDefinition(object.getId());
@@ -453,7 +453,7 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
 			regionId,
 			worldPoint.getRegionX(),
 			worldPoint.getRegionY(),
-			client.getPlane());
+			worldPoint.getPlane());
 
 		Set<ObjectPoint> objectPoints = points.computeIfAbsent(regionId, k -> new HashSet<>());
 

runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlNpc.java

@@ -117,7 +117,7 @@ public class PestControlNpc
 		NpcID.PORTAL_1748, // Novice Blue Active
 		NpcID.PORTAL_1749, // Novice Yellow Active
 		NpcID.PORTAL_1750, // Novice Red Active
-		NpcID.PORTAL_1739, // Intermediate Purple Active
+		NpcID.PORTAL, // Intermediate Purple Active
 		NpcID.PORTAL_1740, // Intermediate Blue Active
 		NpcID.PORTAL_1741, // Intermediate Yellow Active
 		NpcID.PORTAL_1742 // Intermediate Red Active

runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java

@@ -108,7 +108,7 @@ class ScreenMarkerPanel extends JPanel
 	static
 	{
 		final BufferedImage borderImg = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "border_color_icon.png");
-		final BufferedImage borderImgHover = ImageUtil.grayscaleOffset(borderImg, -150);
+		final BufferedImage borderImgHover = ImageUtil.luminanceOffset(borderImg, -150);
 		BORDER_COLOR_ICON = new ImageIcon(borderImg);
 		BORDER_COLOR_HOVER_ICON = new ImageIcon(borderImgHover);
 
@@ -116,7 +116,7 @@ class ScreenMarkerPanel extends JPanel
 		NO_BORDER_COLOR_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(borderImgHover, -100));
 
 		final BufferedImage fillImg = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "fill_color_icon.png");
-		final BufferedImage fillImgHover = ImageUtil.grayscaleOffset(fillImg, -150);
+		final BufferedImage fillImgHover = ImageUtil.luminanceOffset(fillImg, -150);
 		FILL_COLOR_ICON = new ImageIcon(fillImg);
 		FILL_COLOR_HOVER_ICON = new ImageIcon(fillImgHover);
 
@@ -124,7 +124,7 @@ class ScreenMarkerPanel extends JPanel
 		NO_FILL_COLOR_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(fillImgHover, -100));
 
 		final BufferedImage opacityImg = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "opacity_icon.png");
-		final BufferedImage opacityImgHover = ImageUtil.grayscaleOffset(opacityImg, -150);
+		final BufferedImage opacityImgHover = ImageUtil.luminanceOffset(opacityImg, -150);
 		FULL_OPACITY_ICON = new ImageIcon(opacityImg);
 		FULL_OPACITY_HOVER_ICON = new ImageIcon(opacityImgHover);
 

runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java

@@ -218,12 +218,14 @@ enum Task
 	STEEL_DRAGONS("Steel dragons", ItemID.STEEL_DRAGON),
 	SULPHUR_LIZARDS("Sulphur Lizards", ItemID.SULPHUR_LIZARD),
 	SUQAHS("Suqahs", ItemID.SUQAH_TOOTH),
+	TEMPLE_SPIDERS("Temple Spiders", ItemID.RED_SPIDERS_EGGS),
 	TERROR_DOGS("Terror dogs", ItemID.TERROR_DOG),
 	THERMONUCLEAR_SMOKE_DEVIL("Thermonuclear Smoke Devil", ItemID.PET_SMOKE_DEVIL),
 	TROLLS("Trolls", ItemID.TROLL_GUARD),
 	TUROTH("Turoth", ItemID.TUROTH),
 	TZHAAR("Tzhaar", ItemID.ENSOULED_TZHAAR_HEAD,
 		Collections.singletonList("Tz-"), Collections.emptyList(), false),
+	UNDEAD_DRUIDS("Undead Druids", ItemID.MASK_OF_RANUL),
 	VAMPIRES("Vampires", ItemID.STAKE,
 		asList("Vampyre", "Vyrewatch", "Vampire"), Collections.emptyList()),
 	VENENATIS("Venenatis", ItemID.VENENATIS_SPIDERLING),
@@ -257,6 +259,7 @@ enum Task
 		"Death Plateau",
 		"Evil Chicken's Lair",
 		"Fossil Island",
+		"Forthos Dungeon",
 		"Fremennik Slayer Dungeon",
 		"God Wars Dungeon",
 		"Iorwerth Dungeon",

runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java

@@ -30,12 +30,12 @@ import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.time.Duration;
 import java.time.format.DateTimeParseException;
 import javax.swing.BorderFactory;
+import javax.swing.JButton;
 import javax.swing.JPanel;
+import javax.swing.JToggleButton;
 import javax.swing.SwingConstants;
 import javax.swing.border.Border;
 import javax.swing.border.CompoundBorder;
@@ -44,7 +44,7 @@ import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.components.FlatTextField;
-import net.runelite.client.ui.components.IconButton;
+import net.runelite.client.util.SwingUtil;
 
 abstract class ClockPanel extends JPanel
 {
@@ -64,7 +64,7 @@ abstract class ClockPanel extends JPanel
 	final JPanel rightActions;
 
 	private final FlatTextField nameInput;
-	private final IconButton startPauseButton;
+	private final JToggleButton startPauseButton;
 	private final FlatTextField displayInput;
 
 	@Getter(AccessLevel.PACKAGE)
@@ -168,28 +168,17 @@ abstract class ClockPanel extends JPanel
 		leftActions = new JPanel(new FlowLayout(FlowLayout.LEFT, 6, 0));
 		leftActions.setBackground(ColorScheme.DARKER_GRAY_COLOR);
 
-		startPauseButton = new IconButton(ClockTabPanel.START_ICON);
+		startPauseButton = new JToggleButton(ClockTabPanel.START_ICON);
+		startPauseButton.setRolloverIcon(ClockTabPanel.START_ICON_HOVER);
+		startPauseButton.setSelectedIcon(ClockTabPanel.PAUSE_ICON);
+		startPauseButton.setRolloverSelectedIcon(ClockTabPanel.PAUSE_ICON_HOVER);
+		SwingUtil.removeButtonDecorations(startPauseButton);
 		startPauseButton.setPreferredSize(new Dimension(16, 14));
 		updateActivityStatus();
 
-		startPauseButton.addMouseListener(new MouseAdapter()
-		{
-			@Override
-			public void mouseEntered(MouseEvent e)
-			{
-				startPauseButton.setIcon(clock.isActive() ? ClockTabPanel.PAUSE_ICON_HOVER : ClockTabPanel.START_ICON_HOVER);
-			}
-
-			@Override
-			public void mouseExited(MouseEvent e)
-			{
-				startPauseButton.setIcon(clock.isActive() ? ClockTabPanel.PAUSE_ICON : ClockTabPanel.START_ICON);
-			}
-		});
-
 		startPauseButton.addActionListener(e ->
 		{
-			if (clock.isActive())
+			if (!startPauseButton.isSelected())
 			{
 				clock.pause();
 			}
@@ -202,7 +191,9 @@ abstract class ClockPanel extends JPanel
 			clockManager.saveToConfig();
 		});
 
-		IconButton resetButton = new IconButton(ClockTabPanel.RESET_ICON, ClockTabPanel.RESET_ICON_HOVER);
+		JButton resetButton = new JButton(ClockTabPanel.RESET_ICON);
+		resetButton.setRolloverIcon(ClockTabPanel.RESET_ICON_HOVER);
+		SwingUtil.removeButtonDecorations(resetButton);
 		resetButton.setPreferredSize(new Dimension(16, 14));
 		resetButton.setToolTipText("Reset " + clockType);
 
@@ -250,7 +241,7 @@ abstract class ClockPanel extends JPanel
 		displayInput.setEditable(editable && !isActive);
 		displayInput.getTextField().setForeground(isActive ? ACTIVE_CLOCK_COLOR : INACTIVE_CLOCK_COLOR);
 		startPauseButton.setToolTipText(isActive ? "Pause " + clockType : "Start " + clockType);
-		startPauseButton.setIcon(isActive ? ClockTabPanel.PAUSE_ICON : ClockTabPanel.START_ICON);
+		startPauseButton.setSelected(isActive);
 
 		if (editable && clock.getDisplayTime() == 0 && !isActive)
 		{

runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockTabPanel.java

@@ -32,6 +32,7 @@ import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.border.EmptyBorder;
@@ -40,9 +41,9 @@ import net.runelite.client.plugins.timetracking.TimeTrackingPlugin;
 import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.DynamicGridLayout;
 import net.runelite.client.ui.FontManager;
-import net.runelite.client.ui.components.IconButton;
 import net.runelite.client.ui.components.shadowlabel.JShadowedLabel;
 import net.runelite.client.util.ImageUtil;
+import net.runelite.client.util.SwingUtil;
 
 public class ClockTabPanel extends TabContentPanel
 {
@@ -74,15 +75,15 @@ public class ClockTabPanel extends TabContentPanel
 		BufferedImage addIcon = ImageUtil.getResourceStreamFromClass(TimeTrackingPlugin.class, "add_icon.png");
 
 		DELETE_ICON = new ImageIcon(deleteIcon);
-		DELETE_ICON_HOVER = new ImageIcon(ImageUtil.grayscaleOffset(deleteIcon, -80));
+		DELETE_ICON_HOVER = new ImageIcon(ImageUtil.luminanceOffset(deleteIcon, -80));
 		LAP_ICON = new ImageIcon(lapIcon);
-		LAP_ICON_HOVER = new ImageIcon(ImageUtil.grayscaleOffset(lapIcon, -80));
+		LAP_ICON_HOVER = new ImageIcon(ImageUtil.luminanceOffset(lapIcon, -80));
 		PAUSE_ICON = new ImageIcon(pauseIcon);
-		PAUSE_ICON_HOVER = new ImageIcon(ImageUtil.grayscaleOffset(pauseIcon, -80));
+		PAUSE_ICON_HOVER = new ImageIcon(ImageUtil.luminanceOffset(pauseIcon, -80));
 		RESET_ICON = new ImageIcon(resetIcon);
-		RESET_ICON_HOVER = new ImageIcon(ImageUtil.grayscaleOffset(resetIcon, -80));
+		RESET_ICON_HOVER = new ImageIcon(ImageUtil.luminanceOffset(resetIcon, -80));
 		START_ICON = new ImageIcon(startIcon);
-		START_ICON_HOVER = new ImageIcon(ImageUtil.grayscaleOffset(startIcon, -80));
+		START_ICON_HOVER = new ImageIcon(ImageUtil.luminanceOffset(startIcon, -80));
 		ADD_ICON = new ImageIcon(addIcon);
 		ADD_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(addIcon, 0.53f));
 	}
@@ -150,7 +151,9 @@ public class ClockTabPanel extends TabContentPanel
 		headerLabel.setFont(FontManager.getRunescapeSmallFont());
 		panel.add(headerLabel, BorderLayout.CENTER);
 
-		IconButton addButton = new IconButton(ADD_ICON, ADD_ICON_HOVER);
+		JButton addButton = new JButton(ADD_ICON);
+		addButton.setRolloverIcon(ADD_ICON_HOVER);
+		SwingUtil.removeButtonDecorations(addButton);
 		addButton.setPreferredSize(new Dimension(14, 14));
 		addButton.setToolTipText("Add a " + type);
 		addButton.addActionListener(actionListener);

runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/StopwatchPanel.java

@@ -30,13 +30,14 @@ import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.util.List;
+import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import javax.swing.border.EmptyBorder;
 import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.FontManager;
-import net.runelite.client.ui.components.IconButton;
+import net.runelite.client.util.SwingUtil;
 
 class StopwatchPanel extends ClockPanel
 {
@@ -57,7 +58,9 @@ class StopwatchPanel extends ClockPanel
 
 		contentContainer.add(lapsContainer);
 
-		IconButton lapButton = new IconButton(ClockTabPanel.LAP_ICON, ClockTabPanel.LAP_ICON_HOVER);
+		JButton lapButton = new JButton(ClockTabPanel.LAP_ICON);
+		lapButton.setRolloverIcon(ClockTabPanel.LAP_ICON_HOVER);
+		SwingUtil.removeButtonDecorations(lapButton);
 		lapButton.setPreferredSize(new Dimension(16, 14));
 		lapButton.setToolTipText("Add lap time");
 
@@ -70,7 +73,9 @@ class StopwatchPanel extends ClockPanel
 
 		leftActions.add(lapButton);
 
-		IconButton deleteButton = new IconButton(ClockTabPanel.DELETE_ICON, ClockTabPanel.DELETE_ICON_HOVER);
+		JButton deleteButton = new JButton(ClockTabPanel.DELETE_ICON);
+		deleteButton.setRolloverIcon(ClockTabPanel.DELETE_ICON_HOVER);
+		SwingUtil.removeButtonDecorations(deleteButton);
 		deleteButton.setPreferredSize(new Dimension(16, 14));
 		deleteButton.setToolTipText("Delete stopwatch");
 		deleteButton.addActionListener(e -> clockManager.removeStopwatch(stopwatch));

runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/TimerPanel.java

@@ -25,7 +25,8 @@
 package net.runelite.client.plugins.timetracking.clocks;
 
 import java.awt.Dimension;
-import net.runelite.client.ui.components.IconButton;
+import javax.swing.JButton;
+import net.runelite.client.util.SwingUtil;
 
 class TimerPanel extends ClockPanel
 {
@@ -33,7 +34,9 @@ class TimerPanel extends ClockPanel
 	{
 		super(clockManager, timer, "timer", true);
 
-		IconButton deleteButton = new IconButton(ClockTabPanel.DELETE_ICON, ClockTabPanel.DELETE_ICON_HOVER);
+		JButton deleteButton = new JButton(ClockTabPanel.DELETE_ICON);
+		SwingUtil.removeButtonDecorations(deleteButton);
+		deleteButton.setRolloverIcon(ClockTabPanel.DELETE_ICON_HOVER);
 		deleteButton.setPreferredSize(new Dimension(16, 14));
 		deleteButton.setToolTipText("Delete timer");
 		deleteButton.addActionListener(e -> clockManager.removeTimer(timer));

runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java

@@ -29,10 +29,30 @@ import java.time.Duration;
 import java.util.Map;
 import javax.annotation.Nullable;
 import lombok.Getter;
-import static net.runelite.api.NullObjectID.NULL_10823;
-import static net.runelite.api.NullObjectID.NULL_10835;
 import net.runelite.api.ObjectID;
-import static net.runelite.api.ObjectID.*;
+import static net.runelite.api.ObjectID.MAGIC_TREE_10834;
+import static net.runelite.api.NullObjectID.NULL_10835;
+import static net.runelite.api.ObjectID.MAHOGANY;
+import static net.runelite.api.ObjectID.MAHOGANY_36688;
+import static net.runelite.api.ObjectID.MAPLE_TREE_10832;
+import static net.runelite.api.ObjectID.MAPLE_TREE_36681;
+import static net.runelite.api.ObjectID.OAK_10820;
+import static net.runelite.api.ObjectID.OAK_TREE_4540;
+import static net.runelite.api.ObjectID.REDWOOD_29670;
+import static net.runelite.api.ObjectID.TEAK;
+import static net.runelite.api.ObjectID.TEAK_36686;
+import static net.runelite.api.ObjectID.TREE;
+import static net.runelite.api.ObjectID.TREE_1277;
+import static net.runelite.api.ObjectID.TREE_1278;
+import static net.runelite.api.ObjectID.TREE_1279;
+import static net.runelite.api.ObjectID.TREE_1280;
+import static net.runelite.api.ObjectID.WILLOW;
+import static net.runelite.api.ObjectID.WILLOW_10829;
+import static net.runelite.api.ObjectID.WILLOW_10831;
+import static net.runelite.api.ObjectID.WILLOW_10833;
+import static net.runelite.api.ObjectID.YEW;
+import static net.runelite.api.NullObjectID.NULL_10823;
+import static net.runelite.api.ObjectID.YEW_36683;
 
 @Getter
 enum Tree
@@ -40,13 +60,31 @@ enum Tree
 	REGULAR_TREE(null, TREE, TREE_1277, TREE_1278, TREE_1279, TREE_1280),
 	OAK_TREE(Duration.ofMillis(8500), ObjectID.OAK_TREE, OAK_TREE_4540, OAK_10820),
 	WILLOW_TREE(Duration.ofMillis(8500), WILLOW, WILLOW_10829, WILLOW_10831, WILLOW_10833),
-	MAPLE_TREE(Duration.ofSeconds(35), ObjectID.MAPLE_TREE, MAPLE_TREE_10832, MAPLE_TREE_36681),
+	MAPLE_TREE(Duration.ofSeconds(35), ObjectID.MAPLE_TREE, MAPLE_TREE_10832, MAPLE_TREE_36681)
+		{
+			@Override
+			Duration getRespawnTime(int region)
+			{
+				return region == MISCELLANIA_REGION ? Duration.ofMillis(8500) : super.respawnTime;
+			}
+		},
 	TEAK_TREE(Duration.ofMillis(8500), TEAK, TEAK_36686),
 	MAHOGANY_TREE(Duration.ofMillis(8500), MAHOGANY, MAHOGANY_36688),
 	YEW_TREE(Duration.ofMinutes(1), YEW, NULL_10823, YEW_36683),
 	MAGIC_TREE(Duration.ofMinutes(2), MAGIC_TREE_10834, NULL_10835),
 	REDWOOD(Duration.ofMinutes(2), ObjectID.REDWOOD, REDWOOD_29670);
 
+	@Nullable
+	private final Duration respawnTime;
+	private final int[] treeIds;
+
+	Tree(Duration respawnTime, int... treeIds)
+	{
+		this.respawnTime = respawnTime;
+		this.treeIds = treeIds;
+	}
+
+	private static final int MISCELLANIA_REGION = 10044;
 	private static final Map<Integer, Tree> TREES;
 
 	static
@@ -64,14 +102,9 @@ enum Tree
 		TREES = builder.build();
 	}
 
-	@Nullable
+	Duration getRespawnTime(int region)
-	private final Duration respawnTime;
-	private final int[] treeIds;
-
-	Tree(@org.jetbrains.annotations.Nullable Duration respawnTime, int... treeIds)
 	{
-		this.respawnTime = respawnTime;
+		return respawnTime;
-		this.treeIds = treeIds;
 	}
 
 	static Tree findTree(int objectId)

runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java

@@ -112,6 +112,7 @@ public class WoodcuttingPlugin extends Plugin
 	private int treeTypeID;
 	@Getter(AccessLevel.PACKAGE)
 	private int gpEarned;
+	private int currentPlane;
 
 	@Provides
 	WoodcuttingConfig getConfig(ConfigManager configManager)
@@ -153,6 +154,7 @@ public class WoodcuttingPlugin extends Plugin
 	private void onGameTick(GameTick gameTick)
 	{
 		recentlyLoggedIn = false;
+		currentPlane = client.getPlane();
 
 		respawns.removeIf(TreeRespawn::isExpired);
 
@@ -217,14 +219,16 @@ public class WoodcuttingPlugin extends Plugin
 		Tree tree = Tree.findTree(object.getId());
 		if (tree != null)
 		{
-			if (tree.getRespawnTime() != null && !recentlyLoggedIn)
+			if (tree.getRespawnTime() != null && !recentlyLoggedIn && currentPlane == object.getPlane())
 			{
 				Point max = object.getSceneMaxLocation();
 				Point min = object.getSceneMinLocation();
 				int lenX = max.getX() - min.getX();
 				int lenY = max.getY() - min.getY();
 				log.debug("Adding respawn timer for {} tree at {}", tree, object.getLocalLocation());
-				TreeRespawn treeRespawn = new TreeRespawn(tree, lenX, lenY, WorldPoint.fromScene(client, min.getX(), min.getY(), client.getPlane()), Instant.now(), (int) tree.getRespawnTime().toMillis());
+
+				final int region = client.getLocalPlayer().getWorldLocation().getRegionID();
+				TreeRespawn treeRespawn = new TreeRespawn(tree, lenX, lenY, WorldPoint.fromScene(client, min.getX(), min.getY(), client.getPlane()), Instant.now(), (int) tree.getRespawnTime(region).toMillis());
 				respawns.add(treeRespawn);
 			}
 

runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java

@@ -58,7 +58,7 @@ class WorldTableHeader extends JPanel
 	{
 		final BufferedImage arrowDown = ImageUtil.getResourceStreamFromClass(WorldHopperPlugin.class, "arrow_down.png");
 		final BufferedImage arrowUp = ImageUtil.rotateImage(arrowDown, Math.PI);
-		final BufferedImage arrowUpFaded = ImageUtil.grayscaleOffset(arrowUp, -80);
+		final BufferedImage arrowUpFaded = ImageUtil.luminanceOffset(arrowUp, -80);
 		ARROW_UP = new ImageIcon(arrowUpFaded);
 
 		final BufferedImage highlightArrowDown = ImageUtil.fillImage(arrowDown, HIGHLIGHT_COLOR);

runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java

@@ -686,7 +686,19 @@ public class XpTrackerPlugin extends Plugin
 			xpPauseState.tickXp(skill, skillExperience, this.pauseSkillAfter);
 		}
 
-		xpPauseState.tickLogout(this.pauseOnLogout, !GameState.LOGIN_SCREEN.equals(client.getGameState()));
+		final boolean loggedIn;
+		switch (client.getGameState())
+		{
+			case LOGIN_SCREEN:
+			case LOGGING_IN:
+			case LOGIN_SCREEN_AUTHENTICATOR:
+				loggedIn = false;
+				break;
+			default:
+				loggedIn = true;
+				break;
+		}
+		xpPauseState.tickLogout(this.pauseOnLogout, loggedIn);
 
 		if (lastTickMillis == 0)
 		{

runelite-client/src/main/java/net/runelite/client/ui/DynamicGridLayout.java

@@ -100,8 +100,11 @@ public class DynamicGridLayout extends GridLayout
 
 			// scaling factors
 			final Dimension pd = preferredLayoutSize(parent);
-			final double sw = (1.0 * parent.getWidth()) / pd.width;
+			final Insets parentInsets = parent.getInsets();
-			final double sh = (1.0 * parent.getHeight()) / pd.height;
+			int wborder = parentInsets.left + parentInsets.right;
+			int hborder = parentInsets.top + parentInsets.bottom;
+			final double sw = (1.0 * parent.getWidth() - wborder) / (pd.width - wborder);
+			final double sh = (1.0 * parent.getHeight() - hborder) / (pd.height - hborder);
 
 			final int[] w = new int[ncols];
 			final int[] h = new int[nrows];

runelite-client/src/main/java/net/runelite/client/ui/PluginPanel.java

@@ -36,9 +36,9 @@ import lombok.Getter;
 public abstract class PluginPanel extends JPanel
 {
 	public static final int PANEL_WIDTH = 225;
-	private static final int SCROLLBAR_WIDTH = 17;
+	public static final int SCROLLBAR_WIDTH = 17;
-	private static final int OFFSET = 6;
+	public static final int BORDER_OFFSET = 6;
-	private static final EmptyBorder BORDER_PADDING = new EmptyBorder(OFFSET, OFFSET, OFFSET, OFFSET);
+	private static final EmptyBorder BORDER_PADDING = new EmptyBorder(BORDER_OFFSET, BORDER_OFFSET, BORDER_OFFSET, BORDER_OFFSET);
 	private static final Dimension OUTER_PREFERRED_SIZE = new Dimension(PluginPanel.PANEL_WIDTH + SCROLLBAR_WIDTH, 0);
 
 	@Getter(AccessLevel.PROTECTED)

runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java

@@ -36,13 +36,12 @@ import java.awt.image.PixelGrabber;
 import java.awt.image.RescaleOp;
 import java.awt.image.WritableRaster;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.function.Predicate;
 import javax.imageio.ImageIO;
 import javax.swing.GrayFilter;
+import java.util.function.Predicate;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.IndexedSprite;
@@ -63,7 +62,7 @@ public class ImageUtil
 	 * Creates a {@link BufferedImage} from an {@link Image}.
 	 *
 	 * @param image An Image to be converted to a BufferedImage.
-	 * @return A BufferedImage instance of the same given image.
+	 * @return      A BufferedImage instance of the same given image.
 	 */
 	public static BufferedImage bufferedImageFromImage(final Image image)
 	{
@@ -72,23 +71,37 @@ public class ImageUtil
 			return (BufferedImage) image;
 		}
 
-		final BufferedImage out = new BufferedImage(image.getWidth(null), image.getHeight(null), BufferedImage.TYPE_INT_ARGB);
+		return toARGB(image);
-		final Graphics2D g2d = out.createGraphics();
+	}
+
+	/**
+	 * Creates an ARGB {@link BufferedImage} from an {@link Image}.
+	 */
+	public static BufferedImage toARGB(final Image image)
+	{
+		if (image instanceof BufferedImage && ((BufferedImage) image).getType() == BufferedImage.TYPE_INT_ARGB)
+		{
+			return (BufferedImage) image;
+		}
+
+		BufferedImage out = new BufferedImage(image.getWidth(null), image.getHeight(null), BufferedImage.TYPE_INT_ARGB);
+		Graphics2D g2d = out.createGraphics();
 		g2d.drawImage(image, 0, 0, null);
 		g2d.dispose();
 		return out;
 	}
 
 	/**
-	 * Offsets an image in the grayscale (darkens/brightens) by a given offset.
+	 * Offsets an image's luminance by a given value.
 	 *
-	 * @param image  The image to be darkened or brightened.
+	 * @param rawImg  The image to be darkened or brightened.
 	 * @param offset A signed 8-bit integer value to brighten or darken the image with.
 	 *               Values above 0 will brighten, and values below 0 will darken.
-	 * @return The given image with its brightness adjusted by the given offset.
+	 * @return       The given image with its brightness adjusted by the given offset.
 	 */
-	public static BufferedImage grayscaleOffset(final BufferedImage image, final int offset)
+	public static BufferedImage luminanceOffset(final Image rawImg, final int offset)
 	{
+		BufferedImage image = toARGB(rawImg);
 		final float offsetFloat = (float) offset;
 		final int numComponents = image.getColorModel().getNumComponents();
 		final float[] scales = new float[numComponents];
@@ -106,15 +119,16 @@ public class ImageUtil
 	}
 
 	/**
-	 * Offsets an image in the grayscale (darkens/brightens) by a given percentage.
+	 * Changes an images luminance by a scaling factor
 	 *
-	 * @param image      The image to be darkened or brightened.
+	 * @param rawImg      The image to be darkened or brightened.
 	 * @param percentage The ratio to darken or brighten the given image.
 	 *                   Values above 1 will brighten, and values below 1 will darken.
-	 * @return The given image with its brightness scaled by the given percentage.
+	 * @return           The given image with its brightness scaled by the given percentage.
 	 */
-	public static BufferedImage grayscaleOffset(final BufferedImage image, final float percentage)
+	public static BufferedImage luminanceScale(final Image rawImg, final float percentage)
 	{
+		BufferedImage image = toARGB(rawImg);
 		final int numComponents = image.getColorModel().getNumComponents();
 		final float[] scales = new float[numComponents];
 		final float[] offsets = new float[numComponents];
@@ -133,14 +147,15 @@ public class ImageUtil
 	/**
 	 * Offsets an image's alpha component by a given offset.
 	 *
-	 * @param image  The image to be made more or less transparent.
+	 * @param rawImg  The image to be made more or less transparent.
 	 * @param offset A signed 8-bit integer value to modify the image's alpha component with.
 	 *               Values above 0 will increase transparency, and values below 0 will decrease
 	 *               transparency.
-	 * @return The given image with its alpha component adjusted by the given offset.
+	 * @return       The given image with its alpha component adjusted by the given offset.
 	 */
-	public static BufferedImage alphaOffset(final BufferedImage image, final int offset)
+	public static BufferedImage alphaOffset(final Image rawImg, final int offset)
 	{
+		BufferedImage image = toARGB(rawImg);
 		final float offsetFloat = (float) offset;
 		final int numComponents = image.getColorModel().getNumComponents();
 		final float[] scales = new float[numComponents];
@@ -155,14 +170,15 @@ public class ImageUtil
 	/**
 	 * Offsets an image's alpha component by a given percentage.
 	 *
-	 * @param image      The image to be made more or less transparent.
+	 * @param rawImg      The image to be made more or less transparent.
 	 * @param percentage The ratio to modify the image's alpha component with.
 	 *                   Values above 1 will increase transparency, and values below 1 will decrease
 	 *                   transparency.
-	 * @return The given image with its alpha component scaled by the given percentage.
+	 * @return           The given image with its alpha component scaled by the given percentage.
 	 */
-	public static BufferedImage alphaOffset(final BufferedImage image, final float percentage)
+	public static BufferedImage alphaOffset(final Image rawImg, final float percentage)
 	{
+		BufferedImage image = toARGB(rawImg);
 		final int numComponents = image.getColorModel().getNumComponents();
 		final float[] scales = new float[numComponents];
 		final float[] offsets = new float[numComponents];
@@ -177,7 +193,7 @@ public class ImageUtil
 	 * Creates a grayscale image from the given image.
 	 *
 	 * @param image The source image to be converted.
-	 * @return A copy of the given imnage, with colors converted to grayscale.
+	 * @return      A copy of the given imnage, with colors converted to grayscale.
 	 */
 	public static BufferedImage grayscaleImage(final BufferedImage image)
 	{
@@ -188,8 +204,8 @@ public class ImageUtil
 	/**
 	 * Re-size a BufferedImage to the given dimensions.
 	 *
-	 * @param image     the BufferedImage.
+	 * @param image the BufferedImage.
-	 * @param newWidth  The width to set the BufferedImage to.
+	 * @param newWidth The width to set the BufferedImage to.
 	 * @param newHeight The height to set the BufferedImage to.
 	 * @return The BufferedImage with the specified dimensions
 	 */
@@ -205,7 +221,7 @@ public class ImageUtil
 	 * @param image     The image whose canvas should be re-sized.
 	 * @param newWidth  The width to set the BufferedImage to.
 	 * @param newHeight The height to set the BufferedImage to.
-	 * @return The BufferedImage centered within canvas of given dimensions.
+	 * @return          The BufferedImage centered within canvas of given dimensions.
 	 */
 	public static BufferedImage resizeCanvas(final BufferedImage image, final int newWidth, final int newHeight)
 	{
@@ -224,7 +240,7 @@ public class ImageUtil
 	 *
 	 * @param image The image to be rotated.
 	 * @param theta The number of radians to rotate the image.
-	 * @return The given image, rotated by the given theta.
+	 * @return      The given image, rotated by the given theta.
 	 */
 	public static BufferedImage rotateImage(final BufferedImage image, final double theta)
 	{
@@ -240,7 +256,7 @@ public class ImageUtil
 	 * @param image      The image to be flipped.
 	 * @param horizontal Whether the image should be flipped horizontally.
 	 * @param vertical   Whether the image should be flipped vertically.
-	 * @return The given image, flipped horizontally and/or vertically.
+	 * @return           The given image, flipped horizontally and/or vertically.
 	 */
 	public static BufferedImage flipImage(final BufferedImage image, final boolean horizontal, final boolean vertical)
 	{
@@ -275,7 +291,7 @@ public class ImageUtil
 	 *
 	 * @param image The image to be outlined.
 	 * @param color The color to use for the outline.
-	 * @return The BufferedImage with its edges outlined with the given color.
+	 * @return      The BufferedImage with its edges outlined with the given color.
 	 */
 	public static BufferedImage outlineImage(final BufferedImage image, final Color color)
 	{
@@ -289,7 +305,7 @@ public class ImageUtil
 	 * @param image         The image to be outlined.
 	 * @param color         The color to use for the outline.
 	 * @param fillCondition The predicate to be consumed by {@link #fillImage(BufferedImage, Color, Predicate) fillImage(BufferedImage, Color, Predicate)}
-	 * @return The BufferedImage with its edges outlined with the given color.
+	 * @return              The BufferedImage with its edges outlined with the given color.
 	 */
 	public static BufferedImage outlineImage(final BufferedImage image, final Color color, final Predicate<Color> fillCondition)
 	{
@@ -303,8 +319,8 @@ public class ImageUtil
 	 * @param image          The image to be outlined.
 	 * @param color          The color to use for the outline.
 	 * @param outlineCorners Whether to draw an outline around corners, or only around edges.
-	 * @return The BufferedImage with its edges--and optionally, corners--outlined
+	 * @return               The BufferedImage with its edges--and optionally, corners--outlined
-	 * with the given color.
+	 *                       with the given color.
 	 */
 	public static BufferedImage outlineImage(final BufferedImage image, final Color color, final Boolean outlineCorners)
 	{
@@ -319,8 +335,8 @@ public class ImageUtil
 	 * @param color          The color to use for the outline.
 	 * @param fillCondition  The predicate to be consumed by {@link #fillImage(BufferedImage, Color, Predicate) fillImage(BufferedImage, Color, Predicate)}
 	 * @param outlineCorners Whether to draw an outline around corners, or only around edges.
-	 * @return The BufferedImage with its edges--and optionally, corners--outlined
+	 * @return               The BufferedImage with its edges--and optionally, corners--outlined
-	 * with the given color.
+	 * 	                     with the given color.
 	 */
 	public static BufferedImage outlineImage(final BufferedImage image, final Color color, final Predicate<Color> fillCondition, final Boolean outlineCorners)
 	{
@@ -354,7 +370,7 @@ public class ImageUtil
 	 *
 	 * @param c    The class to be referenced for resource path.
 	 * @param path The path, relative to the given class.
-	 * @return A {@link BufferedImage} of the loaded image resource from the given path.
+	 * @return     A {@link BufferedImage} of the loaded image resource from the given path.
 	 */
 	public static BufferedImage getResourceStreamFromClass(final Class c, final String path)
 	{
@@ -362,15 +378,16 @@ public class ImageUtil
 		{
 			synchronized (ImageIO.class)
 			{
-				try (InputStream in = c.getResourceAsStream(path))
+				return ImageIO.read(c.getResourceAsStream(path));
-				{
-					return ImageIO.read(in);
-				}
 			}
 		}
+		catch (IllegalArgumentException e)
+		{
+			throw new IllegalArgumentException(path, e);
+		}
 		catch (IOException e)
 		{
-			throw new RuntimeException(e);
+			throw new RuntimeException(path, e);
 		}
 	}
 
@@ -379,7 +396,7 @@ public class ImageUtil
 	 *
 	 * @param image The image which should have its non-transparent pixels filled.
 	 * @param color The color with which to fill pixels.
-	 * @return The given image with all non-transparent pixels set to the given color.
+	 * @return      The given image with all non-transparent pixels set to the given color.
 	 */
 	public static BufferedImage fillImage(final BufferedImage image, final Color color)
 	{
@@ -387,14 +404,14 @@ public class ImageUtil
 	}
 
 	/**
-	 * Fills pixels of the given image with the given color based on a given fill condition
+	 * 	Fills pixels of the given image with the given color based on a given fill condition
-	 * predicate.
+	 * 	predicate.
 	 *
 	 * @param image         The image which should have its non-transparent pixels filled.
 	 * @param color         The color with which to fill pixels.
 	 * @param fillCondition The condition on which to fill pixels with the given color.
-	 * @return The given image with all pixels fulfilling the fill condition predicate
+	 * @return              The given image with all pixels fulfilling the fill condition predicate
-	 * set to the given color.
+	 *                      set to the given color.
 	 */
 	static BufferedImage fillImage(final BufferedImage image, final Color color, final Predicate<Color> fillCondition)
 	{
@@ -471,7 +488,7 @@ public class ImageUtil
 	 * @param image   The image to be adjusted.
 	 * @param scales  An array of scale operations to be performed on the image's color components.
 	 * @param offsets An array of offset operations to be performed on the image's color components.
-	 * @return The modified image after applying the given adjustments.
+	 * @return        The modified image after applying the given adjustments.
 	 */
 	private static BufferedImage offset(final BufferedImage image, final float[] scales, final float[] offsets)
 	{
@@ -481,10 +498,9 @@ public class ImageUtil
 
 	/**
 	 * Converts the buffered image into a sprite image and returns it
-	 *
 	 * @param image  The image to be converted
 	 * @param client Current client instance
-	 * @return The buffered image as a sprite image
+	 * @return       The buffered image as a sprite image
 	 */
 	public static Sprite getImageSprite(BufferedImage image, Client client)
 	{
@@ -516,12 +532,12 @@ public class ImageUtil
 
 	/**
 	 * Converts an image into an {@code IndexedSprite} instance.
-	 * <p>
+	 *
 	 * The passed in image can only have at max 255 different colors.
 	 *
 	 * @param image  The image to be converted
 	 * @param client Current client instance
-	 * @return The image as an {@code IndexedSprite}
+	 * @return		 The image as an {@code IndexedSprite}
 	 */
 	public static IndexedSprite getImageIndexedSprite(BufferedImage image, Client client)
 	{
@@ -713,4 +729,4 @@ public class ImageUtil
 
 		return result;
 	}
-}
+}

runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java

@@ -32,6 +32,7 @@ import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Frame;
 import java.awt.Image;
+import java.awt.Insets;
 import java.awt.SystemTray;
 import java.awt.TrayIcon;
 import java.awt.event.MouseAdapter;
@@ -45,6 +46,7 @@ import java.util.function.BiConsumer;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.swing.ButtonModel;
+import javax.swing.AbstractButton;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
@@ -456,4 +458,18 @@ public class SwingUtil
 			SwingUtil.setFont(FontManager.getRunescapeFont());
 		}
 	}
+
+	public static void removeButtonDecorations(AbstractButton button)
+	{
+		button.setBorderPainted(false);
+		button.setContentAreaFilled(false);
+		button.setFocusPainted(false);
+		button.setMargin(new Insets(0, 0, 0, 0));
+		button.setOpaque(false);
+	}
+
+	public static void addModalTooltip(AbstractButton button, String on, String off)
+	{
+		button.addItemListener(l -> button.setToolTipText(button.isSelected() ? on : off));
+	}
 }

runelite-client/src/main/java/net/runelite/client/util/VerificationException.java

@@ -22,7 +22,7 @@
  * (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.rs;
+package net.runelite.client.util;
 
 public class VerificationException extends Exception
 {

runelite-client/src/main/resources/item_variations.json

@@ -9670,5 +9670,10 @@
     24393,
     24403,
     24411
+  ],
+  "iced gingerbread shield": [
+    24438,
+    24439,
+    24440
   ]
 }