Merge branch 'beta' into frozen_treasure_tracker

10 files changed, 876 insertions, 43 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 85267240e..899001e75 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
@@ -1,12 +1,21 @@
 package at.hannibal2.skyhanni.features.bazaar
 
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryOpenEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name
+import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUItems
+import at.hannibal2.skyhanni.utils.OSUtils
+import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import net.minecraft.client.gui.inventory.GuiChest
+import net.minecraft.inventory.ContainerChest
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
@@ -17,6 +26,7 @@ class BazaarApi {
     companion object {
         val holder = BazaarDataHolder()
         var inBazaarInventory = false
+        private var currentSearchedItem = ""
 
         fun getBazaarDataByName(name: String): BazaarData? =
             NEUItems.getInternalNameOrNull(name)?.let { getBazaarDataByInternalName(it) }
@@ -32,6 +42,16 @@ class BazaarApi {
         fun isBazaarItem(internalName: String): Boolean {
             return NEUItems.manager.auctionManager.getBazaarInfo(internalName) != null
         }
+
+        fun searchForBazaarItem(displayName: String, amount: Int = -1) {
+            if (!LorenzUtils.inSkyBlock) return
+            if (NEUItems.neuHasFocus()) return
+            if (LorenzUtils.noTradeMode) return
+            if (LorenzUtils.inDungeons || LorenzUtils.inKuudraFight) return
+            LorenzUtils.sendCommandToServer("bz ${displayName.removeColor()}")
+            if (amount != -1) OSUtils.copyToClipboard(amount.toString())
+            currentSearchedItem = displayName.removeColor()
+        }
     }
 
     @SubscribeEvent
@@ -39,7 +59,6 @@ class BazaarApi {
         inBazaarInventory = checkIfInBazaar(event)
     }
 
-
     @SubscribeEvent
     fun onTick(event: TickEvent.ClientTickEvent) {
         if (event.phase != TickEvent.Phase.START) return
@@ -50,6 +69,38 @@ class BazaarApi {
         }
     }
 
+    @SubscribeEvent
+    fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        if (!inBazaarInventory) return
+        if (!SkyHanniMod.feature.bazaar.purchaseHelper) return
+        if (currentSearchedItem == "") return
+
+        if (event.gui !is GuiChest) return
+        val guiChest = event.gui
+        val chest = guiChest.inventorySlots as ContainerChest
+
+        for (slot in chest.inventorySlots) {
+            if (slot == null) continue
+            val stack = slot.stack ?: continue
+
+            if (chest.inventorySlots.indexOf(slot) !in 9..44) {
+                continue
+            }
+
+            if (stack.displayName.removeColor() == currentSearchedItem) {
+                slot highlight LorenzColor.GREEN
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if ("\\[Bazaar] (Buy Order Setup!|Bought).*$currentSearchedItem.*".toRegex().matches(event.message.removeColor())) {
+            currentSearchedItem = ""
+        }
+    }
+
     private fun checkIfInBazaar(event: InventoryOpenEvent): Boolean {
         val returnItem = event.inventorySize - 5
         for ((slot, item) in event.inventoryItems) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
index 241f6cbcd..5c67ea67e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
@@ -3,19 +3,23 @@ package at.hannibal2.skyhanni.features.garden.composter
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.model.ComposterUpgrade
 import at.hannibal2.skyhanni.events.*
+import at.hannibal2.skyhanni.features.bazaar.BazaarApi
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.features.garden.composter.ComposterAPI.getLevel
-import at.hannibal2.skyhanni.utils.*
 import at.hannibal2.skyhanni.utils.ItemUtils.name
+import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.LorenzUtils.addSelector
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzUtils.sortedDesc
+import at.hannibal2.skyhanni.utils.NEUItems
+import at.hannibal2.skyhanni.utils.NumberUtil
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNeeded
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.TimeUtils
 import at.hannibal2.skyhanni.utils.jsonobjects.GardenJson
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates
@@ -389,10 +393,9 @@ class ComposterOverlay {
             val name = itemName.substring(0, 2) + selected + rawItemName
             list.add(Renderable.link("$name§r §8x${itemsNeeded.addSeparators()} §7(§6$format§7)") {
                 onClick(internalName)
-                if (LorenzUtils.isControlKeyDown() && !LorenzUtils.noTradeMode) {
+                if (LorenzUtils.isControlKeyDown()) {
                     inInventory = false
-                    LorenzUtils.sendCommandToServer("bz $rawItemName")
-                    OSUtils.copyToClipboard("${itemsNeeded.toInt()}")
+                    BazaarApi.searchForBazaarItem(itemName, itemsNeeded.toInt())
                 }
             })
             bigList.add(list)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
index fcf0096a1..32578e647 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
@@ -67,6 +67,8 @@ class OverviewPage: FFGuideGUI.FFGuidePage() {
             else -> FFStats.armorTotalFF
         }
 
+        var word = if (currentArmor == 0) "Armor" else "Piece"
+
         line = if (currentArmor == 0) "§7§2Total fortune from your armor\n§2Select a piece for more info"
         else "§7§2Total fortune from your\n${armorItem.getItem().displayName}"
         var value = if (currentArmor == 0) {
@@ -84,7 +86,7 @@ class OverviewPage: FFGuideGUI.FFGuidePage() {
                 else -> 78.75
             }
         }
-        GuiRenderUtils.drawFarmingBar("§2Total Armor Fortune", line, armorFF[FFTypes.TOTAL] ?: 0, value,
+        GuiRenderUtils.drawFarmingBar("§2Total $word Fortune", line, armorFF[FFTypes.TOTAL] ?: 0, value,
             FFGuideGUI.guiLeft + 135, FFGuideGUI.guiTop + 30, 90, mouseX, mouseY, FFGuideGUI.tooltipToDisplay)
 
         line = if (currentArmor == 0) "§7§2The base fortune from your armor\n§2Select a piece for more info"
@@ -97,7 +99,7 @@ class OverviewPage: FFGuideGUI.FFGuidePage() {
         else {
             if (FFStats.usingSpeedBoots) 60 else 30
         }
-        GuiRenderUtils.drawFarmingBar("§2Base Armor Fortune", line, armorFF[FFTypes.BASE] ?: 0,
+        GuiRenderUtils.drawFarmingBar("§2Base $word Fortune", line, armorFF[FFTypes.BASE] ?: 0,
             value, FFGuideGUI.guiLeft + 135,
             FFGuideGUI.guiTop + 55, 90, mouseX, mouseY, FFGuideGUI.tooltipToDisplay)
 
@@ -106,6 +108,7 @@ class OverviewPage: FFGuideGUI.FFGuidePage() {
         value = if (FFStats.usingSpeedBoots) {
             when (currentArmor) {
                 0 -> 50
+                4 -> 0
                 else -> 16.67
             }
         } else {
@@ -115,7 +118,7 @@ class OverviewPage: FFGuideGUI.FFGuidePage() {
             }
         }
 
-        GuiRenderUtils.drawFarmingBar("§2Armor Ability", line, armorFF[FFTypes.ABILITY] ?: 0,
+        GuiRenderUtils.drawFarmingBar("§2$word Ability", line, armorFF[FFTypes.ABILITY] ?: 0,
             value, FFGuideGUI.guiLeft + 135,
             FFGuideGUI.guiTop + 80, 90, mouseX, mouseY, FFGuideGUI.tooltipToDisplay)
 
@@ -126,7 +129,7 @@ class OverviewPage: FFGuideGUI.FFGuidePage() {
         } else if (currentArmor == 4) {
             if (FFStats.usingSpeedBoots) 25 else 30
         } else 30
-        GuiRenderUtils.drawFarmingBar("§2Armor Reforge", line, armorFF[FFTypes.REFORGE] ?: 0,
+        GuiRenderUtils.drawFarmingBar("§2$word Reforge", line, armorFF[FFTypes.REFORGE] ?: 0,
             value, FFGuideGUI.guiLeft + 135,
             FFGuideGUI.guiTop + 105, 90, mouseX, mouseY, FFGuideGUI.tooltipToDisplay)
 
@@ -149,6 +152,8 @@ class OverviewPage: FFGuideGUI.FFGuidePage() {
         GuiRenderUtils.drawFarmingBar("§2Pet Item", line, currentPet[FFTypes.PET_ITEM] ?: 0, 60, FFGuideGUI.guiLeft + 185,
             FFGuideGUI.guiTop + 155, 70, mouseX, mouseY, FFGuideGUI.tooltipToDisplay)
 
+        word = if (currentEquipment == 0) "Equipment" else "Piece"
+
         val equipmentItem = when (currentEquipment) {
             1 -> FarmingItems.NECKLACE
             2 -> FarmingItems.CLOAK
@@ -166,31 +171,31 @@ class OverviewPage: FFGuideGUI.FFGuidePage() {
 
         line = if (currentEquipment == 0) "§7§2Total fortune from all your equipment\n§2Select a piece for more info"
         else "§7§2Total fortune from your\n${equipmentItem.getItem().displayName}"
-        GuiRenderUtils.drawFarmingBar("§2Total Equipment Fortune", line, equipmentFF[FFTypes.TOTAL] ?: 0,
+        GuiRenderUtils.drawFarmingBar("§2Total $word Fortune", line, equipmentFF[FFTypes.TOTAL] ?: 0,
             if (currentEquipment == 0) 198 else 49.5,
             FFGuideGUI.guiLeft + 255, FFGuideGUI.guiTop + 30, 90, mouseX, mouseY, FFGuideGUI.tooltipToDisplay)
 
         line = if (currentEquipment == 0) "§7§2The base fortune from all your equipment\n§2Select a piece for more info"
         else "§7§2Total base fortune from your\n${equipmentItem.getItem().displayName}"
-        GuiRenderUtils.drawFarmingBar("§2Equipment Base Fortune", line, equipmentFF[FFTypes.BASE] ?: 0,
+        GuiRenderUtils.drawFarmingBar("§2$word Base Fortune", line, equipmentFF[FFTypes.BASE] ?: 0,
             if (currentEquipment == 0) 20 else 5,
             FFGuideGUI.guiLeft + 255, FFGuideGUI.guiTop + 55, 90, mouseX, mouseY, FFGuideGUI.tooltipToDisplay)
 
         line = if (currentEquipment == 0) "§7§2The fortune from all of your equipment's abilities\n§2Select a piece for more info"
         else "§7§2Total ability fortune from your\n${equipmentItem.getItem().displayName}"
-        GuiRenderUtils.drawFarmingBar("§2Equipment Ability", line, equipmentFF[FFTypes.ABILITY] ?: 0,
+        GuiRenderUtils.drawFarmingBar("§2$word Ability", line, equipmentFF[FFTypes.ABILITY] ?: 0,
             if (currentEquipment == 0) 60 else 15,
             FFGuideGUI.guiLeft + 255, FFGuideGUI.guiTop + 80, 90, mouseX, mouseY, FFGuideGUI.tooltipToDisplay)
 
         line = if (currentEquipment == 0) "§7§2The fortune from all of your equipment's reforges\n§2Select a piece for more info"
         else "§7§2Total reforge fortune from your\n${equipmentItem.getItem().displayName}"
-        GuiRenderUtils.drawFarmingBar("§2Equipment Reforge", line, equipmentFF[FFTypes.REFORGE] ?: 0,
+        GuiRenderUtils.drawFarmingBar("§2$word Reforge", line, equipmentFF[FFTypes.REFORGE] ?: 0,
             if (currentEquipment == 0) 40 else 10,
             FFGuideGUI.guiLeft + 255, FFGuideGUI.guiTop + 105, 90, mouseX, mouseY, FFGuideGUI.tooltipToDisplay)
 
         line = if (currentEquipment == 0) "§7§2The fortune from all of your equipment's enchantments\n§2Select a piece for more info"
         else "§7§2Total enchantment fortune from your\n${equipmentItem.getItem().displayName}"
-        GuiRenderUtils.drawFarmingBar("§2Equipment Enchantment", line, equipmentFF[FFTypes.GREEN_THUMB] ?: 0,
+        GuiRenderUtils.drawFarmingBar("§2$word Enchantment", line, equipmentFF[FFTypes.GREEN_THUMB] ?: 0,
             if (currentEquipment == 0) 78 else 19.5,
             FFGuideGUI.guiLeft + 255, FFGuideGUI.guiTop + 130, 90, mouseX, mouseY, FFGuideGUI.tooltipToDisplay)
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/UpgradePage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/UpgradePage.kt
index 36f67eab6..e04c0dc54 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/UpgradePage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/UpgradePage.kt
@@ -1,13 +1,12 @@
 package at.hannibal2.skyhanni.features.garden.fortuneguide.pages
 
+import at.hannibal2.skyhanni.features.bazaar.BazaarApi
 import at.hannibal2.skyhanni.features.garden.fortuneguide.FFGuideGUI
 import at.hannibal2.skyhanni.features.garden.fortuneguide.FortuneUpgrades
 import at.hannibal2.skyhanni.utils.GuiRenderUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.nameWithEnchantment
-import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.NumberUtil
-import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.util.MathHelper
 import java.text.DecimalFormat
@@ -38,9 +37,7 @@ class UpgradePage: FFGuideGUI.FFGuidePage() {
             var formattedUpgrade = upgradeItem.nameWithEnchantment ?: return
             if (adjustedY + 25 * index - 5 < FFGuideGUI.lastClickedHeight && FFGuideGUI.lastClickedHeight < adjustedY + 25 * index + 10) {
                 FFGuideGUI.lastClickedHeight = 0
-                if (!NEUItems.neuHasFocus() && !LorenzUtils.noTradeMode) {
-                    LorenzUtils.sendCommandToServer("bz ${formattedUpgrade.removeColor()}")
-                }
+                BazaarApi.searchForBazaarItem(formattedUpgrade, upgrade.itemQuantity)
             }
             if (upgrade.itemQuantity != 1) {
                 formattedUpgrade = "$formattedUpgrade §fx${upgrade.itemQuantity}"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index 973f122d5..f7fedd18c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.TitleUtils
 import at.hannibal2.skyhanni.events.*
+import at.hannibal2.skyhanni.features.bazaar.BazaarApi
 import at.hannibal2.skyhanni.features.garden.CropType.Companion.getByNameOrNull
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed.getSpeed
@@ -175,9 +176,8 @@ class GardenVisitorFeatures {
                 list.add(Renderable.optionalLink("$name §ex${amount.addSeparators()}", {
                     if (Minecraft.getMinecraft().currentScreen is GuiEditSign) {
                         LorenzUtils.setTextIntoSign("$amount")
-                    } else if (!NEUItems.neuHasFocus() && !LorenzUtils.noTradeMode) {
-                        LorenzUtils.sendCommandToServer("bz ${name.removeColor()}")
-                        OSUtils.copyToClipboard("$amount")
+                    } else {
+                        BazaarApi.searchForBazaarItem(name, amount)
                     }
                 }) { GardenAPI.inGarden() && !NEUItems.neuHasFocus() })
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
index 6f5678bc8..acb7d6b67 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
@@ -186,9 +186,7 @@ class SackDisplay {
                     add(itemStack)
                     if (!isTrophySack)
                         add(Renderable.optionalLink("${itemName.replace("§k", "")}: ", {
-                            if (!NEUItems.neuHasFocus() && !LorenzUtils.noTradeMode) {
-                                LorenzUtils.sendCommandToServer("bz ${itemName.removeColor()}")
-                            }
+                            BazaarApi.searchForBazaarItem(itemName)
                         }) { !NEUItems.neuHasFocus() })
                     else
                         add("${itemName.replace("§k", "")}: ")
@@ -254,9 +252,7 @@ class SackDisplay {
                     add(" §7- ")
                     add(NEUItems.getItemStack(internalName))
                     add(Renderable.optionalLink("$name: ", {
-                        if (!NEUItems.neuHasFocus() && !LorenzUtils.noTradeMode) {
-                            LorenzUtils.sendCommandToServer("bz ${name.removeColor().dropLast(1)}")
-                        }
+                        BazaarApi.searchForBazaarItem(name.dropLast(1))
                     }) { !NEUItems.neuHasFocus() })
                     add(" ($rough-§a$flawed-§9$fine-§5$flawless)")
                     val price = (roughprice + flawedprice + fineprice + flawlessprice)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyBlockLevelGuideHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyBlockLevelGuideHelper.kt
index 60c1a28de..16df062f8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyBlockLevelGuideHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyBlockLevelGuideHelper.kt
@@ -11,7 +11,7 @@ import net.minecraft.client.gui.inventory.GuiChest
 import net.minecraft.inventory.ContainerChest
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
-class SkyBlockLevelGuideHelper {
+class SkyblockLevelGuideHelper {
 
     @SubscribeEvent
     fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt
index dee222aa2..d8d18ec6d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryOpenEvent
+import at.hannibal2.skyhanni.features.bazaar.BazaarApi
 import at.hannibal2.skyhanni.features.garden.contest.FarmingContestAPI
 import at.hannibal2.skyhanni.utils.*
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
@@ -15,7 +16,6 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
-import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.inventory.GuiChest
@@ -136,9 +136,8 @@ class CityProjectFeatures {
             list.add(Renderable.optionalLink("$name §ex${amount.addSeparators()}", {
                 if (Minecraft.getMinecraft().currentScreen is GuiEditSign) {
                     LorenzUtils.setTextIntoSign("$amount")
-                } else if (!NEUItems.neuHasFocus() && !LorenzUtils.noTradeMode) {
-                    LorenzUtils.sendCommandToServer("bz ${name.removeColor()}")
-                    OSUtils.copyToClipboard("$amount")
+                } else {
+                    BazaarApi.searchForBazaarItem(name, amount)
                 }
             }) { inInventory && !NEUItems.neuHasFocus() })
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/GhostCounter.kt
new file mode 100644
index 000000000..0be9f0655
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/GhostCounter.kt
@@ -0,0 +1,647 @@
+package at.hannibal2.skyhanni.features.misc
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigManager
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.ProfileStorageData
+import at.hannibal2.skyhanni.events.*
+import at.hannibal2.skyhanni.features.bazaar.BazaarApi
+import at.hannibal2.skyhanni.features.misc.GhostCounter.Option.*
+import at.hannibal2.skyhanni.utils.CombatUtils._isKilling
+import at.hannibal2.skyhanni.utils.CombatUtils.calculateETA
+import at.hannibal2.skyhanni.utils.CombatUtils.calculateXP
+import at.hannibal2.skyhanni.utils.CombatUtils.interp
+import at.hannibal2.skyhanni.utils.CombatUtils.isKilling
+import at.hannibal2.skyhanni.utils.CombatUtils.killGainHour
+import at.hannibal2.skyhanni.utils.CombatUtils.killGainHourLast
+import at.hannibal2.skyhanni.utils.CombatUtils.lastKillUpdate
+import at.hannibal2.skyhanni.utils.CombatUtils.lastUpdate
+import at.hannibal2.skyhanni.utils.CombatUtils.xpGainHour
+import at.hannibal2.skyhanni.utils.CombatUtils.xpGainHourLast
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
+import at.hannibal2.skyhanni.utils.LorenzUtils.chat
+import at.hannibal2.skyhanni.utils.LorenzUtils.clickableChat
+import at.hannibal2.skyhanni.utils.NumberUtil
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
+import at.hannibal2.skyhanni.utils.NumberUtil.roundToPrecision
+import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
+import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import com.google.gson.JsonArray
+import com.google.gson.JsonParser
+import com.google.gson.JsonPrimitive
+import io.github.moulberry.notenoughupdates.util.Utils
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import net.minecraftforge.fml.common.gameevent.TickEvent
+import java.awt.Toolkit
+import java.awt.datatransfer.DataFlavor
+import java.awt.datatransfer.StringSelection
+import java.io.File
+import java.io.FileReader
+import java.nio.charset.StandardCharsets
+import java.text.NumberFormat
+import java.util.*
+import java.util.regex.Pattern
+import kotlin.math.roundToInt
+import kotlin.math.roundToLong
+
+object GhostCounter {
+
+    val config get() = SkyHanniMod.feature.ghostCounter
+    val hidden get() = ProfileStorageData.profileSpecific?.ghostCounter
+    private var display = listOf<List<Any>>()
+    private var ghostCounterV3File = File("." + File.separator + "config" + File.separator + "ChatTriggers" + File.separator + "modules" + File.separator + "GhostCounterV3" + File.separator + ".persistantData.json")
+    private val skillXPPattern = ".*§3\\+(?<gained>.*) .* \\((?<total>.*)\\/(?<current>.*)\\).*".toPattern()
+    private val killComboExpiredPattern = "§cYour Kill Combo has expired! You reached a (?<combo>.*) Kill Combo!".toPattern()
+    private val ghostXPPattern = "(?<current>\\d+(?:\\.\\d+)?(?:,\\d+)?[kK]?)\\/(?<total>\\d+(?:\\.\\d+)?(?:,\\d+)?[kKmM]?)".toPattern()
+    private val bestiaryPattern = "BESTIARY Ghost .*➜(?<newLevel>.*)".toPattern()
+    private val format = NumberFormat.getIntegerInstance()
+    private const val exportPrefix = "gc/"
+    private var tick = 0
+    private var lastXp: String = "0"
+    private var gain: Int = 0
+    private var num: Double = 0.0
+    private var inMist = false
+    private var notifyCTModule = true
+    var bestiaryCurrentKill = 0
+    private var killETA = ""
+    private var session = mutableMapOf(
+            KILLS to 0.0,
+            SORROWCOUNT to 0.0,
+            VOLTACOUNT to 0.0,
+            PLASMACOUNT to 0.0,
+            GHOSTLYBOOTS to 0.0,
+            BAGOFCASH to 0.0,
+            TOTALDROPS to 0.0,
+            SCAVENGERCOINS to 0.0,
+            MAXKILLCOMBO to 0.0,
+            SKILLXPGAINED to 0.0
+    )
+    val bestiaryData = mutableMapOf<Int, Int>().apply {
+        val commonValue = 100_000
+        for (i in 1..46) {
+            this[i] = when (i) {
+                1 -> 10
+                2 -> 15
+                3 -> 75
+                4 -> 150
+                5 -> 250
+                6 -> 500
+                7 -> 1_500
+                8 -> 2_500
+                9 -> 5_000
+                10 -> 15_000
+                11 -> 25_000
+                12 -> 50_000
+                else -> commonValue
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) {
+        if (!isEnabled()) return
+        if (config.onlyOnMist && !inMist) return
+        config.position.renderStringsAndItems(display,
+                extraSpace = config.extraSpace,
+                posLabel = "Ghost Counter")
+    }
+
+    private fun formatDisplay(map: List<List<Any>>): List<List<Any>> {
+        val newList = mutableListOf<List<Any>>()
+        for (index in config.ghostDisplayText) {
+            newList.add(map[index])
+        }
+        return newList
+    }
+
+    fun update() {
+        display = formatDisplay(drawDisplay())
+    }
+
+    private fun drawDisplay() = buildList<List<Any>> {
+        val value: Int = when (SORROWCOUNT.get()) {
+            0.0 -> 0
+            else -> "${((((KILLS.get() / SORROWCOUNT.get()) + Math.ulp(1.0)) * 100) / 100).roundToInt()}".toInt()
+        }
+        val mgc = when (TOTALDROPS.get()) {
+            0.0 -> "0"
+            else -> "${((((hidden?.totalMF!! / TOTALDROPS.get()) + Math.ulp(1.0)) * 100) / 100).roundToPrecision(2)}"
+        }
+
+        val xpHourFormatting = config.textFormatting.xpHourFormatting
+        val xp: String
+        val xpInterp: Float
+        if (xpGainHourLast == xpGainHour && xpGainHour <= 0) {
+            xp = xpHourFormatting.noData
+        } else {
+            xpInterp = interp(xpGainHour, xpGainHourLast, lastUpdate)
+            xp = "${format.format(xpInterp)} ${if (isKilling) "" else xpHourFormatting.paused}"
+        }
+
+        val killHourFormatting = config.textFormatting.killHourFormatting
+        val killh: String
+        var killInterp: Long = 0
+        if (killGainHourLast == killGainHour && killGainHour <= 0) {
+            killh = killHourFormatting.noData
+        } else {
+            killInterp = interp(killGainHour.toFloat(), killGainHourLast.toFloat(), lastKillUpdate).toLong()
+            killh = "${format.format(killInterp)} ${if (_isKilling) "" else killHourFormatting.paused}"
+        }
+
+
+        val bestiaryFormatting = config.textFormatting.bestiaryFormatting
+        val currentKill = hidden?.bestiaryCurrentKill?.toInt() ?: 0
+        val killNeeded = hidden?.bestiaryKillNeeded?.toInt() ?: 0
+        val nextLevel = hidden?.bestiaryNextLevel?.toInt() ?: 0
+        val bestiary = if (config.showMax) {
+            when (nextLevel) {
+                -1 -> bestiaryFormatting.maxed
+                in 1..46 -> {
+                    val sum = bestiaryData.filterKeys { it <= nextLevel - 1 }.values.sum()
+                    val cKill = sum + currentKill
+                    bestiaryCurrentKill = cKill
+                    bestiaryFormatting.showMax_progress
+                }
+
+                else -> bestiaryFormatting.openMenu
+            }
+        } else {
+            when (nextLevel) {
+                -1 -> bestiaryFormatting.maxed
+                in 1..46 -> bestiaryFormatting.progress
+                else -> bestiaryFormatting.openMenu
+            }
+        }
+
+        val etaFormatting = config.textFormatting.etaFormatting
+        val remaining: Int = when (config.showMax) {
+            true -> 3_000_000 - bestiaryCurrentKill
+            false -> killNeeded - currentKill
+        }
+
+        val eta = if (remaining < 0) {
+            etaFormatting.maxed
+        } else {
+            if (killGainHour < 1) {
+                etaFormatting.noData
+            } else {
+                killETA = Utils.prettyTime(remaining.toLong() * 1000 * 60 * 60 / killInterp)
+                etaFormatting.progress + if (_isKilling) "" else etaFormatting.paused
+            }
+        }
+
+        addAsSingletonList(Utils.chromaStringByColourCode(config.textFormatting.titleFormat.replace("&", "§")))
+        addAsSingletonList(config.textFormatting.ghostKilledFormat.formatText(KILLS.getInt(), KILLS.getInt(true)))
+        addAsSingletonList(config.textFormatting.sorrowsFormat.formatText(SORROWCOUNT.getInt(), SORROWCOUNT.getInt(true)))
+        addAsSingletonList(config.textFormatting.ghostSinceSorrowFormat.formatText(GHOSTSINCESORROW.getInt()))
+        addAsSingletonList(config.textFormatting.ghostKillPerSorrowFormat.formatText(value))
+        addAsSingletonList(config.textFormatting.voltasFormat.formatText(VOLTACOUNT.getInt(), VOLTACOUNT.getInt(true)))
+        addAsSingletonList(config.textFormatting.plasmasFormat.formatText(PLASMACOUNT.getInt(), PLASMACOUNT.getInt(true)))
+        addAsSingletonList(config.textFormatting.ghostlyBootsFormat.formatText(GHOSTLYBOOTS.getInt(), GHOSTLYBOOTS.getInt(true)))
+        addAsSingletonList(config.textFormatting.bagOfCashFormat.formatText(BAGOFCASH.getInt(), BAGOFCASH.getInt(true)))
+        addAsSingletonList(config.textFormatting.avgMagicFindFormat.formatText(mgc))
+        addAsSingletonList(config.textFormatting.scavengerCoinsFormat.formatText(SCAVENGERCOINS.getInt(), SCAVENGERCOINS.getInt(true)))
+        addAsSingletonList(config.textFormatting.killComboFormat.formatText(KILLCOMBO.getInt(), MAXKILLCOMBO.getInt(true)))
+        addAsSingletonList(config.textFormatting.highestKillComboFormat.formatText(MAXKILLCOMBO.getInt(), MAXKILLCOMBO.getInt(true)))
+        addAsSingletonList(config.textFormatting.skillXPGainFormat.formatText(SKILLXPGAINED.get(), SKILLXPGAINED.get(true)))
+        addAsSingletonList(bestiaryFormatting.base.formatText(bestiary).formatBestiary(currentKill, killNeeded))
+        addAsSingletonList(xpHourFormatting.base.formatText(xp))
+        addAsSingletonList(killHourFormatting.base.formatText(killh))
+        addAsSingletonList(etaFormatting.base.formatText(eta).formatText(killETA))
+
+        /*
+        I'm very not sure about all that
+         */
+        val rate = 0.12 * (1 + (mgc.toDouble()/100))
+        val price =  (BazaarApi.getBazaarDataByInternalName("SORROW")?.sellPrice ?: 0).toLong()
+        val final: String = (killInterp * price * (rate/100)).toLong().addSeparators()
+        addAsSingletonList(config.textFormatting.moneyHourFormat.formatText(final))
+    }
+
+
+    // Part of this was taken from GhostCounterV3 CT module
+    // maybe replace this with a SkillXpGainEvent ?
+    @SubscribeEvent
+    fun onActionBar(event: LorenzActionBarEvent) {
+        if (!isEnabled()) return
+        skillXPPattern.matchMatcher(event.message) {
+            val gained = group("gained").formatNumber().toDouble()
+            val total = group("total")
+            if (total != lastXp) {
+                val res = total.replace("\\D".toRegex(), "")
+                gain = (res.toLong() - lastXp.toLong()).toDouble().roundToInt()
+                num = (gain.toDouble() / gained)
+                if (gained in 150.0..450.0) {
+                    if (lastXp != "0") {
+                        if (num >= 0) {
+                            KILLS.add(num)
+                            KILLS.add(num, true)
+                            GHOSTSINCESORROW.add(num)
+                            KILLCOMBO.add(num)
+                            SKILLXPGAINED.add(gained * num.roundToLong())
+                            SKILLXPGAINED.add(gained * num.roundToLong(), true)
+                            hidden?.bestiaryCurrentKill = hidden?.bestiaryCurrentKill?.plus(num) ?: num
+                        }
+                    }
+                }
+                lastXp = res
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+        if (LorenzUtils.skyBlockIsland != IslandType.DWARVEN_MINES) return
+        for (opt in Option.values()) {
+            val pattern = opt.pattern ?: continue
+            pattern.matchMatcher(event.message) {
+                when (opt) {
+                    SORROWCOUNT, VOLTACOUNT, PLASMACOUNT, GHOSTLYBOOTS -> {
+                        opt.add(1.0)
+                        opt.add(1.0, true)
+                        hidden?.totalMF = hidden?.totalMF?.plus(group("mf").substring(4).toDouble())
+                                ?: group("mf").substring(4).toDouble()
+                        TOTALDROPS.add(1.0)
+                        update()
+                    }
+
+                    BAGOFCASH -> {
+                        BAGOFCASH.add(1.0)
+                        BAGOFCASH.add(1.0, true)
+                        update()
+                    }
+
+                    KILLCOMBOCOINS -> {
+                        KILLCOMBOCOINS.set(KILLCOMBOCOINS.get() + group("coin").toDouble())
+                        update()
+                    }
+
+                    else -> {}
+                }
+            }
+