From 64e59b4a917f6d71868f3722f65700a592404388 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Mon, 19 Jun 2023 19:48:18 +1000
Subject: Merge pull request #241

* BazaarApi searching

* Highlight Item

* Resetting on purchase and only highlights correct one

* adding default value
---
 .../at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/features/misc')

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() })
 
-- 
cgit