aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt
index 5f61f0330..0038f4448 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt
@@ -7,8 +7,8 @@ import at.hannibal2.skyhanni.events.RepositoryReloadEvent
import at.hannibal2.skyhanni.features.garden.CropType
import at.hannibal2.skyhanni.features.garden.GardenAPI
import at.hannibal2.skyhanni.utils.ItemUtils.getLore
-import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
-import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
+import at.hannibal2.skyhanni.utils.StringUtils.matchFirst
import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
import net.minecraft.item.ItemStack
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -25,11 +25,9 @@ object GardenCropMilestones {
)
fun getCropTypeByLore(itemStack: ItemStack): CropType? {
- for (line in itemStack.getLore()) {
- cropPattern.matchMatcher(line) {
- val name = group("name")
- return CropType.getByNameOrNull(name)
- }
+ itemStack.getLore().matchFirst(cropPattern) {
+ val name = group("name")
+ return CropType.getByNameOrNull(name)
}
return null
}
@@ -40,11 +38,9 @@ object GardenCropMilestones {
for ((_, stack) in event.inventoryItems) {
val crop = getCropTypeByLore(stack) ?: continue
- for (line in stack.getLore()) {
- totalPattern.matchMatcher(line) {
- val amount = group("name").formatNumber()
- crop.setCounter(amount)
- }
+ stack.getLore().matchFirst(totalPattern) {
+ val amount = group("name").formatLong()
+ crop.setCounter(amount)
}
}
CropMilestoneUpdateEvent().postAndCatch()