From 0f1f311351a310c53cf0c785983a2c0e6d493efd Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Fri, 24 Feb 2023 16:52:52 +0100 Subject: Show additionally the bin price and copper price for every item. --- .../java/at/hannibal2/skyhanni/config/features/Garden.java | 6 ++++++ .../skyhanni/features/garden/SkyMartBestProfit.kt | 14 ++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'src/main') diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java index b2684880d..2343773de 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java @@ -17,6 +17,12 @@ public class Garden { @ConfigAccordionId(id = 0) public boolean skyMartCopperPrice = true; + @Expose + @ConfigOption(name = "Advanced stats", desc = "Show additionally the bin price and copper price for every item.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean skyMartCopperPriceAdvancedStats = false; + @Expose @ConfigOption(name = "Copper Price Position", desc = "") @ConfigEditorButton(runnableId = "skyMartCopperPrice", buttonText = "Edit") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/SkyMartBestProfit.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/SkyMartBestProfit.kt index ead2f6832..83d46e1ff 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/SkyMartBestProfit.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/SkyMartBestProfit.kt @@ -22,6 +22,7 @@ class SkyMartBestProfit { private val pattern = Pattern.compile("§c(.*) Copper") private val display = mutableListOf() + private val config get() = SkyHanniMod.feature.garden @SubscribeEvent fun onChatPacket(event: InventoryOpenEvent) { @@ -53,14 +54,17 @@ class SkyMartBestProfit { name = "§9Sunder I" } - val pair = Pair("$name§f:", "§6§l$perFormat §f(§6$priceFormat §f/ §c$amountFormat copper§f)") + val advancedStats = if (config.skyMartCopperPriceAdvancedStats) { + " §f(§6$priceFormat §f/ §c$amountFormat Copper§f)" + } else "" + val pair = Pair("$name§f:", "§6§l$perFormat$advancedStats") priceMap[pair] = factor } } display.clear() - display.add("Coins per §ccopper§f:") + display.add("Coins per §cCopper§f:") display.add(" ") val keys = priceMap.sortedDesc().keys @@ -84,12 +88,10 @@ class SkyMartBestProfit { @SubscribeEvent fun onBackgroundDraw(event: GuiScreenEvent.BackgroundDrawnEvent) { if (isEnabled()) { - SkyHanniMod.feature.garden.skyMartCopperPricePos.renderStrings(display) + config.skyMartCopperPricePos.renderStrings(display) } } private fun isEnabled() = - LorenzUtils.inSkyBlock && - SkyHanniMod.feature.garden.skyMartCopperPrice && - LorenzUtils.skyBlockIsland == IslandType.GARDEN + LorenzUtils.inSkyBlock && config.skyMartCopperPrice && LorenzUtils.skyBlockIsland == IslandType.GARDEN } \ No newline at end of file -- cgit