diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features')
6 files changed, 9 insertions, 27 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt index f4f4fbac4..445714402 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt @@ -170,7 +170,7 @@ object CityProjectFeatures { ) { inInventory && !NEUItems.neuHasFocus() } ) - val price = internalName.getPrice(false) * amount + val price = internalName.getPrice() * amount val format = price.shortFormat() list.add(" §7(§6$format§7)") add(list) 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 303fd7464..8ed772ea3 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 @@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.garden.composter import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.config.features.garden.composter.ComposterConfig -import at.hannibal2.skyhanni.config.features.garden.composter.ComposterConfig.OverlayPriceTypeEntry import at.hannibal2.skyhanni.config.features.garden.composter.ComposterConfig.RetrieveFromEntry import at.hannibal2.skyhanni.data.SackAPI.getAmountInSacksOrNull import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenJson @@ -535,8 +534,7 @@ object ComposterOverlay { } private fun getPrice(internalName: NEUInternalName): Double { - val useSellPrice = config.overlayPriceType == ComposterConfig.OverlayPriceTypeEntry.BUY_ORDER - val price = internalName.getPrice(useSellPrice) + val price = internalName.getPrice(config.priceSource) if (internalName.equals("BIOFUEL") && price > 20_000) return 20_000.0 return price @@ -622,9 +620,6 @@ object ComposterOverlay { event.move(3, "garden.composterOverlayOrganicMatterPos", "garden.composters.overlayOrganicMatterPos") event.move(3, "garden.composterOverlayFuelExtrasPos", "garden.composters.overlayFuelExtrasPos") event.move(3, "garden.composterRoundDown", "garden.composters.roundDown") - event.transform(15, "garden.composters.overlayPriceType") { element -> - ConfigUtils.migrateIntToEnum(element, OverlayPriceTypeEntry::class.java) - } event.transform(15, "garden.composters.retrieveFrom") { element -> ConfigUtils.migrateIntToEnum(element, RetrieveFromEntry::class.java) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt index b2575c88d..5ef150907 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt @@ -1,7 +1,6 @@ package at.hannibal2.skyhanni.features.garden.inventory import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator -import at.hannibal2.skyhanni.config.features.garden.SkyMartConfig import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.InventoryCloseEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent @@ -56,8 +55,7 @@ object SkyMartCopperPrice { } ?: continue val internalName = item.getInternalName() - val useSellPrice = config.overlayPriceType == SkyMartConfig.OverlayPriceTypeEntry.SELL_ORDER - val itemPrice = internalName.getPriceOrNull(useSellPrice) ?: continue + val itemPrice = internalName.getPriceOrNull(config.priceSource) ?: continue val profit = itemPrice - (otherItemsPrice ?: 0.0) val factor = profit / copper 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 81e277fd6..55be1b08f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt @@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.inventory import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator -import at.hannibal2.skyhanni.config.features.inventory.SackDisplayConfig import at.hannibal2.skyhanni.config.features.inventory.SackDisplayConfig.NumberFormatEntry import at.hannibal2.skyhanni.config.features.inventory.SackDisplayConfig.PriceFormatEntry import at.hannibal2.skyhanni.config.features.inventory.SackDisplayConfig.SortingTypeEntry @@ -17,6 +16,7 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.addSelector import at.hannibal2.skyhanni.utils.CollectionUtils.addString import at.hannibal2.skyhanni.utils.ConfigUtils import at.hannibal2.skyhanni.utils.InventoryUtils +import at.hannibal2.skyhanni.utils.ItemPriceSource import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.LorenzColor import at.hannibal2.skyhanni.utils.LorenzUtils @@ -206,11 +206,11 @@ object SackDisplay { ) if (config.showPrice) { - list.addSelector<PriceFrom>(" ", + list.addSelector<ItemPriceSource>(" ", getName = { type -> type.displayName }, - isCurrent = { it.ordinal == config.priceFrom.ordinal }, // todo avoid ordinal + isCurrent = { it.ordinal == config.priceSource.ordinal }, // todo avoid ordinal onChange = { - config.priceFrom = SackDisplayConfig.PriceFrom.entries[it.ordinal] // todo avoid ordinal + config.priceSource = ItemPriceSource.entries[it.ordinal] // todo avoid ordinal update(false) }) list.addButton( @@ -300,12 +300,6 @@ object SackDisplay { ; } - enum class PriceFrom(val displayName: String) { - BAZAAR("Bazaar Price"), - NPC("NPC Price"), - ; - } - enum class PriceFormat(val displayName: String) { FORMATED("Formatted"), UNFORMATED("Unformatted"), @@ -327,9 +321,6 @@ object SackDisplay { event.transform(15, "inventory.sackDisplay.priceFormat") { element -> ConfigUtils.migrateIntToEnum(element, PriceFormatEntry::class.java) } - event.transform(15, "inventory.sackDisplay.priceFrom") { element -> - ConfigUtils.migrateIntToEnum(element, SackDisplayConfig.PriceFrom::class.java) - } event.transform(15, "inventory.sackDisplay.sortingType") { element -> ConfigUtils.migrateIntToEnum(element, SortingTypeEntry::class.java) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt index 21b86b6cf..e55916f95 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt @@ -123,7 +123,7 @@ object EstimatedItemValue { ignoreHelmetSkins, ignoreArmorDyes, ignoreRunes, - bazaarPriceSource, + priceSource, useAttributeComposite, ) { cache.clear() diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt index bfc42659f..ad00298c3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt @@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.misc.items import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.api.ReforgeAPI -import at.hannibal2.skyhanni.config.features.misc.EstimatedItemValueConfig import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName @@ -760,7 +759,6 @@ object EstimatedItemValueCalculator { private fun NEUInternalName.getPrice(): Double = getPriceOrNull() ?: -1.0 private fun NEUInternalName.getPriceOrNull(): Double? { - val useSellPrice = config.bazaarPriceSource.get() == EstimatedItemValueConfig.BazaarPriceSource.BUY_ORDER - return getPriceOrNull(useSellPrice) + return getPriceOrNull(config.priceSource.get()) } } |