summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/utils
diff options
context:
space:
mode:
authorCalMWolfs <94038482+CalMWolfs@users.noreply.github.com>2023-07-04 22:46:39 +1000
committerGitHub <noreply@github.com>2023-07-04 14:46:39 +0200
commit138f5294776704123138d1a2206e53d392fdd5e8 (patch)
tree289bc76cbe791027dcb464f2fb311ac276a617df /src/main/java/at/hannibal2/skyhanni/utils
parent0a29213e7b22dd3673138a7283a8ac97fc133aed (diff)
downloadskyhanni-138f5294776704123138d1a2206e53d392fdd5e8.tar.gz
skyhanni-138f5294776704123138d1a2206e53d392fdd5e8.tar.bz2
skyhanni-138f5294776704123138d1a2206e53d392fdd5e8.zip
Merge pull request #288
* stop excessive warnings
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 848acd0ff..30424593c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -1,8 +1,6 @@
package at.hannibal2.skyhanni.utils
-import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.config.ConfigManager
-import at.hannibal2.skyhanni.data.ProfileStorageData
import at.hannibal2.skyhanni.test.command.CopyErrorCommand
import at.hannibal2.skyhanni.utils.ItemBlink.checkBlinkItem
import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
@@ -37,7 +35,6 @@ object NEUItems {
private val enchantmentNamePattern = Pattern.compile("^(?<format>(?:§.)+)(?<name>[^§]+) (?<level>[IVXL]+)$")
var allItemsCache = mapOf<String, String>() // item name -> internal name
var allInternalNames = mutableListOf<String>()
- private var warnedAlready = false
private val fallbackItem by lazy {
Utils.createItemStack(
@@ -156,16 +153,16 @@ object NEUItems {
.withKnownInternalName(internalName)
.resolveToItemStack()?.copy()
- fun getItemStack(internalName: String): ItemStack = getItemStackOrNull(internalName) ?: run {
- if (ProfileStorageData.playerSpecific?.lastRepoIssueVersion != SkyHanniMod.version || !warnedAlready) {
+ fun getItemStack(internalName: String, definite: Boolean = false): ItemStack = getItemStackOrNull(internalName) ?: run {
+ if (definite) {
Utils.showOutdatedRepoNotification()
- CopyErrorCommand.logError(
- IllegalStateException("Something went wrong!"),
- "Encountered an error getting the item for §7$internalName§c. " +
- "This is probably because your NEU repo is outdated"
- )
}
- warnedAlready = true
+ CopyErrorCommand.logError(
+ IllegalStateException("Something went wrong!"),
+ "Encountered an error getting the item for §7$internalName§c. " +
+ "This may be because your NEU repo is outdated. Please ask in the SkyHanni" +
+ "Discord if this is the case"
+ )
fallbackItem
}