diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-08-08 03:28:52 +0200 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-08-08 03:28:52 +0200 |
| commit | 3ba6a1b438b4bb4d7143903bc477a1493508c54c (patch) | |
| tree | 705b421f6f5a2d2b2a194c1e79d3b50d3785a3b6 /src/main/java/at/hannibal2/skyhanni/features/misc | |
| parent | 7b84e7782e63d85bf17a4f9c3d66af5681eecf90 (diff) | |
| download | skyhanni-3ba6a1b438b4bb4d7143903bc477a1493508c54c.tar.gz skyhanni-3ba6a1b438b4bb4d7143903bc477a1493508c54c.tar.bz2 skyhanni-3ba6a1b438b4bb4d7143903bc477a1493508c54c.zip | |
misc code cleanup
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/misc')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/misc/BestiaryData.kt | 14 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/misc/BrewingStandOverlay.kt | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/BestiaryData.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/BestiaryData.kt index b25d4be39..104d6b25f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/BestiaryData.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/BestiaryData.kt @@ -340,13 +340,15 @@ object BestiaryData { for (cat in catList) { newDisplay.add(buildList { add(" §7- ${cat.name}§7: ") - if (cat.familiesCompleted == cat.totalFamilies) { - add("§c§lCompleted!") - } else if (cat.familiesFound == cat.totalFamilies) { - add("§b${cat.familiesCompleted}§7/§b${cat.totalFamilies} §7completed") - } else if (cat.familiesFound < cat.totalFamilies) { - add("§b${cat.familiesFound}§7/§b${cat.totalFamilies} §7found, §b${cat.familiesCompleted}§7/§b${cat.totalFamilies} §7completed") + val element = when { + cat.familiesCompleted == cat.totalFamilies -> "§c§lCompleted!" + cat.familiesFound == cat.totalFamilies -> "§b${cat.familiesCompleted}§7/§b${cat.totalFamilies} §7completed" + cat.familiesFound < cat.totalFamilies -> + "§b${cat.familiesFound}§7/§b${cat.totalFamilies} §7found, §b${cat.familiesCompleted}§7/§b${cat.totalFamilies} §7completed" + + else -> continue } + add(element) }) } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/BrewingStandOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/BrewingStandOverlay.kt index 5557309a2..d7bee2948 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/BrewingStandOverlay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/BrewingStandOverlay.kt @@ -23,8 +23,7 @@ class BrewingStandOverlay { 13, // Ingredient input 21, // Progress 42, // Output right side - -> { - } + -> Unit else -> return } |