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 d84c849c04..bde6a00de3 100644 --- a/runelite-api/src/main/java/net/runelite/api/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/AnimationID.java @@ -46,6 +46,7 @@ public final class AnimationID 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 CONSUMING = 829; // consuming consumables public static final int FIREMAKING = 733; public static final int DEATH = 836; @@ -107,6 +108,8 @@ public final class AnimationID public static final int FISHING_DRAGON_HARPOON = 7401; 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; @@ -141,6 +144,9 @@ public final class AnimationID 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_2 = 8788; + public static final int MINING_TRAILBLAZER_PICKAXE_3 = 8789; public static final int MINING_MOTHERLODE_BRONZE = 6753; public static final int MINING_MOTHERLODE_IRON = 6754; public static final int MINING_MOTHERLODE_STEEL = 6755; @@ -155,6 +161,7 @@ public final class AnimationID 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 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/plugins/crowdsourcing/woodcutting/CrowdsourcingWoodcutting.java b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/woodcutting/CrowdsourcingWoodcutting.java index b3e1189103..c8499575cf 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 @@ -87,7 +87,8 @@ public class CrowdsourcingWoodcutting put(AnimationID.WOODCUTTING_DRAGON, ItemID.DRAGON_AXE). put(AnimationID.WOODCUTTING_INFERNAL, ItemID.INFERNAL_AXE). put(AnimationID.WOODCUTTING_3A_AXE, ItemID._3RD_AGE_AXE). - put(AnimationID.WOODCUTTING_CRYSTAL, ItemID.CRYSTAL_AXE).build(); + put(AnimationID.WOODCUTTING_CRYSTAL, ItemID.CRYSTAL_AXE). + put(AnimationID.WOODCUTTING_TRAILBLAZER, ItemID.TRAILBLAZER_AXE).build(); private static final Set SUCCESS_MESSAGES = new ImmutableSet.Builder(). add("You get some logs."). 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 07d9897fef..43853f95c7 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 @@ -66,6 +66,8 @@ class FishingOverlay extends OverlayPanel AnimationID.FISHING_DRAGON_HARPOON, 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 7fd0b6aeaf..93566d4c22 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 @@ -139,6 +139,7 @@ public class IdleNotifierPlugin extends Plugin case WOODCUTTING_INFERNAL: case WOODCUTTING_3A_AXE: case WOODCUTTING_CRYSTAL: + case WOODCUTTING_TRAILBLAZER: /* Cooking(Fire, Range) */ case COOKING_FIRE: case COOKING_RANGE: @@ -198,6 +199,8 @@ public class IdleNotifierPlugin extends Plugin case FISHING_DRAGON_HARPOON: 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: @@ -223,6 +226,9 @@ public class IdleNotifierPlugin extends Plugin case MINING_INFERNAL_PICKAXE: case MINING_3A_PICKAXE: case MINING_CRYSTAL_PICKAXE: + case MINING_TRAILBLAZER_PICKAXE: + case MINING_TRAILBLAZER_PICKAXE_2: + case MINING_TRAILBLAZER_PICKAXE_3: case DENSE_ESSENCE_CHIPPING: case DENSE_ESSENCE_CHISELING: /* Mining(Motherlode) */ @@ -240,6 +246,7 @@ public class IdleNotifierPlugin extends Plugin case MINING_MOTHERLODE_INFERNAL: case MINING_MOTHERLODE_3A: case MINING_MOTHERLODE_CRYSTAL: + case MINING_MOTHERLODE_TRAILBLAZER: /* Herblore */ case HERBLORE_PESTLE_AND_MORTAR: case HERBLORE_POTIONMAKING: 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 b21b3eea29..edfd2826ff 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 @@ -53,8 +53,12 @@ import static net.runelite.api.AnimationID.MINING_MOTHERLODE_IRON; import static net.runelite.api.AnimationID.MINING_MOTHERLODE_MITHRIL; import static net.runelite.api.AnimationID.MINING_MOTHERLODE_RUNE; import static net.runelite.api.AnimationID.MINING_MOTHERLODE_STEEL; +import static net.runelite.api.AnimationID.MINING_MOTHERLODE_TRAILBLAZER; import static net.runelite.api.AnimationID.MINING_RUNE_PICKAXE; import static net.runelite.api.AnimationID.MINING_STEEL_PICKAXE; +import static net.runelite.api.AnimationID.MINING_TRAILBLAZER_PICKAXE; +import static net.runelite.api.AnimationID.MINING_TRAILBLAZER_PICKAXE_2; +import static net.runelite.api.AnimationID.MINING_TRAILBLAZER_PICKAXE_3; import static net.runelite.api.ItemID.ADAMANT_PICKAXE; import static net.runelite.api.ItemID.BLACK_PICKAXE; import static net.runelite.api.ItemID.BRONZE_PICKAXE; @@ -69,6 +73,7 @@ import static net.runelite.api.ItemID.MITHRIL_PICKAXE; import static net.runelite.api.ItemID.RUNE_PICKAXE; import static net.runelite.api.ItemID.STEEL_PICKAXE; import static net.runelite.api.ItemID._3RD_AGE_PICKAXE; +import static net.runelite.api.ItemID.TRAILBLAZER_PICKAXE; import net.runelite.api.Player; @Getter @@ -87,7 +92,9 @@ enum Pickaxe 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), - CRYSTAL(CRYSTAL_PICKAXE, MINING_CRYSTAL_PICKAXE, MINING_MOTHERLODE_CRYSTAL); + CRYSTAL(CRYSTAL_PICKAXE, MINING_CRYSTAL_PICKAXE, MINING_MOTHERLODE_CRYSTAL), + TRAILBLAZER(TRAILBLAZER_PICKAXE, MINING_TRAILBLAZER_PICKAXE, MINING_TRAILBLAZER_PICKAXE_2, + MINING_TRAILBLAZER_PICKAXE_3, MINING_MOTHERLODE_TRAILBLAZER); private final int itemId; private final int[] animIds; 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 0ee91ab522..b3dba5c048 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 @@ -48,7 +48,7 @@ class MotherlodeOverlay extends OverlayPanel 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_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/wintertodt/WintertodtPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java index f993505978..611dbeba22 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 @@ -50,6 +50,7 @@ import static net.runelite.api.AnimationID.WOODCUTTING_IRON; import static net.runelite.api.AnimationID.WOODCUTTING_MITHRIL; import static net.runelite.api.AnimationID.WOODCUTTING_RUNE; import static net.runelite.api.AnimationID.WOODCUTTING_STEEL; +import static net.runelite.api.AnimationID.WOODCUTTING_TRAILBLAZER; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.InventoryID; @@ -416,6 +417,7 @@ public class WintertodtPlugin extends Plugin case WOODCUTTING_INFERNAL: case WOODCUTTING_3A_AXE: case WOODCUTTING_CRYSTAL: + case WOODCUTTING_TRAILBLAZER: setActivity(WintertodtActivity.WOODCUTTING); break; 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 54b579e5ae..306e9dd346 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 @@ -40,6 +40,7 @@ import static net.runelite.api.AnimationID.WOODCUTTING_IRON; import static net.runelite.api.AnimationID.WOODCUTTING_MITHRIL; import static net.runelite.api.AnimationID.WOODCUTTING_RUNE; import static net.runelite.api.AnimationID.WOODCUTTING_STEEL; +import static net.runelite.api.AnimationID.WOODCUTTING_TRAILBLAZER; import static net.runelite.api.ItemID.ADAMANT_AXE; import static net.runelite.api.ItemID.BLACK_AXE; import static net.runelite.api.ItemID.BRONZE_AXE; @@ -51,6 +52,7 @@ import static net.runelite.api.ItemID.IRON_AXE; import static net.runelite.api.ItemID.MITHRIL_AXE; import static net.runelite.api.ItemID.RUNE_AXE; import static net.runelite.api.ItemID.STEEL_AXE; +import static net.runelite.api.ItemID.TRAILBLAZER_AXE; import static net.runelite.api.ItemID._3RD_AGE_AXE; import net.runelite.api.Player; @@ -69,7 +71,8 @@ enum Axe DRAGON(WOODCUTTING_DRAGON, DRAGON_AXE), INFERNAL(WOODCUTTING_INFERNAL, INFERNAL_AXE), THIRDAGE(WOODCUTTING_3A_AXE, _3RD_AGE_AXE), - CRYSTAL(WOODCUTTING_CRYSTAL, CRYSTAL_AXE); + CRYSTAL(WOODCUTTING_CRYSTAL, CRYSTAL_AXE), + TRAILBLAZER(WOODCUTTING_TRAILBLAZER, TRAILBLAZER_AXE); private final Integer animId; private final Integer itemId;