item identification: add option for each seed type
Also add an option to split pyre logs from regular logs, and fix the section for Sacks Co-authored-by: Adam <Adam@sigterm.info>
This commit is contained in:
septicsalmon
Adam
@@ -33,42 +33,84 @@ import net.runelite.api.ItemID;
|
||||
enum ItemIdentification
|
||||
{
|
||||
//Seeds
|
||||
GUAM_SEED(Type.SEED, "Guam", "G", ItemID.GUAM_SEED),
|
||||
MARRENTILL_SEED(Type.SEED, "Marren", "M", ItemID.MARRENTILL_SEED),
|
||||
TARROMIN_SEED(Type.SEED, "Tarro", "TAR", ItemID.TARROMIN_SEED),
|
||||
HARRALANDER_SEED(Type.SEED, "Harra", "H", ItemID.HARRALANDER_SEED),
|
||||
RANARR_SEED(Type.SEED, "Ranarr", "R", ItemID.RANARR_SEED),
|
||||
TOADFLAX_SEED(Type.SEED, "Toad", "TOA", ItemID.TOADFLAX_SEED),
|
||||
IRIT_SEED(Type.SEED, "Irit", "I", ItemID.IRIT_SEED),
|
||||
AVANTOE_SEED(Type.SEED, "Avan", "A", ItemID.AVANTOE_SEED),
|
||||
KWUARM_SEED(Type.SEED, "Kwuarm", "K", ItemID.KWUARM_SEED),
|
||||
SNAPDRAGON_SEED(Type.SEED, "Snap", "S", ItemID.SNAPDRAGON_SEED),
|
||||
CADANTINE_SEED(Type.SEED, "Cadan", "C", ItemID.CADANTINE_SEED),
|
||||
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),
|
||||
GUAM_SEED(Type.SEED_HERB, "Guam", "G", ItemID.GUAM_SEED),
|
||||
MARRENTILL_SEED(Type.SEED_HERB, "Marren", "M", ItemID.MARRENTILL_SEED),
|
||||
TARROMIN_SEED(Type.SEED_HERB, "Tarro", "TAR", ItemID.TARROMIN_SEED),
|
||||
HARRALANDER_SEED(Type.SEED_HERB, "Harra", "H", ItemID.HARRALANDER_SEED),
|
||||
RANARR_SEED(Type.SEED_HERB, "Ranarr", "R", ItemID.RANARR_SEED),
|
||||
TOADFLAX_SEED(Type.SEED_HERB, "Toad", "TOA", ItemID.TOADFLAX_SEED),
|
||||
IRIT_SEED(Type.SEED_HERB, "Irit", "I", ItemID.IRIT_SEED),
|
||||
AVANTOE_SEED(Type.SEED_HERB, "Avan", "A", ItemID.AVANTOE_SEED),
|
||||
KWUARM_SEED(Type.SEED_HERB, "Kwuarm", "K", ItemID.KWUARM_SEED),
|
||||
SNAPDRAGON_SEED(Type.SEED_HERB, "Snap", "S", ItemID.SNAPDRAGON_SEED),
|
||||
CADANTINE_SEED(Type.SEED_HERB, "Cadan", "C", ItemID.CADANTINE_SEED),
|
||||
LANTADYME_SEED(Type.SEED_HERB, "Lanta", "L", ItemID.LANTADYME_SEED),
|
||||
DWARF_WEED_SEED(Type.SEED_HERB, "Dwarf", "D", ItemID.DWARF_WEED_SEED),
|
||||
TORSTOL_SEED(Type.SEED_HERB, "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),
|
||||
REDBERRY_SEED(Type.SEED_BERRY, "Redberry", "RED", ItemID.REDBERRY_SEED),
|
||||
CADAVABERRY_SEED(Type.SEED_BERRY, "Cadava", "CAD", ItemID.CADAVABERRY_SEED),
|
||||
DWELLBERRY_SEED(Type.SEED_BERRY, "Dwell", "DWEL", ItemID.DWELLBERRY_SEED),
|
||||
JANGERBERRY_SEED(Type.SEED_BERRY, "Janger", "JANG", ItemID.JANGERBERRY_SEED),
|
||||
WHITEBERRY_SEED(Type.SEED_BERRY, "White", "WHIT", ItemID.WHITEBERRY_SEED),
|
||||
POISON_IVY_SEED(Type.SEED_BERRY, "Ivy", "POI", ItemID.POISON_IVY_SEED),
|
||||
|
||||
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),
|
||||
GRAPE_SEED(Type.SEED_SPECIAL, "Grape", "GRA", ItemID.GRAPE_SEED),
|
||||
MUSHROOM_SPORE(Type.SEED_SPECIAL, "Mushroom", "MUSH", ItemID.MUSHROOM_SPORE),
|
||||
BELLADONNA_SEED(Type.SEED_SPECIAL, "Bella", "BELL", ItemID.BELLADONNA_SEED),
|
||||
SEAWEED_SPORE(Type.SEED_SPECIAL, "Seaweed", "SW", ItemID.SEAWEED_SPORE),
|
||||
HESPORI_SEED(Type.SEED_SPECIAL, "Hespori", "HES", ItemID.HESPORI_SEED),
|
||||
KRONOS_SEED(Type.SEED_SPECIAL, "Kronos", "KRO", ItemID.KRONOS_SEED),
|
||||
IASOR_SEED(Type.SEED_SPECIAL, "Iasor", "IA", ItemID.IASOR_SEED),
|
||||
ATTAS_SEED(Type.SEED_SPECIAL, "Attas", "AT", ItemID.ATTAS_SEED),
|
||||
CACTUS_SEED(Type.SEED_SPECIAL, "Cactus", "CAC", ItemID.CACTUS_SEED),
|
||||
POTATO_CACTUS_SEED(Type.SEED_SPECIAL, "P.Cact", "P.CAC", ItemID.POTATO_CACTUS_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.YEW_SEED),
|
||||
MAGIC_SEED(Type.SEED, "Magic", "MAG", ItemID.MAGIC_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),
|
||||
ACORN(Type.SEED_TREE, "Oak", "OAK", ItemID.ACORN),
|
||||
WILLOW_SEED(Type.SEED_TREE, "Willow", "WIL", ItemID.WILLOW_SEED),
|
||||
MAPLE_SEED(Type.SEED_TREE, "Maple", "MAP", ItemID.MAPLE_SEED),
|
||||
YEW_SEED(Type.SEED_TREE, "Yew", "YEW", ItemID.YEW_SEED),
|
||||
MAGIC_SEED(Type.SEED_TREE, "Magic", "MAG", ItemID.MAGIC_SEED),
|
||||
REDWOOD_SEED(Type.SEED_TREE, "Red", "RED", ItemID.REDWOOD_TREE_SEED),
|
||||
TEAK_SEED(Type.SEED_TREE, "Teak", "TEAK", ItemID.TEAK_SEED),
|
||||
MAHOGANY_SEED(Type.SEED_TREE, "Mahog", "MAH", ItemID.MAHOGANY_SEED),
|
||||
CRYSTAL_ACORN(Type.SEED_TREE, "Crystal", "CRY", ItemID.CRYSTAL_ACORN),
|
||||
CELASTRUS_SEED(Type.SEED_TREE, "Celas", "CEL", ItemID.CELASTRUS_SEED),
|
||||
SPIRIT_SEED(Type.SEED_TREE, "Spirit", "SPI", ItemID.SPIRIT_SEED),
|
||||
CALQUAT_SEED(Type.SEED_TREE, "Calquat", "CAL", ItemID.CALQUAT_TREE_SEED),
|
||||
|
||||
APPLE_TREE_SEED(Type.SEED_FRUIT_TREE, "Apple", "APP", ItemID.APPLE_TREE_SEED),
|
||||
BANANA_TREE_SEED(Type.SEED_FRUIT_TREE, "Banana", "BAN", ItemID.BANANA_TREE_SEED),
|
||||
ORANGE_TREE_SEED(Type.SEED_FRUIT_TREE, "Orange", "ORA", ItemID.ORANGE_TREE_SEED),
|
||||
CURRY_TREE_SEED(Type.SEED_FRUIT_TREE, "Curry", "CUR", ItemID.CURRY_TREE_SEED),
|
||||
PINEAPPLE_SEED(Type.SEED_FRUIT_TREE, "Pine.A", "PINE", ItemID.PINEAPPLE_SEED),
|
||||
PAPAYA_TREE_SEED(Type.SEED_FRUIT_TREE, "Papaya", "PAPA", ItemID.PAPAYA_TREE_SEED),
|
||||
PALM_TREE_SEED(Type.SEED_FRUIT_TREE, "Palm", "PALM", ItemID.PALM_TREE_SEED),
|
||||
DRAGONFRIUT_TREE_SEED(Type.SEED_FRUIT_TREE, "Dragon", "DRA", ItemID.DRAGONFRUIT_TREE_SEED),
|
||||
|
||||
POTATO_SEED(Type.SEED_ALLOTMENT, "Potato", "POT", ItemID.POTATO_SEED),
|
||||
ONION_SEED(Type.SEED_ALLOTMENT, "Onion", "ONI", ItemID.ONION_SEED),
|
||||
CABBAGE_SEED(Type.SEED_ALLOTMENT, "Cabbage", "CAB", ItemID.CABBAGE_SEED),
|
||||
TOMATO_SEED(Type.SEED_ALLOTMENT, "Tomato", "TOM", ItemID.TOMATO_SEED),
|
||||
SWEETCORN_SEED(Type.SEED_ALLOTMENT, "S.Corn", "CORN", ItemID.SWEETCORN_SEED),
|
||||
STRAWBERRY_SEED(Type.SEED_ALLOTMENT, "S.Berry", "STRA", ItemID.STRAWBERRY_SEED),
|
||||
WATERMELON_SEED(Type.SEED_ALLOTMENT, "Melon", "MEL", ItemID.WATERMELON_SEED),
|
||||
SNAPE_GRASS_SEED(Type.SEED_ALLOTMENT, "Snape", "SNA", ItemID.SNAPE_GRASS_SEED),
|
||||
|
||||
MARIGOLD_SEED(Type.SEED_FLOWER, "Marigo", "MARI", ItemID.MARIGOLD_SEED),
|
||||
ROSEMARY_SEED(Type.SEED_FLOWER, "Rosemar", "ROSE", ItemID.ROSEMARY_SEED),
|
||||
NASTURTIUM_SEED(Type.SEED_FLOWER, "Nastur", "NAS", ItemID.NASTURTIUM_SEED),
|
||||
WOAD_SEED(Type.SEED_FLOWER, "Woad", "WOAD", ItemID.WOAD_SEED),
|
||||
LIMPWURT_SEED(Type.SEED_FLOWER, "Limpwurt", "LIMP", ItemID.LIMPWURT_SEED),
|
||||
WHITE_LILY_SEED(Type.SEED_FLOWER, "Lily", "LILY", ItemID.WHITE_LILY_SEED),
|
||||
|
||||
BARLEY_SEED(Type.HOPS_SEED, "Barley", "BAR", ItemID.BARLEY_SEED),
|
||||
HAMMERSTONE_SEED(Type.HOPS_SEED, "Hammer", "HAMM", ItemID.HAMMERSTONE_SEED),
|
||||
ASGARNIAN_SEED(Type.HOPS_SEED, "Asgar", "ASG", ItemID.ASGARNIAN_SEED),
|
||||
JUTE_SEED(Type.HOPS_SEED, "Jute", "JUTE", ItemID.JUTE_SEED),
|
||||
YANILLIAN_SEED(Type.HOPS_SEED, "Yani", "YAN", ItemID.YANILLIAN_SEED),
|
||||
KRANDORIAN_SEED(Type.HOPS_SEED, "Krand", "KRA", ItemID.KRANDORIAN_SEED),
|
||||
WILDBLOOD_SEED(Type.HOPS_SEED, "Wild.B", "WILD", ItemID.WILDBLOOD_SEED),
|
||||
|
||||
//Sacks
|
||||
SACK(Type.SACK, "Empty", "EMP", ItemID.EMPTY_SACK),
|
||||
@@ -121,16 +163,16 @@ enum ItemIdentification
|
||||
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),
|
||||
PYRE_LOGS(Type.LOGS_PYRE, "Pyre", "P", ItemID.PYRE_LOGS),
|
||||
ARCTIC_PYRE_LOGS(Type.LOGS_PYRE, "Art P", "AP", ItemID.ARCTIC_PYRE_LOGS),
|
||||
OAK_PYRE_LOGS(Type.LOGS_PYRE, "Oak P", "OAKP", ItemID.OAK_PYRE_LOGS),
|
||||
WILLOW_PYRE_LOGS(Type.LOGS_PYRE, "Wil P", "WILP", ItemID.WILLOW_PYRE_LOGS),
|
||||
TEAK_PYRE_LOGS(Type.LOGS_PYRE, "Teak P", "TEAKP", ItemID.TEAK_PYRE_LOGS),
|
||||
MAPLE_PYRE_LOGS(Type.LOGS_PYRE, "Map P", "MAPP", ItemID.MAPLE_PYRE_LOGS),
|
||||
MAHOGANY_PYRE_LOGS(Type.LOGS_PYRE, "Mah P", "MAHP", ItemID.MAHOGANY_PYRE_LOGS),
|
||||
YEW_PYRE_LOGS(Type.LOGS_PYRE, "Yew P", "YEWP", ItemID.YEW_PYRE_LOGS),
|
||||
MAGIC_PYRE_LOGS(Type.LOGS_PYRE, "Mag P", "MAGP", ItemID.MAGIC_PYRE_LOGS),
|
||||
REDWOOD_PYRE_LOGS(Type.LOGS_PYRE, "Red P", "REDP", ItemID.REDWOOD_PYRE_LOGS),
|
||||
|
||||
//Planks
|
||||
PLANK(Type.PLANK, "Plank", "PLANK", ItemID.PLANK),
|
||||
@@ -424,10 +466,18 @@ enum ItemIdentification
|
||||
@AllArgsConstructor
|
||||
enum Type
|
||||
{
|
||||
SEED(ItemIdentificationConfig::showSeeds),
|
||||
SEED_HERB(ItemIdentificationConfig::showHerbSeeds),
|
||||
SEED_BERRY(ItemIdentificationConfig::showBerrySeeds),
|
||||
SEED_ALLOTMENT(ItemIdentificationConfig::showAllotmentSeeds),
|
||||
SEED_SPECIAL(ItemIdentificationConfig::showSpecialSeeds),
|
||||
SEED_TREE(ItemIdentificationConfig::showTreeSeeds),
|
||||
SEED_FRUIT_TREE(ItemIdentificationConfig::showFruitTreeSeeds),
|
||||
SEED_FLOWER(ItemIdentificationConfig::showFlowerSeeds),
|
||||
HOPS_SEED(ItemIdentificationConfig::showHopsSeeds),
|
||||
SACK(ItemIdentificationConfig::showSacks),
|
||||
HERB(ItemIdentificationConfig::showHerbs),
|
||||
LOGS(ItemIdentificationConfig::showLogs),
|
||||
LOGS_PYRE(ItemIdentificationConfig::showPyreLogs),
|
||||
PLANK(ItemIdentificationConfig::showPlanks),
|
||||
SAPLING(ItemIdentificationConfig::showSaplings),
|
||||
COMPOST(ItemIdentificationConfig::showComposts),
|
||||
|
||||
@@ -63,20 +63,98 @@ public interface ItemIdentificationConfig extends Config
|
||||
}
|
||||
|
||||
@ConfigItem(
|
||||
keyName = "showSeeds",
|
||||
name = "Seeds",
|
||||
description = "Show identification on Seeds",
|
||||
keyName = "showHerbSeeds",
|
||||
name = "Seeds (Herb)",
|
||||
description = "Show identification on Herb Seeds",
|
||||
section = identificationSection
|
||||
)
|
||||
default boolean showSeeds()
|
||||
default boolean showHerbSeeds()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@ConfigItem(
|
||||
keyName = "showAllotmentSeeds",
|
||||
name = "Seeds (Allotment)",
|
||||
description = "Show identification on Allotment Seeds",
|
||||
section = identificationSection
|
||||
)
|
||||
default boolean showAllotmentSeeds()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@ConfigItem(
|
||||
keyName = "showFlowerSeeds",
|
||||
name = "Seeds (Flower)",
|
||||
description = "Show identification on Flower Seeds",
|
||||
section = identificationSection
|
||||
)
|
||||
default boolean showFlowerSeeds()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@ConfigItem(
|
||||
keyName = "showFruitTreeSeeds",
|
||||
name = "Seeds (Fruit Tree)",
|
||||
description = "Show identification on Fruit Tree Seeds",
|
||||
section = identificationSection
|
||||
)
|
||||
default boolean showFruitTreeSeeds()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@ConfigItem(
|
||||
keyName = "showTreeSeeds",
|
||||
name = "Seeds (Tree)",
|
||||
description = "Show identification on Tree Seeds",
|
||||
section = identificationSection
|
||||
)
|
||||
default boolean showTreeSeeds()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@ConfigItem(
|
||||
keyName = "showSpecialSeeds",
|
||||
name = "Seeds (Special)",
|
||||
description = "Show identification on Special Seeds",
|
||||
section = identificationSection
|
||||
)
|
||||
default boolean showSpecialSeeds()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@ConfigItem(
|
||||
keyName = "showBerrySeeds",
|
||||
name = "Seeds (Berry)",
|
||||
description = "Show identification on Berry Seeds",
|
||||
section = identificationSection
|
||||
)
|
||||
default boolean showBerrySeeds()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@ConfigItem(
|
||||
keyName = "showHopSeeds",
|
||||
name = "Seeds (Hops)",
|
||||
description = "Show identification on Hops Seeds",
|
||||
section = identificationSection
|
||||
)
|
||||
default boolean showHopsSeeds()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@ConfigItem(
|
||||
keyName = "showSacks",
|
||||
name = "Sacks",
|
||||
description = "Show identification on Sacks"
|
||||
description = "Show identification on Sacks",
|
||||
section = identificationSection
|
||||
)
|
||||
default boolean showSacks()
|
||||
{
|
||||
@@ -105,6 +183,17 @@ public interface ItemIdentificationConfig extends Config
|
||||
return false;
|
||||
}
|
||||
|
||||
@ConfigItem(
|
||||
keyName = "showPyreLogs",
|
||||
name = "Logs (Pyre)",
|
||||
description = "Show identification on Pyre Logs",
|
||||
section = identificationSection
|
||||
)
|
||||
default boolean showPyreLogs()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@ConfigItem(
|
||||
keyName = "showPlanks",
|
||||
name = "Planks",
|
||||
|
||||
Reference in New Issue
Block a user