fix: update mods and their loaders

README.md

@@ -7,24 +7,29 @@
 Options Profiles is a Minecraft mod that lets you load and save your options as profiles from in-game.
 
 ## Features
+
 - Save and load profiles in-game
-- Load specific options (like only load keybinds, resource packs or FOV and GUI scale)
+- Load specific options (e.g. only load keybinds, resource packs, FOV, etc.)
+- Load profiles when joining a certain server
 - Edit profiles in-game (deleting, renaming, overwriting, pick options to only load)
-- Fabric, NeoForge, Forge support
+- Fabric, NeoForge support
 - Third party mod support (see below)
 
 ## Mod Support
+
 Options Profiles supports these mods which means you can create and load profiles with them and the mod will load their configuration.
 
 - Sodium
 - Sodium Extra
 - Iris
 - Distant Horizons
-- OptiFine
 
 If you would like support for another mod, open an issue.
 
 ## Frequently Asked Questions
+
+- How to open profiles menu without going to options?
+  > You can open the profiles menu by using the command `/optionsprofiles` or by accessing it from Mod Menu
 - Can you port [version]?
   > Open an issue in the GitHub repository.
 - Can I use this in my modpack?
@@ -39,10 +44,10 @@ If you would like support for another mod, open an issue.
 
 ## Gallery
 
-Profiles Menu              | Edit Profile Screen       
-:-------------------------:|:-------------------------:
-<img src="gallery/profiles-menu.png" alt="profiles list"/> | <img src="gallery/edit-profile-screen.png" alt="edit profile screen"/>
+|                       Profiles Menu                        |                          Edit Profile Screen                           |
+| :--------------------------------------------------------: | :--------------------------------------------------------------------: |
+| <img src="gallery/profiles-menu.png" alt="profiles list"/> | <img src="gallery/edit-profile-screen.png" alt="edit profile screen"/> |
 
-Options Toggle Menu        | Options Screen     
-:-------------------------:|:-------------------------:
-<img src="gallery/options-toggle-menu.png" alt="options toggle menu"/> | <img src="gallery/options-screen.png" alt="options screen"/>
+|                          Options Toggle Menu                           |                        Options Screen                        |
+| :--------------------------------------------------------------------: | :----------------------------------------------------------: |
+| <img src="gallery/options-toggle-menu.png" alt="options toggle menu"/> | <img src="gallery/options-screen.png" alt="options screen"/> |

build.gradle

@@ -1,7 +1,7 @@
 plugins {
-    id 'dev.architectury.loom' version '1.10-SNAPSHOT' apply false
+    id 'dev.architectury.loom' version '1.11-SNAPSHOT' apply false
     id 'architectury-plugin' version '3.4-SNAPSHOT'
-    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
+    id 'com.gradleup.shadow' version '8.3.6' apply false
 }
 
 architectury {
@@ -31,6 +31,10 @@ subprojects {
         // for more information about repositories.
     }
 
+     loom {
+        silentMojangMappingsLicense()
+    }
+
     dependencies {
         minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
         mappings loom.officialMojangMappings()

common/build.gradle

@@ -26,9 +26,9 @@ dependencies {
     modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"
 
     // Mod implementations
-    modImplementation "maven.modrinth:sodium:mc1.21.6-0.6.13-fabric"            // Sodium
-    modImplementation "maven.modrinth:sodium-extra:mc1.21.6-0.6.6+fabric"       // Sodium Extra
-    modImplementation "maven.modrinth:iris:1.9.1+1.21.7-fabric"                 // Iris
-    modImplementation "maven.modrinth:distanthorizons:2.3.4-b-1.21.6"           // Distant Horizons
-    modImplementation "maven.modrinth:controlify:2.2.1-fabric,1.21.6"           // Controlify
+    modImplementation "maven.modrinth:sodium:mc1.21.10-0.7.2-fabric"            // Sodium
+    modImplementation "maven.modrinth:sodium-extra:mc1.21.9-0.7.0+fabric"       // Sodium Extra
+    modImplementation "maven.modrinth:iris:1.9.6+1.21.10-fabric"                // Iris
+    modImplementation "maven.modrinth:distanthorizons:2.3.6-b-1.21.10"          // Distant Horizons
+    modImplementation "maven.modrinth:controlify:2.4.2-fabric,1.21.9"           // Controlify
 }

common/src/main/java/net/trafficlunar/optionsprofiles/Keybinds.java

@@ -5,6 +5,7 @@ import dev.architectury.event.events.client.ClientTickEvent;
 import dev.architectury.registry.client.keymappings.KeyMappingRegistry;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
+import net.minecraft.resources.ResourceLocation;
 import net.trafficlunar.optionsprofiles.profiles.ProfileConfiguration;
 import net.trafficlunar.optionsprofiles.profiles.Profiles;
 
@@ -17,12 +18,14 @@ public class Keybinds {
     private static final KeyMapping[] PROFILE_KEYMAPPINGS = new KeyMapping[3];
 
     public static void init() {
+        KeyMapping.Category category = KeyMapping.Category.register(ResourceLocation.fromNamespaceAndPath(OptionsProfilesMod.MOD_ID, "keys"));
+
         for (int i = 0; i < PROFILE_KEYMAPPINGS.length; i++) {
             PROFILE_KEYMAPPINGS[i] = new KeyMapping(
                     "key.optionsprofiles.profile_" + (i + 1),
                     InputConstants.Type.KEYSYM,
                     -1,
-                    "category.optionsprofiles.keys"
+                    category
             );
             KeyMappingRegistry.register(PROFILE_KEYMAPPINGS[i]);
         }
@@ -44,19 +47,7 @@ public class Keybinds {
 
                         ProfileConfiguration profileConfiguration = ProfileConfiguration.get(profileName);
                         if (profileConfiguration.getKeybindIndex() == keybindIndex) {
-                            Minecraft minecraft = Minecraft.getInstance();
-
                             Profiles.loadProfile(profileName);
-                            minecraft.options.load();
-
-                            if (ProfileConfiguration.get(profileName).getOptionsToLoad().contains("resourcePacks")) {
-                                minecraft.options.loadSelectedResourcePacks(minecraft.getResourcePackRepository());
-                                minecraft.reloadResourcePacks();
-                            }
-
-                            minecraft.options.save();
-                            minecraft.levelRenderer.allChanged();
-
                             OptionsProfilesMod.LOGGER.warn("[Profile '{}']: Loaded through keybind", profileName);
                         }
                     });

common/src/main/java/net/trafficlunar/optionsprofiles/OptionsProfilesMod.java

@@ -1,14 +1,22 @@
 package net.trafficlunar.optionsprofiles;
 
 import dev.architectury.event.events.client.ClientLifecycleEvent;
+import dev.architectury.event.events.client.ClientPlayerEvent;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.network.Connection;
+import net.trafficlunar.optionsprofiles.profiles.ProfileConfiguration;
 import net.trafficlunar.optionsprofiles.profiles.Profiles;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.stream.Stream;
 
 public class OptionsProfilesMod {
     public static final String MOD_ID = "optionsprofiles";
@@ -30,9 +38,33 @@ public class OptionsProfilesMod {
         // Load mod config
         CONFIG = OptionsProfilesModConfiguration.load();
 
-        // Init profiles (for loading on startup)
+        // Load profiles marked to load on startup
         ClientLifecycleEvent.CLIENT_STARTED.register(client -> {
-            Profiles.init();
+            try (Stream<Path> paths = Files.list(Profiles.PROFILES_DIRECTORY)) {
+                paths.filter(Files::isDirectory)
+                        .forEach(path -> {
+                            String profileName = path.getFileName().toString();
+
+                            // This gets the configuration but also creates the configuration file if it is not there
+                            ProfileConfiguration profileConfiguration = ProfileConfiguration.get(profileName);
+                            if (profileConfiguration.shouldLoadOnStartup()) {
+                                Profiles.loadProfile(profileName);
+                                OptionsProfilesMod.LOGGER.info("[Profile '{}']: Loaded on startup", profileName);
+                            }
+                        });
+            } catch (IOException e) {
+                OptionsProfilesMod.LOGGER.error("An error occurred when initializing", e);
+            }
+        });
+
+        // Load profiles marked to load on server join
+        ClientPlayerEvent.CLIENT_PLAYER_JOIN.register((LocalPlayer player) -> {
+            handleClientPlayerEvent(player, false);
+        });
+
+        // Load profiles marked to load on server leave
+        ClientPlayerEvent.CLIENT_PLAYER_QUIT.register((LocalPlayer player) -> {
+            handleClientPlayerEvent(player, true);
         });
 
         Keybinds.init();
@@ -46,4 +78,38 @@ public class OptionsProfilesMod {
             return CONFIG;
         }
     }
+
+    private static void handleClientPlayerEvent(LocalPlayer player, boolean isOnLeave) {
+        if (player == null) return;
+        Connection connection = player.connection.getConnection();
+
+        // Check if it's not an integrated server
+        if (!connection.isMemoryConnection()) {
+            // Get IP address
+            SocketAddress address = connection.getRemoteAddress();
+            if (address instanceof InetSocketAddress inetAddress) {
+                String ip = inetAddress.getHostString().trim();
+
+                // Go through all profiles and check what profiles to load
+                try (Stream<Path> paths = Files.list(Profiles.PROFILES_DIRECTORY)) {
+                    paths.filter(Files::isDirectory)
+                            .forEach(path -> {
+                                String profileName = path.getFileName().toString();
+                                ProfileConfiguration profileConfiguration = ProfileConfiguration.get(profileName);
+                                String[] servers = profileConfiguration.getServers().split(",");
+
+                                if (servers.length == 0) return;
+
+                                // Check if "leave" for the leave event or IP for the join event is in profile's servers
+                                if (Arrays.asList(servers).contains(isOnLeave ? "leave" : ip)) {
+                                    Profiles.loadProfile(profileName);
+                                    OptionsProfilesMod.LOGGER.info("[Profile '{}']: Loaded on server ({})" + (isOnLeave ? "leave" : ""), profileName, ip);
+                                }
+                            });
+                } catch (IOException e) {
+                    OptionsProfilesMod.LOGGER.error("An error occurred when initializing", e);
+                }
+            }
+        }
+    }
 }

common/src/main/java/net/trafficlunar/optionsprofiles/gui/EditProfileScreen.java

@@ -18,6 +18,7 @@ public class EditProfileScreen extends Screen {
     private final Component profileName;
     private final ProfileConfiguration profileConfiguration;
     private EditBox profileNameEdit;
+    private EditBox serversEdit;
 
     public EditProfileScreen(ProfilesScreen profilesScreen, Component profileName) {
         super(Component.literal(Component.translatable("gui.optionsprofiles.editing-profile-title").getString() + profileName.getString()));
@@ -33,11 +34,20 @@ public class EditProfileScreen extends Screen {
         this.profileNameEdit = new EditBox(this.font, this.width / 2 - 102, 116, 204, 20, Component.empty());
         this.profileNameEdit.setValue(profileName.getString());
 
+        this.serversEdit = new EditBox(this.font, this.width / 2 - 102, 137, 204, 20, Component.empty());
+        this.serversEdit.setMaxLength(128);
+        this.serversEdit.setValue(this.profileConfiguration.getServers());
+        this.serversEdit.setHint(Component.translatable("gui.optionsprofiles.servers-hint").withStyle(ChatFormatting.GRAY));
+        this.serversEdit.setTooltip(Tooltip.create(Component.translatable("gui.optionsprofiles.servers.tooltip")));
+
         LinearLayout linearLayoutContent = this.layout.addToContents(LinearLayout.vertical().spacing(12), LayoutSettings::alignHorizontallyCenter);
 
-        LinearLayout linearLayoutEditBox = linearLayoutContent.addChild(LinearLayout.vertical().spacing(6), LayoutSettings::alignHorizontallyCenter);
+        LinearLayout linearLayoutEditBox = linearLayoutContent.addChild(LinearLayout.vertical().spacing(3), LayoutSettings::alignHorizontallyCenter);
         linearLayoutEditBox.addChild(new StringWidget(Component.translatable("gui.optionsprofiles.profile-name-text"), this.font), LayoutSettings::alignHorizontallyCenter);
         linearLayoutEditBox.addChild(this.profileNameEdit);
+        linearLayoutEditBox.addChild(LinearLayout.vertical());  // add an extra spacing above edit box
+        linearLayoutEditBox.addChild(new StringWidget(Component.translatable("gui.optionsprofiles.servers-text"), this.font), LayoutSettings::alignHorizontallyCenter);
+        linearLayoutEditBox.addChild(this.serversEdit);
 
         LinearLayout linearLayoutButtons = linearLayoutContent.addChild(LinearLayout.vertical().spacing(1), LayoutSettings::alignHorizontallyCenter);
         linearLayoutButtons.addChild(
@@ -53,18 +63,6 @@ public class EditProfileScreen extends Screen {
                         .build(),
                 LayoutSettings::alignHorizontallyCenter
         );
-        linearLayoutButtons.addChild(
-                Button.builder(
-                                Component.translatable("gui.optionsprofiles.rename-profile"),
-                                (button) -> {
-                                    Profiles.renameProfile(profileName.getString(), this.profileNameEdit.getValue());
-                                    this.minecraft.setScreen(new EditProfileScreen(profilesScreen, Component.literal(this.profileNameEdit.getValue())));
-                                })
-                        .size(150, 20)
-                        .pos(this.width / 2 - 75, 166)
-                        .build(),
-                LayoutSettings::alignHorizontallyCenter
-        );
         linearLayoutButtons.addChild(
                 Button.builder(
                                 Component.translatable("gui.optionsprofiles.options-toggle").append("..."),
@@ -128,8 +126,12 @@ public class EditProfileScreen extends Screen {
     }
 
     public void onClose(boolean deleted) {
-        if (!deleted)
+        if (!deleted) {
+            this.profileConfiguration.setServers(this.serversEdit.getValue());
             this.profileConfiguration.save();
+
+            Profiles.renameProfile(profileName.getString(), this.profileNameEdit.getValue());
+        }
         this.minecraft.setScreen(this.profilesScreen);
         this.profilesScreen.profilesList.refreshEntries();
     }

common/src/main/java/net/trafficlunar/optionsprofiles/gui/OptionsToggleList.java

@@ -1,5 +1,8 @@
 package net.trafficlunar.optionsprofiles.gui;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.screens.options.controls.KeyBindsList;
 import net.trafficlunar.optionsprofiles.OptionsProfilesMod;
 import net.trafficlunar.optionsprofiles.profiles.ProfileConfiguration;
 import net.trafficlunar.optionsprofiles.profiles.Profiles;
@@ -10,6 +13,7 @@ import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.ContainerObjectSelectionList;
 import net.minecraft.client.gui.components.CycleButton;
+import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.gui.components.Tooltip;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratableEntry;
@@ -22,21 +26,40 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
 
-public class OptionsToggleList extends ContainerObjectSelectionList<OptionsToggleList.Entry> {
+public class OptionsToggleList extends ContainerObjectSelectionList<OptionsToggleList.OptionEntry> {
     private final String profileName;
     private final ProfileConfiguration profileConfiguration;
+    private final EditBox searchBox;
+    private final List<OptionEntry> allEntries = new ArrayList<>();
 
-    public OptionsToggleList(OptionsToggleScreen optionsToggleScreen, Minecraft minecraft, String profileName, ProfileConfiguration profileConfiguration) {
+    public OptionsToggleList(OptionsToggleScreen optionsToggleScreen, Minecraft minecraft, String profileName, ProfileConfiguration profileConfiguration, EditBox searchBox) {
         super(minecraft, optionsToggleScreen.width, optionsToggleScreen.layout.getContentHeight(), optionsToggleScreen.layout.getHeaderHeight(), 20);
         this.profileConfiguration = profileConfiguration;
         this.profileName = profileName;
+        this.searchBox = searchBox;
+
+        this.searchBox.setResponder(this::filterEntries);
 
         refreshEntries(false, false);
     }
 
+    private void filterEntries(String searchText) {
+        this.clearEntries();
+
+        if (searchText.isEmpty()) {
+            allEntries.forEach(this::addEntry);
+            return;
+        }
+
+        String filter = searchText.toLowerCase();
+        allEntries.stream()
+                .filter(entry -> entry.key.toLowerCase().contains(filter))
+                .forEach(this::addEntry);
+    }
+
     // If overriding boolean is set to true then this function will set every option in the list to overrideToggle (false or true)
     public void refreshEntries(boolean overriding, boolean overrideToggle) {
-        this.clearEntries();
+        allEntries.clear();
 
         Path profile = Profiles.PROFILES_DIRECTORY.resolve(profileName);
         Path optionsFile = profile.resolve("options.txt");
@@ -60,14 +83,16 @@ public class OptionsToggleList extends ContainerObjectSelectionList<OptionsToggl
                     }
 
                     // Add entry with option key and value and if the key is in the profile configuration
-                    this.addEntry(new OptionEntry(option[0], option[1], profileConfiguration.getOptionsToLoad().contains(option[0])));
+                    allEntries.add(new OptionEntry(option[0], option[1], profileConfiguration.getOptionsToLoad().contains(option[0])));
                 } else {
-                    this.addEntry(new OptionEntry(option[0], "", profileConfiguration.getOptionsToLoad().contains(option[0])));
+                    allEntries.add(new OptionEntry(option[0], "", profileConfiguration.getOptionsToLoad().contains(option[0])));
                 }
             });
         } catch (IOException e) {
             OptionsProfilesMod.LOGGER.error("An error occurred when listing options", e);
         }
+
+        filterEntries(searchBox.getValue());
     }
 
     protected int scrollBarX() {
@@ -78,11 +103,13 @@ public class OptionsToggleList extends ContainerObjectSelectionList<OptionsToggl
         return 340;
     }
 
-    public class OptionEntry extends Entry {
+    public class OptionEntry extends ContainerObjectSelectionList.Entry<OptionEntry> {
+        private final String key;
         private final Component optionKey;
         private final CycleButton<Boolean> toggleButton;
 
         OptionEntry(String optionKey, String optionValue, boolean toggled) {
+            this.key = optionKey;
             this.optionKey = Component.literal(optionKey);
 
             this.toggleButton = CycleButton.onOffBuilder(toggled).displayOnlyValue().create(0, 0, 44, 20, Component.empty(), (button, boolean_) -> {
@@ -110,17 +137,14 @@ public class OptionsToggleList extends ContainerObjectSelectionList<OptionsToggl
             }
         }
 
-        public void render(GuiGraphics guiGraphics, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            Font fontRenderer = OptionsToggleList.this.minecraft.font;
-
+        public void renderContent(GuiGraphics guiGraphics, int mouseX, int mouseY, boolean hovered, float tickDelta) {
             int posX = OptionsToggleList.this.scrollBarX() - this.toggleButton.getWidth() - 10;
-            int posY = y - 2;
-            int textY = y + entryHeight / 2;
-
-            guiGraphics.drawString(fontRenderer, this.optionKey, x, textY - 9 / 2, -1);
+            int posY = this.getContentY() - 2;
 
             this.toggleButton.setPosition(posX, posY);
             this.toggleButton.render(guiGraphics, mouseX, mouseY, tickDelta);
+
+            guiGraphics.drawString(OptionsToggleList.this.minecraft.font, this.optionKey, this.getContentX(), this.getContentYMiddle() - 4, -1);
         }
 
         public List<? extends GuiEventListener> children() {
@@ -131,9 +155,4 @@ public class OptionsToggleList extends ContainerObjectSelectionList<OptionsToggl
             return ImmutableList.of(this.toggleButton);
         }
     }
-
-    public abstract static class Entry extends ContainerObjectSelectionList.Entry<OptionsToggleList.Entry> {
-        public Entry() {
-        }
-    }
 }

common/src/main/java/net/trafficlunar/optionsprofiles/gui/OptionsToggleScreen.java

@@ -1,18 +1,22 @@
 package net.trafficlunar.optionsprofiles.gui;
 
-import net.trafficlunar.optionsprofiles.profiles.ProfileConfiguration;
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.components.StringWidget;
 import net.minecraft.client.gui.layouts.LinearLayout;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.options.OptionsSubScreen;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
+import net.trafficlunar.optionsprofiles.profiles.ProfileConfiguration;
 
 public class OptionsToggleScreen extends OptionsSubScreen {
     private final Component profileName;
     private final ProfileConfiguration profileConfiguration;
     private OptionsToggleList optionsToggleList;
+    private EditBox searchBox;
 
     protected OptionsToggleScreen(Screen lastScreen, Component profileName, ProfileConfiguration profileConfiguration) {
         super(lastScreen, null, Component.literal(Component.translatable("gui.optionsprofiles.options-toggle").append(": ").getString() + profileName.getString()));
@@ -20,11 +24,22 @@ public class OptionsToggleScreen extends OptionsSubScreen {
         this.profileConfiguration = profileConfiguration;
     }
 
+    protected void init() {
+        this.searchBox = new EditBox(this.minecraft.font, 0, 0, 200, 20, Component.empty());
+        this.searchBox.setHint(Component.translatable("gui.optionsprofiles.options-search-hint"));
+        super.init();
+    }
+
+    protected void addTitle() {
+        this.layout.addToHeader(new StringWidget(this.title, this.font), (settings) -> settings.alignVerticallyTop().paddingTop(6));
+        this.layout.addToHeader(this.searchBox, (settings) -> settings.alignVerticallyBottom().padding(4));
+    }
+
     protected void addOptions() {}
 
     protected void addContents() {
-        this.layout.setHeaderHeight(24);
-        this.optionsToggleList = this.layout.addToContents(new OptionsToggleList(this, this.minecraft, profileName.getString(), this.profileConfiguration));
+        this.layout.setHeaderHeight(42);
+        this.optionsToggleList = this.layout.addToContents(new OptionsToggleList(this, this.minecraft, profileName.getString(), this.profileConfiguration, this.searchBox));
     }
 
     protected void addFooter() {

common/src/main/java/net/trafficlunar/optionsprofiles/gui/ProfilesList.java

@@ -51,12 +51,12 @@ public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.Prof
             OptionsProfilesMod.LOGGER.error("An error occurred when listing profiles", e);
         }
 
-        checkEntriesLoaded();
+//        checkEntriesLoaded();
     }
 
-    public void checkEntriesLoaded() {
-        this.children().forEach(ProfileEntry::checkLoaded);
-    }
+//    public void checkEntriesLoaded() {
+//        this.children().forEach(ProfileEntry::checkLoaded);
+//    }
 
     protected int scrollBarX() {
         return super.scrollBarX() + 15;
@@ -84,38 +84,26 @@ public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.Prof
                             Component.translatable("gui.optionsprofiles.load-profile"),
                             (button) -> {
                                 Profiles.loadProfile(profileName.getString());
+                                OptionsProfilesMod.LOGGER.warn("[Profile '{}']: Loaded through button", profileName);
 
-                                minecraft.options.load();
-
-                                if (ProfileConfiguration.get(profileName.getString()).getOptionsToLoad().contains("resourcePacks")) {
-                                    minecraft.options.loadSelectedResourcePacks(minecraft.getResourcePackRepository());
-                                    minecraft.reloadResourcePacks();
-                                }
-
-                                minecraft.options.save();
-                                minecraft.levelRenderer.allChanged();
-
-                                ProfilesList.this.checkEntriesLoaded();
-                                button.active = false;
+//                                ProfilesList.this.checkEntriesLoaded();
+//                                button.active = false;
                             })
                     .size(75, 20)
                     .build();
         }
 
-        public void render(GuiGraphics guiGraphics, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            Font fontRenderer = ProfilesList.this.minecraft.font;
-
+        public void renderContent(GuiGraphics guiGraphics, int mouseX, int mouseY, boolean hovered, float tickDelta) {
             int posX = ProfilesList.this.scrollBarX() - this.loadButton.getWidth() - 10;
-            int posY = y - 2;
-            int textY = y + entryHeight / 2;
-
-            guiGraphics.drawString(fontRenderer, this.profileName, x, textY - 9 / 2, -1);
+            int posY = this.getContentY() - 2;
 
             this.editButton.setPosition(posX - this.editButton.getWidth(), posY);
             this.editButton.render(guiGraphics, mouseX, mouseY, tickDelta);
 
             this.loadButton.setPosition(posX, posY);
             this.loadButton.render(guiGraphics, mouseX, mouseY, tickDelta);
+
+            guiGraphics.drawString(ProfilesList.this.minecraft.font, this.profileName, this.getContentX(), this.getContentYMiddle() - 4, -1);
         }
 
         public List<? extends GuiEventListener> children() {
@@ -126,8 +114,8 @@ public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.Prof
             return ImmutableList.of(this.editButton, this.loadButton);
         }
 
-        protected void checkLoaded() {
-            this.loadButton.active = !Profiles.isProfileLoaded(profileName.getString());
-        }
+//        protected void checkLoaded() {
+//            this.loadButton.active = !Profiles.isProfileLoaded(profileName.getString());
+//        }
     }
 }

common/src/main/java/net/trafficlunar/optionsprofiles/profiles/ProfileConfiguration.java

@@ -17,6 +17,7 @@ public class ProfileConfiguration {
     private static String profileName;
 
     private boolean loadOnStartup = false;
+    private String servers = "";
     private int keybindIndex = 0;
     private List<String> optionsToLoad = new ArrayList<>();
 
@@ -79,4 +80,12 @@ public class ProfileConfiguration {
     public void setOptionsToLoad(List<String> optionsToLoad) {
         this.optionsToLoad = optionsToLoad;
     }
+
+    public String getServers() {
+        return servers;
+    }
+
+    public void setServers(String servers) {
+        this.servers = servers;
+    }
 }

common/src/main/java/net/trafficlunar/optionsprofiles/profiles/Profiles.java

@@ -14,8 +14,9 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
@@ -28,36 +29,6 @@ public class Profiles {
     public static final Path IRIS_OPTIONS_FILE = Paths.get("config/iris.properties");
     public static final Path DISTANT_HORIZONS_OPTIONS_FILE = Paths.get("config/DistantHorizons.toml");
 
-    public static void init() {
-        try (Stream<Path> paths = Files.list(PROFILES_DIRECTORY)) {
-            paths.filter(Files::isDirectory)
-                    .forEach(path -> {
-                        String profileName = path.getFileName().toString();
-
-                        // This gets the configuration but also creates the configuration file if it is not there
-                        ProfileConfiguration profileConfiguration = ProfileConfiguration.get(profileName);
-                        if (profileConfiguration.shouldLoadOnStartup()) {
-                            Minecraft minecraft = Minecraft.getInstance();
-                            loadProfile(profileName);
-
-                            minecraft.options.load();
-
-                            if (ProfileConfiguration.get(profileName).getOptionsToLoad().contains("resourcePacks")) {
-                                minecraft.options.loadSelectedResourcePacks(minecraft.getResourcePackRepository());
-                                minecraft.reloadResourcePacks();
-                            }
-
-                            minecraft.options.save();
-                            minecraft.levelRenderer.allChanged();
-
-                            OptionsProfilesMod.LOGGER.info("[Profile '{}']: Loaded on startup", profileName);
-                        }
-                    });
-        } catch (IOException e) {
-            OptionsProfilesMod.LOGGER.error("An error occurred when initializing", e);
-        }
-    }
-
     public static void createProfile() {
         String profileName = "Profile 1";
         Path profile = PROFILES_DIRECTORY.resolve(profileName);
@@ -145,7 +116,7 @@ public class Profiles {
         }
     }
 
-    public static boolean isProfileLoaded(String profileName) {
+//    public static boolean isProfileLoaded(String profileName) {
         // TODO: rewrite/fix; returns incorrect results
 
 //        Path profile = PROFILES_DIRECTORY.resolve(profileName);
@@ -198,8 +169,8 @@ public class Profiles {
 //            return false;
 //        }
 
-        return false;
-    }
+//        return false;
+//    }
 
     private static void loadOptionFile(String profileName, Path options) {
         ProfileConfiguration profileConfiguration = ProfileConfiguration.get(profileName);
@@ -294,6 +265,18 @@ public class Profiles {
             loadOptionFile(profileName, DISTANT_HORIZONS_OPTIONS_FILE);                                 // Overwrite / load original Disant Horizons option file
             loadOptionFile(profileName, DISTANT_HORIZONS_OPTIONS_FILE, DistantHorizonsLoader::load);    // Tell Distant Horizons mod to reload configuration
         }
+
+        // Reload Minecraft options
+        Minecraft minecraft = Minecraft.getInstance();
+        minecraft.options.load();
+
+        if (ProfileConfiguration.get(profileName).getOptionsToLoad().contains("resourcePacks")) {
+            minecraft.options.loadSelectedResourcePacks(minecraft.getResourcePackRepository());
+            minecraft.reloadResourcePacks();
+        }
+
+        minecraft.options.save();
+        minecraft.levelRenderer.allChanged();
     }
 
     public static void renameProfile(String profileName, String newProfileName) {

common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/DistantHorizonsLoader.java

@@ -1,11 +1,11 @@
 package net.trafficlunar.optionsprofiles.profiles.loaders;
 
-import com.seibel.distanthorizons.core.config.ConfigBase;
+import com.seibel.distanthorizons.core.config.ConfigHandler;
 
 import java.nio.file.Path;
 
 public class DistantHorizonsLoader {
     public static void load(Path file) {
-        ConfigBase.INSTANCE.configFileINSTANCE.loadFromFile();
+        ConfigHandler.INSTANCE.configFileHandler.loadFromFile();
     }
 }

common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumExtraLoader.java

@@ -1,13 +1,14 @@
 package net.trafficlunar.optionsprofiles.profiles.loaders;
 
-import me.flashyreese.mods.sodiumextra.client.gui.FogTypeConfig;
-import net.minecraft.world.level.material.FogType;
-import net.trafficlunar.optionsprofiles.OptionsProfilesMod;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import me.flashyreese.mods.sodiumextra.client.gui.FogTypeConfig;
 import me.flashyreese.mods.sodiumextra.client.gui.SodiumExtraGameOptions;
+import me.flashyreese.mods.sodiumextra.common.util.ResourceLocationSerializer;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.material.FogType;
+import net.trafficlunar.optionsprofiles.OptionsProfilesMod;
 
 import java.io.FileReader;
 import java.io.IOException;
@@ -18,7 +19,7 @@ import java.util.Map;
 public class SodiumExtraLoader {
     public static void load(Path file) {
         try (FileReader reader = new FileReader(file.toFile())) {
-            Gson gson = new GsonBuilder().create();
+            Gson gson = new GsonBuilder().registerTypeAdapter(ResourceLocation.class, new ResourceLocationSerializer()).create();
             Configuration configuration = gson.fromJson(reader, Configuration.class);
 
             apply(configuration);
@@ -71,7 +72,6 @@ public class SodiumExtraLoader {
         SodiumExtraClientMod.options().extraSettings.reduceResolutionOnMac = configuration.extra_settings.reduce_resolution_on_mac;
         SodiumExtraClientMod.options().extraSettings.useAdaptiveSync = configuration.extra_settings.use_adaptive_sync;
         SodiumExtraClientMod.options().extraSettings.cloudHeight = configuration.extra_settings.cloud_height;
-        SodiumExtraClientMod.options().extraSettings.cloudDistance = configuration.extra_settings.cloud_distance;
         SodiumExtraClientMod.options().extraSettings.toasts = configuration.extra_settings.toasts;
         SodiumExtraClientMod.options().extraSettings.advancementToast = configuration.extra_settings.advancement_toast;
         SodiumExtraClientMod.options().extraSettings.recipeToast = configuration.extra_settings.recipe_toast;
@@ -144,7 +144,6 @@ public class SodiumExtraLoader {
             public boolean reduce_resolution_on_mac;
             public boolean use_adaptive_sync;
             public int cloud_height;
-            public int cloud_distance;
             public boolean toasts;
             public boolean advancement_toast;
             public boolean recipe_toast;

common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumLoader.java

@@ -1,5 +1,7 @@
 package net.trafficlunar.optionsprofiles.profiles.loaders;
 
+import net.caffeinemc.mods.sodium.client.render.chunk.DeferMode;
+import net.caffeinemc.mods.sodium.client.render.chunk.translucent_sorting.QuadSplittingMode;
 import net.trafficlunar.optionsprofiles.OptionsProfilesMod;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -23,8 +25,8 @@ public class SodiumLoader {
     }
 
     private static void apply(Configuration configuration) {
-        SodiumClientMod.options().quality.weatherQuality = SodiumGameOptions.GraphicsQuality.valueOf(configuration.quality.weather_quality);
-        SodiumClientMod.options().quality.leavesQuality = SodiumGameOptions.GraphicsQuality.valueOf(configuration.quality.leaves_quality);
+        SodiumClientMod.options().quality.weatherQuality = SodiumGameOptions.WeatherQuality.valueOf(configuration.quality.weather_quality);
+        SodiumClientMod.options().quality.leavesQuality = SodiumGameOptions.LeavesQuality.valueOf(configuration.quality.leaves_quality);
         SodiumClientMod.options().quality.enableVignette = configuration.quality.enable_vignette;
 
         SodiumClientMod.options().advanced.enableMemoryTracing = configuration.advanced.enable_memory_tracing;
@@ -32,16 +34,19 @@ public class SodiumLoader {
         SodiumClientMod.options().advanced.cpuRenderAheadLimit = configuration.advanced.cpu_render_ahead_limit;
 
         SodiumClientMod.options().performance.chunkBuilderThreads = configuration.performance.chunk_builder_threads;
-        SodiumClientMod.options().performance.alwaysDeferChunkUpdates = configuration.performance.always_defer_chunk_updates_v2;
+        SodiumClientMod.options().performance.chunkBuildDeferMode = configuration.performance.chunk_build_defer_mode;
         SodiumClientMod.options().performance.animateOnlyVisibleTextures = configuration.performance.animate_only_visible_textures;
         SodiumClientMod.options().performance.useEntityCulling = configuration.performance.use_entity_culling;
         SodiumClientMod.options().performance.useFogOcclusion = configuration.performance.use_fog_occlusion;
         SodiumClientMod.options().performance.useBlockFaceCulling = configuration.performance.use_block_face_culling;
         SodiumClientMod.options().performance.useNoErrorGLContext = configuration.performance.use_no_error_g_l_context;
+        SodiumClientMod.options().performance.quadSplittingMode = configuration.performance.quad_splitting_mode;
 
         SodiumClientMod.options().notifications.hasClearedDonationButton = configuration.notifications.has_cleared_donation_button;
         SodiumClientMod.options().notifications.hasSeenDonationPrompt = configuration.notifications.has_seen_donation_prompt;
 
+        SodiumClientMod.options().debug.terrainSortingEnabled = configuration.debug.terrain_sorting_enabled;
+
         try {
             SodiumGameOptions.writeToDisk(SodiumClientMod.options());
         } catch (IOException e) {
@@ -54,6 +59,7 @@ public class SodiumLoader {
         public Advanced advanced;
         public Performance performance;
         public Notifications notifications;
+        public Debug debug;
 
         public static class Quality {
             public String weather_quality;
@@ -69,17 +75,22 @@ public class SodiumLoader {
 
         public static class Performance {
             public int chunk_builder_threads;
-            public boolean always_defer_chunk_updates_v2;
+            public DeferMode chunk_build_defer_mode;
             public boolean animate_only_visible_textures;
             public boolean use_entity_culling;
             public boolean use_fog_occlusion;
             public boolean use_block_face_culling;
             public boolean use_no_error_g_l_context;
+            public QuadSplittingMode quad_splitting_mode;
         }
 
         public static class Notifications {
             public boolean has_cleared_donation_button;
             public boolean has_seen_donation_prompt;
         }
+
+        public static class Debug {
+            public boolean terrain_sorting_enabled;
+        }
     }
 }

common/src/main/resources/assets/optionsprofiles/lang/en_us.json

@@ -6,6 +6,11 @@
 
   "gui.optionsprofiles.editing-profile-title": "Editing Profile: ",
   "gui.optionsprofiles.profile-name-text": "Profile Name",
+
+  "gui.optionsprofiles.servers-text": "Server List",
+  "gui.optionsprofiles.servers-hint": "mc.hypixel.net, play.mccis...",
+  "gui.optionsprofiles.servers.tooltip": "List servers (comma-separated) to load this profile on join. Add 'leave' to load on server leave.",
+
   "gui.optionsprofiles.overwrite-options": "Overwrite",
   "gui.optionsprofiles.overwrite-options.tooltip": "Replaces the profile's options with your current options",
   "gui.optionsprofiles.rename-profile": "Rename",
@@ -14,6 +19,7 @@
   "gui.optionsprofiles.load-on-startup": "Load on startup",
 
   "gui.optionsprofiles.options-toggle": "Select options to toggle",
+  "gui.optionsprofiles.options-search-hint": "Search options...",
   "gui.optionsprofiles.options-toggle.tooltip": "Select the options you want to load in this profile",
   "gui.optionsprofiles.all-on": "All ON",
   "gui.optionsprofiles.all-off": "All OFF",
@@ -23,7 +29,7 @@
   "gui.optionsprofiles.show-profiles-button": "Show Profiles Button",
   "gui.optionsprofiles.show-profiles-button.tooltip": "Toggle to remove the profiles button in Options. Access profiles through /optionsprofiles.",
 
-  "category.optionsprofiles.keys": "Options Profiles",
+  "key.category.optionsprofiles.keys": "Options Profiles",
   "key.optionsprofiles.profile_1": "Profile 1",
   "key.optionsprofiles.profile_2": "Profile 2",
   "key.optionsprofiles.profile_3": "Profile 3"

fabric/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
 }
 
 architectury {
@@ -41,7 +41,7 @@ dependencies {
     modImplementation "dev.architectury:architectury-fabric:$rootProject.architectury_api_version"
 
     // Mod Menu API
-    modImplementation("com.terraformersmc:modmenu:13.0.2")
+    modImplementation("com.terraformersmc:modmenu:16.0.0-rc.1")
 
     common(project(path: ':common', configuration: 'namedElements')) { transitive false }
     shadowBundle project(path: ':common', configuration: 'transformProductionFabric')

fabric/src/main/resources/fabric.mod.json

@@ -4,9 +4,7 @@
 	"version": "${version}",
 	"name": "Options Profiles",
 	"description": "Load and save your options from in-game.",
-  "authors": [
-    "trafficlunar"
-  ],
+	"authors": ["trafficlunar"],
 	"contact": {
 		"homepage": "https://github.com/trafficlunar/options-profiles",
 		"sources": "https://github.com/trafficlunar/options-profiles",
@@ -16,19 +14,15 @@
 	"icon": "assets/optionsprofiles/icon.png",
 	"environment": "*",
 	"entrypoints": {
-    "main": [
-      "net.trafficlunar.optionsprofiles.fabric.OptionsProfilesModFabric"
-    ],
-    "modmenu": [ "net.trafficlunar.optionsprofiles.fabric.ModMenuApiImpl" ]
+		"main": ["net.trafficlunar.optionsprofiles.fabric.OptionsProfilesModFabric"],
+		"modmenu": ["net.trafficlunar.optionsprofiles.fabric.ModMenuApiImpl"]
 	},
-  "mixins": [
-    "optionsprofiles.mixins.json"
-  ],
+	"mixins": ["optionsprofiles.mixins.json"],
 	"depends": {
-    "fabricloader": ">=0.16.14",
+		"fabricloader": ">=0.17.2",
 		"minecraft": "~1.21",
 		"java": ">=21",
-    "architectury": ">=17.0.6",
+		"architectury": ">=18.0.3",
 		"fabric-api": "*"
 	}
 }

gradle.properties

@@ -5,16 +5,16 @@ org.gradle.parallel=true
 loom.ignoreDependencyLoomVersionValidation=true
 
 # Mod properties
-mod_version=1.4.2
+mod_version=1.4.4
 maven_group=net.trafficlunar.optionsprofiles
 archives_name=optionsprofiles
 enabled_platforms=fabric,neoforge
 
 # Minecraft properties
-minecraft_version=1.21.6
+minecraft_version=1.21.9
 
 # Dependencies
-architectury_api_version = 17.0.6
-fabric_loader_version=0.16.14
-fabric_api_version=0.128.2+1.21.6
-neoforge_version=21.6.20-beta
+architectury_api_version = 18.0.3
+fabric_loader_version=0.17.2
+fabric_api_version=0.134.0+1.21.9
+neoforge_version=21.9.0-beta

neoforge/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
 }
 
 architectury {

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[2,)"
+loaderVersion = "[10,)"
 issueTrackerURL = "https://github.com/trafficlunar/options-profiles/issues"
 license = "GNU GPL 3.0"
 
@@ -16,7 +16,7 @@ logoFile = "icon.png"
 [[dependencies.optionsprofiles]]
 modId = "neoforge"
 type = "required"
-versionRange = "[21.6,)"
+versionRange = "[21.9.0-beta,)"
 ordering = "NONE"
 side = "BOTH"
 
@@ -30,7 +30,7 @@ side = "BOTH"
 [[dependencies.optionsprofiles]]
 modId = "architectury"
 type = "required"
-versionRange = "[17.0.6,)"
+versionRange = "[18.0.3,)"
 ordering = "AFTER"
 side = "BOTH"
 

settings.gradle

@@ -11,4 +11,4 @@ include("common")
 include("fabric")
 include("neoforge")
 
-rootProject.name = "optionsprofiles-v1.4.2-1.21.6"
+rootProject.name = "optionsprofiles-v1.4.4-1.21.9"