From 7c98afb17381f30d2272ebc932bf16cd8a0b707c Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Thu, 7 Jan 2021 12:57:56 -0800 Subject: [PATCH 01/14] AnimationID: Remove incorrect trailblazer harpoon entry This animation is not used for harpooning. It appears to be some kind of obscure trailblazer mining animation. --- runelite-api/src/main/java/net/runelite/api/AnimationID.java | 1 - .../java/net/runelite/client/plugins/fishing/FishingOverlay.java | 1 - .../runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java | 1 - 3 files changed, 3 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/AnimationID.java index bde6a00de3..837a0b6cac 100644 --- a/runelite-api/src/main/java/net/runelite/api/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/AnimationID.java @@ -109,7 +109,6 @@ public final class AnimationID public static final int FISHING_INFERNAL_HARPOON = 7402; public static final int FISHING_CRYSTAL_HARPOON = 8336; public static final int FISHING_TRAILBLAZER_HARPOON = 8784; - public static final int FISHING_TRAILBLAZER_HARPOON_2 = 8785; public static final int FISHING_OILY_ROD = 622; public static final int FISHING_KARAMBWAN = 1193; public static final int FISHING_CRUSHING_INFERNAL_EELS = 7553; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java index 43853f95c7..a56f9cb548 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java @@ -67,7 +67,6 @@ class FishingOverlay extends OverlayPanel AnimationID.FISHING_HARPOON, AnimationID.FISHING_INFERNAL_HARPOON, AnimationID.FISHING_TRAILBLAZER_HARPOON, - AnimationID.FISHING_TRAILBLAZER_HARPOON_2, AnimationID.FISHING_KARAMBWAN, AnimationID.FISHING_NET, AnimationID.FISHING_OILY_ROD, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java index 93566d4c22..f474c40bd6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java @@ -200,7 +200,6 @@ public class IdleNotifierPlugin extends Plugin case FISHING_INFERNAL_HARPOON: case FISHING_CRYSTAL_HARPOON: case FISHING_TRAILBLAZER_HARPOON: - case FISHING_TRAILBLAZER_HARPOON_2: case FISHING_OILY_ROD: case FISHING_KARAMBWAN: case FISHING_BAREHAND: From ccc40e3eb464489af9dd2199bcbcb6d6da47e173 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Thu, 7 Jan 2021 13:55:43 -0800 Subject: [PATCH 02/14] Add support for trailblazer kit rewards --- .../java/net/runelite/api/AnimationID.java | 12 +++++++---- .../net/runelite/client/game/ItemManager.java | 6 ++++++ .../net/runelite/client/game/ItemMapping.java | 11 +++++++++- .../plugins/cluescrolls/clues/EmoteClue.java | 4 ++-- .../cluescrolls/clues/FaloTheBardClue.java | 2 +- .../cluescrolls/clues/SkillChallengeClue.java | 21 +++++++++++++------ .../woodcutting/CrowdsourcingWoodcutting.java | 1 + .../plugins/fishing/FishingOverlay.java | 1 + .../client/plugins/fishing/FishingPlugin.java | 2 ++ .../idlenotifier/IdleNotifierPlugin.java | 4 ++++ .../client/plugins/mining/Pickaxe.java | 4 ++++ .../plugins/motherlode/MotherlodeOverlay.java | 5 +++-- .../plugins/runenergy/RunEnergyPlugin.java | 13 ++++++------ .../plugins/wintertodt/WintertodtPlugin.java | 2 ++ .../client/plugins/woodcutting/Axe.java | 3 +++ 15 files changed, 69 insertions(+), 22 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/AnimationID.java index 837a0b6cac..cb2981e15c 100644 --- a/runelite-api/src/main/java/net/runelite/api/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/AnimationID.java @@ -43,10 +43,11 @@ public final class AnimationID public static final int WOODCUTTING_RUNE = 867; public static final int WOODCUTTING_GILDED = 8303; public static final int WOODCUTTING_DRAGON = 2846; + public static final int WOODCUTTING_DRAGON_OR = 24; public static final int WOODCUTTING_INFERNAL = 2117; public static final int WOODCUTTING_3A_AXE = 7264; public static final int WOODCUTTING_CRYSTAL = 8324; - public static final int WOODCUTTING_TRAILBLAZER = 8778; + public static final int WOODCUTTING_TRAILBLAZER = 8778; // Same animation as Infernal axe (or) public static final int CONSUMING = 829; // consuming consumables public static final int FIREMAKING = 733; public static final int DEATH = 836; @@ -106,9 +107,10 @@ public final class AnimationID public static final int FISHING_HARPOON = 618; public static final int FISHING_BARBTAIL_HARPOON = 5108; public static final int FISHING_DRAGON_HARPOON = 7401; + public static final int FISHING_DRAGON_HARPOON_OR = 88; public static final int FISHING_INFERNAL_HARPOON = 7402; public static final int FISHING_CRYSTAL_HARPOON = 8336; - public static final int FISHING_TRAILBLAZER_HARPOON = 8784; + public static final int FISHING_TRAILBLAZER_HARPOON = 8784; // Same animation as Infernal harpoon (or) public static final int FISHING_OILY_ROD = 622; public static final int FISHING_KARAMBWAN = 1193; public static final int FISHING_CRUSHING_INFERNAL_EELS = 7553; @@ -140,10 +142,11 @@ public final class AnimationID public static final int MINING_DRAGON_PICKAXE = 7139; public static final int MINING_DRAGON_PICKAXE_UPGRADED = 642; public static final int MINING_DRAGON_PICKAXE_OR = 8346; + public static final int MINING_DRAGON_PICKAXE_OR_TRAILBLAZER = 8887; public static final int MINING_INFERNAL_PICKAXE = 4482; public static final int MINING_3A_PICKAXE = 7283; public static final int MINING_CRYSTAL_PICKAXE = 8347; - public static final int MINING_TRAILBLAZER_PICKAXE = 8787; + public static final int MINING_TRAILBLAZER_PICKAXE = 8787; // Same animation as Infernal pickaxe (or) public static final int MINING_TRAILBLAZER_PICKAXE_2 = 8788; public static final int MINING_TRAILBLAZER_PICKAXE_3 = 8789; public static final int MINING_MOTHERLODE_BRONZE = 6753; @@ -157,10 +160,11 @@ public final class AnimationID public static final int MINING_MOTHERLODE_DRAGON = 6758; public static final int MINING_MOTHERLODE_DRAGON_UPGRADED = 335; public static final int MINING_MOTHERLODE_DRAGON_OR = 8344; + public static final int MINING_MOTHERLODE_DRAGON_OR_TRAILBLAZER = 8886; public static final int MINING_MOTHERLODE_INFERNAL = 4481; public static final int MINING_MOTHERLODE_3A = 7282; public static final int MINING_MOTHERLODE_CRYSTAL = 8345; - public static final int MINING_MOTHERLODE_TRAILBLAZER = 8786; + public static final int MINING_MOTHERLODE_TRAILBLAZER = 8786; // Same animation as Infernal pickaxe (or) public static final int DENSE_ESSENCE_CHIPPING = 7201; public static final int DENSE_ESSENCE_CHISELING = 7202; public static final int HERBLORE_POTIONMAKING = 363; //used for both herb and secondary diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java index 21769f98a1..9518ed82d0 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java @@ -151,6 +151,12 @@ public class ItemManager put(GRACEFUL_LEGS_24754, GRACEFUL_LEGS_24752). put(GRACEFUL_GLOVES_24757, GRACEFUL_GLOVES_24755). put(GRACEFUL_BOOTS_24760, GRACEFUL_BOOTS_24758). + put(GRACEFUL_HOOD_25071, GRACEFUL_HOOD_25069). + put(GRACEFUL_CAPE_25074, GRACEFUL_CAPE_25072). + put(GRACEFUL_TOP_25077, GRACEFUL_TOP_25075). + put(GRACEFUL_LEGS_25080, GRACEFUL_LEGS_25078). + put(GRACEFUL_GLOVES_25083, GRACEFUL_GLOVES_25081). + put(GRACEFUL_BOOTS_25086, GRACEFUL_BOOTS_25084). put(MAX_CAPE_13342, MAX_CAPE). diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java index 725fabb239..58f9a917a5 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java @@ -68,8 +68,17 @@ public enum ItemMapping ITEM_DRAGON_SCIMITAR(DRAGON_SCIMITAR, DRAGON_SCIMITAR_OR), ITEM_DRAGON_SCIMITAR_ORNAMENT_KIT(DRAGON_SCIMITAR_ORNAMENT_KIT, DRAGON_SCIMITAR_OR), ITEM_DRAGON_DEFENDER(DRAGON_DEFENDER_ORNAMENT_KIT, DRAGON_DEFENDER_T), - ITEM_DRAGON_PICKAXE(DRAGON_PICKAXE, DRAGON_PICKAXE_12797, DRAGON_PICKAXE_OR), + ITEM_DRAGON_PICKAXE(DRAGON_PICKAXE, DRAGON_PICKAXE_12797, DRAGON_PICKAXE_OR, DRAGON_PICKAXE_OR_25376), ITEM_DRAGON_PICKAXE_OR(ZALCANO_SHARD, DRAGON_PICKAXE_OR), + ITEM_DRAGON_AXE(DRAGON_AXE, DRAGON_AXE_OR), + ITEM_DRAGON_HARPOON(DRAGON_HARPOON, DRAGON_HARPOON_OR), + ITEM_INFERNAL_PICKAXE_OR(INFERNAL_PICKAXE, INFERNAL_PICKAXE_OR), + ITEM_INFERNAL_PICKAXE_OR_UNCHARGED(INFERNAL_PICKAXE_UNCHARGED, INFERNAL_PICKAXE_UNCHARGED_25369), + ITEM_INFERNAL_AXE_OR(INFERNAL_AXE, INFERNAL_AXE_OR), + ITEM_INFERNAL_AXE_OR_UNCHARGED(INFERNAL_AXE_UNCHARGED, INFERNAL_AXE_UNCHARGED_25371), + ITEM_INFERNAL_HARPOON_OR(INFERNAL_HARPOON, INFERNAL_HARPOON_OR), + ITEM_INFERNAL_HARPOON_OR_UNCHARGED(INFERNAL_HARPOON_UNCHARGED, INFERNAL_HARPOON_UNCHARGED_25367), + ITEM_TRAILBLAZER_TOOL_ORNAMENT_KIT(TRAILBLAZER_TOOL_ORNAMENT_KIT, DRAGON_PICKAXE_OR_25376, DRAGON_AXE_OR, DRAGON_HARPOON_OR, INFERNAL_PICKAXE_OR, INFERNAL_AXE_OR, INFERNAL_HARPOON_OR, INFERNAL_PICKAXE_UNCHARGED_25369, INFERNAL_AXE_UNCHARGED_25371, INFERNAL_HARPOON_UNCHARGED_25367), ITEM_DRAGON_KITESHIELD(DRAGON_KITESHIELD, DRAGON_KITESHIELD_G), ITEM_DRAGON_KITESHIELD_ORNAMENT_KIT(DRAGON_KITESHIELD_ORNAMENT_KIT, DRAGON_KITESHIELD_G), ITEM_DRAGON_FULL_HELM(DRAGON_FULL_HELM, DRAGON_FULL_HELM_G), 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 d18aa4d6f2..b59be0da14 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 @@ -154,11 +154,11 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu new EmoteClue("Slap your head in the centre of the Kourend catacombs. Beware of double agents! Equip the arclight and the amulet of the damned.", "Kourend catacombs", CENTRE_OF_THE_CATACOMBS_OF_KOUREND, new WorldPoint(1663, 10045, 0), DOUBLE_AGENT_141, SLAP_HEAD, item(ARCLIGHT), any("Amulet of the damned", item(AMULET_OF_THE_DAMNED), item(AMULET_OF_THE_DAMNED_FULL))), new EmoteClue("Spin at the crossroads north of Rimmington. Equip a green gnome hat, cream gnome top and leather chaps.", "Rimmington", ROAD_JUNCTION_NORTH_OF_RIMMINGTON, new WorldPoint(2981, 3276, 0), SPIN, item(GREEN_HAT), item(CREAM_ROBE_TOP), item(LEATHER_CHAPS)), new EmoteClue("Spin in Draynor Manor by the fountain. Equip an iron platebody, studded leather chaps and a bronze full helmet.", "Draynor Manor", DRAYNOR_MANOR_BY_THE_FOUNTAIN, new WorldPoint(3088, 3336, 0), SPIN, item(IRON_PLATEBODY), item(STUDDED_CHAPS), item(BRONZE_FULL_HELM)), - new EmoteClue("Spin in front of the Soul altar. Beware of double agents! Equip a dragon pickaxe, helm of neitiznot and a pair of rune boots.", "Soul altar", SOUL_ALTAR, new WorldPoint(1815, 3856, 0), DOUBLE_AGENT_141, SPIN, any("Dragon or Crystal pickaxe", item(DRAGON_PICKAXE), item(DRAGON_PICKAXE_12797), item(INFERNAL_PICKAXE), item(INFERNAL_PICKAXE_UNCHARGED), item(DRAGON_PICKAXE_OR), item(CRYSTAL_PICKAXE), item(CRYSTAL_PICKAXE_INACTIVE)), item(HELM_OF_NEITIZNOT), item(RUNE_BOOTS)), + new EmoteClue("Spin in front of the Soul altar. Beware of double agents! Equip a dragon pickaxe, helm of neitiznot and a pair of rune boots.", "Soul altar", SOUL_ALTAR, new WorldPoint(1815, 3856, 0), DOUBLE_AGENT_141, SPIN, any("Dragon or Crystal pickaxe", item(DRAGON_PICKAXE), item(DRAGON_PICKAXE_12797), item(INFERNAL_PICKAXE), item(INFERNAL_PICKAXE_UNCHARGED), item(DRAGON_PICKAXE_OR), item(DRAGON_PICKAXE_OR_25376), item(CRYSTAL_PICKAXE), item(CRYSTAL_PICKAXE_INACTIVE), item(INFERNAL_PICKAXE_OR), item(INFERNAL_PICKAXE_UNCHARGED_25369)), item(HELM_OF_NEITIZNOT), item(RUNE_BOOTS)), new EmoteClue("Spin in the Varrock Castle courtyard. Equip a black axe, a coif and a ruby ring.", "Varrock Castle", OUTSIDE_VARROCK_PALACE_COURTYARD, new WorldPoint(3213, 3463, 0), SPIN, item(BLACK_AXE), item(COIF), item(RUBY_RING)), new EmoteClue("Spin in West Ardougne Church. Equip a dragon spear and red dragonhide chaps.", "West Ardougne Church", CHAPEL_IN_WEST_ARDOUGNE, new WorldPoint(2530, 3290, 0), SPIN, item(DRAGON_SPEAR), item(RED_DHIDE_CHAPS)), new EmoteClue("Spin on the bridge by the Barbarian Village. Salute before you talk to me. Equip purple gloves, a steel kiteshield and a mithril full helmet.", "Barbarian Village", EAST_OF_THE_BARBARIAN_VILLAGE_BRIDGE, new WorldPoint(3105, 3420, 0), SPIN, SALUTE, item(PURPLE_GLOVES), item(STEEL_KITESHIELD), item(MITHRIL_FULL_HELM)), - new EmoteClue("Stamp in the Enchanted valley west of the waterfall. Beware of double agents! Equip a dragon axe.", "Enchanted Valley (BKQ)", NORTHWESTERN_CORNER_OF_THE_ENCHANTED_VALLEY, new WorldPoint(3030, 4522, 0), DOUBLE_AGENT_141, STAMP, any("Dragon or Crystal axe", item(DRAGON_AXE), item(CRYSTAL_AXE), item(CRYSTAL_AXE_INACTIVE), item(INFERNAL_AXE), item(INFERNAL_AXE_UNCHARGED))), + new EmoteClue("Stamp in the Enchanted valley west of the waterfall. Beware of double agents! Equip a dragon axe.", "Enchanted Valley (BKQ)", NORTHWESTERN_CORNER_OF_THE_ENCHANTED_VALLEY, new WorldPoint(3030, 4522, 0), DOUBLE_AGENT_141, STAMP, any("Dragon or Crystal axe", item(DRAGON_AXE), item(DRAGON_AXE_OR), item(CRYSTAL_AXE), item(CRYSTAL_AXE_INACTIVE), item(INFERNAL_AXE), item(INFERNAL_AXE_UNCHARGED), item(INFERNAL_AXE_OR), item(INFERNAL_AXE_UNCHARGED_25371))), new EmoteClue("Think in middle of the wheat field by the Lumbridge mill. Equip a blue gnome robetop, a turquoise gnome robe bottom and an oak shortbow.", "Lumbridge mill", WHEAT_FIELD_NEAR_THE_LUMBRIDGE_WINDMILL, new WorldPoint(3159, 3298, 0), THINK, item(BLUE_ROBE_TOP), item(TURQUOISE_ROBE_BOTTOMS), item(OAK_SHORTBOW)), new EmoteClue("Think in the centre of the Observatory. Spin before you talk to me. Equip a mithril chain body, green dragonhide chaps and a ruby amulet.", "Observatory", OBSERVATORY, new WorldPoint(2439, 3161, 0), THINK, SPIN, item(MITHRIL_CHAINBODY), item(GREEN_DHIDE_CHAPS), item(RUBY_AMULET)), new EmoteClue("Wave along the south fence of the Lumber Yard. Equip a hard leather body, leather chaps and a bronze axe.", "Lumber Yard", NEAR_THE_SAWMILL_OPERATORS_BOOTH, new WorldPoint(3307, 3491, 0), WAVE, item(HARDLEATHER_BODY), item(LEATHER_CHAPS), item(BRONZE_AXE)), diff --git 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 index 77910ab61d..e35226dd0b 100644 --- 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 @@ -53,7 +53,7 @@ public class FaloTheBardClue extends ClueScroll implements TextClueScroll, NpcCl new FaloTheBardClue("A blood red weapon, a strong curved sword, found on the island of primate lords.", item(DRAGON_SCIMITAR)), 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)), + new FaloTheBardClue("A fiery axe of great inferno, when you use it, you'll wonder where the logs go.", any("Infernal axe", item(INFERNAL_AXE), item(INFERNAL_AXE_OR))), new FaloTheBardClue("A mark used to increase one's grace, found atop a seer's place.", item(MARK_OF_GRACE)), new FaloTheBardClue("A molten beast with fiery breath, you acquire these with its death.", item(LAVA_DRAGON_BONES)), new FaloTheBardClue("A shiny helmet of flight, to obtain this with melee, struggle you might.", item(ARMADYL_HELMET)), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/SkillChallengeClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/SkillChallengeClue.java index 4f7adb6db6..67de8ad26a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/SkillChallengeClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/SkillChallengeClue.java @@ -79,8 +79,11 @@ public class SkillChallengeClue extends ClueScroll implements NpcClueScroll, Nam item(ItemID.DRAGON_PICKAXE), item(ItemID.DRAGON_PICKAXE_12797), item(ItemID.DRAGON_PICKAXE_OR), + item(ItemID.DRAGON_PICKAXE_OR_25376), item(ItemID.INFERNAL_PICKAXE), + item(ItemID.INFERNAL_PICKAXE_OR), item(ItemID.INFERNAL_PICKAXE_UNCHARGED), + item(ItemID.INFERNAL_PICKAXE_UNCHARGED_25369), item(ItemID.GILDED_PICKAXE), item(ItemID._3RD_AGE_PICKAXE), item(ItemID.CRYSTAL_PICKAXE) @@ -95,8 +98,11 @@ public class SkillChallengeClue extends ClueScroll implements NpcClueScroll, Nam item(ItemID.ADAMANT_AXE), item(ItemID.RUNE_AXE), item(ItemID.DRAGON_AXE), + item(ItemID.DRAGON_AXE_OR), item(ItemID.INFERNAL_AXE), + item(ItemID.INFERNAL_AXE_OR), item(ItemID.INFERNAL_AXE_UNCHARGED), + item(ItemID.INFERNAL_AXE_UNCHARGED_25371), item(ItemID.GILDED_AXE), item(ItemID._3RD_AGE_AXE), item(ItemID.CRYSTAL_AXE) @@ -106,8 +112,11 @@ public class SkillChallengeClue extends ClueScroll implements NpcClueScroll, Nam item(ItemID.HARPOON), item(ItemID.BARBTAIL_HARPOON), item(ItemID.DRAGON_HARPOON), + item(ItemID.DRAGON_HARPOON_OR), item(ItemID.INFERNAL_HARPOON), + item(ItemID.INFERNAL_HARPOON_OR), item(ItemID.INFERNAL_HARPOON_UNCHARGED), + item(ItemID.INFERNAL_HARPOON_UNCHARGED_25367), item(ItemID.CRYSTAL_HARPOON) ); @@ -162,12 +171,12 @@ public class SkillChallengeClue extends ClueScroll implements NpcClueScroll, Nam new SkillChallengeClue("Burn a redwood log.", item(ItemID.REDWOOD_LOGS), item(ItemID.TINDERBOX)), new SkillChallengeClue("Complete a lap of Rellekka's Rooftop Agility Course", "complete a lap of the rellekka rooftop agility course whilst sporting the finest amount of grace.", true, all("A full Graceful set", - any("", item(ItemID.GRACEFUL_HOOD), item(ItemID.GRACEFUL_HOOD_11851), item(ItemID.GRACEFUL_HOOD_13579), item(ItemID.GRACEFUL_HOOD_13580), item(ItemID.GRACEFUL_HOOD_13591), item(ItemID.GRACEFUL_HOOD_13592), item(ItemID.GRACEFUL_HOOD_13603), item(ItemID.GRACEFUL_HOOD_13604), item(ItemID.GRACEFUL_HOOD_13615), item(ItemID.GRACEFUL_HOOD_13616), item(ItemID.GRACEFUL_HOOD_13627), item(ItemID.GRACEFUL_HOOD_13628), item(ItemID.GRACEFUL_HOOD_13667), item(ItemID.GRACEFUL_HOOD_13668), item(ItemID.GRACEFUL_HOOD_21061), item(ItemID.GRACEFUL_HOOD_21063), item(ItemID.GRACEFUL_HOOD_24743), item(ItemID.GRACEFUL_HOOD_24745)), - any("", item(ItemID.GRACEFUL_CAPE), item(ItemID.GRACEFUL_CAPE_11853), item(ItemID.GRACEFUL_CAPE_13581), item(ItemID.GRACEFUL_CAPE_13582), item(ItemID.GRACEFUL_CAPE_13593), item(ItemID.GRACEFUL_CAPE_13594), item(ItemID.GRACEFUL_CAPE_13605), item(ItemID.GRACEFUL_CAPE_13606), item(ItemID.GRACEFUL_CAPE_13617), item(ItemID.GRACEFUL_CAPE_13618), item(ItemID.GRACEFUL_CAPE_13629), item(ItemID.GRACEFUL_CAPE_13630), item(ItemID.GRACEFUL_CAPE_13669), item(ItemID.GRACEFUL_CAPE_13670), item(ItemID.GRACEFUL_CAPE_21064), item(ItemID.GRACEFUL_CAPE_21066), item(ItemID.GRACEFUL_CAPE_24746), item(ItemID.GRACEFUL_CAPE_24748), item(ItemID.AGILITY_CAPE), item(ItemID.AGILITY_CAPE_13340), item(ItemID.AGILITY_CAPET), item(ItemID.AGILITY_CAPET_13341), item(ItemID.MAX_CAPE), item(ItemID.MAX_CAPE_13342)), - any("", item(ItemID.GRACEFUL_TOP), item(ItemID.GRACEFUL_TOP_11855), item(ItemID.GRACEFUL_TOP_13583), item(ItemID.GRACEFUL_TOP_13584), item(ItemID.GRACEFUL_TOP_13595), item(ItemID.GRACEFUL_TOP_13596), item(ItemID.GRACEFUL_TOP_13607), item(ItemID.GRACEFUL_TOP_13608), item(ItemID.GRACEFUL_TOP_13619), item(ItemID.GRACEFUL_TOP_13620), item(ItemID.GRACEFUL_TOP_13631), item(ItemID.GRACEFUL_TOP_13632), item(ItemID.GRACEFUL_TOP_13671), item(ItemID.GRACEFUL_TOP_13672), item(ItemID.GRACEFUL_TOP_21067), item(ItemID.GRACEFUL_TOP_21069), item(ItemID.GRACEFUL_TOP_24749), item(ItemID.GRACEFUL_TOP_24751)), - any("", item(ItemID.GRACEFUL_LEGS), item(ItemID.GRACEFUL_LEGS_11857), item(ItemID.GRACEFUL_LEGS_13585), item(ItemID.GRACEFUL_LEGS_13586), item(ItemID.GRACEFUL_LEGS_13597), item(ItemID.GRACEFUL_LEGS_13598), item(ItemID.GRACEFUL_LEGS_13609), item(ItemID.GRACEFUL_LEGS_13610), item(ItemID.GRACEFUL_LEGS_13621), item(ItemID.GRACEFUL_LEGS_13622), item(ItemID.GRACEFUL_LEGS_13633), item(ItemID.GRACEFUL_LEGS_13634), item(ItemID.GRACEFUL_LEGS_13673), item(ItemID.GRACEFUL_LEGS_13674), item(ItemID.GRACEFUL_LEGS_21070), item(ItemID.GRACEFUL_LEGS_21072), item(ItemID.GRACEFUL_LEGS_24752), item(ItemID.GRACEFUL_LEGS_24754)), - any("", item(ItemID.GRACEFUL_GLOVES), item(ItemID.GRACEFUL_GLOVES_11859), item(ItemID.GRACEFUL_GLOVES_13587), item(ItemID.GRACEFUL_GLOVES_13588), item(ItemID.GRACEFUL_GLOVES_13599), item(ItemID.GRACEFUL_GLOVES_13600), item(ItemID.GRACEFUL_GLOVES_13611), item(ItemID.GRACEFUL_GLOVES_13612), item(ItemID.GRACEFUL_GLOVES_13623), item(ItemID.GRACEFUL_GLOVES_13624), item(ItemID.GRACEFUL_GLOVES_13635), item(ItemID.GRACEFUL_GLOVES_13636), item(ItemID.GRACEFUL_GLOVES_13675), item(ItemID.GRACEFUL_GLOVES_13676), item(ItemID.GRACEFUL_GLOVES_21073), item(ItemID.GRACEFUL_GLOVES_21075), item(ItemID.GRACEFUL_GLOVES_24755), item(ItemID.GRACEFUL_GLOVES_24757)), - any("", item(ItemID.GRACEFUL_BOOTS), item(ItemID.GRACEFUL_BOOTS_11861), item(ItemID.GRACEFUL_BOOTS_13589), item(ItemID.GRACEFUL_BOOTS_13590), item(ItemID.GRACEFUL_BOOTS_13601), item(ItemID.GRACEFUL_BOOTS_13602), item(ItemID.GRACEFUL_BOOTS_13613), item(ItemID.GRACEFUL_BOOTS_13614), item(ItemID.GRACEFUL_BOOTS_13625), item(ItemID.GRACEFUL_BOOTS_13626), item(ItemID.GRACEFUL_BOOTS_13637), item(ItemID.GRACEFUL_BOOTS_13638), item(ItemID.GRACEFUL_BOOTS_13677), item(ItemID.GRACEFUL_BOOTS_13678), item(ItemID.GRACEFUL_BOOTS_21076), item(ItemID.GRACEFUL_BOOTS_21078), item(ItemID.GRACEFUL_BOOTS_24758), item(ItemID.GRACEFUL_BOOTS_24760)))), + any("", item(ItemID.GRACEFUL_HOOD), item(ItemID.GRACEFUL_HOOD_11851), item(ItemID.GRACEFUL_HOOD_13579), item(ItemID.GRACEFUL_HOOD_13580), item(ItemID.GRACEFUL_HOOD_13591), item(ItemID.GRACEFUL_HOOD_13592), item(ItemID.GRACEFUL_HOOD_13603), item(ItemID.GRACEFUL_HOOD_13604), item(ItemID.GRACEFUL_HOOD_13615), item(ItemID.GRACEFUL_HOOD_13616), item(ItemID.GRACEFUL_HOOD_13627), item(ItemID.GRACEFUL_HOOD_13628), item(ItemID.GRACEFUL_HOOD_13667), item(ItemID.GRACEFUL_HOOD_13668), item(ItemID.GRACEFUL_HOOD_21061), item(ItemID.GRACEFUL_HOOD_21063), item(ItemID.GRACEFUL_HOOD_24743), item(ItemID.GRACEFUL_HOOD_24745), item(ItemID.GRACEFUL_HOOD_25069), item(ItemID.GRACEFUL_HOOD_25071)), + any("", item(ItemID.GRACEFUL_CAPE), item(ItemID.GRACEFUL_CAPE_11853), item(ItemID.GRACEFUL_CAPE_13581), item(ItemID.GRACEFUL_CAPE_13582), item(ItemID.GRACEFUL_CAPE_13593), item(ItemID.GRACEFUL_CAPE_13594), item(ItemID.GRACEFUL_CAPE_13605), item(ItemID.GRACEFUL_CAPE_13606), item(ItemID.GRACEFUL_CAPE_13617), item(ItemID.GRACEFUL_CAPE_13618), item(ItemID.GRACEFUL_CAPE_13629), item(ItemID.GRACEFUL_CAPE_13630), item(ItemID.GRACEFUL_CAPE_13669), item(ItemID.GRACEFUL_CAPE_13670), item(ItemID.GRACEFUL_CAPE_21064), item(ItemID.GRACEFUL_CAPE_21066), item(ItemID.GRACEFUL_CAPE_24746), item(ItemID.GRACEFUL_CAPE_24748), item(ItemID.GRACEFUL_CAPE_25072), item(ItemID.GRACEFUL_CAPE_25074), item(ItemID.AGILITY_CAPE), item(ItemID.AGILITY_CAPE_13340), item(ItemID.AGILITY_CAPET), item(ItemID.AGILITY_CAPET_13341), item(ItemID.MAX_CAPE), item(ItemID.MAX_CAPE_13342)), + any("", item(ItemID.GRACEFUL_TOP), item(ItemID.GRACEFUL_TOP_11855), item(ItemID.GRACEFUL_TOP_13583), item(ItemID.GRACEFUL_TOP_13584), item(ItemID.GRACEFUL_TOP_13595), item(ItemID.GRACEFUL_TOP_13596), item(ItemID.GRACEFUL_TOP_13607), item(ItemID.GRACEFUL_TOP_13608), item(ItemID.GRACEFUL_TOP_13619), item(ItemID.GRACEFUL_TOP_13620), item(ItemID.GRACEFUL_TOP_13631), item(ItemID.GRACEFUL_TOP_13632), item(ItemID.GRACEFUL_TOP_13671), item(ItemID.GRACEFUL_TOP_13672), item(ItemID.GRACEFUL_TOP_21067), item(ItemID.GRACEFUL_TOP_21069), item(ItemID.GRACEFUL_TOP_24749), item(ItemID.GRACEFUL_TOP_24751), item(ItemID.GRACEFUL_TOP_25075), item(ItemID.GRACEFUL_TOP_25077)), + any("", item(ItemID.GRACEFUL_LEGS), item(ItemID.GRACEFUL_LEGS_11857), item(ItemID.GRACEFUL_LEGS_13585), item(ItemID.GRACEFUL_LEGS_13586), item(ItemID.GRACEFUL_LEGS_13597), item(ItemID.GRACEFUL_LEGS_13598), item(ItemID.GRACEFUL_LEGS_13609), item(ItemID.GRACEFUL_LEGS_13610), item(ItemID.GRACEFUL_LEGS_13621), item(ItemID.GRACEFUL_LEGS_13622), item(ItemID.GRACEFUL_LEGS_13633), item(ItemID.GRACEFUL_LEGS_13634), item(ItemID.GRACEFUL_LEGS_13673), item(ItemID.GRACEFUL_LEGS_13674), item(ItemID.GRACEFUL_LEGS_21070), item(ItemID.GRACEFUL_LEGS_21072), item(ItemID.GRACEFUL_LEGS_24752), item(ItemID.GRACEFUL_LEGS_24754), item(ItemID.GRACEFUL_LEGS_25078), item(ItemID.GRACEFUL_LEGS_25080)), + any("", item(ItemID.GRACEFUL_GLOVES), item(ItemID.GRACEFUL_GLOVES_11859), item(ItemID.GRACEFUL_GLOVES_13587), item(ItemID.GRACEFUL_GLOVES_13588), item(ItemID.GRACEFUL_GLOVES_13599), item(ItemID.GRACEFUL_GLOVES_13600), item(ItemID.GRACEFUL_GLOVES_13611), item(ItemID.GRACEFUL_GLOVES_13612), item(ItemID.GRACEFUL_GLOVES_13623), item(ItemID.GRACEFUL_GLOVES_13624), item(ItemID.GRACEFUL_GLOVES_13635), item(ItemID.GRACEFUL_GLOVES_13636), item(ItemID.GRACEFUL_GLOVES_13675), item(ItemID.GRACEFUL_GLOVES_13676), item(ItemID.GRACEFUL_GLOVES_21073), item(ItemID.GRACEFUL_GLOVES_21075), item(ItemID.GRACEFUL_GLOVES_24755), item(ItemID.GRACEFUL_GLOVES_24757), item(ItemID.GRACEFUL_GLOVES_25081), item(ItemID.GRACEFUL_GLOVES_25083)), + any("", item(ItemID.GRACEFUL_BOOTS), item(ItemID.GRACEFUL_BOOTS_11861), item(ItemID.GRACEFUL_BOOTS_13589), item(ItemID.GRACEFUL_BOOTS_13590), item(ItemID.GRACEFUL_BOOTS_13601), item(ItemID.GRACEFUL_BOOTS_13602), item(ItemID.GRACEFUL_BOOTS_13613), item(ItemID.GRACEFUL_BOOTS_13614), item(ItemID.GRACEFUL_BOOTS_13625), item(ItemID.GRACEFUL_BOOTS_13626), item(ItemID.GRACEFUL_BOOTS_13637), item(ItemID.GRACEFUL_BOOTS_13638), item(ItemID.GRACEFUL_BOOTS_13677), item(ItemID.GRACEFUL_BOOTS_13678), item(ItemID.GRACEFUL_BOOTS_21076), item(ItemID.GRACEFUL_BOOTS_21078), item(ItemID.GRACEFUL_BOOTS_24758), item(ItemID.GRACEFUL_BOOTS_24760), item(ItemID.GRACEFUL_BOOTS_25084), item(ItemID.GRACEFUL_BOOTS_25086)))), new SkillChallengeClue("Mix an anti-venom potion.", item(ItemID.ANTIDOTE4_5952), xOfItem(ItemID.ZULRAHS_SCALES, 20)), new SkillChallengeClue("Mine a piece of Runite ore", "mine a piece of runite ore whilst sporting the finest mining gear.", true, ANY_PICKAXE, all("Prospector kit", item(ItemID.PROSPECTOR_HELMET), any("", item(ItemID.PROSPECTOR_JACKET), item(ItemID.VARROCK_ARMOUR_4)), item(ItemID.PROSPECTOR_LEGS), item(ItemID.PROSPECTOR_BOOTS))), new SkillChallengeClue("Steal a gem from the Ardougne market."), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/woodcutting/CrowdsourcingWoodcutting.java b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/woodcutting/CrowdsourcingWoodcutting.java index e61a017960..8defbe2b0d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/woodcutting/CrowdsourcingWoodcutting.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/woodcutting/CrowdsourcingWoodcutting.java @@ -85,6 +85,7 @@ public class CrowdsourcingWoodcutting put(AnimationID.WOODCUTTING_ADAMANT, ItemID.ADAMANT_AXE). put(AnimationID.WOODCUTTING_RUNE, ItemID.RUNE_AXE). put(AnimationID.WOODCUTTING_DRAGON, ItemID.DRAGON_AXE). + put(AnimationID.WOODCUTTING_DRAGON_OR, ItemID.DRAGON_AXE_OR). put(AnimationID.WOODCUTTING_INFERNAL, ItemID.INFERNAL_AXE). put(AnimationID.WOODCUTTING_3A_AXE, ItemID._3RD_AGE_AXE). put(AnimationID.WOODCUTTING_CRYSTAL, ItemID.CRYSTAL_AXE). diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java index a56f9cb548..6d2f06d473 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java @@ -64,6 +64,7 @@ class FishingOverlay extends OverlayPanel AnimationID.FISHING_CAGE, AnimationID.FISHING_CRYSTAL_HARPOON, AnimationID.FISHING_DRAGON_HARPOON, + AnimationID.FISHING_DRAGON_HARPOON_OR, AnimationID.FISHING_HARPOON, AnimationID.FISHING_INFERNAL_HARPOON, AnimationID.FISHING_TRAILBLAZER_HARPOON, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java index 4715450f79..1311021c29 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java @@ -255,8 +255,10 @@ public class FishingPlugin extends Plugin switch (item.getId()) { case ItemID.DRAGON_HARPOON: + case ItemID.DRAGON_HARPOON_OR: case ItemID.INFERNAL_HARPOON: case ItemID.INFERNAL_HARPOON_UNCHARGED: + case ItemID.INFERNAL_HARPOON_UNCHARGED_25367: case ItemID.HARPOON: case ItemID.BARBTAIL_HARPOON: case ItemID.BIG_FISHING_NET: diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java index f474c40bd6..ee084f3c44 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java @@ -136,6 +136,7 @@ public class IdleNotifierPlugin extends Plugin case WOODCUTTING_RUNE: case WOODCUTTING_GILDED: case WOODCUTTING_DRAGON: + case WOODCUTTING_DRAGON_OR: case WOODCUTTING_INFERNAL: case WOODCUTTING_3A_AXE: case WOODCUTTING_CRYSTAL: @@ -197,6 +198,7 @@ public class IdleNotifierPlugin extends Plugin case FISHING_HARPOON: case FISHING_BARBTAIL_HARPOON: case FISHING_DRAGON_HARPOON: + case FISHING_DRAGON_HARPOON_OR: case FISHING_INFERNAL_HARPOON: case FISHING_CRYSTAL_HARPOON: case FISHING_TRAILBLAZER_HARPOON: @@ -222,6 +224,7 @@ public class IdleNotifierPlugin extends Plugin case MINING_DRAGON_PICKAXE: case MINING_DRAGON_PICKAXE_UPGRADED: case MINING_DRAGON_PICKAXE_OR: + case MINING_DRAGON_PICKAXE_OR_TRAILBLAZER: case MINING_INFERNAL_PICKAXE: case MINING_3A_PICKAXE: case MINING_CRYSTAL_PICKAXE: @@ -242,6 +245,7 @@ public class IdleNotifierPlugin extends Plugin case MINING_MOTHERLODE_DRAGON: case MINING_MOTHERLODE_DRAGON_UPGRADED: case MINING_MOTHERLODE_DRAGON_OR: + case MINING_MOTHERLODE_DRAGON_OR_TRAILBLAZER: case MINING_MOTHERLODE_INFERNAL: case MINING_MOTHERLODE_3A: case MINING_MOTHERLODE_CRYSTAL: diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/Pickaxe.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/Pickaxe.java index c0531ac091..9ad4604607 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/Pickaxe.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/Pickaxe.java @@ -34,6 +34,7 @@ import static net.runelite.api.AnimationID.MINING_BRONZE_PICKAXE; import static net.runelite.api.AnimationID.MINING_CRYSTAL_PICKAXE; import static net.runelite.api.AnimationID.MINING_DRAGON_PICKAXE; import static net.runelite.api.AnimationID.MINING_DRAGON_PICKAXE_OR; +import static net.runelite.api.AnimationID.MINING_DRAGON_PICKAXE_OR_TRAILBLAZER; import static net.runelite.api.AnimationID.MINING_DRAGON_PICKAXE_UPGRADED; import static net.runelite.api.AnimationID.MINING_GILDED_PICKAXE; import static net.runelite.api.AnimationID.MINING_INFERNAL_PICKAXE; @@ -46,6 +47,7 @@ import static net.runelite.api.AnimationID.MINING_MOTHERLODE_BRONZE; import static net.runelite.api.AnimationID.MINING_MOTHERLODE_CRYSTAL; import static net.runelite.api.AnimationID.MINING_MOTHERLODE_DRAGON; import static net.runelite.api.AnimationID.MINING_MOTHERLODE_DRAGON_OR; +import static net.runelite.api.AnimationID.MINING_MOTHERLODE_DRAGON_OR_TRAILBLAZER; import static net.runelite.api.AnimationID.MINING_MOTHERLODE_DRAGON_UPGRADED; import static net.runelite.api.AnimationID.MINING_MOTHERLODE_GILDED; import static net.runelite.api.AnimationID.MINING_MOTHERLODE_INFERNAL; @@ -65,6 +67,7 @@ import static net.runelite.api.ItemID.BRONZE_PICKAXE; import static net.runelite.api.ItemID.CRYSTAL_PICKAXE; import static net.runelite.api.ItemID.DRAGON_PICKAXE; import static net.runelite.api.ItemID.DRAGON_PICKAXE_OR; +import static net.runelite.api.ItemID.DRAGON_PICKAXE_OR_25376; import static net.runelite.api.ItemID.DRAGON_PICKAXE_12797; import static net.runelite.api.ItemID.GILDED_PICKAXE; import static net.runelite.api.ItemID.INFERNAL_PICKAXE; @@ -89,6 +92,7 @@ enum Pickaxe GILDED(GILDED_PICKAXE, MINING_GILDED_PICKAXE, MINING_MOTHERLODE_GILDED), DRAGON(DRAGON_PICKAXE, MINING_DRAGON_PICKAXE, MINING_MOTHERLODE_DRAGON), DRAGON_OR(DRAGON_PICKAXE_OR, MINING_DRAGON_PICKAXE_OR, MINING_MOTHERLODE_DRAGON_OR), + DRAGON_OR_TRAILBLAZER(DRAGON_PICKAXE_OR_25376, MINING_DRAGON_PICKAXE_OR_TRAILBLAZER, MINING_MOTHERLODE_DRAGON_OR_TRAILBLAZER), DRAGON_UPGRADED(DRAGON_PICKAXE_12797, MINING_DRAGON_PICKAXE_UPGRADED, MINING_MOTHERLODE_DRAGON_UPGRADED), INFERNAL(INFERNAL_PICKAXE, MINING_INFERNAL_PICKAXE, MINING_MOTHERLODE_INFERNAL), THIRDAGE(_3RD_AGE_PICKAXE, MINING_3A_PICKAXE, MINING_MOTHERLODE_3A), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java index b3dba5c048..62e399369e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java @@ -47,8 +47,9 @@ class MotherlodeOverlay extends OverlayPanel MINING_MOTHERLODE_BRONZE, MINING_MOTHERLODE_IRON, MINING_MOTHERLODE_STEEL, MINING_MOTHERLODE_BLACK, MINING_MOTHERLODE_MITHRIL, MINING_MOTHERLODE_ADAMANT, MINING_MOTHERLODE_RUNE, MINING_MOTHERLODE_GILDED, MINING_MOTHERLODE_DRAGON, - MINING_MOTHERLODE_DRAGON_UPGRADED, MINING_MOTHERLODE_DRAGON_OR, MINING_MOTHERLODE_INFERNAL, - MINING_MOTHERLODE_3A, MINING_MOTHERLODE_CRYSTAL, MINING_MOTHERLODE_TRAILBLAZER + MINING_MOTHERLODE_DRAGON_UPGRADED, MINING_MOTHERLODE_DRAGON_OR, MINING_MOTHERLODE_DRAGON_OR_TRAILBLAZER, + MINING_MOTHERLODE_INFERNAL, MINING_MOTHERLODE_3A, MINING_MOTHERLODE_CRYSTAL, + MINING_MOTHERLODE_TRAILBLAZER ); static final String MINING_RESET = "Reset"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java index 867134f8fd..004396a75e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java @@ -63,35 +63,35 @@ public class RunEnergyPlugin extends Plugin GRACEFUL_HOOD_11851, GRACEFUL_HOOD_13579, GRACEFUL_HOOD_13580, GRACEFUL_HOOD_13591, GRACEFUL_HOOD_13592, GRACEFUL_HOOD_13603, GRACEFUL_HOOD_13604, GRACEFUL_HOOD_13615, GRACEFUL_HOOD_13616, GRACEFUL_HOOD_13627, GRACEFUL_HOOD_13628, GRACEFUL_HOOD_13667, GRACEFUL_HOOD_13668, GRACEFUL_HOOD_21061, GRACEFUL_HOOD_21063, - GRACEFUL_HOOD_24743, GRACEFUL_HOOD_24745 + GRACEFUL_HOOD_24743, GRACEFUL_HOOD_24745, GRACEFUL_HOOD_25069, GRACEFUL_HOOD_25071 ); private static final ImmutableSet ALL_GRACEFUL_TOPS = ImmutableSet.of( GRACEFUL_TOP_11855, GRACEFUL_TOP_13583, GRACEFUL_TOP_13584, GRACEFUL_TOP_13595, GRACEFUL_TOP_13596, GRACEFUL_TOP_13607, GRACEFUL_TOP_13608, GRACEFUL_TOP_13619, GRACEFUL_TOP_13620, GRACEFUL_TOP_13631, GRACEFUL_TOP_13632, GRACEFUL_TOP_13671, GRACEFUL_TOP_13672, GRACEFUL_TOP_21067, GRACEFUL_TOP_21069, - GRACEFUL_TOP_24749, GRACEFUL_TOP_24751 + GRACEFUL_TOP_24749, GRACEFUL_TOP_24751, GRACEFUL_TOP_25075, GRACEFUL_TOP_25077 ); private static final ImmutableSet ALL_GRACEFUL_LEGS = ImmutableSet.of( GRACEFUL_LEGS_11857, GRACEFUL_LEGS_13585, GRACEFUL_LEGS_13586, GRACEFUL_LEGS_13597, GRACEFUL_LEGS_13598, GRACEFUL_LEGS_13609, GRACEFUL_LEGS_13610, GRACEFUL_LEGS_13621, GRACEFUL_LEGS_13622, GRACEFUL_LEGS_13633, GRACEFUL_LEGS_13634, GRACEFUL_LEGS_13673, GRACEFUL_LEGS_13674, GRACEFUL_LEGS_21070, GRACEFUL_LEGS_21072, - GRACEFUL_LEGS_24752, GRACEFUL_LEGS_24754 + GRACEFUL_LEGS_24752, GRACEFUL_LEGS_24754, GRACEFUL_LEGS_25078, GRACEFUL_LEGS_25080 ); private static final ImmutableSet ALL_GRACEFUL_GLOVES = ImmutableSet.of( GRACEFUL_GLOVES_11859, GRACEFUL_GLOVES_13587, GRACEFUL_GLOVES_13588, GRACEFUL_GLOVES_13599, GRACEFUL_GLOVES_13600, GRACEFUL_GLOVES_13611, GRACEFUL_GLOVES_13612, GRACEFUL_GLOVES_13623, GRACEFUL_GLOVES_13624, GRACEFUL_GLOVES_13635, GRACEFUL_GLOVES_13636, GRACEFUL_GLOVES_13675, GRACEFUL_GLOVES_13676, GRACEFUL_GLOVES_21073, GRACEFUL_GLOVES_21075, - GRACEFUL_GLOVES_24755, GRACEFUL_GLOVES_24757 + GRACEFUL_GLOVES_24755, GRACEFUL_GLOVES_24757, GRACEFUL_GLOVES_25081, GRACEFUL_GLOVES_25083 ); private static final ImmutableSet ALL_GRACEFUL_BOOTS = ImmutableSet.of( GRACEFUL_BOOTS_11861, GRACEFUL_BOOTS_13589, GRACEFUL_BOOTS_13590, GRACEFUL_BOOTS_13601, GRACEFUL_BOOTS_13602, GRACEFUL_BOOTS_13613, GRACEFUL_BOOTS_13614, GRACEFUL_BOOTS_13625, GRACEFUL_BOOTS_13626, GRACEFUL_BOOTS_13637, GRACEFUL_BOOTS_13638, GRACEFUL_BOOTS_13677, GRACEFUL_BOOTS_13678, GRACEFUL_BOOTS_21076, GRACEFUL_BOOTS_21078, - GRACEFUL_BOOTS_24758, GRACEFUL_BOOTS_24760 + GRACEFUL_BOOTS_24758, GRACEFUL_BOOTS_24760, GRACEFUL_BOOTS_25084, GRACEFUL_BOOTS_25086 ); // Agility skill capes and the non-cosmetic Max capes also count for the Graceful set effect @@ -99,7 +99,8 @@ public class RunEnergyPlugin extends Plugin GRACEFUL_CAPE_11853, GRACEFUL_CAPE_13581, GRACEFUL_CAPE_13582, GRACEFUL_CAPE_13593, GRACEFUL_CAPE_13594, GRACEFUL_CAPE_13605, GRACEFUL_CAPE_13606, GRACEFUL_CAPE_13617, GRACEFUL_CAPE_13618, GRACEFUL_CAPE_13629, GRACEFUL_CAPE_13630, GRACEFUL_CAPE_13669, GRACEFUL_CAPE_13670, GRACEFUL_CAPE_21064, GRACEFUL_CAPE_21066, - GRACEFUL_CAPE_24746, GRACEFUL_CAPE_24748, AGILITY_CAPE, AGILITY_CAPET, MAX_CAPE + GRACEFUL_CAPE_24746, GRACEFUL_CAPE_24748, GRACEFUL_CAPE_25072, GRACEFUL_CAPE_25074, + AGILITY_CAPE, AGILITY_CAPET, MAX_CAPE ); @RequiredArgsConstructor diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java index 611dbeba22..343b55f458 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java @@ -44,6 +44,7 @@ import static net.runelite.api.AnimationID.WOODCUTTING_BLACK; import static net.runelite.api.AnimationID.WOODCUTTING_BRONZE; import static net.runelite.api.AnimationID.WOODCUTTING_CRYSTAL; import static net.runelite.api.AnimationID.WOODCUTTING_DRAGON; +import static net.runelite.api.AnimationID.WOODCUTTING_DRAGON_OR; import static net.runelite.api.AnimationID.WOODCUTTING_GILDED; import static net.runelite.api.AnimationID.WOODCUTTING_INFERNAL; import static net.runelite.api.AnimationID.WOODCUTTING_IRON; @@ -414,6 +415,7 @@ public class WintertodtPlugin extends Plugin case WOODCUTTING_RUNE: case WOODCUTTING_GILDED: case WOODCUTTING_DRAGON: + case WOODCUTTING_DRAGON_OR: case WOODCUTTING_INFERNAL: case WOODCUTTING_3A_AXE: case WOODCUTTING_CRYSTAL: diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java index 90797e265d..5f48169633 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java @@ -34,6 +34,7 @@ import static net.runelite.api.AnimationID.WOODCUTTING_BLACK; import static net.runelite.api.AnimationID.WOODCUTTING_BRONZE; import static net.runelite.api.AnimationID.WOODCUTTING_CRYSTAL; import static net.runelite.api.AnimationID.WOODCUTTING_DRAGON; +import static net.runelite.api.AnimationID.WOODCUTTING_DRAGON_OR; import static net.runelite.api.AnimationID.WOODCUTTING_GILDED; import static net.runelite.api.AnimationID.WOODCUTTING_INFERNAL; import static net.runelite.api.AnimationID.WOODCUTTING_IRON; @@ -46,6 +47,7 @@ import static net.runelite.api.ItemID.BLACK_AXE; import static net.runelite.api.ItemID.BRONZE_AXE; import static net.runelite.api.ItemID.CRYSTAL_AXE; import static net.runelite.api.ItemID.DRAGON_AXE; +import static net.runelite.api.ItemID.DRAGON_AXE_OR; import static net.runelite.api.ItemID.GILDED_AXE; import static net.runelite.api.ItemID.INFERNAL_AXE; import static net.runelite.api.ItemID.IRON_AXE; @@ -69,6 +71,7 @@ enum Axe RUNE(WOODCUTTING_RUNE, RUNE_AXE), GILDED(WOODCUTTING_GILDED, GILDED_AXE), DRAGON(WOODCUTTING_DRAGON, DRAGON_AXE), + DRAGON_OR(WOODCUTTING_DRAGON_OR, DRAGON_AXE_OR), INFERNAL(WOODCUTTING_INFERNAL, INFERNAL_AXE), THIRDAGE(WOODCUTTING_3A_AXE, _3RD_AGE_AXE), CRYSTAL(WOODCUTTING_CRYSTAL, CRYSTAL_AXE), From 703f06e1543638ef7385dd0819b330c9c5021af5 Mon Sep 17 00:00:00 2001 From: Patrick Pollock <39643664+Lemonici@users.noreply.github.com> Date: Sat, 16 Jan 2021 00:32:22 -0700 Subject: [PATCH 03/14] loottracker: Track boosted hunter level for birdhouse loot (#13068) --- .../runelite/client/plugins/loottracker/LootTrackerPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git 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 index c57ae05197..7bf83abca3 100644 --- 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 @@ -745,7 +745,7 @@ public class LootTrackerPlugin extends Plugin return; } - setEvent(LootRecordType.EVENT, type, client.getRealSkillLevel(Skill.HUNTER)); + setEvent(LootRecordType.EVENT, type, client.getBoostedSkillLevel(Skill.HUNTER)); takeInventorySnapshot(); } } From 0030306f4f0cd0a57ee9fc4f5ce2eed4fa8afb5e Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Mon, 18 Jan 2021 01:40:43 +0000 Subject: [PATCH 04/14] WidgetOverlay: Make Classic Resizeable Multicombat Indicator moveable --- .../src/main/java/net/runelite/api/widgets/WidgetInfo.java | 3 ++- .../java/net/runelite/client/ui/overlay/WidgetOverlay.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index 37da0f0fc9..1fb5a8b7aa 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -548,7 +548,8 @@ public enum WidgetInfo TRAILBLAZER_AREA_TELEPORT(WidgetID.TRAILBLAZER_AREAS_GROUP_ID, WidgetID.TrailblazerAreas.TELEPORT), MULTICOMBAT_FIXED(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.MULTICOMBAT_INDICATOR), - MULTICOMBAT_RESIZEABLE(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewport.MULTICOMBAT_INDICATOR), + MULTICOMBAT_RESIZEABLE_MODERN(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewport.MULTICOMBAT_INDICATOR), + MULTICOMBAT_RESIZEABLE_CLASSIC(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.MULTICOMBAT_INDICATOR), ; private final int groupId; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java index c1c1028375..7f5ba0a4c2 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java @@ -65,7 +65,8 @@ public class WidgetOverlay extends Overlay new WidgetOverlay(client, WidgetInfo.VOLCANIC_MINE_VENTS_INFOBOX_GROUP, OverlayPosition.BOTTOM_RIGHT), new WidgetOverlay(client, WidgetInfo.VOLCANIC_MINE_STABILITY_INFOBOX_GROUP, OverlayPosition.BOTTOM_LEFT), new WidgetOverlay(client, WidgetInfo.MULTICOMBAT_FIXED, OverlayPosition.BOTTOM_RIGHT), - new WidgetOverlay(client, WidgetInfo.MULTICOMBAT_RESIZEABLE, OverlayPosition.CANVAS_TOP_RIGHT) + new WidgetOverlay(client, WidgetInfo.MULTICOMBAT_RESIZEABLE_MODERN, OverlayPosition.CANVAS_TOP_RIGHT), + new WidgetOverlay(client, WidgetInfo.MULTICOMBAT_RESIZEABLE_CLASSIC, OverlayPosition.CANVAS_TOP_RIGHT) ); } From 3c7a6380798f9821ec0477ee3746819f69e2897f Mon Sep 17 00:00:00 2001 From: Joshua Kahn Date: Sun, 17 Jan 2021 21:33:18 -0800 Subject: [PATCH 05/14] bank: Fix item container NPE (#13082) --- .../main/java/net/runelite/client/plugins/bank/BankPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java index 5b8ea483d6..e0161503ae 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java @@ -275,7 +275,7 @@ public class BankPlugin extends Plugin final Widget[] children = bankItemContainer.getChildren(); long geTotal = 0, haTotal = 0; - if (children != null) + if (bankContainer != null && children != null) { log.debug("Computing bank price of {} items", bankContainer.size()); From 6d42e7ba42fac6e8748d8ad3f0c789a59900337e Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 18 Jan 2021 17:00:28 -0500 Subject: [PATCH 06/14] client: update gluegen and jogl osx natives The natives have been rebuilt to be universal libraries for both x64 and arm64 --- runelite-client/pom.xml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index eca6efed54..43281456c5 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -37,7 +37,6 @@ 4.1.0 - 2.4.0-rc-20200429 true true @@ -117,66 +116,66 @@ net.runelite.jogl jogl-all - ${jogl.version} + 2.4.0-rc-20200429 net.runelite.jogl jogl-all - ${jogl.version} + 2.4.0-rc-20200429 natives-windows-amd64 runtime net.runelite.jogl jogl-all - ${jogl.version} + 2.4.0-rc-20200429 natives-windows-i586 runtime net.runelite.jogl jogl-all - ${jogl.version} + 2.4.0-rc-20200429 natives-linux-amd64 runtime net.runelite.jogl jogl-all - ${jogl.version} + 2.4.0-rc-20210117 natives-macosx-universal runtime net.runelite.gluegen gluegen-rt - ${jogl.version} + 2.4.0-rc-20200429 net.runelite.gluegen gluegen-rt - ${jogl.version} + 2.4.0-rc-20200429 natives-windows-amd64 runtime net.runelite.gluegen gluegen-rt - ${jogl.version} + 2.4.0-rc-20200429 natives-windows-i586 runtime net.runelite.gluegen gluegen-rt - ${jogl.version} + 2.4.0-rc-20200429 natives-linux-amd64 runtime net.runelite.gluegen gluegen-rt - ${jogl.version} + 2.4.0-rc-20210117 natives-macosx-universal runtime From 239d58df72d5135e21e4a826a906ca4f3fb874ce Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 18 Jan 2021 19:08:52 -0500 Subject: [PATCH 07/14] client: update discord dependency version The osx native has been rebuilt to be a universal library for both x64 and arm64 --- runelite-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 43281456c5..5e411feb19 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -220,7 +220,7 @@ net.runelite discord - 1.2 + 1.3 net.runelite From b12860b52d2f65b1535984c8dce4b812918c0e47 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 19 Jan 2021 12:39:35 -0500 Subject: [PATCH 08/14] chat notifier: restore original color when highlighting own name --- .../chatnotifications/ChatNotificationsPlugin.java | 12 ++++++++---- .../ChatNotificationsPluginTest.java | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java index 4ccfd1925e..afe574d3c6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.chatnotifications; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.MoreObjects; import com.google.common.base.Strings; import com.google.inject.Provides; import java.util.Arrays; @@ -76,7 +77,6 @@ public class ChatNotificationsPlugin extends Plugin //Custom Highlights private Pattern usernameMatcher = null; - private String usernameReplacer = ""; private Pattern highlightMatcher = null; @Provides @@ -181,15 +181,19 @@ public class ChatNotificationsPlugin extends Plugin .map(s -> s.isEmpty() ? "" : Pattern.quote(s)) .collect(Collectors.joining("[\u00a0\u0020]")); // space or nbsp usernameMatcher = Pattern.compile("\\b" + pattern + "\\b", Pattern.CASE_INSENSITIVE); - usernameReplacer = "" + username + ""; } if (config.highlightOwnName() && usernameMatcher != null) { - Matcher matcher = usernameMatcher.matcher(messageNode.getValue()); + final String message = messageNode.getValue(); + Matcher matcher = usernameMatcher.matcher(message); if (matcher.find()) { - messageNode.setValue(matcher.replaceAll(usernameReplacer)); + final int start = matcher.start(); + final String username = client.getLocalPlayer().getName(); + final String closeColor = MoreObjects.firstNonNull(getLastColor(message.substring(0, start)), ""); + final String replacement = "" + username + "" + closeColor; + messageNode.setValue(matcher.replaceAll(replacement)); update = true; if (config.notifyOnOwnName() && (chatMessage.getType() == ChatMessageType.PUBLICCHAT || chatMessage.getType() == ChatMessageType.PRIVATECHAT diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java index 69a28f5dc9..5b312dc1e6 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java @@ -262,11 +262,11 @@ public class ChatNotificationsPluginTest when(config.highlightOwnName()).thenReturn(true); MessageNode messageNode = mock(MessageNode.class); - when(messageNode.getValue()).thenReturn("Logic Knot received a drop: Adamant longsword"); + when(messageNode.getValue()).thenReturn("Logic Knot received a drop: Adamant longsword"); ChatMessage chatMessage = new ChatMessage(messageNode, ChatMessageType.GAMEMESSAGE, "", "", "", 0); chatNotificationsPlugin.onChatMessage(chatMessage); - verify(messageNode).setValue("Logic Knot received a drop: Adamant longsword"); + verify(messageNode).setValue("Logic Knot received a drop: Adamant longsword"); } @Test @@ -284,6 +284,6 @@ public class ChatNotificationsPluginTest chatNotificationsPlugin.onChatMessage(chatMessage); // set value uses our player name, which has nbsp replaced - verify(messageNode).setValue("Logic Knot received a drop: Adamant longsword"); + verify(messageNode).setValue("Logic Knot received a drop: Adamant longsword"); } } \ No newline at end of file From e9be96f8ae64e0dc4f686bb546df2af196e1b114 Mon Sep 17 00:00:00 2001 From: equirs <77648102+equirs@users.noreply.github.com> Date: Tue, 19 Jan 2021 11:55:19 -0800 Subject: [PATCH 09/14] kittype: add arms kit type --- runelite-api/src/main/java/net/runelite/api/kit/KitType.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-api/src/main/java/net/runelite/api/kit/KitType.java b/runelite-api/src/main/java/net/runelite/api/kit/KitType.java index 788c7c74e9..0b605ee515 100644 --- a/runelite-api/src/main/java/net/runelite/api/kit/KitType.java +++ b/runelite-api/src/main/java/net/runelite/api/kit/KitType.java @@ -42,6 +42,7 @@ public enum KitType WEAPON(3), TORSO(4), SHIELD(5), + ARMS(6), LEGS(7), HAIR(8), HANDS(9), From f8b407f79ad2ed0c251f83069467187c9de243d2 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 19 Jan 2021 15:00:31 -0500 Subject: [PATCH 10/14] kittype: use ordinal for index --- .../java/net/runelite/api/kit/KitType.java | 36 +++++++------------ 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/kit/KitType.java b/runelite-api/src/main/java/net/runelite/api/kit/KitType.java index 0b605ee515..94d795aeff 100644 --- a/runelite-api/src/main/java/net/runelite/api/kit/KitType.java +++ b/runelite-api/src/main/java/net/runelite/api/kit/KitType.java @@ -36,28 +36,18 @@ import net.runelite.api.PlayerComposition; */ public enum KitType { - HEAD(0), - CAPE(1), - AMULET(2), - WEAPON(3), - TORSO(4), - SHIELD(5), - ARMS(6), - LEGS(7), - HAIR(8), - HANDS(9), - BOOTS(10), - JAW(11); - - /** - * Raw equipment index. - */ - private final int index; - - KitType(int index) - { - this.index = index; - } + HEAD, + CAPE, + AMULET, + WEAPON, + TORSO, + SHIELD, + ARMS, + LEGS, + HAIR, + HANDS, + BOOTS, + JAW; /** * Gets the raw equipment index for use in {@link PlayerComposition#getEquipmentIds()}. @@ -66,6 +56,6 @@ public enum KitType */ public int getIndex() { - return index; + return ordinal(); } } From 19122e71c3fafcbcead9827216f0d6f4d7557bb3 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 19 Jan 2021 16:51:50 -0500 Subject: [PATCH 11/14] Use delomboked sources for javadoc generation --- cache/pom.xml | 14 ++++++++++ pom.xml | 26 +++++++++++++++++++ .../runelite/client/ui/overlay/Overlay.java | 2 +- .../client/ui/overlay/OverlayPanel.java | 2 +- 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/cache/pom.xml b/cache/pom.xml index 48c5d61313..dcd1892fc5 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -155,6 +155,20 @@ + + + org.projectlombok + lombok-maven-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + ${project.build.directory}/delombok;${project.build.directory}/generated-sources/antlr4 + + org.apache.maven.plugins maven-jar-plugin diff --git a/pom.xml b/pom.xml index 11465f772f..32a884b1b1 100644 --- a/pom.xml +++ b/pom.xml @@ -200,6 +200,30 @@ maven-release-plugin 2.5.3 + + org.projectlombok + lombok-maven-plugin + 1.18.16.0 + + + ${maven.javadoc.skip} + ${project.basedir}/src/main/java + + ${project.build.directory}/delombok + false + + + + generate-sources + + delombok + + + + org.apache.maven.plugins maven-javadoc-plugin @@ -209,6 +233,8 @@ 8 --no-module-directories + + ${project.build.directory}/delombok