diff options
| author | Walker Selby <git@walkerselby.com> | 2023-11-22 12:20:15 +0000 |
|---|---|---|
| committer | Walker Selby <git@walkerselby.com> | 2023-11-22 12:20:15 +0000 |
| commit | 514d3f0ec1eb3a7900206ac0b0469d922828b506 (patch) | |
| tree | 0a0dba7248bcb6acfa0f5fbb7526cc4ee0ea9bba /src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt | |
| parent | bf225d26b399fcc3fd258d7acbdedb1e76154b8e (diff) | |
| parent | a6de55740355b3bc4d7c869626d22da5b3854416 (diff) | |
| download | skyhanni-514d3f0ec1eb3a7900206ac0b0469d922828b506.tar.gz skyhanni-514d3f0ec1eb3a7900206ac0b0469d922828b506.tar.bz2 skyhanni-514d3f0ec1eb3a7900206ac0b0469d922828b506.zip | |
Merge branch 'beta' into https
# Conflicts:
# src/main/java/SkyHanniInstallerFrame.java
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt index 59d250b0a..7079ae6fd 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.config.ConfigFileType import at.hannibal2.skyhanni.events.InventoryCloseEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.events.LorenzChatEvent @@ -21,6 +22,7 @@ import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull import at.hannibal2.skyhanni.utils.NEUItems.getPrice import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher +import at.hannibal2.skyhanni.utils.StringUtils.matches import at.hannibal2.skyhanni.utils.StringUtils.removeColor import com.google.gson.annotations.Expose import net.minecraft.item.ItemStack @@ -32,6 +34,7 @@ object SackAPI { private var lastOpenedInventory = "" var inSackInventory = false + // TODO USE SH-REPO private val sackPattern = "^(.* Sack|Enchanted .* Sack)$".toPattern() private val numPattern = @@ -66,7 +69,7 @@ object SackAPI { val inventoryName = event.inventoryName val isNewInventory = inventoryName != lastOpenedInventory lastOpenedInventory = inventoryName - val match = sackPattern.matcher(inventoryName).matches() + val match = sackPattern.matches(inventoryName) if (!match) return val stacks = event.inventoryItems isRuneSack = inventoryName == "Runes Sack" @@ -301,7 +304,7 @@ object SackAPI { private fun saveSackData() { ProfileStorageData.sackProfiles?.sackContents = sackData - SkyHanniMod.configManager.saveSackData("saving-data") + SkyHanniMod.configManager.saveConfig(ConfigFileType.SACKS, "saving-data") } data class SackGemstone( |