From 575ae4201c0e9b39347cca10dfd75a0922ccfa03 Mon Sep 17 00:00:00 2001 From: mkowen1 Date: Sat, 20 Feb 2021 14:23:51 -0800 Subject: [PATCH 1/4] item identification: Add more seeds --- .../ItemIdentification.java | 20 +++++++++++++++++++ 1 file changed, 20 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..22bfe28984 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 @@ -45,8 +45,28 @@ enum ItemIdentification LANTADYME_SEED(Type.SEED, "Lanta", "L", ItemID.LANTADYME_SEED), DWARF_WEED_SEED(Type.SEED, "Dwarf", "D", ItemID.DWARF_WEED_SEED), TORSTOL_SEED(Type.SEED, "Torstol", "TOR", ItemID.TORSTOL_SEED), + POISON_IVY_SEED(Type.SEED, "Ivy", "I", ItemID.POISON_IVY_SEED), WHITEBERRY_SEED(Type.SEED, "White", "W", ItemID.WHITEBERRY_SEED), + SEAWEED_SPORE(Type.SEED, "Seaweed", "SW", ItemID.SEAWEED_SPORE), + + HESPORI_SEED(Type.SEED, "Hespori", "HES", ItemID.HESPORI_SEED), + KRONOS_SEED(Type.SEED, "Kronos", "KRO", ItemID.KRONOS_SEED), + IASOR_SEED(Type.SEED, "Iasor", "IA", ItemID.IASOR_SEED), + ATTAS_SEED(Type.SEED, "Attas", "AT", ItemID.ATTAS_SEED), + CELASTRUS_SEED(Type.SEED, "Celas", "CEL", ItemID.CELASTRUS_SEED), + SPIRIT_SEED(Type.SEED, "Spirit", "SPI", ItemID.SPIRIT_SEED), + CALQUAT_SEED(Type.SEED, "Calquat", "CAL", ItemID.CALQUAT_TREE_SEED), + + ACORN(Type.SEED, "Oak", "OAK", ItemID.ACORN), + WILLOW_SEED(Type.SEED, "Willow", "WIL", ItemID.WILLOW_SEED), + MAPLE_SEED(Type.SEED, "Maple", "MAP", ItemID.MAPLE_SEED), + YEW_SEED(Type.SEED, "Yew", "YEW", ItemID.SPIRIT_SEED), + MAGIC_SEED(Type.SEED, "Magic", "MAG", ItemID.SPIRIT_SEED), + REDWOOD_SEED(Type.SEED, "Red", "RED", ItemID.REDWOOD_TREE_SEED), + TEAK_SEED(Type.SEED, "Teak", "TEAK", ItemID.TEAK_SEED), + MAHOGANY_SEED(Type.SEED, "Mahog", "MAH", ItemID.MAHOGANY_SEED), + CRYSTAL_ACORN(Type.SEED, "Crystal", "CRY", ItemID.CRYSTAL_ACORN), //Sacks SACK(Type.SACK, "Empty", "EMP", ItemID.EMPTY_SACK), From 09f0cfd0c80adcb84f5ecf29d8b742928f6c4d01 Mon Sep 17 00:00:00 2001 From: mkowen1 Date: Sat, 20 Feb 2021 14:25:07 -0800 Subject: [PATCH 2/4] item identification: Add lunar teleport tablets --- .../itemidentification/ItemIdentification.java | 15 +++++++++++++++ 1 file changed, 15 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 22bfe28984..1b701d2259 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 @@ -253,15 +253,18 @@ enum ItemIdentification ARDOUGNE_TELEPORT(Type.TABLET, "Ardoug", "ARD", ItemID.ARDOUGNE_TELEPORT), WATCHTOWER_TELEPORT(Type.TABLET, "W.tow", "WT", ItemID.WATCHTOWER_TELEPORT), TELEPORT_TO_HOUSE(Type.TABLET, "House", "POH", ItemID.TELEPORT_TO_HOUSE), + ENCHANT_SAPPHIRE_OR_OPAL(Type.TABLET, "E.Saph", "E SO", ItemID.ENCHANT_SAPPHIRE_OR_OPAL), ENCHANT_EMERALD_OR_JADE(Type.TABLET, "E.Emer", "E EJ", ItemID.ENCHANT_EMERALD_OR_JADE), ENCHANT_RUBY_OR_TOPAZ(Type.TABLET, "E.Ruby", "E RT", ItemID.ENCHANT_RUBY_OR_TOPAZ), ENCHANT_DIAMOND(Type.TABLET, "E.Diam", "E DIA", ItemID.ENCHANT_DIAMOND), ENCHANT_DRAGONSTONE(Type.TABLET, "E.Dstn", "E DS", ItemID.ENCHANT_DRAGONSTONE), ENCHANT_ONYX(Type.TABLET, "E.Onyx", "E ONX", ItemID.ENCHANT_ONYX), + TELEKINETIC_GRAB(Type.TABLET, "T.grab", "T.GRB", ItemID.TELEKINETIC_GRAB), BONES_TO_PEACHES(Type.TABLET, "Peach", "BtP", ItemID.BONES_TO_PEACHES_8015), BONES_TO_BANANAS(Type.TABLET, "Banana", "BtB", ItemID.BONES_TO_BANANAS), + RIMMINGTON_TELEPORT(Type.TABLET, "Rimmi", "RIM", ItemID.RIMMINGTON_TELEPORT), TAVERLEY_TELEPORT(Type.TABLET, "Taver", "TAV", ItemID.TAVERLEY_TELEPORT), POLLNIVNEACH_TELEPORT(Type.TABLET, "Pollnv", "POL", ItemID.POLLNIVNEACH_TELEPORT), @@ -271,6 +274,7 @@ enum ItemIdentification TROLLHEIM_TELEPORT(Type.TABLET, "Trollh", "T.HM", ItemID.TROLLHEIM_TELEPORT), PRIFDDINAS_TELEPORT(Type.TABLET, "Prifd", "PRIF", ItemID.PRIFDDINAS_TELEPORT), HOSIDIUS_TELEPORT(Type.TABLET, "Hosid", "HOS", ItemID.HOSIDIUS_TELEPORT), + ANNAKARL_TELEPORT(Type.TABLET, "Annak", "GDZ", ItemID.ANNAKARL_TELEPORT), CARRALLANGAR_TELEPORT(Type.TABLET, "Carra", "CAR", ItemID.CARRALLANGAR_TELEPORT), DAREEYAK_TELEPORT(Type.TABLET, "Dareey", "DAR", ItemID.DAREEYAK_TELEPORT), @@ -278,6 +282,7 @@ enum ItemIdentification LASSAR_TELEPORT(Type.TABLET, "Lass", "LSR", ItemID.LASSAR_TELEPORT), PADDEWWA_TELEPORT(Type.TABLET, "Paddew", "PDW", ItemID.PADDEWWA_TELEPORT), SENNTISTEN_TELEPORT(Type.TABLET, "Sennt", "SNT", ItemID.SENNTISTEN_TELEPORT), + LUMBRIDGE_GRAVEYARD_TELEPORT(Type.TABLET, "L.Grave", "L.GRV", ItemID.LUMBRIDGE_GRAVEYARD_TELEPORT), DRAYNOR_MANOR_TELEPORT(Type.TABLET, "D.Manor", "D.MNR", ItemID.DRAYNOR_MANOR_TELEPORT), MIND_ALTAR_TELEPORT(Type.TABLET, "M.Altar", "M.ALT", ItemID.MIND_ALTAR_TELEPORT), @@ -289,6 +294,16 @@ enum ItemIdentification BARROWS_TELEPORT(Type.TABLET, "Barrow", "BAR", ItemID.BARROWS_TELEPORT), APE_ATOLL_TELEPORT(Type.TABLET, "Atoll", "APE", ItemID.APE_ATOLL_TELEPORT), BATTLEFRONT_TELEPORT(Type.TABLET, "B.Front", "BF", ItemID.BATTLEFRONT_TELEPORT), + + MOONCLAN_TELEPORT(Type.TABLET, "Moon", "MOON", ItemID.MOONCLAN_TELEPORT), + OURANIA_TELEPORT(Type.TABLET, "Ourania", "ZMI", ItemID.OURANIA_TELEPORT), + WATERBIRTH_TELEPORT(Type.TABLET, "W.Birth", "WAT", ItemID.WATERBIRTH_TELEPORT), + BARBARIAN_TELEPORT(Type.TABLET, "Barb", "BARB", ItemID.BARBARIAN_TELEPORT), + KHAZARD_TELEPORT(Type.TABLET, "Khaz", "KHA", ItemID.KHAZARD_TELEPORT), + FISHING_GUILD_TELEPORT(Type.TABLET, "Fish G.", "FIS", ItemID.FISHING_GUILD_TELEPORT), + CATHERBY_TELEPORT(Type.TABLET, "Cathy", "CATH", ItemID.CATHERBY_TELEPORT), + ICE_PLATEAU(Type.TABLET, "Ice Pl.", "ICE", ItemID.ICE_PLATEAU_TELEPORT), + TARGET_TELEPORT(Type.TABLET, "Target", "TRG", ItemID.TARGET_TELEPORT), VOLCANIC_MINE_TELEPORT(Type.TABLET, "V.Mine", "VM", ItemID.VOLCANIC_MINE_TELEPORT), WILDERNESS_CRABS_TELEPORT(Type.TABLET, "W.Crab", "CRAB", ItemID.WILDERNESS_CRABS_TELEPORT); From 68a544943c8b32c396a620cf76914976e345775c Mon Sep 17 00:00:00 2001 From: mkowen1 Date: Sat, 20 Feb 2021 14:27:01 -0800 Subject: [PATCH 3/4] item identification: Add composts --- .../itemidentification/ItemIdentification.java | 8 +++++++- .../itemidentification/ItemIdentificationConfig.java | 11 +++++++++++ .../itemidentification/ItemIdentificationOverlay.java | 6 ++++++ 3 files changed, 24 insertions(+), 1 deletion(-) 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 1b701d2259..adaff1575e 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 @@ -120,6 +120,11 @@ enum ItemIdentification CALQUAT_SAPLING(Type.SAPLING, "Calquat", "CALQ", ItemID.CALQUAT_SAPLING, ItemID.CALQUAT_SEEDLING, ItemID.CALQUAT_SEEDLING_W), CELASTRUS_SAPLING(Type.SAPLING, "Celas", "CEL", ItemID.CELASTRUS_SAPLING, ItemID.CELASTRUS_SEEDLING, ItemID.CELASTRUS_SEEDLING_W), + //Compost + COMPOST(Type.COMPOST, "Compost", "COM", ItemID.COMPOST), + SUPERCOMPOST(Type.COMPOST, "Sup Com", "SCOM", ItemID.SUPERCOMPOST), + ULTRACOMPOST(Type.COMPOST, "Ult Com", "UCOM", ItemID.ULTRACOMPOST), + //Ores COPPER_ORE(Type.ORE, "Copper", "COP", ItemID.COPPER_ORE), TIN_ORE(Type.ORE, "Tin", "TIN", ItemID.TIN_ORE), @@ -209,7 +214,7 @@ enum ItemIdentification SERUM_207(Type.POTION, "Ser207", "S7", ItemID.SERUM_207_4, ItemID.SERUM_207_3, ItemID.SERUM_207_2, ItemID.SERUM_207_1), SERUM_208(Type.POTION, "Ser208", "S8", ItemID.SERUM_208_4, ItemID.SERUM_208_3, ItemID.SERUM_208_2, ItemID.SERUM_208_1), - COMPOST(Type.POTION, "Compost", "Cp", ItemID.COMPOST_POTION4, ItemID.COMPOST_POTION3, ItemID.COMPOST_POTION2, ItemID.COMPOST_POTION1), + COMPOST_POTION(Type.POTION, "Compost", "COM", ItemID.COMPOST_POTION4, ItemID.COMPOST_POTION3, ItemID.COMPOST_POTION2, ItemID.COMPOST_POTION1), AGILITY(Type.POTION, "Agility", "Ag", ItemID.AGILITY_POTION4, ItemID.AGILITY_POTION3, ItemID.AGILITY_POTION2, ItemID.AGILITY_POTION1), FISHING(Type.POTION, "Fishing", "Fi", ItemID.FISHING_POTION4, ItemID.FISHING_POTION3, ItemID.FISHING_POTION2, ItemID.FISHING_POTION1), @@ -349,6 +354,7 @@ enum ItemIdentification SACK, HERB, SAPLING, + COMPOST, ORE, GEM, POTION, 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..d677b5ccb8 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 @@ -105,6 +105,17 @@ public interface ItemIdentificationConfig extends Config return true; } + @ConfigItem( + keyName = "showComposts", + name = "Composts", + description = "Show identification on Composts", + section = identificationSection + ) + default boolean showComposts() + { + return false; + } + @ConfigItem( keyName = "showOres", name = "Ores", 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..65bacc644e 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 @@ -89,6 +89,12 @@ class ItemIdentificationOverlay extends WidgetItemOverlay return; } break; + case COMPOST: + if (!config.showComposts()) + { + return; + } + break; case ORE: if (!config.showOres()) { From 05cc4f419ca49f1594580ba363cc0d9538b7152d Mon Sep 17 00:00:00 2001 From: mkowen1 Date: Sat, 20 Feb 2021 14:27:44 -0800 Subject: [PATCH 4/4] item identification: Add bars --- .../itemidentification/ItemIdentification.java | 11 +++++++++++ .../itemidentification/ItemIdentificationConfig.java | 11 +++++++++++ .../itemidentification/ItemIdentificationOverlay.java | 6 ++++++ 3 files changed, 28 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 adaff1575e..458dd1395e 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 @@ -147,6 +147,16 @@ enum ItemIdentification DAEYALT_ORE(Type.ORE, "Daeyalt", "DAE", ItemID.DAEYALT_ORE), LUNAR_ORE(Type.ORE, "Lunar", "LUN", ItemID.LUNAR_ORE), + //Bars + BRONZE_BAR(Type.BAR, "Bronze", "BRO", ItemID.BRONZE_BAR), + IRON_BAR(Type.BAR, "Iron", "IRO", ItemID.IRON_BAR), + SILVER_BAR(Type.BAR, "Silver", "SIL", ItemID.SILVER_BAR), + STEEL_BAR(Type.BAR, "Steel", "STE", ItemID.STEEL_BAR), + GOLD_BAR(Type.BAR, "Gold", "GOL", ItemID.GOLD_BAR), + MITHRIL_BAR(Type.BAR, "Mithril", "MIT", ItemID.MITHRIL_BAR), + ADAMANTITE_BAR(Type.BAR, "Adaman", "ADA", ItemID.ADAMANTITE_BAR), + RUNITE_BAR(Type.BAR, "Runite", "RUN", ItemID.RUNITE_BAR), + //Gems SAPPHIRE(Type.GEM, "Sapphir", "S", ItemID.UNCUT_SAPPHIRE, ItemID.SAPPHIRE), EMERALD(Type.GEM, "Emerald", "E", ItemID.UNCUT_EMERALD, ItemID.EMERALD), @@ -356,6 +366,7 @@ enum ItemIdentification SAPLING, COMPOST, ORE, + BAR, GEM, POTION, IMPLING_JAR, 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 d677b5ccb8..1a61948cf3 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 @@ -127,6 +127,17 @@ public interface ItemIdentificationConfig extends Config return false; } + @ConfigItem( + keyName = "showBars", + name = "Bars", + description = "Show identification on Bars", + section = identificationSection + ) + default boolean showBars() + { + return false; + } + @ConfigItem( keyName = "showGems", name = "Gems", 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 65bacc644e..ce7a658398 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 @@ -101,6 +101,12 @@ class ItemIdentificationOverlay extends WidgetItemOverlay return; } break; + case BAR: + if (!config.showBars()) + { + return; + } + break; case GEM: if (!config.showGems()) {