From 53caebdecfffdcb3c386bc9ae412c32e8a6c709c Mon Sep 17 00:00:00 2001 From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Date: Wed, 28 Jun 2023 08:25:08 +1000 Subject: Merge pull request #258 * highlight items missing in NEU repo * fixed it detecting some wrong items * Merge branch 'hannibal002:beta' into highlight_missing_neu_items --- src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/utils') diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt index dc98f3a0a..97f1b7ca3 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt @@ -30,7 +30,8 @@ object NEUItems { private val multiplierCache = mutableMapOf>() private val recipesCache = mutableMapOf>() private val enchantmentNamePattern = Pattern.compile("^(?(?:§.)+)(?[^§]+) (?[IVXL]+)$") - private var allItemsCache = mapOf() // item name -> internal name + var allItemsCache = mapOf() // item name -> internal name + var allInternalNames = mutableListOf() fun getInternalName(itemName: String): String { return getInternalNameOrNull(itemName) ?: throw Error("getInternalName is null for '$itemName'") @@ -53,11 +54,13 @@ object NEUItems { return null } - private fun readAllNeuItems(): Map { + fun readAllNeuItems(): Map { + allInternalNames.clear() val map = mutableMapOf() for (internalName in manager.itemInformation.keys) { val name = manager.createItem(internalName).displayName.removeColor().lowercase() map[name] = internalName + allInternalNames.add(internalName) } return map } -- cgit