aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/data
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-04-19 23:47:02 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-04-19 23:47:02 +0200
commit1e52428d3939d0b579cbc156b4e30fb4e8cdc342 (patch)
tree0a2aa3b81a5034654a7a135975d830606eb79641 /src/main/java/at/hannibal2/skyhanni/data
parent50dfb62bad66e9bdb04cca17a2dd32a69b108265 (diff)
downloadskyhanni-1e52428d3939d0b579cbc156b4e30fb4e8cdc342.tar.gz
skyhanni-1e52428d3939d0b579cbc156b4e30fb4e8cdc342.tar.bz2
skyhanni-1e52428d3939d0b579cbc156b4e30fb4e8cdc342.zip
Code cleanup
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/GardenCropUpgrades.kt2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt
index 251ec3ac2..f4c2802f2 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt
@@ -44,7 +44,7 @@ class GardenCropMilestones {
var matcher = cropPattern.matcher(line)
if (matcher.matches()) {
val name = matcher.group(1)
- crop = CropType.getByName(name) ?: continue
+ crop = CropType.getByNameOrNull(name) ?: continue
}
matcher = totalPattern.matcher(line)
if (matcher.matches()) {
diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenCropUpgrades.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenCropUpgrades.kt
index 21c35837c..07b796b33 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/GardenCropUpgrades.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/GardenCropUpgrades.kt
@@ -29,7 +29,7 @@ class GardenCropUpgrades {
if (event.inventoryName != "Crop Upgrades") return
event.inventoryItems.forEach { (_, item) ->
val crop = item.name?.removeColor()?.let {
- CropType.getByName(it)
+ CropType.getByNameOrNull(it)
} ?: return@forEach
val level = item.getLore().firstNotNullOfOrNull {
tierPattern.matchEntire(it)?.groups?.get(1)?.value?.toIntOrNull()