Merge remote-tracking branch 'upstream/master' into runelite

Also pulled out a couple of our merged apis into our own classes. Getting much easier to keep up to date with their data # Conflicts: # .github/FUNDING.yml # .github/workflows/CI.yml # cache-client/pom.xml # cache-updater/pom.xml # cache/pom.xml # cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java # ci/build.sh # http-api/pom.xml # http-service/pom.xml # http-service/src/main/java/net/runelite/http/service/chat/ChatController.java # http-service/src/main/java/net/runelite/http/service/config/ConfigController.java # http-service/src/main/java/net/runelite/http/service/config/ConfigService.java # http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java # http-service/src/main/java/net/runelite/http/service/ge/Trade.java # http-service/src/test/java/net/runelite/http/service/config/ConfigServiceTest.java # http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java # pom.xml # runelite-api/pom.xml # runelite-api/src/main/java/net/runelite/api/Client.java # runelite-api/src/main/java/net/runelite/api/ObjectID.java # runelite-api/src/main/java/net/runelite/api/ParamHolder.java # runelite-api/src/main/java/net/runelite/api/ParamID.java # runelite-api/src/main/java/net/runelite/api/Preferences.java # runelite-api/src/main/java/net/runelite/api/ScriptEvent.java # runelite-api/src/main/java/net/runelite/api/ScriptID.java # runelite-api/src/main/java/net/runelite/api/SettingID.java # runelite-api/src/main/java/net/runelite/api/StructComposition.java # runelite-api/src/main/java/net/runelite/api/StructID.java # runelite-api/src/main/java/net/runelite/api/Varbits.java # runelite-api/src/main/java/net/runelite/api/events/PlayerChanged.java # runelite-api/src/main/java/net/runelite/api/events/PostStructComposition.java # runelite-api/src/main/java/net/runelite/api/events/WidgetClosed.java # runelite-api/src/main/java/net/runelite/api/events/WidgetHiddenChanged.java # runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java # runelite-api/src/main/java/net/runelite/api/events/WorldChanged.java # runelite-api/src/main/java/net/runelite/api/widgets/Widget.java # runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java # runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java # runelite-api/src/main/java/net/runelite/api/widgets/WidgetModalMode.java # runelite-api/src/test/java/net/runelite/api/plugins/combatlevel/CombatLevelOverlayTest.java # runelite-client/pom.xml # runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java # runelite-client/src/main/java/net/runelite/client/callback/Hooks.java # runelite-client/src/main/java/net/runelite/client/plugins/config/PluginToggleButton.java # runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java # runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java # runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixOverlay.java # runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java # runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java # runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java # runelite-client/src/main/resources/net/runelite/client/runelite.properties # runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash # runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java # runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/discord/DiscordStateTest.java # runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/specialcounter/SpecialCounterPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java # runelite-client/src/test/java/net/runelite/client/util/ColorUtilTest.java # runelite-script-assembler-plugin/pom.xml
2021-01-14 14:41:17 -05:00
parent 20eb55c8ac 7dae40daef
commit a2a295a054
99 changed files with 7485 additions and 1754 deletions
--- a/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
@@ -32,6 +32,7 @@ import net.runelite.api.Constants;
 import net.runelite.client.Notifier;
 import net.runelite.client.ui.ContainableFrame;
 import net.runelite.client.ui.overlay.components.ComponentConstants;
+import net.runelite.client.util.OSType;

@ConfigGroup(RuneLiteConfig.GROUP_NAME)
 public interface RuneLiteConfig extends Config
@@ -122,14 +123,14 @@ public interface RuneLiteConfig extends Config
 	@ConfigItem(
 		keyName = "uiEnableCustomChrome",
 		name = "Enable custom window chrome",
-		description = "Use Runelite's custom window title and borders.",
+		description = "Use RuneLite's custom window title and borders.",
 		warning = "Please restart your client after changing this setting",
 		position = 15,
 		section = windowSettings
 	)
 	default boolean enableCustomChrome()
 	{
-		return true;
+		return OSType.getOSType() == OSType.Windows;
 	}

 	@Range(
@@ -150,7 +151,7 @@ public interface RuneLiteConfig extends Config

 	@ConfigItem(
 		keyName = "gameAlwaysOnTop",
-		name = "Enable client always on top",
+		name = "Always on top",
 		description = "The game will always be on the top of the screen",
 		position = 17,
 		section = windowSettings
@@ -162,8 +163,8 @@ public interface RuneLiteConfig extends Config

 	@ConfigItem(
 		keyName = "warningOnExit",
-		name = "Display warning on exit",
-		description = "Toggles a warning popup when trying to exit the client",
+		name = "Exit warning",
+		description = "Shows a warning popup when trying to exit the client",
 		position = 18,
 		section = windowSettings
 	)
@@ -198,7 +199,7 @@ public interface RuneLiteConfig extends Config

 	@ConfigItem(
 		keyName = "notificationRequestFocus",
-		name = "Request focus on notification",
+		name = "Request focus",
 		description = "Configures the window focus request type on notification",
 		position = 21,
 		section = notificationSettings
@@ -222,8 +223,8 @@ public interface RuneLiteConfig extends Config

 	@ConfigItem(
 		keyName = "notificationGameMessage",
-		name = "Enable game message notifications",
-		description = "Puts a notification message in the chatbox",
+		name = "Game message notifications",
+		description = "Adds a notification message to the chatbox",
 		position = 23,
 		section = notificationSettings
 	)
@@ -234,7 +235,7 @@ public interface RuneLiteConfig extends Config

 	@ConfigItem(
 		keyName = "flashNotification",
-		name = "Flash notification",
+		name = "Flash",
 		description = "Flashes the game frame as a notification",
 		position = 24,
 		section = notificationSettings
@@ -259,7 +260,7 @@ public interface RuneLiteConfig extends Config
 	@Alpha
 	@ConfigItem(
 		keyName = "notificationFlashColor",
-		name = "Notification Flash Color",
+		name = "Notification Flash",
 		description = "Sets the color of the notification flashes.",
 		position = 26,
 		section = notificationSettings
@@ -295,7 +296,7 @@ public interface RuneLiteConfig extends Config

 	@ConfigItem(
 		keyName = "interfaceFontType",
-		name = "Interface Overlay Font",
+		name = "Interface Font",
 		description = "Configures what font type is used for in-game interface overlays such as panels, opponent info, clue scrolls etc.",
 		position = 32,
 		section = overlaySettings
--- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java
@@ -689,6 +689,11 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse
 						log.warn("Unable to get clipboard", ex);
 					}
 					return;
+				case KeyEvent.VK_A:
+					selectionStart = 0;
+					selectionEnd = value.length();
+					cursorAt(0, selectionEnd);
+					return;
 			}
 			return;
 		}
@@ -753,11 +758,25 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse
 				return;
 			case KeyEvent.VK_LEFT:
 				ev.consume();
-				newPos--;
+				if (cursorStart != cursorEnd)
+				{
+					newPos = cursorStart;
+				}
+				else
+				{
+					newPos--;
+				}
 				break;
 			case KeyEvent.VK_RIGHT:
 				ev.consume();
-				newPos++;
+				if (cursorStart != cursorEnd)
+				{
+					newPos = cursorEnd;
+				}
+				else
+				{
+					newPos++;
+				}
 				break;
 			case KeyEvent.VK_UP:
 				ev.consume();
--- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/KaramjaDiaryRequirement.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/KaramjaDiaryRequirement.java
@@ -50,9 +50,9 @@ public class KaramjaDiaryRequirement extends GenericDiaryRequirement
 		add("Claim a ticket from the Agility Arena in Brimhaven.",
 			new SkillRequirement(Skill.AGILITY, 30));
 		add("Discover hidden wall in the dungeon below the volcano.",
-			new QuestRequirement(Quest.DRAGON_SLAYER, true));
+			new QuestRequirement(Quest.DRAGON_SLAYER_I, true));
 		add("Visit the Isle of Crandor via the dungeon below the volcano.",
-			new QuestRequirement(Quest.DRAGON_SLAYER, true));
+			new QuestRequirement(Quest.DRAGON_SLAYER_I, true));
 		add("Use Vigroy and Hajedy's cart service.",
 			new QuestRequirement(Quest.SHILO_VILLAGE));
 		add("Earn 100% favour in the village of Tai Bwo Wannai.",
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityConfig.java
@@ -147,7 +147,7 @@ public interface AgilityConfig extends Config
 	@Alpha
 	@ConfigItem(
 		keyName = "portalsHighlight",
-		name = "Portals Highlight Color",
+		name = "Portals Color",
 		description = "Color of highlighted Prifddinas portals",
 		position = 9
 	)
--- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsConfig.java
@@ -81,7 +81,7 @@ public interface BoostsConfig extends Config

 	@ConfigItem(
 		keyName = "displayNextBuffChange",
-		name = "Display next buff change",
+		name = "Next buff change",
 		description = "Configures whether or not to display when the next buffed stat change will be",
 		position = 4
 	)
@@ -92,7 +92,7 @@ public interface BoostsConfig extends Config

 	@ConfigItem(
 		keyName = "displayNextDebuffChange",
-		name = "Display next debuff change",
+		name = "Next debuff change",
 		description = "Configures whether or not to display when the next debuffed stat change will be",
 		position = 5
 	)
@@ -103,7 +103,7 @@ public interface BoostsConfig extends Config

 	@ConfigItem(
 		keyName = "boostThreshold",
-		name = "Boost amount threshold",
+		name = "Boost threshold",
 		description = "The threshold at which boosted levels will be displayed in a different color. A value of 0 will disable the feature.",
 		position = 6
 	)
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonConfig.java
@@ -51,7 +51,7 @@ public interface CannonConfig extends Config
 	)
 	@ConfigItem(
 		keyName = "lowWarningThreshold",
-		name = "Low Warning Threshold",
+		name = "Low warning threshold",
 		description = "Configures the number of cannonballs remaining before a notification is sent. <br>Regardless of this value, a notification will still be sent when your cannon is empty.",
 		position = 2
 	)
@@ -62,7 +62,7 @@ public interface CannonConfig extends Config

 	@ConfigItem(
 		keyName = "showInfobox",
-		name = "Show Cannonball infobox",
+		name = "Show cannonball infobox",
 		description = "Configures whether to show the cannonballs in an infobox",
 		position = 3
 	)
@@ -85,7 +85,7 @@ public interface CannonConfig extends Config
 	@Alpha
 	@ConfigItem(
 		keyName = "highlightDoubleHitColor",
-		name = "Color of double hit spots",
+		name = "Double hit spots",
 		description = "Configures the highlight color of double hit spots",
 		position = 5
 	)
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java
@@ -156,7 +156,7 @@ public interface ChatFilterConfig extends Config

 	@ConfigItem(
 		keyName = "maxRepeatedPublicChats",
-		name = "Max repeated public chats",
+		name = "Repeat filter",
 		description = "Block player chat message if repeated this many times. 0 is off",
 		position = 11
 	)
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
@@ -105,7 +105,7 @@ public class CrypticClue extends ClueScroll implements TextClueScroll, NpcClueSc
 		new CrypticClue("A crate found in the tower of a church is your next location.", CRATE_357, new WorldPoint(2612, 3304, 1), "Climb the ladder and search the crates on the first floor in the Church in Ardougne."),
 		new CrypticClue("Covered in shadows, the centre of the circle is where you will find the answer.", new WorldPoint(3488, 3289, 0), "Dig in the centre of Mort'ton, where the roads intersect."),
 		new CrypticClue("I lie lonely and forgotten in mid wilderness, where the dead rise from their beds. Feel free to quarrel and wind me up, and dig while you shoot their heads.", new WorldPoint(3174, 3663, 0), "Directly under the crossbow respawn in the Graveyard of Shadows in level 18 Wilderness."),
-		new CrypticClue("In the city where merchants are said to have lived, talk to a man with a splendid cape, but a hat dropped by goblins.", "Head chef", new WorldPoint(3143, 3445, 0), "Talk to the Head chef in Cooks' Guild west of Varrock. You will need a chef hat or cooking cape to enter."),
+		new CrypticClue("In the city where merchants are said to have lived, talk to a man with a splendid cape, but a hat dropped by goblins.", "Head chef", new WorldPoint(3143, 3445, 0), "Talk to the Head chef in Cooks' Guild west of Varrock. You will need a chef's hat, Varrock armour 3 or 4, or the Cooking cape to enter."),
 		new CrypticClue("The mother of the reptilian sacrifice.", "Zul-Cheray", new WorldPoint(2204, 3050, 0), "Talk to Zul-Cheray in a house near the sacrificial boat at Zul-Andra."),
 		new CrypticClue("I watch the sea. I watch you fish. I watch your tree.", "Ellena", new WorldPoint(2860, 3431, 0), "Speak to Ellena at Catherby fruit tree patch."),
 		new CrypticClue("Dig between some ominous stones in Falador.", new WorldPoint(3040, 3399, 0), "Three standing stones inside a walled area. East of the northern Falador gate."),
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/FaloTheBardClue.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/FaloTheBardClue.java
@@ -50,7 +50,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
 public class FaloTheBardClue extends ClueScroll implements TextClueScroll, NpcClueScroll
 {
 	private static final List<FaloTheBardClue> CLUES = ImmutableList.of(
-		new FaloTheBardClue("A blood red weapon, a strong curved sword, found on the island of primate lords.", item(DRAGON_SCIMITAR)),
+		new FaloTheBardClue("A blood red weapon, a strong curved sword, found on the island of primate lords.", any("Dragon scimitar", item(DRAGON_SCIMITAR), item(DRAGON_SCIMITAR_OR))),
 		new FaloTheBardClue("A book that preaches of some great figure, lending strength, might and vigour.", any("Any god book (must be complete)", item(HOLY_BOOK), item(BOOK_OF_BALANCE), item(UNHOLY_BOOK), item(BOOK_OF_LAW), item(BOOK_OF_WAR), item(BOOK_OF_DARKNESS))),
 		new FaloTheBardClue("A bow of elven craft was made, it shimmers bright, but will soon fade.", any("Crystal Bow", item(CRYSTAL_BOW), item(CRYSTAL_BOW_24123))),
 		new FaloTheBardClue("A fiery axe of great inferno, when you use it, you'll wonder where the logs go.", item(INFERNAL_AXE)),
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java
@@ -91,7 +91,7 @@ public enum HotColdLocation
 	FREMENNIK_PROVINCE_FREMMY_ISLES_MINE(new WorldPoint(2374, 3850, 0), FREMENNIK_PROVINCE, "Central Fremennik Isles mine.", ANCIENT_WIZARDS),
 	FREMENNIK_PROVINCE_WEST_ISLES_MINE(new WorldPoint(2313, 3850, 0), FREMENNIK_PROVINCE, "West Fremennik Isles mine.", ANCIENT_WIZARDS),
 	FREMENNIK_PROVINCE_WEST_JATIZSO_ENTRANCE(new WorldPoint(2393, 3812, 0), FREMENNIK_PROVINCE, "West of the Jatizso mine entrance.", BRASSICAN_MAGE),
-	FREMENNIK_PROVINCE_PIRATES_COVE(new WorldPoint(2210, 3814, 0), FREMENNIK_PROVINCE, "Pirates' Cove", ANCIENT_WIZARDS),
+	FREMENNIK_PROVINCE_PIRATES_COVE(new WorldPoint(2211, 3817, 0), FREMENNIK_PROVINCE, "Pirates' Cove", ANCIENT_WIZARDS),
 	FREMENNIK_PROVINCE_ASTRAL_ALTER(new WorldPoint(2149, 3865, 0), FREMENNIK_PROVINCE, "Astral altar", ANCIENT_WIZARDS),
 	FREMENNIK_PROVINCE_LUNAR_VILLAGE(new WorldPoint(2084, 3916, 0), FREMENNIK_PROVINCE, "Lunar Isle, inside the village.", ANCIENT_WIZARDS),
 	FREMENNIK_PROVINCE_LUNAR_NORTH(new WorldPoint(2106, 3949, 0), FREMENNIK_PROVINCE, "Lunar Isle, north of the village.", ANCIENT_WIZARDS),
--- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
@@ -487,15 +487,19 @@ class ConfigPanel extends PluginPanel
 			if (cid.getType().isEnum())
 			{
 				Class<? extends Enum> type = (Class<? extends Enum>) cid.getType();
-				JComboBox box = new JComboBox(type.getEnumConstants());
+
+				JComboBox<Enum<?>> box = new JComboBox<Enum<?>>(type.getEnumConstants()); // NOPMD: UseDiamondOperator
+				// set renderer prior to calling box.getPreferredSize(), since it will invoke the renderer
+				// to build components for each combobox element in order to compute the display size of the
+				// combobox
+				box.setRenderer(new ComboBoxListRenderer<>());
 				box.setPreferredSize(new Dimension(box.getPreferredSize().width, 25));
-				box.setRenderer(new ComboBoxListRenderer());
 				box.setForeground(Color.WHITE);
 				box.setFocusable(false);
-				box.setPrototypeDisplayValue("XXXXXXXX"); //sorry but this is the way to keep the size of the combobox in check.
+
 				try
 				{
-					Enum selectedItem = Enum.valueOf(type, configManager.getConfiguration(cd.getGroup().value(), cid.getItem().keyName()));
+					Enum<?> selectedItem = Enum.valueOf(type, configManager.getConfiguration(cd.getGroup().value(), cid.getItem().keyName()));
 					box.setSelectedItem(selectedItem);
 					box.setToolTipText(Text.titleCase(selectedItem));
 				}
@@ -508,7 +512,7 @@ class ConfigPanel extends PluginPanel
 					if (e.getStateChange() == ItemEvent.SELECTED)
 					{
 						changeConfiguration(box, cd, cid);
-						box.setToolTipText(Text.titleCase((Enum) box.getSelectedItem()));
+						box.setToolTipText(Text.titleCase((Enum<?>) box.getSelectedItem()));
 					}
 				});
 				item.add(box, BorderLayout.EAST);
--- a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java
@@ -56,4 +56,11 @@ public enum CustomCursor
 		this.name = name;
 		this.cursorImage = ImageUtil.loadImageResource(CustomCursorPlugin.class, icon);
 	}
+
+	@Override
+	public String toString()
+	{
+		return name;
+	}
 }
+
--- a/runelite-client/src/main/java/net/runelite/client/plugins/driftnet/DriftNetConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/driftnet/DriftNetConfig.java
@@ -99,7 +99,7 @@ public interface DriftNetConfig extends Config

 	@ConfigItem(
 		keyName = "tagAnnette",
-		name = "Tag Annette when no nets in inventory",
+		name = "Tag Annette",
 		description = "Tag Annette when no nets in inventory",
 		position = 6
 	)
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingConfig.java
@@ -93,7 +93,7 @@ public interface FishingConfig extends Config
 	@Alpha
 	@ConfigItem(
 		keyName = "minnowsOverlayColor",
-		name = "Minnows Overlay Color",
+		name = "Minnows Overlay",
 		description = "Color of overlays for Minnows",
 		position = 5
 	)
@@ -105,7 +105,7 @@ public interface FishingConfig extends Config
 	@Alpha
 	@ConfigItem(
 		keyName = "aerialOverlayColor",
-		name = "Aerial Overlay Color",
+		name = "Aerial Overlay",
 		description = "Color of overlays when 1-tick aerial fishing",
 		position = 6
 	)
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsConfig.java
@@ -156,7 +156,7 @@ public interface GroundItemsConfig extends Config

 	@ConfigItem(
 		keyName = "notifyTier",
-		name = "Notify >= Tier",
+		name = "Notify tier",
 		description = "Configures which price tiers will trigger a notification on drop",
 		position = 8
 	)
@@ -211,7 +211,7 @@ public interface GroundItemsConfig extends Config

 	@ConfigItem(
 		keyName = "hideUnderValue",
-		name = "Hide < Value",
+		name = "Hide under value",
 		description = "Configures hidden ground items under both GE and HA value",
 		position = 13
 	)
@@ -223,7 +223,7 @@ public interface GroundItemsConfig extends Config
 	@Alpha
 	@ConfigItem(
 		keyName = "defaultColor",
-		name = "Default items color",
+		name = "Default items",
 		description = "Configures the color for default, non-highlighted items",
 		position = 14
 	)
@@ -235,7 +235,7 @@ public interface GroundItemsConfig extends Config
 	@Alpha
 	@ConfigItem(
 		keyName = "highlightedColor",
-		name = "Highlighted items color",
+		name = "Highlighted items",
 		description = "Configures the color for highlighted items",
 		position = 15
 	)
@@ -247,7 +247,7 @@ public interface GroundItemsConfig extends Config
 	@Alpha
 	@ConfigItem(
 		keyName = "hiddenColor",
-		name = "Hidden items color",
+		name = "Hidden items",
 		description = "Configures the color for hidden items in right-click menu and when holding ALT",
 		position = 16
 	)
@@ -259,7 +259,7 @@ public interface GroundItemsConfig extends Config
 	@Alpha
 	@ConfigItem(
 		keyName = "lowValueColor",
-		name = "Low value items color",
+		name = "Low value items",
 		description = "Configures the color for low value items",
 		position = 17
 	)
@@ -282,7 +282,7 @@ public interface GroundItemsConfig extends Config
 	@Alpha
 	@ConfigItem(
 		keyName = "mediumValueColor",
-		name = "Medium value items color",
+		name = "Medium value items",
 		description = "Configures the color for medium value items",
 		position = 19
 	)
@@ -305,7 +305,7 @@ public interface GroundItemsConfig extends Config
 	@Alpha
 	@ConfigItem(
 		keyName = "highValueColor",
-		name = "High value items color",
+		name = "High value items",
 		description = "Configures the color for high value items",
 		position = 21
 	)
@@ -328,7 +328,7 @@ public interface GroundItemsConfig extends Config
 	@Alpha
 	@ConfigItem(
 		keyName = "insaneValueColor",
-		name = "Insane value items color",
+		name = "Insane value items",
 		description = "Configures the color for insane value items",
 		position = 23
 	)
@@ -361,8 +361,8 @@ public interface GroundItemsConfig extends Config

 	@ConfigItem(
 		keyName = "doubleTapDelay",
-		name = "Delay for double-tap ALT to hide",
-		description = "Decrease this number if you accidentally hide ground items often. (0 = Disabled)",
+		name = "Double-tap delay",
+		description = "Delay for the double-tap ALT to hide ground items. 0 to disable.",
 		position = 26
 	)
 	@Units(Units.MILLISECONDS)
@@ -373,7 +373,7 @@ public interface GroundItemsConfig extends Config

 	@ConfigItem(
 		keyName = "collapseEntries",
-		name = "Collapse ground item menu entries",
+		name = "Collapse ground item menu",
 		description = "Collapses ground item menu entries together and appends count",
 		position = 27
 	)
--- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierConfig.java
@@ -90,7 +90,7 @@ public interface IdleNotifierConfig extends Config

 	@ConfigItem(
 		keyName = "hitpoints",
-		name = "Hitpoints Notification Threshold",
+		name = "Hitpoints Threshold",
 		description = "The amount of hitpoints to send a notification at. A value of 0 will disable notification.",
 		position = 6
 	)
@@ -101,7 +101,7 @@ public interface IdleNotifierConfig extends Config

 	@ConfigItem(
 		keyName = "prayer",
-		name = "Prayer Notification Threshold",
+		name = "Prayer Threshold",
 		description = "The amount of prayer points to send a notification at. A value of 0 will disable notification.",
 		position = 7
 	)
@@ -112,7 +112,7 @@ public interface IdleNotifierConfig extends Config

 	@ConfigItem(
 		keyName = "oxygen",
-		name = "Oxygen Notification Threshold",
+		name = "Oxygen Threshold",
 		position = 8,
 		description = "The amount of remaining oxygen to send a notification at. A value of 0 will disable notification."
 	)
@@ -124,9 +124,9 @@ public interface IdleNotifierConfig extends Config

 	@ConfigItem(
 		keyName = "spec",
-		name = "Special Attack Energy Notification Threshold",
+		name = "Spec Threshold",
 		position = 9,
-		description = "The amount of spec energy reached to send a notification at. A value of 0 will disable notification."
+		description = "The amount of special attack energy reached to send a notification at. A value of 0 will disable notification."
 	)
 	@Units(Units.PERCENT)
 	default int getSpecEnergyThreshold()
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java
@@ -55,7 +55,7 @@ public interface ImplingsConfig extends Config
 	@ConfigItem(
 		position = 1,
 		keyName = "showbaby",
-		name = "Show Baby implings",
+		name = "Baby implings",
 		description = "Configures whether or not Baby impling tags are displayed",
 		section = implingSection
 	)
@@ -80,7 +80,7 @@ public interface ImplingsConfig extends Config
 	@ConfigItem(
 		position = 3,
 		keyName = "showyoung",
-		name = "Show Young implings",
+		name = "Young implings",
 		description = "Configures whether or not Young impling tags are displayed",
 		section = implingSection
 	)
@@ -105,7 +105,7 @@ public interface ImplingsConfig extends Config
 	@ConfigItem(
 		position = 5,
 		keyName = "showgourmet",
-		name = "Show Gourmet implings",
+		name = "Gourmet implings",
 		description = "Configures whether or not Gourmet impling tags are displayed",
 		section = implingSection
 	)
@@ -130,7 +130,7 @@ public interface ImplingsConfig extends Config
 	@ConfigItem(
 		position = 7,
 		keyName = "showearth",
-		name = "Show Earth implings",
+		name = "Earth implings",
 		description = "Configures whether or not Earth impling tags are displayed",
 		section = implingSection
 	)
@@ -155,7 +155,7 @@ public interface ImplingsConfig extends Config
 	@ConfigItem(
 		position = 9,
 		keyName = "showessence",
-		name = "Show Essence implings",
+		name = "Essence implings",
 		description = "Configures whether or not Essence impling tags are displayed",
 		section = implingSection
 	)
@@ -180,7 +180,7 @@ public interface ImplingsConfig extends Config
 	@ConfigItem(
 		position = 11,
 		keyName = "showeclectic",
-		name = "Show Eclectic implings",
+		name = "Eclectic implings",
 		description = "Configures whether or not Eclectic impling tags are displayed",
 		section = implingSection
 	)
@@ -205,7 +205,7 @@ public interface ImplingsConfig extends Config
 	@ConfigItem(
 		position = 13,
 		keyName = "shownature",
-		name = "Show Nature implings",
+		name = "Nature implings",
 		description = "Configures whether or not Nature impling tags are displayed",
 		section = implingSection
 	)
@@ -230,7 +230,7 @@ public interface ImplingsConfig extends Config
 	@ConfigItem(
 		position = 15,
 		keyName = "showmagpie",
-		name = "Show Magpie implings",
+		name = "Magpie implings",
 		description = "Configures whether or not Magpie impling tags are displayed",
 		section = implingSection
 	)
@@ -255,7 +255,7 @@ public interface ImplingsConfig extends Config
 	@ConfigItem(
 		position = 17,
 		keyName = "showninja",
-		name = "Show Ninja implings",
+		name = "Ninja implings",
 		description = "Configures whether or not Ninja impling tags are displayed",
 		section = implingSection
 	)
@@ -280,7 +280,7 @@ public interface ImplingsConfig extends Config
 	@ConfigItem(
 		position = 19,
 		keyName = "showCrystal",
-		name = "Show Crystal implings",
+		name = "Crystal implings",
 		description = "Configures whether or not Crystal implings are displayed",
 		section = implingSection
 	)
@@ -305,7 +305,7 @@ public interface ImplingsConfig extends Config
 	@ConfigItem(
 		position = 21,
 		keyName = "showdragon",
-		name = "Show Dragon implings",
+		name = "Dragon implings",
 		description = "Configures whether or not Dragon impling tags are displayed",
 		section = implingSection
 	)
@@ -330,7 +330,7 @@ public interface ImplingsConfig extends Config
 	@ConfigItem(
 		position = 23,
 		keyName = "showlucky",
-		name = "Show Lucky implings",
+		name = "Lucky implings",
 		description = "Configures whether or not Lucky impling tags are displayed",
 		section = implingSection
 	)
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
@@ -51,7 +51,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "veryLowWarningColor",
-		name = "Very Low Warning Color",
+		name = "Very Low Warning",
 		description = "The color of the overlay when charges are very low",
 		position = 1
 	)
@@ -62,7 +62,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "lowWarningColor",
-		name = "Low Warning Color",
+		name = "Low Warning",
 		description = "The color of the overlay when charges are low",
 		position = 2
 	)
@@ -95,7 +95,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showTeleportCharges",
-		name = "Show Teleport Charges",
+		name = "Teleport Charges",
 		description = "Show teleport item charge counts",
 		position = 5,
 		section = chargesSection
@@ -149,7 +149,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showImpCharges",
-		name = "Show Imp-in-a-box charges",
+		name = "Imp-in-a-box charges",
 		description = "Show Imp-in-a-box item charges",
 		position = 8,
 		section = chargesSection
@@ -161,7 +161,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showFungicideCharges",
-		name = "Show Fungicide Charges",
+		name = "Fungicide Charges",
 		description = "Show Fungicide item charges",
 		position = 9,
 		section = chargesSection
@@ -173,7 +173,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showWateringCanCharges",
-		name = "Show Watering Can Charges",
+		name = "Watering Can Charges",
 		description = "Show Watering can item charges",
 		position = 10,
 		section = chargesSection
@@ -185,7 +185,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showWaterskinCharges",
-		name = "Show Waterskin Charges",
+		name = "Waterskin Charges",
 		description = "Show Waterskin dose counts",
 		position = 11,
 		section = chargesSection
@@ -197,7 +197,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showBellowCharges",
-		name = "Show Bellows Charges",
+		name = "Bellows Charges",
 		description = "Show Ogre bellows item charges",
 		position = 12,
 		section = chargesSection
@@ -209,7 +209,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showBasketCharges",
-		name = "Show Basket Charges",
+		name = "Basket Charges",
 		description = "Show Fruit basket item counts",
 		position = 13,
 		section = chargesSection
@@ -221,7 +221,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showSackCharges",
-		name = "Show Sack Charges",
+		name = "Sack Charges",
 		description = "Show Sack item counts",
 		position = 14,
 		section = chargesSection
@@ -233,7 +233,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showAbyssalBraceletCharges",
-		name = "Show Abyssal Bracelet Charges",
+		name = "Abyssal Bracelet Charges",
 		description = "Show Abyssal bracelet item charges",
 		position = 15,
 		section = chargesSection
@@ -245,7 +245,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showAmuletOfChemistryCharges",
-		name = "Show Amulet of Chemistry Charges",
+		name = "Amulet of Chemistry Charges",
 		description = "Show Amulet of chemistry item charges",
 		position = 16,
 		section = chargesSection
@@ -275,7 +275,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showAmuletOfBountyCharges",
-		name = "Show Amulet of Bounty Charges",
+		name = "Amulet of Bounty Charges",
 		description = "Show Amulet of bounty item charges",
 		position = 17,
 		section = chargesSection
@@ -317,7 +317,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showBindingNecklaceCharges",
-		name = "Show Binding Necklace Charges",
+		name = "Binding Necklace Charges",
 		description = "Show Binding necklace item charges",
 		position = 19,
 		section = chargesSection
@@ -359,7 +359,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showExplorerRingCharges",
-		name = "Show Explorer's Ring Alch Charges",
+		name = "Explorer's Ring Alch Charges",
 		description = "Show Explorer's ring alchemy charges",
 		position = 21,
 		section = chargesSection
@@ -389,7 +389,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showRingOfForgingCount",
-		name = "Show Ring of Forging Charges",
+		name = "Ring of Forging Charges",
 		description = "Show Ring of forging item charges",
 		position = 22,
 		section = chargesSection
@@ -431,7 +431,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showInfoboxes",
-		name = "Show Infoboxes",
+		name = "Infoboxes",
 		description = "Show an infobox with remaining charges for equipped items",
 		position = 24
 	)
@@ -442,7 +442,7 @@ public interface ItemChargeConfig extends Config

 	@ConfigItem(
 		keyName = "showPotionDoseCount",
-		name = "Show Potion Doses",
+		name = "Potion Doses",
 		description = "Show remaining potion doses",
 		position = 25,
 		section = chargesSection
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java
@@ -131,7 +131,7 @@ public class ItemStatChanges
 		add(boost(DEFENCE, perc(.15, 5)), SUPER_DEFENCE1, SUPER_DEFENCE2, SUPER_DEFENCE3, SUPER_DEFENCE4);
 		add(boost(MAGIC, 3), MAGIC_ESSENCE1, MAGIC_ESSENCE2, MAGIC_ESSENCE3, MAGIC_ESSENCE4);
 		add(combo(3, boost(ATTACK, perc(.15, 5)), boost(STRENGTH, perc(.15, 5)), boost(DEFENCE, perc(.15, 5))), SUPER_COMBAT_POTION1, SUPER_COMBAT_POTION2, SUPER_COMBAT_POTION3, SUPER_COMBAT_POTION4);
-		add(combo(3, boost(ATTACK, perc(.20, 2)), boost(STRENGTH, perc(.12, 2)), heal(PRAYER, perc(.10, 0)), heal(DEFENCE, perc(.10, -2)), new BoostedStatBoost(HITPOINTS, false, perc(-.12, 0))), ZAMORAK_BREW1, ZAMORAK_BREW2, ZAMORAK_BREW3, ZAMORAK_BREW4);
+		add(combo(3, boost(ATTACK, perc(.20, 2)), boost(STRENGTH, perc(.12, 2)), heal(PRAYER, perc(.10, 0)), new BoostedStatBoost(DEFENCE, false, perc(.10, -2)), new BoostedStatBoost(HITPOINTS, false, perc(-.12, 0))), ZAMORAK_BREW1, ZAMORAK_BREW2, ZAMORAK_BREW3, ZAMORAK_BREW4);
 		add(new SaradominBrew(0.15, 0.2, 0.1, 2, 2), SARADOMIN_BREW1, SARADOMIN_BREW2, SARADOMIN_BREW3, SARADOMIN_BREW4);
 		add(boost(RANGED, perc(.15, 5)), SUPER_RANGING_1, SUPER_RANGING_2, SUPER_RANGING_3, SUPER_RANGING_4);
 		add(boost(MAGIC, perc(.15, 5)), SUPER_MAGIC_POTION_1, SUPER_MAGIC_POTION_2, SUPER_MAGIC_POTION_3, SUPER_MAGIC_POTION_4);
@@ -214,6 +214,10 @@ public class ItemStatChanges
 		add(heal(HITPOINTS, 20), PADDLEFISH);
 		add(new GauntletPotion(), EGNIOL_POTION_1, EGNIOL_POTION_2, EGNIOL_POTION_3, EGNIOL_POTION_4);

+		// Soul Wars
+		add(combo(2, heal(HITPOINTS, perc(.20, 2)), heal(RUN_ENERGY, 100)), BANDAGES_25202);
+		add(combo(6, boost(ATTACK, perc(.15, 5)), boost(STRENGTH, perc(.15, 5)), boost(DEFENCE, perc(.15, 5)), boost(RANGED, perc(.15, 5)), boost(MAGIC, perc(.15, 5)), heal(PRAYER, perc(.25, 8))), POTION_OF_POWER1, POTION_OF_POWER2, POTION_OF_POWER3, POTION_OF_POWER4);
+
 		log.debug("{} items; {} behaviours loaded", effects.size(), new HashSet<>(effects.values()).size());
 	}

--- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
@@ -227,6 +227,10 @@ public class LootTrackerPlugin extends Plugin

 	private static final String CASKET_EVENT = "Casket";

+	// Soul Wars
+	private static final String SPOILS_OF_WAR_EVENT = "Spoils of war";
+	private static final Set<Integer> SOUL_WARS_REGIONS = ImmutableSet.of(8493, 8749, 9005);
+
 	private static final Set<Character> VOWELS = ImmutableSet.of('a', 'e', 'i', 'o', 'u');

 	@Inject
@@ -487,8 +491,8 @@ public class LootTrackerPlugin extends Plugin
 	@Subscribe
 	public void onPlayerLootReceived(final PlayerLootReceived playerLootReceived)
 	{
-		// Ignore Last Man Standing player loots
-		if (isPlayerWithinMapRegion(LAST_MAN_STANDING_REGIONS))
+		// Ignore Last Man Standing and Soul Wars player loots
+		if (isPlayerWithinMapRegion(LAST_MAN_STANDING_REGIONS) || isPlayerWithinMapRegion(SOUL_WARS_REGIONS))
 		{
 			return;
 		}
@@ -763,6 +767,7 @@ public class LootTrackerPlugin extends Plugin
 			|| SEEDPACK_EVENT.equals(eventType)
 			|| CASKET_EVENT.equals(eventType)
 			|| BIRDNEST_EVENT.equals(eventType)
+			|| SPOILS_OF_WAR_EVENT.equals(eventType)
 			|| eventType.endsWith("Bird House")
 			|| eventType.startsWith("H.A.M. chest")
 			|| lootRecordType == LootRecordType.PICKPOCKET)
@@ -808,6 +813,12 @@ public class LootTrackerPlugin extends Plugin
 			setEvent(LootRecordType.EVENT, CASKET_EVENT);
 			takeInventorySnapshot();
 		}
+
+		if (event.getMenuOption().equals("Open") && event.getId() == ItemID.SPOILS_OF_WAR)
+		{
+			setEvent(LootRecordType.EVENT, SPOILS_OF_WAR_EVENT);
+			takeInventorySnapshot();
+		}
 	}

 	@Schedule(
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
@@ -606,4 +606,15 @@ public interface MenuEntrySwapperConfig extends Config
 	{
 		return false;
 	}
+
+	@ConfigItem(
+		keyName = "swapRockCake",
+		name = "Dwarven rock cake",
+		description = "Swap Eat with Guzzle on the Dwarven rock cake",
+		section = itemSection
+	)
+	default boolean swapRockCake()
+	{
+		return false;
+	}
 }
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
@@ -355,6 +355,8 @@ public class MenuEntrySwapperPlugin extends Plugin
 		swapTeleport("camelot teleport", "seers'");
 		swapTeleport("watchtower teleport", "yanille");
 		swapTeleport("teleport to house", "outside");
+
+		swap("eat", "guzzle", config::swapRockCake);
 	}

 	private void swap(String option, String swappedOption, Supplier<Boolean> enabled)
--- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoConfig.java
@@ -44,7 +44,7 @@ public interface OpponentInfoConfig extends Config

 	@ConfigItem(
 		keyName = "hitpointsDisplayStyle",
-		name = "Hitpoints display style",
+		name = "Display style",
 		description = "Show opponent's hitpoints as a value (if known), percentage, or both",
 		position = 1
 	)
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java
@@ -55,7 +55,7 @@ public interface PlayerIndicatorsConfig extends Config
 	@ConfigItem(
 		position = 1,
 		keyName = "ownNameColor",
-		name = "Own player color",
+		name = "Own player",
 		description = "Color of your own player",
 		section = highlightSection
 	)
@@ -79,7 +79,7 @@ public interface PlayerIndicatorsConfig extends Config
 	@ConfigItem(
 		position = 3,
 		keyName = "friendNameColor",
-		name = "Friend color",
+		name = "Friend",
 		description = "Color of friend names",
 		section = highlightSection
 	)
@@ -103,7 +103,7 @@ public interface PlayerIndicatorsConfig extends Config
 	@ConfigItem(
 		position = 5,
 		keyName = "clanMemberColor",
-		name = "Friends chat member color",
+		name = "Friends chat",
 		description = "Color of friends chat members",
 		section = highlightSection
 	)
@@ -127,7 +127,7 @@ public interface PlayerIndicatorsConfig extends Config
 	@ConfigItem(
 		position = 7,
 		keyName = "teamMemberColor",
-		name = "Team member color",
+		name = "Team member",
 		description = "Color of team members",
 		section = highlightSection
 	)
@@ -151,7 +151,7 @@ public interface PlayerIndicatorsConfig extends Config
 	@ConfigItem(
 		position = 9,
 		keyName = "nonClanMemberColor",
-		name = "Others color",
+		name = "Others",
 		description = "Color of other players names",
 		section = highlightSection
 	)
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerConfig.java
@@ -133,7 +133,7 @@ public interface PrayerConfig extends Config
 	@ConfigItem(
 		position = 9,
 		keyName = "replaceOrbText",
-		name = "Replace orb text with prayer time left",
+		name = "Show time left",
 		description = "Show time remaining of current prayers in the prayer orb."
 	)
 	default boolean replaceOrbText()
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderConfig.java
@@ -69,7 +69,7 @@ public interface PyramidPlunderConfig extends Config
 	@ConfigItem(
 		position = 3,
 		keyName = "highlightDoorsColor",
-		name = "Highlight doors color",
+		name = "Highlight doors",
 		description = "Selects the color for highlighting tomb doors"
 	)
 	default Color highlightDoorsColor()
@@ -92,7 +92,7 @@ public interface PyramidPlunderConfig extends Config
 	@ConfigItem(
 		position = 5,
 		keyName = "highlightSpeartrapColor",
-		name = "Highlight speartrap color",
+		name = "Highlight speartrap",
 		description = "Selects the color for highlighting speartraps"
 	)
 	default Color highlightSpeartrapsColor()
@@ -115,7 +115,7 @@ public interface PyramidPlunderConfig extends Config
 	@ConfigItem(
 		position = 7,
 		keyName = "highlightContainersColor",
-		name = "Highlight containers color",
+		name = "Highlight containers",
 		description = "Selects the color for highlighting urns, chests and sarcophagus"
 	)
 	default Color highlightContainersColor()
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java
@@ -47,7 +47,7 @@ public interface RaidsConfig extends Config
 	@ConfigItem(
 		position = 1,
 		keyName = "pointsMessage",
-		name = "Display points in chatbox after raid",
+		name = "Display points in chatbox",
 		description = "Display a message with total points, individual points and percentage at the end of a raid"
 	)
 	default boolean pointsMessage()
@@ -69,8 +69,8 @@ public interface RaidsConfig extends Config
 	@ConfigItem(
 		position = 3,
 		keyName = "scoutOverlayAtBank",
-		name = "Show scout overlay outside lobby",
-		description = "Keep the overlay active while at the raids area"
+		name = "Show scout overlay outside",
+		description = "Keep the overlay active outside of the raid starting room"
 	)
 	default boolean scoutOverlayAtBank()
 	{
@@ -168,8 +168,8 @@ public interface RaidsConfig extends Config
 	@ConfigItem(
 		position = 12,
 		keyName = "layoutMessage",
-		name = "Send raid layout message when entering raid",
-		description = "Sends game message with raid layout on entering new raid"
+		name = "Raid layout message",
+		description = "Sends a game message with the raid layout on entering a raid"
 	)
 	default boolean layoutMessage()
 	{
@@ -179,7 +179,7 @@ public interface RaidsConfig extends Config
 	@ConfigItem(
 		position = 13,
 		keyName = "screenshotHotkey",
-		name = "Scouter screenshot hotkey",
+		name = "Screenshot hotkey",
 		description = "Hotkey used to screenshot the scouting overlay"
 	)
 	default Keybind screenshotHotkey()
@@ -190,7 +190,7 @@ public interface RaidsConfig extends Config
 	@ConfigItem(
 		position = 14,
 		keyName = "uploadScreenshot",
-		name = "Upload scouting screenshot",
+		name = "Upload screenshot",
 		description = "Uploads the scouting screenshot to Imgur or the clipboard"
 	)
 	default ImageUploadStyle uploadScreenshot()
--- a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterConfig.java
@@ -52,7 +52,7 @@ public interface RegenMeterConfig extends Config

 	@ConfigItem(
 		keyName = "showWhenNoChange",
-		name = "Show hitpoints regen at full hitpoints",
+		name = "Show at full hitpoints",
 		description = "Always show the hitpoints regen orb, even if there will be no stat change")
 	default boolean showWhenNoChange()
 	{
@@ -61,7 +61,7 @@ public interface RegenMeterConfig extends Config

 	@ConfigItem(
 		keyName = "notifyBeforeHpRegenDuration",
-		name = "Hitpoint Regen Notification",
+		name = "Hitpoint Notification",
 		description = "Notify approximately when your next hitpoint is about to regen. A value of 0 will disable notification."
 	)
 	@Units(Units.SECONDS)
--- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsConfig.java
@@ -64,7 +64,7 @@ public interface StatusBarsConfig extends Config

 	@ConfigItem(
 		keyName = "leftBarMode",
-		name = "Left Status Bar",
+		name = "Left Bar",
 		description = "Configures the left status bar"
 	)
 	default BarMode leftBarMode()
@@ -74,7 +74,7 @@ public interface StatusBarsConfig extends Config

 	@ConfigItem(
 		keyName = "rightBarMode",
-		name = "Right Status Bar",
+		name = "Right Bar",
 		description = "Configures the right status bar"
 	)
 	default BarMode rightBarMode()
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java
@@ -36,8 +36,9 @@ public interface TileIndicatorsConfig extends Config
 	@Alpha
 	@ConfigItem(
 		keyName = "highlightDestinationColor",
-		name = "Color of current destination highlighting",
-		description = "Configures the highlight color of current destination"
+		name = "Destination tile",
+		description = "Configures the highlight color of current destination",
+		position = 1
 	)
 	default Color highlightDestinationColor()
 	{
@@ -47,7 +48,8 @@ public interface TileIndicatorsConfig extends Config
 	@ConfigItem(
 		keyName = "highlightDestinationTile",
 		name = "Highlight destination tile",
-		description = "Highlights tile player is walking to"
+		description = "Highlights tile player is walking to",
+		position = 2
 	)
 	default boolean highlightDestinationTile()
 	{
@@ -57,8 +59,9 @@ public interface TileIndicatorsConfig extends Config
 	@Alpha
 	@ConfigItem(
 		keyName = "highlightHoveredColor",
-		name = "Color of current hovered highlighting",
-		description = "Configures the highlight color of hovered tile"
+		name = "Hovered tile",
+		description = "Configures the highlight color of hovered tile",
+		position = 3
 	)
 	default Color highlightHoveredColor()
 	{
@@ -68,7 +71,8 @@ public interface TileIndicatorsConfig extends Config
 	@ConfigItem(
 		keyName = "highlightHoveredTile",
 		name = "Highlight hovered tile",
-		description = "Highlights tile player is hovering with mouse"
+		description = "Highlights tile player is hovering with mouse",
+		position = 4
 	)
 	default boolean highlightHoveredTile()
 	{
@@ -78,8 +82,9 @@ public interface TileIndicatorsConfig extends Config
 	@Alpha
 	@ConfigItem(
 		keyName = "highlightCurrentColor",
-		name = "Color of current true tile highlighting",
-		description = "Configures the highlight color of current true tile"
+		name = "True tile",
+		description = "Configures the highlight color of current true tile",
+		position = 5
 	)
 	default Color highlightCurrentColor()
 	{
@@ -88,8 +93,9 @@ public interface TileIndicatorsConfig extends Config

 	@ConfigItem(
 		keyName = "highlightCurrentTile",
-		name = "Highlight current true tile",
-		description = "Highlights true tile player is on as seen by server"
+		name = "Highlight true tile",
+		description = "Highlights true tile player is on as seen by server",
+		position = 6
 	)
 	default boolean highlightCurrentTile()
 	{
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingConfig.java
@@ -110,7 +110,7 @@ public interface TimeTrackingConfig extends Config

 	@ConfigItem(
 		keyName = "timerWarningThreshold",
-		name = "Timer Warning Threshold",
+		name = "Warning Threshold",
 		description = "The time at which to change the timer color to the warning color",
 		position = 6
 	)
--- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java
@@ -51,7 +51,7 @@ public interface WintertodtConfig extends Config
 	@ConfigItem(
 		position = 1,
 		keyName = "damageNotificationColor",
-		name = "Damage Notification Color",
+		name = "Damage Notification",
 		description = "Color of damage notification text in chat"
 	)
 	default Color damageNotificationColor()
@@ -62,7 +62,7 @@ public interface WintertodtConfig extends Config
 	@ConfigItem(
 		position = 2,
 		keyName = "roundNotification",
-		name = "Wintertodt round notification",
+		name = "Round notification",
 		description = "Notifies you before the round starts (in seconds)"
 	)
 	@Range(
--- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MinigameLocation.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MinigameLocation.java
@@ -71,7 +71,13 @@ enum MinigameLocation
 	CATAPULT_ROOM("Catapult Room", new WorldPoint(2842, 3545, 0)),
 	SHOT_PUT_ROOM("Shot Put Room", new WorldPoint(2863, 3550, 0)),
 	HALLOWED_SEPULCHRE("Hallowed Sepulchre", new WorldPoint(3653, 3386, 1)),
-	THE_GAUNTLET("The Gauntlet", new WorldPoint(3223, 12505, 1));
+	THE_GAUNTLET("The Gauntlet", new WorldPoint(3223, 12505, 1)),
+	MAHOGANY_HOMES_ARDOUGNE("Mahogany Homes", new WorldPoint(2634, 3295, 0)),
+	MAHOGANY_HOMES_FALADOR("Mahogany Homes", new WorldPoint(2989, 3363, 0)),
+	MAHOGANY_HOMES_HOSIDIUS("Mahogany Homes", new WorldPoint(1780, 3623, 0)),
+	MAHOGANY_HOMES_VARROCK("Mahogany Homes", new WorldPoint(3240, 3471, 0)),
+	SOUL_WARS("Soul Wars", new WorldPoint(2209, 2855, 0)),
+	SOUL_WARS_EDGEVILLE_PORTAL("Soul Wars", new WorldPoint(3082, 3474, 0));

 	private final String tooltip;
 	private final WorldPoint location;
--- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java
@@ -38,7 +38,7 @@ enum QuestStartLocation
 	THE_CORSAIR_CURSE(Quest.THE_CORSAIR_CURSE, new WorldPoint(3029, 3273, 0)),
 	DEMON_SLAYER(Quest.DEMON_SLAYER, new WorldPoint(3204, 3424, 0)),
 	DORICS_QUEST(Quest.DORICS_QUEST, new WorldPoint(2952, 3450, 0)),
-	DRAGON_SLAYER(Quest.DRAGON_SLAYER, new WorldPoint(3190, 3362, 0)),
+	DRAGON_SLAYER_I(Quest.DRAGON_SLAYER_I, new WorldPoint(3190, 3362, 0)),
 	ERNEST_THE_CHICKEN(Quest.ERNEST_THE_CHICKEN, new WorldPoint(3109, 3330, 0)),
 	GOBLIN_DIPLOMACY(Quest.GOBLIN_DIPLOMACY, new WorldPoint(2957, 3509, 0)),
 	IMP_CATCHER(Quest.IMP_CATCHER, new WorldPoint(3108, 3160, 0)),
@@ -136,7 +136,7 @@ enum QuestStartLocation
 	A_PORCINE_OF_INTEREST(Quest.A_PORCINE_OF_INTEREST, new WorldPoint(3085, 3251, 0)),
 	PRIEST_IN_PERIL(Quest.PRIEST_IN_PERIL, new WorldPoint(3219, 3473, 0)),
 	THE_QUEEN_OF_THIEVES(Quest.THE_QUEEN_OF_THIEVES, new WorldPoint(1795, 3782, 0)),
-	RAG_AND_BONE_MAN(new Quest[]{Quest.RAG_AND_BONE_MAN, Quest.RAG_AND_BONE_MAN_II}, new WorldPoint(3359, 3504, 0)),
+	RAG_AND_BONE_MAN_I(new Quest[]{Quest.RAG_AND_BONE_MAN_I, Quest.RAG_AND_BONE_MAN_II}, new WorldPoint(3359, 3504, 0)),
 	RECRUITMENT_DRIVE_BLACK_KNIGHTS_FORTRESS(new Quest[]{Quest.BLACK_KNIGHTS_FORTRESS, Quest.RECRUITMENT_DRIVE}, new WorldPoint(2959, 3336, 0)),
 	ROVING_ELVES(Quest.ROVING_ELVES, new WorldPoint(2288, 3146, 0)),
 	RUM_DEAL(Quest.RUM_DEAL, new WorldPoint(3679, 3535, 0)),
--- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TransportationPointLocation.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TransportationPointLocation.java
@@ -192,6 +192,7 @@ enum TransportationPointLocation
 	MUSHTREE_TAR_SWAMP("Mushtree", new WorldPoint(3676, 3755, 0)),
 	MUSHTREE_VERDANT_VALLEY("Mushtree", new WorldPoint(3757, 3756, 0)),
 	MYTHS_GUILD_PORTAL("Portal to Guilds", new WorldPoint(2456, 2856, 0)),
+	SOUL_WARS_PORTAL("Portal to Edgeville/Ferox Enclave", new WorldPoint(2204, 2858, 0)),
 	TRAIN_KELDAGRIM("Railway Station", new WorldPoint(2941, 10179, 0)),
 	WILDERNESS_LEVER_ARDOUGNE("Wilderness Lever to Deserted Keep", new WorldPoint(2559, 3309, 0), new WorldPoint(3154, 3924, 0)),
 	WILDERNESS_LEVER_EDGEVILLE("Wilderness Lever to Deserted Keep", new WorldPoint(3088, 3474, 0), new WorldPoint(3154, 3924, 0)),
--- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapConfig.java
@@ -34,7 +34,7 @@ public interface WorldMapConfig extends Config
 {
 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_FAIRY_RING_TOOLTIPS,
-		name = "Show fairy ring codes in tooltip",
+		name = "Fairy ring code tooltip",
 		description = "Display the code for fairy rings in the icon tooltip",
 		position = 1
 	)
@@ -45,7 +45,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_FAIRY_RING_ICON,
-		name = "Show fairy ring travel icon",
+		name = "Fairy ring travel icon",
 		description = "Override the travel icon for fairy rings",
 		position = 2
 	)
@@ -56,7 +56,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_AGILITY_SHORTCUT_TOOLTIPS,
-		name = "Show agility level requirement",
+		name = "Agility level requirement",
 		description = "Display the required Agility level in the icon tooltip",
 		position = 3
 	)
@@ -78,7 +78,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_AGILITY_COURSE_TOOLTIPS,
-		name = "Show agility course in tooltip",
+		name = "Agility course tooltip",
 		description = "Displays the name of the agility course in the tooltip",
 		position = 5
 	)
@@ -100,7 +100,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_NORMAL_TELEPORT_ICON,
-		name = "Show Standard Spellbook destinations",
+		name = "Standard Spellbook destinations",
 		description = "Show icons at the destinations for teleports in the Standard Spellbook",
 		position = 7
 	)
@@ -111,7 +111,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_MINIGAME_TOOLTIP,
-		name = "Show minigame name in tooltip",
+		name = "Minigame names",
 		description = "Display the name of the minigame in the icon tooltip",
 		position = 8
 	)
@@ -122,7 +122,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_ANCIENT_TELEPORT_ICON,
-		name = "Show Ancient Magicks destinations",
+		name = "Ancient Magicks destinations",
 		description = "Show icons at the destinations for teleports in the Ancient Spellbook",
 		position = 9
 	)
@@ -133,7 +133,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_LUNAR_TELEPORT_ICON,
-		name = "Show Lunar Spellbook destinations",
+		name = "Lunar Spellbook destinations",
 		description = "Show icons at the destinations for teleports in the Lunar Spellbook",
 		position = 10
 	)
@@ -144,7 +144,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_ARCEUUS_TELEPORT_ICON,
-		name = "Show Arceuus Spellbook destinations",
+		name = "Arceuus Spellbook destinations",
 		description = "Show icons at the destinations for teleports in the Arceuus Spellbook",
 		position = 11
 	)
@@ -155,7 +155,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_JEWELLERY_TELEPORT_ICON,
-		name = "Show jewellery teleport locations",
+		name = "Jewellery teleport destinations",
 		description = "Show icons at the destinations for teleports from jewellery",
 		position = 12
 	)
@@ -166,7 +166,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_SCROLL_TELEPORT_ICON,
-		name = "Show teleport scroll locations",
+		name = "Teleport scroll destinations",
 		description = "Show icons at the destinations for teleports from scrolls",
 		position = 13
 	)
@@ -177,7 +177,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_MISC_TELEPORT_ICON,
-		name = "Show misc teleport locations",
+		name = "Misc teleport destinations",
 		description = "Show icons at the destinations for miscellaneous teleport items",
 		position = 14
 	)
@@ -188,7 +188,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_QUEST_START_TOOLTIPS,
-		name = "Show quest names and status",
+		name = "Quest names and status",
 		description = "Indicates the names of quests and shows completion status",
 		position = 15
 	)
@@ -199,7 +199,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_FARMING_PATCH_TOOLTIPS,
-		name = "Show farming patch type",
+		name = "Farming patch type",
 		description = "Display the type of farming patches in the icon tooltip",
 		position = 16
 	)
@@ -210,7 +210,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_RARE_TREE_TOOLTIPS,
-		name = "Show rare tree type",
+		name = "Rare tree type",
 		description = "Display the type of rare tree in the icon tooltip",
 		position = 17
 	)
@@ -232,7 +232,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_TRANSPORTATION_TELEPORT_TOOLTIPS,
-		name = "Show transportation tooltips",
+		name = "Transportation tooltips",
 		description = "Indicates types and destinations of Transportation",
 		position = 19
 	)
@@ -243,7 +243,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_RUNECRAFTING_ALTAR_ICON,
-		name = "Show runecrafting altar locations",
+		name = "Runecrafting altar locations",
 		description = "Show the icons of runecrafting altars",
 		position = 20
 	)
@@ -254,7 +254,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_MINING_SITE_TOOLTIPS,
-		name = "Show mining site tooltips",
+		name = "Mining site tooltips",
 		description = "Indicates the ore available at mining sites",
 		position = 21
 	)
@@ -265,7 +265,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_DUNGEON_TOOLTIPS,
-		name = "Show dungeon tooltips",
+		name = "Dungeon tooltips",
 		description = "Indicates the names of dungeons",
 		position = 22
 	)
@@ -276,7 +276,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_HUNTER_AREA_TOOLTIPS,
-		name = "Show hunter area tooltips",
+		name = "Hunter area tooltips",
 		description = "Indicates the creatures inside a hunting area",
 		position = 23
 	)
@@ -287,7 +287,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_FISHING_SPOT_TOOLTIPS,
-		name = "Show fishing spot tooltips",
+		name = "Fishing spot tooltips",
 		description = "Indicates the type of fish fishable at the fishing spot",
 		position = 24
 	)
@@ -298,7 +298,7 @@ public interface WorldMapConfig extends Config

 	@ConfigItem(
 		keyName = WorldMapPlugin.CONFIG_KEY_KOUREND_TASK_TOOLTIPS,
-		name = "Show Kourend task tooltips",
+		name = "Kourend task tooltips",
 		description = "Indicates the task or unlock for Kourend Favour locations",
 		position = 25
 	)
--- a/runelite-client/src/main/java/net/runelite/client/ui/SplashScreen.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/SplashScreen.java
@@ -69,7 +69,7 @@ public class SplashScreen extends JFrame implements ActionListener

 	private SplashScreen() throws IOException
 	{
-		BufferedImage logo = ImageUtil.getResourceStreamFromClass(SplashScreen.class, "runelite_transparent.png");
+		BufferedImage logo = ImageUtil.loadImageResource(SplashScreen.class, "runelite_transparent.png");

 		setTitle("RuneLite Launcher");

--- a/runelite-client/src/main/java/net/runelite/client/ui/components/ComboBoxListRenderer.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/components/ComboBoxListRenderer.java
@@ -39,11 +39,11 @@ import net.runelite.client.util.Text;
 * was very hard to see in the dark gray background, this makes the selected
 * item white and adds some padding to the elements for more readable list.
 */
-public final class ComboBoxListRenderer extends JLabel implements ListCellRenderer
+public final class ComboBoxListRenderer<T> extends JLabel implements ListCellRenderer<T>
 {

 	@Override
-	public Component getListCellRendererComponent(JList list, Object o, int index, boolean isSelected, boolean cellHasFocus)
+	public Component getListCellRendererComponent(JList<? extends T> list, T o, int index, boolean isSelected, boolean cellHasFocus)
 	{
 		if (isSelected)
 		{