From f4da7e767401fdf6a612f7f236e1e494dc5fa815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Tue, 24 Sep 2024 21:49:06 +0200 Subject: [PATCH] small cleanup in settings --- .../craftattack/spawn/appliances/settings/Settings.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java index f1ba0d7..4703619 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java @@ -135,11 +135,15 @@ public class Settings extends Appliance { } private int calculateInvSize(List> settings) { - int countOfUncategorized = (int) settings.stream().filter(setting -> !(setting instanceof CategorizedSetting)).count(); + int countOfUncategorized = (int) settings.stream() + .filter(setting -> !(setting instanceof CategorizedSetting)) + .count(); + return Arrays.stream(SettingCategory.values()) .map(settingCategory -> settings.stream() .filter(setting -> setting instanceof CategorizedSetting) - .filter(setting -> ((CategorizedSetting) setting).category().equals(settingCategory)) + .map(setting -> (CategorizedSetting) setting) + .filter(categorizedSetting -> categorizedSetting.category().equals(settingCategory)) .count()) .map(itemCount -> itemCount + countOfUncategorized) .map(itemCount -> (int) Math.ceil((double) itemCount / 9))