From 37e6a326d0ecc00344ee9742f0426da95bdc8aa7 Mon Sep 17 00:00:00 2001 From: asdftemp <53125463+asdftemp@users.noreply.github.com> Date: Sat, 20 Feb 2021 23:20:56 +0100 Subject: [PATCH] item identification: Add logs and planks (#13171) --- .../ItemIdentification.java | 44 +++++++++++++++++++ .../ItemIdentificationConfig.java | 22 ++++++++++ .../ItemIdentificationOverlay.java | 12 +++++ 3 files changed, 78 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java index c892de9420..dd230567ab 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java @@ -75,6 +75,48 @@ enum ItemIdentification SITO_FOIL(Type.HERB, "Sito", "SF", ItemID.SITO_FOIL, ItemID.GRIMY_SITO_FOIL), SNAKE_WEED(Type.HERB, "Snake", "SW", ItemID.SNAKE_WEED, ItemID.GRIMY_SNAKE_WEED), VOLENCIA_MOSS(Type.HERB, "Volenc", "V", ItemID.VOLENCIA_MOSS, ItemID.GRIMY_VOLENCIA_MOSS), + + //Logs + RED_LOGS(Type.LOGS, "Red", "RED", ItemID.RED_LOGS), + GREEN_LOGS(Type.LOGS, "Green", "GRE", ItemID.GREEN_LOGS), + BLUE_LOGS(Type.LOGS, "Blue", "BLU", ItemID.BLUE_LOGS), + WHITE_LOGS(Type.LOGS, "White", "WHI", ItemID.WHITE_LOGS), + PURPLE_LOGS(Type.LOGS, "Purple", "PUR", ItemID.PURPLE_LOGS), + + SCRAPEY_TREE_LOGS(Type.LOGS, "Scrapey", "SCRAP", ItemID.SCRAPEY_TREE_LOGS), + + LOG(Type.LOGS, "Log", "LOG", ItemID.LOGS), + ACHEY_TREE_LOG(Type.LOGS, "Achey", "ACH", ItemID.ACHEY_TREE_LOGS), + OAK_LOG(Type.LOGS, "Oak", "OAK", ItemID.OAK_LOGS), + WILLOW_LOG(Type.LOGS, "Willow", "WIL", ItemID.WILLOW_LOGS), + TEAK_LOG(Type.LOGS, "Teak", "TEAK", ItemID.TEAK_LOGS), + JUNIPER_LOG(Type.LOGS, "Juniper", "JUN", ItemID.JUNIPER_LOGS), + MAPLE_LOG(Type.LOGS, "Maple", "MAP", ItemID.MAPLE_LOGS), + MAHOGANY_LOG(Type.LOGS, "Mahog", "MAH", ItemID.MAHOGANY_LOGS), + ARCTIC_PINE_LOG(Type.LOGS, "Arctic", "ARC", ItemID.ARCTIC_PINE_LOGS), + YEW_LOG(Type.LOGS, "Yew", "YEW", ItemID.YEW_LOGS), + BLISTERWOOD_LOG(Type.LOGS, "Blister", "BLI", ItemID.BLISTERWOOD_LOGS), + MAGIC_LOG(Type.LOGS, "Magic", "MAG", ItemID.MAGIC_LOGS), + REDWOOD_LOG(Type.LOGS, "Red", "RED", ItemID.REDWOOD_LOGS), + + PYRE_LOGS(Type.LOGS, "Pyre", "P", ItemID.PYRE_LOGS), + ARCTIC_PYRE_LOGS(Type.LOGS, "Art P", "AP", ItemID.ARCTIC_PYRE_LOGS), + OAK_PYRE_LOGS(Type.LOGS, "Oak P", "OAKP", ItemID.OAK_PYRE_LOGS), + WILLOW_PYRE_LOGS(Type.LOGS, "Wil P", "WILP", ItemID.WILLOW_PYRE_LOGS), + TEAK_PYRE_LOGS(Type.LOGS, "Teak P", "TEAKP", ItemID.TEAK_PYRE_LOGS), + MAPLE_PYRE_LOGS(Type.LOGS, "Map P", "MAPP", ItemID.MAPLE_PYRE_LOGS), + MAHOGANY_PYRE_LOGS(Type.LOGS, "Mah P", "MAHP", ItemID.MAHOGANY_PYRE_LOGS), + YEW_PYRE_LOGS(Type.LOGS, "Yew P", "YEWP", ItemID.YEW_PYRE_LOGS), + MAGIC_PYRE_LOGS(Type.LOGS, "Mag P", "MAGP", ItemID.MAGIC_PYRE_LOGS), + REDWOOD_PYRE_LOGS(Type.LOGS, "Red P", "REDP", ItemID.REDWOOD_PYRE_LOGS), + + //Planks + PLANK(Type.PLANK, "Plank", "PLANK", ItemID.PLANK), + OAK_PLANK(Type.PLANK, "Oak", "OAK", ItemID.OAK_PLANK), + TEAK_PLANK(Type.PLANK, "Teak", "TEAK", ItemID.TEAK_PLANK), + MAHOGANY_PLANK(Type.PLANK, "Mahog", "MAH", ItemID.MAHOGANY_PLANK), + WAXWOOD_PLANK(Type.PLANK, "Wax", "WAX", ItemID.WAXWOOD_PLANK), + MALLIGNUM_ROOT_PLANK(Type.PLANK, "Mallig", "MALL", ItemID.MALLIGNUM_ROOT_PLANK), //Saplings OAK_SAPLING(Type.SAPLING, "Oak", "OAK", ItemID.OAK_SAPLING, ItemID.OAK_SEEDLING, ItemID.OAK_SEEDLING_W), @@ -313,6 +355,8 @@ enum ItemIdentification SEED, SACK, HERB, + LOGS, + PLANK, SAPLING, ORE, GEM, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationConfig.java index 606daac64d..ff0bb9442d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationConfig.java @@ -94,6 +94,28 @@ public interface ItemIdentificationConfig extends Config return false; } + @ConfigItem( + keyName = "showLogs", + name = "Logs", + description = "Show identification on Logs", + section = identificationSection + ) + default boolean showLogs() + { + return false; + } + + @ConfigItem( + keyName = "showPlanks", + name = "Planks", + description = "Show identification on Planks", + section = identificationSection + ) + default boolean showPlanks() + { + return false; + } + @ConfigItem( keyName = "showSaplings", name = "Saplings", 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 c63db62924..10a43dfd89 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 @@ -83,6 +83,18 @@ class ItemIdentificationOverlay extends WidgetItemOverlay return; } break; + case LOGS: + if (!config.showLogs()) + { + return; + } + break; + case PLANK: + if (!config.showPlanks()) + { + return; + } + break; case SAPLING: if (!config.showSaplings()) {