Merge branch 'beta' into yaw_snappingyaw_snapping

4 files changed, 27 insertions, 13 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
index 28ac37849..0f6817dd1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
@@ -7,6 +7,7 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import io.github.moulberry.notenoughupdates.NotEnoughUpdates
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -17,10 +18,21 @@ class BazaarApi {
         var inBazaarInventory = false
 
         fun getCleanBazaarName(name: String): String {
-            if (name.endsWith(" Gemstone")) {
-                return name.substring(6)
+            var newName = name
+            if (newName.endsWith(" Gemstone")) {
+                return newName.substring(6)
             }
-            return name.replace("-", " ").removeColor()
+            if (newName.contains("Turbo-Cocoa ")) {
+                newName = newName.replace("Cocoa", "Coco")
+            }
+            if (newName.contains("Turbo-Cacti ")) {
+                newName = newName.replace("Cacti", "Cactus")
+            }
+            newName = newName.removeColor()
+            if (!name.contains("Tightly-Tied")) {
+                newName = newName.replace("-", " ")
+            }
+            return newName
         }
 
         fun getBazaarDataForName(name: String): BazaarData? {
@@ -37,10 +49,11 @@ class BazaarApi {
         fun getBazaarDataForInternalName(internalName: String) =
             bazaarMap.values.firstOrNull { it.apiName == internalName }
 
-        fun isBazaarItem(stack: ItemStack): Boolean {
-            val internalName = stack.getInternalName()
-            return bazaarMap.any { it.value.apiName == internalName }
+        fun isBazaarItem(stack: ItemStack) = isBazaarItem(stack.getInternalName())
 
+        fun isBazaarItem(internalName: String): Boolean {
+            val bazaarInfo = NotEnoughUpdates.INSTANCE.manager.auctionManager.getBazaarInfo(internalName)
+            return bazaarInfo != null
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
index a7f46b44d..04ad6b841 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
@@ -13,10 +13,7 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class BazaarBestSellMethod {
-
-    companion object {
-        private var display = ""
-    }
+    private var display = ""
 
     @SubscribeEvent
     fun onInventoryClose(event: InventoryCloseEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt
index 9ee430050..6af2932b3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt
@@ -52,7 +52,5 @@ class BazaarCancelledBuyOrderClipboard {
         }
     }
 
-    fun isEnabled(): Boolean {
-        return LorenzUtils.inSkyBlock && SkyHanniMod.feature.bazaar.cancelledBuyOrderClipboard
-    }
+    fun isEnabled() = LorenzUtils.inSkyBlock && SkyHanniMod.feature.bazaar.cancelledBuyOrderClipboard
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt
index bd9ef0a79..8fbb9b0c3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt
@@ -49,7 +49,13 @@ class BazaarOrderHelper {
             val bazaarName = BazaarApi.getCleanBazaarName(rawName)
             val data = BazaarApi.getBazaarDataForName(bazaarName)
             if (data == null) {
+                LorenzUtils.debug("Bazaar data is null!")
                 println("Bazaar data is null for '$rawName'/'$bazaarName'")
+//                for (key in BazaarApi.bazaarMap.keys) {
+//                    if (key.lowercase().contains("hay")) {
+//                        println("key: '$key'")
+//                    }
+//                }
                 continue
             }