diff options
| author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2024-04-19 11:43:33 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-19 03:43:33 +0200 |
| commit | fdee390d8e0b4af67f2dfca38316884ccc04e3e0 (patch) | |
| tree | 4cf7749a3404d427b2bfe1d5c1fb41492c973b27 /src/main/java/at/hannibal2/skyhanni/utils | |
| parent | cef5bc4c9914235476d9b1a07c8ef83e8d159827 (diff) | |
| download | skyhanni-fdee390d8e0b4af67f2dfca38316884ccc04e3e0.tar.gz skyhanni-fdee390d8e0b4af67f2dfca38316884ccc04e3e0.tar.bz2 skyhanni-fdee390d8e0b4af67f2dfca38316884ccc04e3e0.zip | |
Feature: Stuff for chocolate factory and hoppity event (#1434)
Co-authored-by: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt | 4 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt index 9bc8ff5ae..69ca8fc59 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt @@ -36,7 +36,9 @@ object InventoryUtils { fun ContainerChest.getInventoryName() = this.lowerChestInventory.displayName.unformattedText.trim() - fun getItemsInOwnInventory() = Minecraft.getMinecraft().thePlayer.inventory.mainInventory.filterNotNull() + fun getItemsInOwnInventory() = + Minecraft.getMinecraft().thePlayer?.inventory?.mainInventory?.filterNotNull() ?: emptyList() + fun getItemsInOwnInventoryWithNull() = Minecraft.getMinecraft().thePlayer.inventory.mainInventory fun countItemsInLowerInventory(predicate: (ItemStack) -> Boolean) = diff --git a/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt b/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt index 18d450040..797207d0b 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt @@ -55,6 +55,10 @@ object UtilsPatterns { "item.amount.behind", "(?<name>(?:§.)*(?:[^§] ?)+)(?:§8x(?<amount>[\\d,]+))?" ) + val costLinePattern by patternGroup.pattern( + "item.cost.line", + "§7Cost" + ) val timeAmountPattern by patternGroup.pattern( "time.amount", |