Merge pull request #11147 from Hydrox6/woodcutting-gilded

Add support for Gilded Tools
This commit is contained in:
Jordan
2020-03-30 11:02:32 -07:00
committed by GitHub
5 changed files with 15 additions and 2 deletions

View File

@@ -41,6 +41,7 @@ public final class AnimationID
public static final int WOODCUTTING_MITHRIL = 871; public static final int WOODCUTTING_MITHRIL = 871;
public static final int WOODCUTTING_ADAMANT = 869; public static final int WOODCUTTING_ADAMANT = 869;
public static final int WOODCUTTING_RUNE = 867; 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 = 2846;
public static final int WOODCUTTING_INFERNAL = 2117; public static final int WOODCUTTING_INFERNAL = 2117;
public static final int WOODCUTTING_3A_AXE = 7264; public static final int WOODCUTTING_3A_AXE = 7264;
@@ -110,6 +111,7 @@ public final class AnimationID
public static final int MINING_MITHRIL_PICKAXE = 629; public static final int MINING_MITHRIL_PICKAXE = 629;
public static final int MINING_ADAMANT_PICKAXE = 628; public static final int MINING_ADAMANT_PICKAXE = 628;
public static final int MINING_RUNE_PICKAXE = 624; public static final int MINING_RUNE_PICKAXE = 624;
public static final int MINING_GILDED_PICKAXE = 8313;
public static final int MINING_DRAGON_PICKAXE = 7139; public static final int MINING_DRAGON_PICKAXE = 7139;
public static final int MINING_DRAGON_PICKAXE_UPGRADED = 642; 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 = 8346;
@@ -123,6 +125,7 @@ public final class AnimationID
public static final int MINING_MOTHERLODE_MITHRIL = 6757; public static final int MINING_MOTHERLODE_MITHRIL = 6757;
public static final int MINING_MOTHERLODE_ADAMANT = 6756; public static final int MINING_MOTHERLODE_ADAMANT = 6756;
public static final int MINING_MOTHERLODE_RUNE = 6752; public static final int MINING_MOTHERLODE_RUNE = 6752;
public static final int MINING_MOTHERLODE_GILDED = 8312;
public static final int MINING_MOTHERLODE_DRAGON = 6758; public static final int MINING_MOTHERLODE_DRAGON = 6758;
public static final int MINING_MOTHERLODE_DRAGON_UPGRADED = 335; 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 = 8344;

View File

@@ -135,6 +135,7 @@ public class IdleNotifierPlugin extends Plugin
case WOODCUTTING_MITHRIL: case WOODCUTTING_MITHRIL:
case WOODCUTTING_ADAMANT: case WOODCUTTING_ADAMANT:
case WOODCUTTING_RUNE: case WOODCUTTING_RUNE:
case WOODCUTTING_GILDED:
case WOODCUTTING_DRAGON: case WOODCUTTING_DRAGON:
case WOODCUTTING_INFERNAL: case WOODCUTTING_INFERNAL:
case WOODCUTTING_3A_AXE: case WOODCUTTING_3A_AXE:
@@ -201,6 +202,7 @@ public class IdleNotifierPlugin extends Plugin
case MINING_MITHRIL_PICKAXE: case MINING_MITHRIL_PICKAXE:
case MINING_ADAMANT_PICKAXE: case MINING_ADAMANT_PICKAXE:
case MINING_RUNE_PICKAXE: case MINING_RUNE_PICKAXE:
case MINING_GILDED_PICKAXE:
case MINING_DRAGON_PICKAXE: case MINING_DRAGON_PICKAXE:
case MINING_DRAGON_PICKAXE_UPGRADED: case MINING_DRAGON_PICKAXE_UPGRADED:
case MINING_DRAGON_PICKAXE_OR: case MINING_DRAGON_PICKAXE_OR:
@@ -217,6 +219,7 @@ public class IdleNotifierPlugin extends Plugin
case MINING_MOTHERLODE_MITHRIL: case MINING_MOTHERLODE_MITHRIL:
case MINING_MOTHERLODE_ADAMANT: case MINING_MOTHERLODE_ADAMANT:
case MINING_MOTHERLODE_RUNE: case MINING_MOTHERLODE_RUNE:
case MINING_MOTHERLODE_GILDED:
case MINING_MOTHERLODE_DRAGON: case MINING_MOTHERLODE_DRAGON:
case MINING_MOTHERLODE_DRAGON_UPGRADED: case MINING_MOTHERLODE_DRAGON_UPGRADED:
case MINING_MOTHERLODE_DRAGON_OR: case MINING_MOTHERLODE_DRAGON_OR:

View File

@@ -39,6 +39,7 @@ 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;
import static net.runelite.api.AnimationID.MINING_MOTHERLODE_DRAGON_OR; import static net.runelite.api.AnimationID.MINING_MOTHERLODE_DRAGON_OR;
import static net.runelite.api.AnimationID.MINING_MOTHERLODE_DRAGON_UPGRADED; 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; import static net.runelite.api.AnimationID.MINING_MOTHERLODE_INFERNAL;
import static net.runelite.api.AnimationID.MINING_MOTHERLODE_IRON; 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_MITHRIL;
@@ -58,8 +59,9 @@ class MotherlodeOverlay extends Overlay
private static final Set<Integer> MINING_ANIMATION_IDS = ImmutableSet.of( private static final Set<Integer> MINING_ANIMATION_IDS = ImmutableSet.of(
MINING_MOTHERLODE_BRONZE, MINING_MOTHERLODE_IRON, MINING_MOTHERLODE_STEEL, MINING_MOTHERLODE_BRONZE, MINING_MOTHERLODE_IRON, MINING_MOTHERLODE_STEEL,
MINING_MOTHERLODE_BLACK, MINING_MOTHERLODE_MITHRIL, MINING_MOTHERLODE_ADAMANT, MINING_MOTHERLODE_BLACK, MINING_MOTHERLODE_MITHRIL, MINING_MOTHERLODE_ADAMANT,
MINING_MOTHERLODE_RUNE, MINING_MOTHERLODE_DRAGON, MINING_MOTHERLODE_DRAGON_UPGRADED, MINING_MOTHERLODE_RUNE, MINING_MOTHERLODE_GILDED, MINING_MOTHERLODE_DRAGON,
MINING_MOTHERLODE_DRAGON_OR, MINING_MOTHERLODE_INFERNAL, MINING_MOTHERLODE_CRYSTAL MINING_MOTHERLODE_DRAGON_UPGRADED, MINING_MOTHERLODE_DRAGON_OR, MINING_MOTHERLODE_INFERNAL,
MINING_MOTHERLODE_CRYSTAL
); );
static final String MINING_RESET = "Reset"; static final String MINING_RESET = "Reset";

View File

@@ -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_BRONZE;
import static net.runelite.api.AnimationID.WOODCUTTING_CRYSTAL; import static net.runelite.api.AnimationID.WOODCUTTING_CRYSTAL;
import static net.runelite.api.AnimationID.WOODCUTTING_DRAGON; import static net.runelite.api.AnimationID.WOODCUTTING_DRAGON;
import static net.runelite.api.AnimationID.WOODCUTTING_GILDED;
import static net.runelite.api.AnimationID.WOODCUTTING_INFERNAL; import static net.runelite.api.AnimationID.WOODCUTTING_INFERNAL;
import static net.runelite.api.AnimationID.WOODCUTTING_IRON; import static net.runelite.api.AnimationID.WOODCUTTING_IRON;
import static net.runelite.api.AnimationID.WOODCUTTING_MITHRIL; import static net.runelite.api.AnimationID.WOODCUTTING_MITHRIL;
@@ -410,6 +411,7 @@ public class WintertodtPlugin extends Plugin
case WOODCUTTING_MITHRIL: case WOODCUTTING_MITHRIL:
case WOODCUTTING_ADAMANT: case WOODCUTTING_ADAMANT:
case WOODCUTTING_RUNE: case WOODCUTTING_RUNE:
case WOODCUTTING_GILDED:
case WOODCUTTING_DRAGON: case WOODCUTTING_DRAGON:
case WOODCUTTING_INFERNAL: case WOODCUTTING_INFERNAL:
case WOODCUTTING_3A_AXE: case WOODCUTTING_3A_AXE:

View File

@@ -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_BRONZE;
import static net.runelite.api.AnimationID.WOODCUTTING_CRYSTAL; import static net.runelite.api.AnimationID.WOODCUTTING_CRYSTAL;
import static net.runelite.api.AnimationID.WOODCUTTING_DRAGON; import static net.runelite.api.AnimationID.WOODCUTTING_DRAGON;
import static net.runelite.api.AnimationID.WOODCUTTING_GILDED;
import static net.runelite.api.AnimationID.WOODCUTTING_INFERNAL; import static net.runelite.api.AnimationID.WOODCUTTING_INFERNAL;
import static net.runelite.api.AnimationID.WOODCUTTING_IRON; import static net.runelite.api.AnimationID.WOODCUTTING_IRON;
import static net.runelite.api.AnimationID.WOODCUTTING_MITHRIL; import static net.runelite.api.AnimationID.WOODCUTTING_MITHRIL;
@@ -44,6 +45,7 @@ import static net.runelite.api.ItemID.BLACK_AXE;
import static net.runelite.api.ItemID.BRONZE_AXE; import static net.runelite.api.ItemID.BRONZE_AXE;
import static net.runelite.api.ItemID.CRYSTAL_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;
import static net.runelite.api.ItemID.GILDED_AXE;
import static net.runelite.api.ItemID.INFERNAL_AXE; import static net.runelite.api.ItemID.INFERNAL_AXE;
import static net.runelite.api.ItemID.IRON_AXE; import static net.runelite.api.ItemID.IRON_AXE;
import static net.runelite.api.ItemID.MITHRIL_AXE; import static net.runelite.api.ItemID.MITHRIL_AXE;
@@ -62,6 +64,7 @@ enum Axe
MITHRIL(WOODCUTTING_MITHRIL, MITHRIL_AXE), MITHRIL(WOODCUTTING_MITHRIL, MITHRIL_AXE),
ADAMANT(WOODCUTTING_ADAMANT, ADAMANT_AXE), ADAMANT(WOODCUTTING_ADAMANT, ADAMANT_AXE),
RUNE(WOODCUTTING_RUNE, RUNE_AXE), RUNE(WOODCUTTING_RUNE, RUNE_AXE),
GILDED(WOODCUTTING_GILDED, GILDED_AXE),
DRAGON(WOODCUTTING_DRAGON, DRAGON_AXE), DRAGON(WOODCUTTING_DRAGON, DRAGON_AXE),
INFERNAL(WOODCUTTING_INFERNAL, INFERNAL_AXE), INFERNAL(WOODCUTTING_INFERNAL, INFERNAL_AXE),
THIRDAGE(WOODCUTTING_3A_AXE, _3RD_AGE_AXE), THIRDAGE(WOODCUTTING_3A_AXE, _3RD_AGE_AXE),