diff options
| author | Walker Selby <git@walkerselby.com> | 2023-10-20 19:32:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-20 20:32:09 +0200 |
| commit | 3dfb81b9d5aefce9a2448d5e9e1533a28b16f11e (patch) | |
| tree | 325914b6a03592e2cfe2249216b2b631401b5736 /src/main/java/at/hannibal2/skyhanni/features/misc | |
| parent | c233f06f5d4c7b054eb7e34e3af51ee02a01387c (diff) | |
| download | skyhanni-3dfb81b9d5aefce9a2448d5e9e1533a28b16f11e.tar.gz skyhanni-3dfb81b9d5aefce9a2448d5e9e1533a28b16f11e.tar.bz2 skyhanni-3dfb81b9d5aefce9a2448d5e9e1533a28b16f11e.zip | |
Internal Changes: getInternalName Pt 2 (#548)
Internal Changes: getInternalName Pt 2 #548
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/misc')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/misc/RestorePieceOfWizardPortalLore.kt | 4 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/RestorePieceOfWizardPortalLore.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/RestorePieceOfWizardPortalLore.kt index b32f19015..af8b3bbbe 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/RestorePieceOfWizardPortalLore.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/RestorePieceOfWizardPortalLore.kt @@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.LorenzToolTipEvent -import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old +import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getRecipientName import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -14,7 +14,7 @@ class RestorePieceOfWizardPortalLore { fun onTooltip(event: LorenzToolTipEvent) { if (!config.restorePieceOfWizardPortalLore) return val stack = event.itemStack - if (stack.getInternalName_old() != "WIZARD_PORTAL_MEMENTO") return + if (!stack.getInternalName().equals("WIZARD_PORTAL_MEMENTO")) return val recipient = stack.getRecipientName() ?: return if (!event.toolTip[5].contains(recipient)) { event.toolTip.add(5, "ยง7Earned by: $recipient") diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt index 277c84735..79f555300 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt @@ -10,7 +10,6 @@ import at.hannibal2.skyhanni.events.RenderItemTooltipEvent import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull -import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old import at.hannibal2.skyhanni.utils.ItemUtils.getItemName import at.hannibal2.skyhanni.utils.ItemUtils.getItemNameOrNull import at.hannibal2.skyhanni.utils.ItemUtils.getItemRarityOrNull @@ -231,7 +230,7 @@ object EstimatedItemValue { private fun addAttributeCost(stack: ItemStack, list: MutableList<String>): Double { val attributes = stack.getAttributes() ?: return 0.0 - var internalName = stack.getInternalName_old().removePrefix("VANQUISHED_") + var internalName = stack.getInternalName().asString().removePrefix("VANQUISHED_") val kuudraSets = listOf("AURORA", "CRIMSON", "TERROR", "HOLLOW") var genericName = internalName if (kuudraSets.any { internalName.contains(it) } @@ -653,7 +652,7 @@ object EstimatedItemValue { "ZOMBIE_COMMANDER_WHIP", ) - val internalName = stack.getInternalName_old() + val internalName = stack.getInternalName().asString() for ((rawName, rawLevel) in enchantments) { // efficiency 1-5 is cheap, 6-10 is handled by silex if (rawName == "efficiency") continue |