From 8eee63d72ceafd9862184e4de2f0067dbb62e3c7 Mon Sep 17 00:00:00 2001 From: Twiglet1022 <29353990+Twiglet1022@users.noreply.github.com> Date: Mon, 3 Jun 2019 22:53:37 +0100 Subject: [PATCH 01/11] mining plugin: draw overlay at correct height for mlm and amethyst Achieved by adding support for a zoffset to rocks in the mining plugin --- .../client/plugins/mining/MiningOverlay.java | 2 +- .../client/plugins/mining/MiningPlugin.java | 6 ++-- .../runelite/client/plugins/mining/Rock.java | 33 +++++++++++-------- .../client/plugins/mining/RockRespawn.java | 1 + 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java index 72ada8814e..3c9ab79234 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java +++ b/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(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java index 7d2a60fb57..cd2feb16cc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java +++ b/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; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java index be9ae0b401..45480e9669 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java @@ -27,6 +27,8 @@ 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_11161; import static net.runelite.api.ObjectID.ROCKS_11360; import static net.runelite.api.ObjectID.ROCKS_11361; @@ -48,9 +50,9 @@ import static net.runelite.api.ObjectID.ROCKS_11387; enum Rock { - TIN(Duration.ofMillis(2300), ROCKS_11360, ROCKS_11361), - COPPER(Duration.ofMillis(2200), ROCKS_11161), - IRON(Duration.ofMillis(5300), ROCKS_11364, ROCKS_11365) + TIN(Duration.ofMillis(2300), 0, ROCKS_11360, ROCKS_11361), + COPPER(Duration.ofMillis(2200), 0, ROCKS_11161), + IRON(Duration.ofMillis(5300), 0, ROCKS_11364, ROCKS_11365) { @Override Duration getRespawnTime(boolean inMiningGuild) @@ -58,7 +60,7 @@ enum Rock return inMiningGuild ? Duration.ofMillis(2200) : super.respawnTime; } }, - COAL(Duration.ofSeconds(40), ROCKS_11366, ROCKS_11367) + COAL(Duration.ofSeconds(40), 0, ROCKS_11366, ROCKS_11367) { @Override Duration getRespawnTime(boolean inMiningGuild) @@ -66,11 +68,11 @@ enum Rock return inMiningGuild ? Duration.ofMillis(14_500) : super.respawnTime; } }, - SILVER(Duration.ofMinutes(1), ROCKS_11369), - SANDSTONE(Duration.ofMillis(5400), ROCKS_11386), - GOLD(Duration.ofMinutes(1), ROCKS_11370, ROCKS_11371), - GRANITE(Duration.ofMillis(5400), ROCKS_11387), - MITHRIL(Duration.ofMinutes(2), ROCKS_11372, ROCKS_11373) + SILVER(Duration.ofMinutes(1), 0, ROCKS_11369), + SANDSTONE(Duration.ofMillis(5400), 0, ROCKS_11386), + GOLD(Duration.ofMinutes(1), 0, ROCKS_11370, ROCKS_11371), + GRANITE(Duration.ofMillis(5400), 0, ROCKS_11387), + MITHRIL(Duration.ofMinutes(2), 0, ROCKS_11372, ROCKS_11373) { @Override Duration getRespawnTime(boolean inMiningGuild) @@ -78,7 +80,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 +88,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 +96,8 @@ enum Rock return inMiningGuild ? Duration.ofMinutes(6) : super.respawnTime; } }, - ORE_VEIN(Duration.ofSeconds(108)), - AMETHYST(Duration.ofSeconds(75)); + ORE_VEIN(Duration.ofSeconds(108), 150), + AMETHYST(Duration.ofSeconds(75), 120); private static final Map ROCKS; @@ -113,11 +115,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; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java index 733bae4bca..daedda8f34 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java +++ b/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; } From 514ae51d5a73900696ee1dca39f0846bf4ed575f Mon Sep 17 00:00:00 2001 From: cjamcl Date: Sat, 8 Jun 2019 23:59:01 -0700 Subject: [PATCH 02/11] MenuEntrySwapper: include "shop" for trade option Example - the [fishing shop in Witchhaven](https://oldschool.runescape.wiki/w/Lovecraft%27s_Tackle) is `shop`, not `trade`. Don't know if there are others. --- .../client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java | 1 + 1 file changed, 1 insertion(+) diff --git 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 index 9d6cfd3fba..1498df1506 100644 --- 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 @@ -418,6 +418,7 @@ public class MenuEntrySwapperPlugin extends Plugin { swap("trade", option, target, true); swap("trade-with", option, target, true); + swap("shop", option, target, true); } if (config.claimSlime() && target.equals("robin")) From df61aee09bc596b0b68c74217afa7bd9d6dfdbf8 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Sun, 9 Jun 2019 17:18:49 -0700 Subject: [PATCH 03/11] cluescrolls: Fix Hosidius mess hall clue locations After the Hosidius rework, the locations of the STASH unit and emote location have moved slightly. Fixes runelite/runelite#9073 --- .../runelite/client/plugins/cluescrolls/clues/EmoteClue.java | 2 +- .../client/plugins/cluescrolls/clues/emote/STASHUnit.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java index 9723e3e58b..6fa4f65e1d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java +++ b/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)), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java index b6d2038cea..8e196c421c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java +++ b/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)), From 93a07905326c86cdaff6d9f140f5272daf415453 Mon Sep 17 00:00:00 2001 From: William Collishaw Date: Sun, 9 Jun 2019 13:31:57 -0600 Subject: [PATCH 04/11] Fix 'Jewellery' typo in PohConfig show jewellery box description --- .../main/java/net/runelite/client/plugins/poh/PohConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohConfig.java index 956618bcc2..9496352800 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohConfig.java +++ b/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() { From c9790884667285244cbcbb04dcd9e3be1ec9a0f4 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Tue, 11 Jun 2019 13:41:22 +0100 Subject: [PATCH 05/11] Add ItemIdentification to Seed Box, Looting Bag, and Miscellania collection screen (#8999) Closes #9028 --- .../src/main/java/net/runelite/api/widgets/WidgetID.java | 1 + .../itemidentification/ItemIdentificationOverlay.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 0c1c2697a8..63d2260be8 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -139,6 +139,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 { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java index ee3dc7deb3..588a51173d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java +++ b/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 From 43c04992bcb4d42533ff53bcf72e23ca007207e9 Mon Sep 17 00:00:00 2001 From: William Collishaw Date: Tue, 11 Jun 2019 06:44:30 -0600 Subject: [PATCH 06/11] Optimize if statements in the client module (#8998) --- .../java/net/runelite/client/plugins/examine/CacheKey.java | 6 +----- .../java/net/runelite/client/plugins/gpu/GpuPlugin.java | 5 +---- .../client/plugins/keyremapping/KeyRemappingPlugin.java | 7 +------ .../client/plugins/puzzlesolver/solver/PuzzleState.java | 7 +------ 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java index 135b300979..8cd0340b69 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java @@ -66,10 +66,6 @@ class CacheKey { return false; } - if (this.type != other.type) - { - return false; - } - return true; + return this.type == other.type; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java index 7c0054ac66..0141f9ebef 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java @@ -1314,10 +1314,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 true; - } + return var22 / var14 < Rasterizer3D_clipMidY2; } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java index 0bfebefdb1..a292843ca1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java @@ -123,12 +123,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 false; - } - - return true; + return worldMapSearch == null || client.getVar(VarClientInt.WORLD_MAP_SEARCH_FOCUSED) != 1; } /** diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java index a34675feb8..c0df3107c5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java @@ -215,11 +215,6 @@ public class PuzzleState return true; } - if (y1 == y2 && absX == 1) - { - return true; - } - - return false; + return y1 == y2 && absX == 1; } } From ee9e16a898d860a948c479bd474a90c17f044197 Mon Sep 17 00:00:00 2001 From: Twiglet1022 <29353990+Twiglet1022@users.noreply.github.com> Date: Sun, 9 Jun 2019 22:38:05 +0100 Subject: [PATCH 07/11] mining plugin: correct coal timer, missing copper rock and other fixes Coal timer adjusted from 40 seconds to 29.4 second Missing copper rock just outside mining guild Tweaked other durations to align to game ticks for more better accuracy --- .../net/runelite/client/plugins/mining/Rock.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java index 45480e9669..b19bc3f5ca 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java @@ -29,6 +29,7 @@ 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; @@ -50,22 +51,22 @@ import static net.runelite.api.ObjectID.ROCKS_11387; enum Rock { - TIN(Duration.ofMillis(2300), 0, ROCKS_11360, ROCKS_11361), - COPPER(Duration.ofMillis(2200), 0, ROCKS_11161), - IRON(Duration.ofMillis(5300), 0, ROCKS_11364, ROCKS_11365) + TIN(Duration.ofMillis(2400), 0, ROCKS_11360, ROCKS_11361), + COPPER(Duration.ofMillis(2400), 0, ROCKS_10943, ROCKS_11161), + 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), 0, 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), 0, ROCKS_11369), From 62821720fc66b50309ccc46923cd3e86091c2a2d Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 24 Oct 2018 17:02:54 +0200 Subject: [PATCH 08/11] Added missing falador rooftop course agility obstacle --- .../java/net/runelite/client/plugins/agility/Obstacles.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java index 929a4fd759..004eddf9fb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java +++ b/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 From d72f5995feeddb284121df56509ea22aefce2288 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Thu, 13 Jun 2019 03:05:57 +0100 Subject: [PATCH 09/11] mining plugin: add missing silver id --- .../src/main/java/net/runelite/client/plugins/mining/Rock.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java index b19bc3f5ca..cfa52372be 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java @@ -37,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; @@ -69,7 +70,7 @@ enum Rock return inMiningGuild ? Duration.ofMillis(14400) : super.respawnTime; } }, - SILVER(Duration.ofMinutes(1), 0, ROCKS_11369), + SILVER(Duration.ofMinutes(1), 0, ROCKS_11368, ROCKS_11369), SANDSTONE(Duration.ofMillis(5400), 0, ROCKS_11386), GOLD(Duration.ofMinutes(1), 0, ROCKS_11370, ROCKS_11371), GRANITE(Duration.ofMillis(5400), 0, ROCKS_11387), From ee14226d70b0de2626bfb71bb419f1d9fa2e6607 Mon Sep 17 00:00:00 2001 From: Jacky Liang <37294123+jkybtw@users.noreply.github.com> Date: Thu, 13 Jun 2019 12:25:06 +1000 Subject: [PATCH 10/11] clue plugin: improve Champions Guild clue hint --- .../client/plugins/cluescrolls/clues/CoordinateClue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java index 0e73bd7f85..ec7334ca2b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java +++ b/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.") From b43b73f9cb661548b7d72a40d8df8247f52c7314 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Tue, 4 Jun 2019 07:58:55 -0700 Subject: [PATCH 11/11] HotColdLocation: Center northeastern Kharazi jungle location --- .../plugins/cluescrolls/clues/hotcold/HotColdLocation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git 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 index 45fe44a15f..e41fd5357e 100644 --- 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 @@ -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."),