ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

item identification: add support for labeling ores and gems (#9268)

Browse Source
This commit is contained in:
meshens
2019-07-11 07:26:50 -05:00
committed by Tomas Slusny
parent ea3b6ac9e8
commit 700658d2cf
3 changed files with 70 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java
View File

@@ -85,7 +85,41 @@ enum ItemIdentification
TEAK_SAPLING(Type.SAPLING, "Teak", "TEAK", ItemID.TEAK_SAPLING, ItemID.TEAK_SEEDLING, ItemID.TEAK_SEEDLING_W),
MAHOGANY_SAPLING(Type.SAPLING, "Mahog", "MAHOG", ItemID.MAHOGANY_SAPLING, ItemID.MAHOGANY_SEEDLING, ItemID.MAHOGANY_SEEDLING_W),
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);
CELASTRUS_SAPLING(Type.SAPLING, "Celas", "CEL", ItemID.CELASTRUS_SAPLING, ItemID.CELASTRUS_SEEDLING, ItemID.CELASTRUS_SEEDLING_W),
//Ores
COPPER_ORE(Type.ORE, "Copper", "COP", ItemID.COPPER_ORE),
TIN_ORE(Type.ORE, "Tin", "TIN", ItemID.TIN_ORE),
IRON_ORE(Type.ORE, "Iron", "IRO", ItemID.IRON_ORE),
SILVER_ORE(Type.ORE, "Silver", "SIL", ItemID.SILVER_ORE),
COAL_ORE(Type.ORE, "Coal", "COA", ItemID.COAL),
GOLD_ORE(Type.ORE, "Gold", "GOL", ItemID.GOLD_ORE),
MITHRIL_ORE(Type.ORE, "Mithril", "MIT", ItemID.MITHRIL_ORE),
ADAMANTITE_ORE(Type.ORE, "Adaman", "ADA", ItemID.ADAMANTITE_ORE),
RUNITE_ORE(Type.ORE, "Runite", "RUN", ItemID.RUNITE_ORE),
RUNE_ESSENCE(Type.ORE, "R.Ess", "R.E.", ItemID.RUNE_ESSENCE),
PURE_ESSENCE(Type.ORE, "P.Ess", "P.E.", ItemID.PURE_ESSENCE),
PAYDIRT(Type.ORE, "Paydirt", "PAY", ItemID.PAYDIRT),
AMETHYST(Type.ORE, "Amethy", "AME", ItemID.AMETHYST),
LOVAKITE_ORE(Type.ORE, "Lovakit", "LOV", ItemID.LOVAKITE_ORE),
BLURITE_ORE(Type.ORE, "Blurite", "BLU", ItemID.BLURITE_ORE),
ELEMENTAL_ORE(Type.ORE, "Element", "ELE", ItemID.ELEMENTAL_ORE),
DAEYALT_ORE(Type.ORE, "Daeyalt", "DAE", ItemID.DAEYALT_ORE),
LUNAR_ORE(Type.ORE, "Lunar", "LUN", ItemID.LUNAR_ORE),
//Gems
SAPPHIRE(Type.GEM, "Sapphir", "S", ItemID.UNCUT_SAPPHIRE, ItemID.SAPPHIRE),
EMERALD(Type.GEM, "Emerald", "E", ItemID.UNCUT_EMERALD, ItemID.EMERALD),
RUBY(Type.GEM, "Ruby", "R", ItemID.UNCUT_RUBY, ItemID.RUBY),
DIAMOND(Type.GEM, "Diamon", "DI", ItemID.UNCUT_DIAMOND, ItemID.DIAMOND),
OPAL(Type.GEM, "Opal", "OP", ItemID.UNCUT_OPAL, ItemID.OPAL),
JADE(Type.GEM, "Jade", "J", ItemID.UNCUT_JADE, ItemID.JADE),
RED_TOPAZ(Type.GEM, "Topaz", "T", ItemID.UNCUT_RED_TOPAZ, ItemID.RED_TOPAZ),
DRAGONSTONE(Type.GEM, "Dragon", "DR", ItemID.UNCUT_DRAGONSTONE, ItemID.DRAGONSTONE),
ONYX(Type.GEM, "Onyx", "ON", ItemID.UNCUT_ONYX, ItemID.ONYX),
ZENYTE(Type.GEM, "Zenyte", "Z", ItemID.UNCUT_ZENYTE, ItemID.ZENYTE);
final Type type;
final String medName;
@@ -126,6 +160,8 @@ enum ItemIdentification
{
SEED,
HERB,
SAPLING
SAPLING,
ORE,
GEM
}
}

20
runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationConfig.java
View File

@@ -83,4 +83,24 @@ public interface ItemIdentificationConfig extends Config
{
return true;
}
@ConfigItem(
keyName = "showOres",
name = "Ores",
description = "Show identification on Ores"
)
default boolean showOres()
{
return false;
}
@ConfigItem(
keyName = "showGems",
name = "Gems",
description = "Show identification on Gems"
)
default boolean showGems()
{
return false;
}
}

12
runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java
View File

@@ -80,6 +80,18 @@ class ItemIdentificationOverlay extends WidgetItemOverlay
return;
}
break;
case ORE:
if (!config.showOres())
{
return;
}
break;
case GEM:
if (!config.showGems())
{
return;
}
break;
}
graphics.setFont(FontManager.getRunescapeSmallFont());