feat: Settings Screen Redesign

common/src/main/java/com/wynntils/core/persisted/config/Category.java

@@ -1,32 +1,40 @@
 /*
- * Copyright © Wynntils 2022-2023.
+ * Copyright © Wynntils 2022-2024.
  * This file is released under LGPLv3. See LICENSE for full license details.
  */
 package com.wynntils.core.persisted.config;
 
+import com.wynntils.utils.render.Texture;
 import java.util.Locale;
 import net.minecraft.client.resources.language.I18n;
 
 public enum Category {
-    UNCATEGORIZED,
-    CHAT,
-    COMBAT,
-    COMMANDS,
-    DEBUG,
-    EMBELLISHMENTS,
-    INVENTORY,
-    MAP,
-    OVERLAYS,
-    PLAYERS,
-    REDIRECTS,
-    TOOLTIPS,
-    TRADEMARKET,
-    UI,
-    UTILITIES,
-    WYNNTILS;
+    UNCATEGORIZED(Texture.UNCATEGORIZED_CONFIG_ICON),
+    CHAT(Texture.CHAT_CONFIG_ICON),
+    COMBAT(Texture.COMBAT_CONFIG_ICON),
+    COMMANDS(Texture.COMMANDS_CONFIG_ICON),
+    DEBUG(Texture.DEBUG_CONFIG_ICON),
+    EMBELLISHMENTS(Texture.EMBELLISHMENTS_CONFIG_ICON),
+    INVENTORY(Texture.INVENTORY_CONFIG_ICON),
+    MAP(Texture.MAP_CONFIG_ICON),
+    OVERLAYS(Texture.OVERLAYS_CONFIG_ICON),
+    PLAYERS(Texture.PLAYERS_CONFIG_ICON),
+    REDIRECTS(Texture.REDIRECTS_CONFIG_ICON),
+    TOOLTIPS(Texture.TOOLTIPS_CONFIG_ICON),
+    TRADEMARKET(Texture.TRADE_MARKET_CONFIG_ICON),
+    UI(Texture.UI_CONFIG_ICON),
+    UTILITIES(Texture.UTILITIES_CONFIG_ICON),
+    WYNNTILS(Texture.WYNNTILS_CONFIG_ICON);
 
-    Category() {
+    private final Texture categoryIcon;
+
+    Category(Texture categoryIcon) {
         assert !toString().startsWith("core.wynntils");
+        this.categoryIcon = categoryIcon;
+    }
+
+    public Texture getCategoryIcon() {
+        return categoryIcon;
     }
 
     @Override

common/src/main/java/com/wynntils/core/persisted/config/ConfigManager.java

@@ -4,9 +4,11 @@
  */
 package com.wynntils.core.persisted.config;
 
+import com.google.common.reflect.TypeToken;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.google.gson.JsonSyntaxException;
 import com.mojang.util.UndashedUuid;
 import com.wynntils.core.WynntilsMod;
 import com.wynntils.core.components.Manager;
@@ -24,8 +26,10 @@
 import java.io.File;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.Stream;
@@ -267,4 +271,66 @@ public Stream<Config<?>> getConfigsForOwner(PersistedOwner owner) {
         return getConfigs()
                 .filter(config -> Managers.Persisted.getMetadata(config).owner() == owner);
     }
+
+    public boolean importConfig(String jsonInput, List<Configurable> configsToImport) {
+        try {
+            Map<String, Object> configData =
+                    Managers.Json.GSON.fromJson(jsonInput, new TypeToken<HashMap<String, Object>>() {}.getType());
+
+            if (configData == null) {
+                WynntilsMod.warn("Unable to import config due to invalid input");
+                return false;
+            }
+
+            // Loop through all features chosen to import to
+            for (Configurable feature : configsToImport) {
+                // Loop through the visible configs only as they are the only configs to be imported
+                for (Config<?> configOption : feature.getVisibleConfigOptions()) {
+                    String configOptionName = configOption.getJsonName();
+
+                    // If the config data contains this config option, then it can be imported
+                    if (configData.containsKey(configOptionName)) {
+                        Object configOptionValue = configData.get(configOptionName);
+                        setConfigValue(configOption, configOptionValue);
+                    }
+                }
+            }
+
+            return true;
+        } catch (JsonSyntaxException ex) {
+            WynntilsMod.warn("Failed to import config ", ex);
+            return false;
+        }
+    }
+
+    public String exportConfig(List<Configurable> featuresToExport) {
+        Map<String, Object> configData = new HashMap<>();
+
+        // Loop through all features to be exported
+        for (Configurable feature : featuresToExport) {
+            List<Config<?>> visibleConfigOptions = feature.getVisibleConfigOptions();
+
+            // Loop through visible config options, as we don't want this to export
+            // hidden configs since they should be exportable in their
+            // own features, like favorites and waypoints
+            for (Config<?> configOption : visibleConfigOptions) {
+                String configOptionName = configOption.getJsonName();
+                Object configOptionValue = configOption.get();
+
+                // Save the config option to the map
+                configData.put(configOptionName, configOptionValue);
+            }
+        }
+
+        // Return the json string of the exported settings
+        return Managers.Json.GSON.toJson(configData);
+    }
+
+    private <T> void setConfigValue(Config<T> config, Object value) {
+        T typedValue = config.tryParseStringValue(value.toString());
+
+        if (typedValue != null) {
+            config.setValue(typedValue);
+        }
+    }
 }

common/src/main/java/com/wynntils/screens/chattabs/ChatTabEditingScreen.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © Wynntils 2022-2023.
+ * Copyright © Wynntils 2022-2024.
  * This file is released under LGPLv3. See LICENSE for full license details.
  */
 package com.wynntils.screens.chattabs;

common/src/main/java/com/wynntils/screens/overlays/selection/OverlaySelectionScreen.java

@@ -488,6 +488,8 @@ public void populateOverlays() {
 
             setSelectedOverlay(newSelected);
         }
+
+        scrollOverlays(overlayScrollOffset);
     }
 
     public void setSelectedOverlay(Overlay selectedOverlay) {
@@ -604,6 +606,8 @@ private void populateConfigs() {
 
             renderY += 43;
         }
+
+        scrollConfigs(configScrollOffset);
     }
 
     private void togglePreview(boolean enabled) {