From c8270df4079f4adf3a24abbdbb318d24bab21fec Mon Sep 17 00:00:00 2001 From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Date: Tue, 2 Jan 2024 01:04:43 +1100 Subject: Remove flawless (#856) Removed flawless gemstones from sack display. #856 --- src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt | 8 -------- .../java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'src/main') diff --git a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt index e2ce24672..454074d3d 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt @@ -141,12 +141,6 @@ object SackAPI { gem.finePrice = internalName.sackPrice(stored) if (savingSacks) setSackItem(internalName, stored.formatNumber()) } - - "Flawless" -> { - gem.flawless = stored - gem.flawlessPrice = internalName.sackPrice(stored) - if (savingSacks) setSackItem(internalName, stored.formatNumber()) - } } gemstoneItem[name] = gem } @@ -310,11 +304,9 @@ object SackAPI { var rough: String = "0", var flawed: String = "0", var fine: String = "0", - var flawless: String = "0", var roughPrice: Long = 0, var flawedPrice: Long = 0, var finePrice: Long = 0, - var flawlessPrice: Long = 0, ) data class SackRune( 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 510b62dd1..3c90ee398 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt @@ -194,15 +194,15 @@ object SackDisplay { if (SackAPI.gemstoneItem.isNotEmpty()) { newDisplay.addAsSingletonList("§7Gemstones:") for ((name, gem) in SackAPI.gemstoneItem) { - val (internalName, rough, flawed, fine, flawless, roughprice, flawedprice, fineprice, flawlessprice) = gem + val (internalName, rough, flawed, fine, roughprice, flawedprice, fineprice) = gem newDisplay.add(buildList { add(" §7- ") add(internalName.getItemStack()) add(Renderable.optionalLink("$name: ", { BazaarApi.searchForBazaarItem(name.dropLast(1)) }) { !NEUItems.neuHasFocus() }) - add(" ($rough-§a$flawed-§9$fine-§5$flawless)") - val price = roughprice + flawedprice + fineprice + flawlessprice + add(" ($rough-§a$flawed-§9$fine)") + val price = roughprice + flawedprice + fineprice totalPrice += price if (config.showPrice && price != 0L) add(" §7(§6${format(price)}§7)") }) -- cgit