diff options
author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-08-09 16:02:27 +0200 |
---|---|---|
committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-08-09 16:02:27 +0200 |
commit | 24014596ce0bfe84a2df3d8c2d597a02c31d8fe2 (patch) | |
tree | da3f0ecb4cbca4578f01666cef2f04afcf06a264 /src/main/java/at/hannibal2 | |
parent | f6d917fce6ef289789c9e594dbb1b911f86ef8bd (diff) | |
download | skyhanni-24014596ce0bfe84a2df3d8c2d597a02c31d8fe2.tar.gz skyhanni-24014596ce0bfe84a2df3d8c2d597a02c31d8fe2.tar.bz2 skyhanni-24014596ce0bfe84a2df3d8c2d597a02c31d8fe2.zip |
RUne display now shows always if sack display is enabled.
Diffstat (limited to 'src/main/java/at/hannibal2')
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java | 14 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java index 883eb3a27..c3cab81db 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java @@ -2,14 +2,7 @@ package at.hannibal2.skyhanni.config.features; import at.hannibal2.skyhanni.config.core.config.Position; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.ConfigAccordionId; -import io.github.moulberry.moulconfig.annotations.ConfigEditorAccordion; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; -import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.moulberry.moulconfig.annotations.*; import java.util.ArrayList; import java.util.Arrays; @@ -191,11 +184,6 @@ public class InventoryConfig { public int priceFrom = 0; @Expose - @ConfigOption(name = "Show in Runes Sack", desc = "Show contained items inside a runes sack.") - @ConfigEditorBoolean - public boolean showRunes = false; - - @Expose public Position position = new Position(144, 139, false, true); } 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 cd927a6a6..46f28a9b0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt @@ -298,7 +298,6 @@ class SackDisplay { fun onInventoryOpen(event: InventoryFullyOpenedEvent) { if (!isEnabled()) return val inventoryName = event.inventoryName - if (!isRuneDisplayEnabled() && inventoryName == "Runes Sack") return val match = sackPattern.matcher(inventoryName).matches() if (!match) return val stacks = event.inventoryItems @@ -340,7 +339,6 @@ class SackDisplay { ) private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled - private fun isRuneDisplayEnabled() = config.showRunes private fun NEUInternalName.sackPrice(stored: String) = when (config.priceFrom) { 0 -> (getPrice(true) * stored.formatNumber()).toInt().let { if (it < 0) 0 else it } |