summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/garden
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2024-08-14 12:41:29 +0200
committerGitHub <noreply@github.com>2024-08-14 12:41:29 +0200
commit0a027ea5dac41002a460a2627d5c4ff3820c271d (patch)
tree0bebf33c70517b24c2fdbba27b63182172a1a3cb /src/main/java/at/hannibal2/skyhanni/features/garden
parent085240750f346d8f5e57b3f2b5bef3ec31c44763 (diff)
downloadskyhanni-0a027ea5dac41002a460a2627d5c4ff3820c271d.tar.gz
skyhanni-0a027ea5dac41002a460a2627d5c4ff3820c271d.tar.bz2
skyhanni-0a027ea5dac41002a460a2627d5c4ff3820c271d.zip
Improvement: Repo Errors (#2338)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/garden')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt24
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt9
2 files changed, 11 insertions, 22 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
index 5bf03b7e3..aee2a93f4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
@@ -171,23 +171,19 @@ object ComposterOverlay {
return
}
if (organicMatterFactors.isEmpty()) {
- organicMatterDisplay =
- Collections.singletonList(
- listOf(
- "§cSkyHanni composter error:", "§cRepo data not loaded!",
- "§7(organicMatterFactors is empty)",
- ),
- )
+ organicMatterDisplay = listOf(
+ Collections.singletonList("§cSkyHanni composter error:"),
+ Collections.singletonList("§cRepo data not loaded!"),
+ Collections.singletonList("§7(organicMatterFactors is empty)"),
+ )
return
}
if (fuelFactors.isEmpty()) {
- organicMatterDisplay =
- Collections.singletonList(
- listOf(
- "§cSkyHanni composter error:", "§cRepo data not loaded!",
- "§7(fuelFactors is empty)",
- ),
- )
+ organicMatterDisplay = listOf(
+ Collections.singletonList("§cSkyHanni composter error:"),
+ Collections.singletonList("§cRepo data not loaded!"),
+ Collections.singletonList("§7(fuelFactors is empty)"),
+ )
return
}
if (currentOrganicMatterItem.let { it !in organicMatterFactors.keys && it != NONE }) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt
index eb6dc41e0..a4510af8b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt
@@ -57,14 +57,7 @@ object GardenComposterInventoryFeatures {
)
continue
}
- val internalName = NEUInternalName.fromItemNameOrNull(itemName) ?: run {
- ErrorManager.logErrorStateWithData(
- "Error reading internal name for item: $itemName",
- "could not find internal name for",
- "itemName" to itemName
- )
- continue
- }
+ val internalName = NEUInternalName.fromItemName(itemName)
val lowestBin = internalName.getPrice()
val price = lowestBin * amount
fullPrice += price