Merge pull request #788 from Emirlol/container-matcher-refactor

Refactor container matcher implementations into interfaces

2 files changed, 25 insertions, 5 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
index ab674b18..7669359e 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
@@ -5,10 +5,12 @@ import de.hysky.skyblocker.config.ConfigUtils;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.configs.GeneralConfig;
 import de.hysky.skyblocker.skyblock.item.tooltip.adders.CraftPriceTooltip;
+import de.hysky.skyblocker.skyblock.item.slottext.SlotTextMode;
 import de.hysky.skyblocker.skyblock.shortcut.ShortcutsConfigScreen;
 import dev.isxander.yacl3.api.*;
 import dev.isxander.yacl3.api.controller.FloatSliderControllerBuilder;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.option.KeybindsScreen;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
@@ -234,13 +236,18 @@ public class GeneralCategory {
                 .group(OptionGroup.createBuilder()
                         .name(Text.translatable("skyblocker.config.general.itemInfoDisplay"))
                         .collapsed(true)
-                        .option(Option.<Boolean>createBuilder()
+                        .option(Option.<SlotTextMode>createBuilder()
                                 .name(Text.translatable("skyblocker.config.general.itemInfoDisplay.slotText"))
                                 .description(OptionDescription.of(Text.translatable("skyblocker.config.general.itemInfoDisplay.slotText.@Tooltip")))
-                                .binding(defaults.general.itemInfoDisplay.slotText,
-                                        () -> config.general.itemInfoDisplay.slotText,
-                                        newValue -> config.general.itemInfoDisplay.slotText = newValue)
-                                .controller(ConfigUtils::createBooleanController)
+                                .binding(defaults.general.itemInfoDisplay.slotTextMode,
+                                        () -> config.general.itemInfoDisplay.slotTextMode,
+                                        newValue -> config.general.itemInfoDisplay.slotTextMode = newValue)
+                                .controller(ConfigUtils::createEnumCyclingListController)
+                                .build())
+                        .option(ButtonOption.createBuilder()
+                                .name(Text.translatable("skyblocker.config.shortcutToKeybindsSettings"))
+                                .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new KeybindsScreen(screen, MinecraftClient.getInstance().options)))
+                                .text(Text.translatable("skyblocker.config.shortcutToKeybindsSettings.@Text"))
                                 .build())
                         .option(Option.<Boolean>createBuilder()
                                 .name(Text.translatable("skyblocker.config.general.itemInfoDisplay.attributeShardInfo"))
@@ -301,6 +308,11 @@ public class GeneralCategory {
                                         newValue -> config.general.wikiLookup.enableWikiLookup = newValue)
                                 .controller(ConfigUtils::createBooleanController)
                                 .build())
+                        .option(ButtonOption.createBuilder()
+                                .name(Text.translatable("skyblocker.config.shortcutToKeybindsSettings"))
+                                .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new KeybindsScreen(screen, MinecraftClient.getInstance().options)))
+                                .text(Text.translatable("skyblocker.config.shortcutToKeybindsSettings.@Text"))
+                                .build())
                         .option(Option.<Boolean>createBuilder()
                                 .name(Text.translatable("skyblocker.config.general.wikiLookup.officialWiki"))
                                 .description(OptionDescription.of(Text.translatable("skyblocker.config.general.wikiLookup.officialWiki.@Tooltip")))
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java
index 691e6f79..61386452 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java
@@ -3,6 +3,7 @@ package de.hysky.skyblocker.config.configs;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.skyblock.item.CustomArmorAnimatedDyes;
 import de.hysky.skyblocker.skyblock.item.CustomArmorTrims;
+import de.hysky.skyblocker.skyblock.item.slottext.SlotTextMode;
 import dev.isxander.yacl3.config.v2.api.SerialEntry;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
@@ -163,10 +164,17 @@ public class GeneralConfig {
     }
 
     public static class ItemInfoDisplay {
+        @Deprecated
         @SerialEntry
         public boolean slotText = true;
 
         @SerialEntry
+        public SlotTextMode slotTextMode = SlotTextMode.ENABLED;
+
+        @SerialEntry
+        public boolean slotTextToggled = true;
+
+        @SerialEntry
         public boolean attributeShardInfo = true;
 
         @SerialEntry