Bazaar best sell method now warns if an unknown bazaar item is detected.

hannibal002 · Dec 20, 2023 · a84a1d7 · a84a1d7
1 parent 0f0ad6b
commit a84a1d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/main/java/at/hannibal2/skyhanni/events/BazaarOpenedProductEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BazaarOpenedProductEvent.kt
@@ -2,5 +2,5 @@ package at.hannibal2.skyhanni.events
 
 import at.hannibal2.skyhanni.utils.NEUInternalName
 
-class BazaarOpenedProductEvent(val openedProduct: NEUInternalName, val inventoryOpenEvent: InventoryFullyOpenedEvent) :
-    LorenzEvent()
+class BazaarOpenedProductEvent(val openedProduct: NEUInternalName?, val inventoryOpenEvent: InventoryFullyOpenedEvent) :
+    LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
@@ -58,20 +58,20 @@ class BazaarApi {
     fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
         inBazaarInventory = checkIfInBazaar(event)
         if (inBazaarInventory) {
-            val openedProduct = getOpenedProduct(event.inventoryItems) ?: return
+            val itemName = getOpenedProduct(event.inventoryItems) ?: return
+            val openedProduct = NEUItems.getInternalNameOrNull(itemName)
             currentlyOpenedProduct = openedProduct
             BazaarOpenedProductEvent(openedProduct, event).postAndCatch()
         }
     }
 
-    private fun getOpenedProduct(inventoryItems: Map<Int, ItemStack>): NEUInternalName? {
+    private fun getOpenedProduct(inventoryItems: Map<Int, ItemStack>): String? {
         val buyInstantly = inventoryItems[10] ?: return null
 
         if (buyInstantly.displayName != "§aBuy Instantly") return null
         val bazaarItem = inventoryItems[13] ?: return null
 
-        val itemName = bazaarItem.displayName
-        return NEUItems.getInternalNameOrNull(itemName)
+        return bazaarItem.displayName
     }
 
     @SubscribeEvent

diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
@@ -42,7 +42,10 @@ class BazaarBestSellMethod {
         display = updateDisplay(event.openedProduct)
     }
 
-    private fun updateDisplay(internalName: NEUInternalName): String {
+    private fun updateDisplay(internalName: NEUInternalName?): String {
+        if (internalName == null) {
+            return "§cUnknown Bazaar item!"
+        }
         try {
             var having = InventoryUtils.countItemsInLowerInventory { it.getInternalName() == internalName }
             lastClickedItem?.let {
@@ -78,4 +81,4 @@ class BazaarBestSellMethod {
     }
 
     private fun isEnabled() = LorenzUtils.inSkyBlock && SkyHanniMod.feature.bazaar.bestSellMethod
-}
+}