From 0a027ea5dac41002a460a2627d5c4ff3820c271d Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal002@users.noreply.github.com> Date: Wed, 14 Aug 2024 12:41:29 +0200 Subject: Improvement: Repo Errors (#2338) Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com> --- .../features/garden/composter/ComposterOverlay.kt | 24 +++++++++------------- .../composter/GardenComposterInventoryFeatures.kt | 9 +------- 2 files changed, 11 insertions(+), 22 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/garden') 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 -- cgit