Merge branch 'master' of https://github.com/runelite/runelite into runelite-master2

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

@@ -145,6 +145,7 @@ public class WidgetID
 	public static final int BEGINNER_CLUE_MAP_DRAYNOR = 348;
 	public static final int BEGINNER_CLUE_MAP_NORTH_OF_FALADOR = 351;
 	public static final int BEGINNER_CLUE_MAP_WIZARDS_TOWER = 356;
+	public static final int SEED_BOX_GROUP_ID = 128;
 
 	static class WorldMap
 	{

runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java

@@ -65,7 +65,7 @@ class Obstacles
 		STEPPING_STONE_15412, TROPICAL_TREE_15414, MONKEYBARS_15417, SKULL_SLOPE_15483, ROPE_15487, TROPICAL_TREE_16062,
 		// Falador
 		ROUGH_WALL_14898, TIGHTROPE_14899, HAND_HOLDS_14901, GAP_14903, GAP_14904, TIGHTROPE_14905,
-		TIGHTROPE_14911, GAP_14919, LEDGE_14920, LEDGE_14921, LEDGE_14922, LEDGE_14924, EDGE_14925,
+		TIGHTROPE_14911, GAP_14919, LEDGE_14920, LEDGE_14921, LEDGE_14922, LEDGE_14923, LEDGE_14924, EDGE_14925,
 		// Wilderness
 		OBSTACLE_PIPE_23137, ROPESWING_23132, STEPPING_STONE_23556, LOG_BALANCE_23542, ROCKS_23640,
 		// Seers

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

@@ -58,7 +58,7 @@ public class CoordinateClue extends ClueScroll implements TextClueScroll, Locati
 		.put(new WorldPoint(2849, 3033, 0), "West of nature altar, north of Shilo Village (CKR).")
 		.put(new WorldPoint(2848, 3296, 0), "North of Crandor island.")
 		.put(new WorldPoint(2583, 2990, 0), "Feldip Hills, south-east of Gu'Thanoth (AKS).")
-		.put(new WorldPoint(3179, 3344, 0), "South of the Champions' Guild, opposite side of the River Lum.")
+		.put(new WorldPoint(3179, 3344, 0), "In the cow pen north of the Lumbridge windmill.")
 		.put(new WorldPoint(2383, 3370, 0), "West of the outpost")
 		.put(new WorldPoint(3312, 3375, 0), "North-west of Exam Centre, on the hill.")
 		.put(new WorldPoint(3121, 3384, 0), "North-east of Draynor Manor, near River Lum.")

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

@@ -146,7 +146,7 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu
 		new EmoteClue("Blow a raspberry in the Fishing Guild bank. Beware of double agents! Equip an elemental shield, blue dragonhide chaps and a rune warhammer.", FISHING_GUILD_BANK, new WorldPoint(2588, 3419, 0), RASPBERRY, item(ELEMENTAL_SHIELD), item(BLUE_DHIDE_CHAPS), item(RUNE_WARHAMMER)),
 		new EmoteClue("Salute in the banana plantation. Beware of double agents! Equip a diamond ring, amulet of power, and nothing on your chest and legs.", WEST_SIDE_OF_THE_KARAMJA_BANANA_PLANTATION, new WorldPoint(2914, 3168, 0), SALUTE, item(DIAMOND_RING), item(AMULET_OF_POWER), emptySlot("Nothing on chest & legs", BODY, LEGS)),
 		new EmoteClue("Salute in the Warriors' guild bank. Equip only a black salamander.", WARRIORS_GUILD_BANK, new WorldPoint(2844, 3542, 0), SALUTE, item(BLACK_SALAMANDER), emptySlot("Nothing else", HEAD, CAPE, AMULET, BODY, SHIELD, LEGS, GLOVES, BOOTS, RING, AMMO)),
-		new EmoteClue("Salute in the centre of the mess hall. Beware of double agents! Equip a rune halberd rune platebody, and an amulet of strength.", HOSIDIUS_MESS, new WorldPoint(1646, 3632, 0), SALUTE, item(RUNE_HALBERD), item(RUNE_PLATEBODY), item(AMULET_OF_STRENGTH)),
+		new EmoteClue("Salute in the centre of the mess hall. Beware of double agents! Equip a rune halberd rune platebody, and an amulet of strength.", HOSIDIUS_MESS, new WorldPoint(1646, 3631, 0), SALUTE, item(RUNE_HALBERD), item(RUNE_PLATEBODY), item(AMULET_OF_STRENGTH)),
 		new EmoteClue("Shrug in the mine near Rimmington. Equip a gold necklace, a gold ring and a bronze spear.", RIMMINGTON_MINE, new WorldPoint(2976, 3238, 0), SHRUG, item(GOLD_NECKLACE), item(GOLD_RING), item(BRONZE_SPEAR)),
 		new EmoteClue("Shrug in Catherby bank. Yawn before you talk to me. Equip a maple longbow, green d'hide chaps and an iron med helm.", OUTSIDE_CATHERBY_BANK, new WorldPoint(2808, 3440, 0), SHRUG, YAWN, item(MAPLE_LONGBOW), item(GREEN_DHIDE_CHAPS), item(IRON_MED_HELM)),
 		new EmoteClue("Shrug in the Zamorak temple found in the Eastern Wilderness. Beware of double agents! Equip rune platelegs, an iron platebody and blue dragonhide vambraces.", CHAOS_TEMPLE_IN_THE_SOUTHEASTERN_WILDERNESS, new WorldPoint(3239, 3611, 0), SHRUG, item(RUNE_PLATELEGS), item(IRON_PLATEBODY), item(BLUE_DHIDE_VAMB)),

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

@@ -96,7 +96,7 @@ public enum STASHUnit
 	VOLCANO_IN_THE_NORTHEASTERN_WILDERNESS(NullObjectID.NULL_29020, new WorldPoint(3368, 3930, 0)),
 	IN_THE_MIDDLE_OF_JIGGIG(NullObjectID.NULL_29021, new WorldPoint(2478, 3048, 0)),
 	AGILITY_PYRAMID(NullObjectID.NULL_29022, new WorldPoint(3357, 2830, 0)),
-	HOSIDIUS_MESS(NullObjectID.NULL_29023, new WorldPoint(1648, 3631, 0)),
+	HOSIDIUS_MESS(NullObjectID.NULL_29023, new WorldPoint(1646, 3632, 0)),
 	CHAPEL_IN_WEST_ARDOUGNE(NullObjectID.NULL_29024, new WorldPoint(2527, 3294, 0)),
 	NEAR_A_RUNITE_ROCK_IN_THE_FREMENNIK_ISLES(NullObjectID.NULL_29025, new WorldPoint(2374, 3847, 0)),
 	NEAR_A_LADDER_IN_THE_WILDERNESS_LAVA_MAZE(NullObjectID.NULL_29026, new WorldPoint(3069, 3862, 0)),

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

@@ -112,7 +112,7 @@ public enum HotColdLocation
 	KARAMJA_BRIMHAVEN_FRUIT_TREE(new WorldPoint(2783, 3214, 0), KARAMJA, "Brimhaven, east of the fruit tree patch."),
 	KARAMJA_WEST_BRIMHAVEN(new WorldPoint(2721, 3169, 0), KARAMJA, "West of Brimhaven."),
 	KARAMJA_GLIDER(new WorldPoint(2966, 2975, 0), KARAMJA, "West of the gnome glider."),
-	KARAMJA_KHARAZI_NE(new WorldPoint(2908, 2922, 0), KARAMJA, "North-eastern part of Kharazi Jungle."),
+	KARAMJA_KHARAZI_NE(new WorldPoint(2904, 2925, 0), KARAMJA, "North-eastern part of Kharazi Jungle."),
 	KARAMJA_KHARAZI_SW(new WorldPoint(2783, 2898, 0), KARAMJA, "South-western part of Kharazi Jungle."),
 	KARAMJA_CRASH_ISLAND(new WorldPoint(2910, 2737, 0), KARAMJA, "Northern part of Crash Island."),
 	MISTHALIN_VARROCK_STONE_CIRCLE(new WorldPoint(3225, 3355, 0), MISTHALIN, "South of the stone circle near Varrock's entrance."),

runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java

@@ -1334,10 +1334,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
 					{
 						int var21 = (pitchCos * modelHeight >> 16) + var19;
 						int var22 = (var18 - var21) * zoom;
-						if (var22 / var14 < Rasterizer3D_clipMidY2)
+						return var22 / var14 < Rasterizer3D_clipMidY2;
-						{
-							return true;
-						}
 					}
 				}
 			}

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

@@ -30,6 +30,9 @@ import java.awt.Point;
 import java.awt.Rectangle;
 import static net.runelite.api.widgets.WidgetID.GUIDE_PRICE_GROUP_ID;
 import static net.runelite.api.widgets.WidgetID.KEPT_ON_DEATH_GROUP_ID;
+import static net.runelite.api.widgets.WidgetID.LOOTING_BAG_GROUP_ID;
+import static net.runelite.api.widgets.WidgetID.SEED_BOX_GROUP_ID;
+import static net.runelite.api.widgets.WidgetID.KINGDOM_GROUP_ID;
 import net.runelite.api.widgets.WidgetItem;
 import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.overlay.WidgetItemOverlay;
@@ -45,7 +48,7 @@ class ItemIdentificationOverlay extends WidgetItemOverlay
 		this.config = config;
 		showOnInventory();
 		showOnBank();
-		showOnInterfaces(KEPT_ON_DEATH_GROUP_ID, GUIDE_PRICE_GROUP_ID);
+		showOnInterfaces(KEPT_ON_DEATH_GROUP_ID, GUIDE_PRICE_GROUP_ID, LOOTING_BAG_GROUP_ID, SEED_BOX_GROUP_ID, KINGDOM_GROUP_ID);
 	}
 
 	@Override

runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java

@@ -127,12 +127,7 @@ public class KeyRemappingPlugin extends Plugin
 		// the search box on the world map can be focused, and chat input goes there, even
 		// though the chatbox still has its key listener.
 		Widget worldMapSearch = client.getWidget(WidgetInfo.WORLD_MAP_SEARCH);
-		if (worldMapSearch != null && client.getVar(VarClientInt.WORLD_MAP_SEARCH_FOCUSED) == 1)
+		return worldMapSearch == null || client.getVar(VarClientInt.WORLD_MAP_SEARCH_FOCUSED) != 1;
-		{
-			return false;
-		}
-
-		return true;
 	}
 
 	/**

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

@@ -940,8 +940,9 @@ public class MenuEntrySwapperPlugin extends Plugin
 
 			if (config.swapTrade())
 			{
-				swap(client, "trade", option, target, true);
+				swap("trade", option, target, true);
-				swap(client, "trade-with", option, target, true);
+				swap("trade-with", option, target, true);
+				swap("shop", option, target, true);
 			}
 
 			if (config.claimSlime() && target.equals("robin"))

runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java

@@ -77,7 +77,7 @@ class MiningOverlay extends Overlay
 				continue;
 			}
 
-			Point point = Perspective.localToCanvas(client, loc, client.getPlane());
+			Point point = Perspective.localToCanvas(client, loc, client.getPlane(), rockRespawn.getZOffset());
 			if (point == null)
 			{
 				it.remove();

runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java

@@ -124,7 +124,7 @@ public class MiningPlugin extends Plugin
 		Rock rock = Rock.getRock(object.getId());
 		if (rock != null)
 		{
-			RockRespawn rockRespawn = new RockRespawn(rock, object.getWorldLocation(), Instant.now(), (int) rock.getRespawnTime(inMiningGuild()).toMillis());
+			RockRespawn rockRespawn = new RockRespawn(rock, object.getWorldLocation(), Instant.now(), (int) rock.getRespawnTime(inMiningGuild()).toMillis(), rock.getZOffset());
 			respawns.add(rockRespawn);
 		}
 	}
@@ -144,7 +144,7 @@ public class MiningPlugin extends Plugin
 			case EMPTY_WALL:
 			{
 				Rock rock = Rock.AMETHYST;
-				RockRespawn rockRespawn = new RockRespawn(rock, object.getWorldLocation(), Instant.now(), (int) rock.getRespawnTime(inMiningGuild()).toMillis());
+				RockRespawn rockRespawn = new RockRespawn(rock, object.getWorldLocation(), Instant.now(), (int) rock.getRespawnTime(inMiningGuild()).toMillis(), rock.getZOffset());
 				respawns.add(rockRespawn);
 				break;
 			}
@@ -154,7 +154,7 @@ public class MiningPlugin extends Plugin
 			case DEPLETED_VEIN_26668: // Depleted motherlode vein
 			{
 				Rock rock = Rock.ORE_VEIN;
-				RockRespawn rockRespawn = new RockRespawn(rock, object.getWorldLocation(), Instant.now(), (int) rock.getRespawnTime(inMiningGuild()).toMillis());
+				RockRespawn rockRespawn = new RockRespawn(rock, object.getWorldLocation(), Instant.now(), (int) rock.getRespawnTime(inMiningGuild()).toMillis(), rock.getZOffset());
 				respawns.add(rockRespawn);
 				break;
 			}

runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java

@@ -27,6 +27,9 @@ package net.runelite.client.plugins.mining;
 import com.google.common.collect.ImmutableMap;
 import java.time.Duration;
 import java.util.Map;
+import lombok.AccessLevel;
+import lombok.Getter;
+import static net.runelite.api.ObjectID.ROCKS_10943;
 import static net.runelite.api.ObjectID.ROCKS_11161;
 import static net.runelite.api.ObjectID.ROCKS_11360;
 import static net.runelite.api.ObjectID.ROCKS_11361;
@@ -34,6 +37,7 @@ import static net.runelite.api.ObjectID.ROCKS_11364;
 import static net.runelite.api.ObjectID.ROCKS_11365;
 import static net.runelite.api.ObjectID.ROCKS_11366;
 import static net.runelite.api.ObjectID.ROCKS_11367;
+import static net.runelite.api.ObjectID.ROCKS_11368;
 import static net.runelite.api.ObjectID.ROCKS_11369;
 import static net.runelite.api.ObjectID.ROCKS_11370;
 import static net.runelite.api.ObjectID.ROCKS_11371;
@@ -48,29 +52,29 @@ import static net.runelite.api.ObjectID.ROCKS_11387;
 
 enum Rock
 {
-	TIN(Duration.ofMillis(2300), ROCKS_11360, ROCKS_11361),
+	TIN(Duration.ofMillis(2400), 0, ROCKS_11360, ROCKS_11361),
-	COPPER(Duration.ofMillis(2200), ROCKS_11161),
+	COPPER(Duration.ofMillis(2400), 0, ROCKS_10943, ROCKS_11161),
-	IRON(Duration.ofMillis(5300), ROCKS_11364, ROCKS_11365)
+	IRON(Duration.ofMillis(5400), 0, ROCKS_11364, ROCKS_11365)
 		{
 			@Override
 			Duration getRespawnTime(boolean inMiningGuild)
 			{
-				return inMiningGuild ? Duration.ofMillis(2200) : super.respawnTime;
+				return inMiningGuild ? Duration.ofMillis(2400) : super.respawnTime;
 			}
 		},
-	COAL(Duration.ofSeconds(40), ROCKS_11366, ROCKS_11367)
+	COAL(Duration.ofMillis(29400), 0, ROCKS_11366, ROCKS_11367)
 		{
 			@Override
 			Duration getRespawnTime(boolean inMiningGuild)
 			{
-				return inMiningGuild ? Duration.ofMillis(14_500) : super.respawnTime;
+				return inMiningGuild ? Duration.ofMillis(14400) : super.respawnTime;
 			}
 		},
-	SILVER(Duration.ofMinutes(1), ROCKS_11369),
+	SILVER(Duration.ofMinutes(1), 0, ROCKS_11368, ROCKS_11369),
-	SANDSTONE(Duration.ofMillis(5400), ROCKS_11386),
+	SANDSTONE(Duration.ofMillis(5400), 0, ROCKS_11386),
-	GOLD(Duration.ofMinutes(1), ROCKS_11370, ROCKS_11371),
+	GOLD(Duration.ofMinutes(1), 0, ROCKS_11370, ROCKS_11371),
-	GRANITE(Duration.ofMillis(5400), ROCKS_11387),
+	GRANITE(Duration.ofMillis(5400), 0, ROCKS_11387),
-	MITHRIL(Duration.ofMinutes(2), ROCKS_11372, ROCKS_11373)
+	MITHRIL(Duration.ofMinutes(2), 0, ROCKS_11372, ROCKS_11373)
 		{
 			@Override
 			Duration getRespawnTime(boolean inMiningGuild)
@@ -78,7 +82,7 @@ enum Rock
 				return inMiningGuild ? Duration.ofMinutes(1) : super.respawnTime;
 			}
 		},
-	ADAMANTITE(Duration.ofMinutes(4), ROCKS_11374, ROCKS_11375)
+	ADAMANTITE(Duration.ofMinutes(4), 0, ROCKS_11374, ROCKS_11375)
 		{
 			@Override
 			Duration getRespawnTime(boolean inMiningGuild)
@@ -86,7 +90,7 @@ enum Rock
 				return inMiningGuild ? Duration.ofMinutes(2) : super.respawnTime;
 			}
 		},
-	RUNITE(Duration.ofMinutes(12), ROCKS_11376, ROCKS_11377)
+	RUNITE(Duration.ofMinutes(12), 0, ROCKS_11376, ROCKS_11377)
 		{
 			@Override
 			Duration getRespawnTime(boolean inMiningGuild)
@@ -94,8 +98,8 @@ enum Rock
 				return inMiningGuild ? Duration.ofMinutes(6) : super.respawnTime;
 			}
 		},
-	ORE_VEIN(Duration.ofSeconds(108)),
+	ORE_VEIN(Duration.ofSeconds(108), 150),
-	AMETHYST(Duration.ofSeconds(75));
+	AMETHYST(Duration.ofSeconds(75), 120);
 
 	private static final Map<Integer, Rock> ROCKS;
 
@@ -113,11 +117,14 @@ enum Rock
 	}
 
 	private final Duration respawnTime;
+	@Getter(AccessLevel.PACKAGE)
+	private final int zOffset;
 	private final int[] ids;
 
-	Rock(Duration respawnTime, int... ids)
+	Rock(Duration respawnTime, int zOffset, int... ids)
 	{
 		this.respawnTime = respawnTime;
+		this.zOffset = zOffset;
 		this.ids = ids;
 	}
 

runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java

@@ -37,4 +37,5 @@ class RockRespawn
 	private final WorldPoint worldPoint;
 	private final Instant startTime;
 	private final int respawnTime;
+	private final int zOffset;
 }

runelite-client/src/main/java/net/runelite/client/plugins/poh/PohConfig.java

@@ -114,7 +114,7 @@ public interface PohConfig extends Config
 	@ConfigItem(
 		keyName = "showJewelleryBox",
 		name = "Show Jewellery Box",
-		description = "Configures whether or not the Jewllery box is displayed"
+		description = "Configures whether or not the jewellery box is displayed"
 	)
 	default boolean showJewelleryBox()
 	{

runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java

@@ -216,6 +216,5 @@ public class PuzzleState
 		}
 
 		return y1 == y2 && absX == 1;
-
 	}
 }