Bump malilib, add "All" Config tab

Author: sakura-ryoko

gradle.properties

@@ -9,16 +9,16 @@ author = masa
 mod_file_name = itemscroller-fabric
 
 # Current mod version
-mod_version = 0.30.1
+mod_version = 0.30.2-sakura.1
 
 # Required malilib version
-malilib_version = 1.21.11-0.27.2
+malilib_version = 7b4f5c657a
 
 # Minecraft, Fabric Loader and API and mappings versions
 minecraft_version_out = 1.21.11
 minecraft_version = 1.21.11
 mappings_version = 1.21.11+build.1
 
-fabric_loader_version = 0.18.2
-mod_menu_version = 17.0.0-alpha.1
-# fabric_api_version = 0.139.5+1.21.11
+fabric_loader_version = 0.18.4
+mod_menu_version = 17.0.0-beta.1
+# fabric_api_version = 0.141.1+1.21.11

src/main/java/fi/dy/masa/itemscroller/gui/GuiConfigs.java

@@ -1,21 +1,24 @@
 package fi.dy.masa.itemscroller.gui;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import com.google.common.collect.ImmutableList;
 import org.jetbrains.annotations.NotNull;
 
+import fi.dy.masa.malilib.MaLiLibConfigGui;
 import fi.dy.masa.malilib.config.IConfigBase;
 import fi.dy.masa.malilib.gui.GuiConfigsBase;
 import fi.dy.masa.malilib.gui.button.ButtonBase;
 import fi.dy.masa.malilib.gui.button.ButtonGeneric;
 import fi.dy.masa.malilib.gui.button.IButtonActionListener;
+import fi.dy.masa.malilib.gui.interfaces.IConfigGuiAllTab;
 import fi.dy.masa.malilib.util.StringUtils;
 import fi.dy.masa.itemscroller.Reference;
 import fi.dy.masa.itemscroller.config.Configs;
 import fi.dy.masa.itemscroller.config.Hotkeys;
 
-public class GuiConfigs extends GuiConfigsBase
+public class GuiConfigs extends GuiConfigsBase implements IConfigGuiAllTab
 {
     private static ConfigGuiTab tab = ConfigGuiTab.GENERIC;
 
@@ -67,7 +70,11 @@ public List<ConfigOptionWrapper> getConfigs()
         List<? extends IConfigBase> configs;
         ConfigGuiTab tab = GuiConfigs.tab;
 
-        if (tab == ConfigGuiTab.GENERIC)
+        if (tab == ConfigGuiTab.ALL && this.useAllTab())
+        {
+            return this.getAllConfigs();
+        }
+        else if (tab == ConfigGuiTab.GENERIC)
         {
             configs = Configs.Generic.OPTIONS;
         }
@@ -87,7 +94,31 @@ else if (tab == ConfigGuiTab.HOTKEYS)
         return ConfigOptionWrapper.createFor(configs);
     }
 
-	private record ButtonListener(ConfigGuiTab tab, GuiConfigs parent) implements IButtonActionListener
+    @Override
+    public boolean useAllTab()
+    {
+        return true;
+    }
+
+    @Override
+    protected boolean useKeybindSearch()
+    {
+        return tab == ConfigGuiTab.ALL || tab == ConfigGuiTab.HOTKEYS;
+    }
+
+    @Override
+    public List<ConfigOptionWrapper> getAllConfigs()
+    {
+        List<ConfigOptionWrapper> configs = new ArrayList<>();
+
+        configs.addAll(ConfigOptionWrapper.createFor(Configs.Generic.OPTIONS));
+        configs.addAll(ConfigOptionWrapper.createFor(Configs.Toggles.OPTIONS));
+        configs.addAll(ConfigOptionWrapper.createFor(Hotkeys.HOTKEY_LIST));
+
+        return configs;
+    }
+
+    private record ButtonListener(ConfigGuiTab tab, GuiConfigs parent) implements IButtonActionListener
 	{
 		@Override
 		public void actionPerformedWithButton(ButtonBase button, int mouseButton)
@@ -102,9 +133,10 @@ public void actionPerformedWithButton(ButtonBase button, int mouseButton)
 
     public enum ConfigGuiTab
     {
-        GENERIC ("itemscroller.gui.button.config_gui.generic"),
-        TOGGLES ("itemscroller.gui.button.config_gui.toggles"),
-        HOTKEYS ("itemscroller.gui.button.config_gui.hotkeys");
+        ALL         (IConfigGuiAllTab.getTranslationKey()),
+        GENERIC     ("itemscroller.gui.button.config_gui.generic"),
+        TOGGLES     ("itemscroller.gui.button.config_gui.toggles"),
+        HOTKEYS     ("itemscroller.gui.button.config_gui.hotkeys");
 
         private final String translationKey;
 

src/main/resources/fabric.mod.json

@@ -35,9 +35,9 @@
 
 	"depends": {
 		"minecraft": "1.21.11",
-		"malilib": ">=0.27.2- <0.28.0-"
+		"malilib": ">=0.27.6- <0.28.0-"
 	},
 	"breaks": {
-		"malilib": "<0.27.2-"
+		"malilib": "<0.27.6-"
 	}
 }