Use LorenzToolTipEvent over ItemTooltipEvent if possible.

2 files changed, 11 insertions, 15 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/test/ShowItemUuid.kt b/src/main/java/at/hannibal2/skyhanni/test/ShowItemUuid.kt
index 8665d99b3..030f6161f 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/ShowItemUuid.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/ShowItemUuid.kt
@@ -2,20 +2,17 @@ package at.hannibal2.skyhanni.test
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
+import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getItemUuid
-import net.minecraftforge.event.entity.player.ItemTooltipEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class ShowItemUuid {
 
     @SubscribeEvent
-    fun onItemTooltipLow(event: ItemTooltipEvent) {
+    fun onItemTooltipLow(event: LorenzToolTipEvent) {
         if (!SkyHanniMod.feature.dev.debug.showItemUuid) return
-        val itemStack = event.itemStack
-        if (itemStack != null) {
-            itemStack.getItemUuid()?.let {
-                event.toolTip.add("§7Item UUID: '$it'")
-            }
+        event.itemStack.getItemUuid()?.let {
+            event.toolTip.add("§7Item UUID: '$it'")
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 1a53e8283..cc97f7bcb 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.data.SlayerAPI
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.events.PlaySoundEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
@@ -42,7 +43,6 @@ import net.minecraft.client.gui.inventory.GuiContainer
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraftforge.client.event.GuiScreenEvent
 import net.minecraftforge.common.MinecraftForge
-import net.minecraftforge.event.entity.player.ItemTooltipEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.io.File
 
@@ -382,10 +382,10 @@ class SkyHanniDebugsAndTests {
     }
 
     @SubscribeEvent
-    fun onShowInternalName(event: ItemTooltipEvent) {
+    fun onShowInternalName(event: LorenzToolTipEvent) {
         if (!LorenzUtils.inSkyBlock) return
         if (!debugConfig.showInternalName) return
-        val itemStack = event.itemStack ?: return
+        val itemStack = event.itemStack
         val internalName = itemStack.getInternalName()
         if ((internalName == NEUInternalName.NONE) && !debugConfig.showEmptyNames) return
         event.toolTip.add("Internal Name: '${internalName.asString()}'")
@@ -393,21 +393,20 @@ class SkyHanniDebugsAndTests {
     }
 
     @SubscribeEvent
-    fun showItemRarity(event: ItemTooltipEvent) {
+    fun showItemRarity(event: LorenzToolTipEvent) {
         if (!LorenzUtils.inSkyBlock) return
         if (!debugConfig.showItemRarity) return
-        val itemStack = event.itemStack ?: return
+        val itemStack = event.itemStack
 
         val rarity = itemStack.getItemRarityOrNull(logError = false)
         event.toolTip.add("Item rarity: $rarity")
     }
 
     @SubscribeEvent
-    fun onSHowNpcPrice(event: ItemTooltipEvent) {
+    fun onSHowNpcPrice(event: LorenzToolTipEvent) {
         if (!LorenzUtils.inSkyBlock) return
         if (!debugConfig.showNpcPrice) return
-        val itemStack = event.itemStack ?: return
-        val internalName = itemStack.getInternalNameOrNull() ?: return
+        val internalName = event.itemStack.getInternalNameOrNull() ?: return
 
         val npcPrice = internalName.getNpcPriceOrNull() ?: return
         event.toolTip.add("§7Npc price: §6${npcPrice.addSeparators()}")