Add NeoForge

.gitignore

@@ -1,4 +1,3 @@
-.architectury-transformer/
 build/
 *.ipr
 run/

README.md

@@ -2,52 +2,29 @@
 
 [![Modrinth](https://github.com/intergrav/devins-badges/blob/v3/assets/cozy/available/modrinth_64h.png?raw=true)](https://modrinth.com/mod/options-profiles)
 [![Curseforge](https://github.com/intergrav/devins-badges/blob/v3/assets/cozy/available/curseforge_64h.png?raw=true)](https://curseforge.com/minecraft/mc-mods/options-profiles)
-[![GitHub](https://github.com/intergrav/devins-badges/blob/v3/assets/cozy/available/git_64h.png?raw=true)](https://github.com/trafficlunar/options-profiles)
+[![GitHub](https://github.com/intergrav/devins-badges/blob/v3/assets/cozy/available/git_64h.png?raw=true)](https://github.com/AxolotlMaid/options-profiles)
 
-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 (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 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
-
-If you would like support for another mod, open an issue.
+Options Profiles lets you load and save your options as profiles from in-game.
 
 ## Frequently Asked Questions
+- If you would like a version ported, open an issue.
+- Versions 1.1 require Architectury API, however versions 1.2+ does not.
+- You may use this mod in modpacks / clients with credit.
+- You can find other versions in the branches.<br/>
 
-- 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?
-  > You may use this mod in modpacks with credit.
-- Where are the profiles saved?
-  > Profiles are saved in a folder called "options-profiles" in the specified ".minecraft" directory.
-- Where can I find the source code for older versions?
-  > You can find them in the branches.
-- Dependencies?
-  > Architectury API and Fabric API (if on Fabric)
-- For any other questions, create an issue or contact me at hello@trafficlunar.net
+Contact: hello@axolotlmaid.com
+
+
+## Features
+- Profiles are saved in a folder called "options-profiles" in the specified ".minecraft" directory.
+- Sodium and Optifine support
+- Forge and Fabric support
+- Resource packs support
+- Save current options
+- Edit profiles in-game (deleting, renaming, overwriting)
 
 ## 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"/> |
-
-|                          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"/> |
+Profiles Menu              | Edit Profile Screen       | Options Screen
+:-------------------------:|:-------------------------:|:-------------------------:
+<img src="https://raw.githubusercontent.com/AxolotlMaid/options-profiles/1.20.4/gallery/profiles-menu.png" alt="profiles list" width="500"/> | <img src="https://raw.githubusercontent.com/AxolotlMaid/options-profiles/1.20.4/gallery/edit-profile-screen.png" alt="edit profile screen" width="500"/> | <img src="https://raw.githubusercontent.com/AxolotlMaid/options-profiles/1.20.4/gallery/options-screen.png" alt="options screen" width="500"/>

build.gradle

@@ -1,7 +1,7 @@
 plugins {
-    id 'dev.architectury.loom' version '1.11-SNAPSHOT' apply false
+    id 'dev.architectury.loom' version '1.6-SNAPSHOT' apply false
     id 'architectury-plugin' version '3.4-SNAPSHOT'
-    id 'com.gradleup.shadow' version '8.3.6' apply false
+    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
 
 architectury {
@@ -31,10 +31,6 @@ subprojects {
         // for more information about repositories.
     }
 
-     loom {
-        silentMojangMappingsLicense()
-    }
-
     dependencies {
         minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
         mappings loom.officialMojangMappings()
@@ -46,12 +42,12 @@ subprojects {
         // If you remove this line, sources will not be generated.
         withSourcesJar()
 
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     tasks.withType(JavaCompile).configureEach {
-        it.options.release = 21
+        it.options.release = 17
     }
 
     // Configure Maven publishing.

common/build.gradle

@@ -1,5 +1,5 @@
 architectury {
-    common rootProject.enabled_platforms.split(',')
+    common(rootProject.enabled_platforms.split(","))
 }
 
 repositories {
@@ -20,15 +20,9 @@ dependencies {
     // We depend on Fabric Loader here to use the Fabric @Environment annotations,
     // which get remapped to the correct annotations on each platform.
     // Do NOT use other classes from Fabric Loader.
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-
-    // Architectury API
-    modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"
+    modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
 
     // Mod implementations
-    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
+    modImplementation "maven.modrinth:sodium:mc1.20.4-0.5.8"
+    modImplementation "maven.modrinth:sodium-extra:mc1.20.4-0.5.4"
 }

common/src/main/java/com/axolotlmaid/optionsprofiles/OptionsProfilesMod.java

@@ -0,0 +1,26 @@
+package com.axolotlmaid.optionsprofiles;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class OptionsProfilesMod {
+    public static final String MOD_ID = "optionsprofiles";
+    public static final Logger LOGGER = LogManager.getLogger("Options Profiles");
+
+    public static void init() {
+        Path profilesDirectory = Paths.get("options-profiles");
+
+        if (Files.notExists(profilesDirectory)) {
+            try {
+                Files.createDirectory(profilesDirectory);
+            } catch (IOException e) {
+                LOGGER.error("An error occurred when creating the 'options-profiles' directory.", e);
+            }
+        }
+    }
+}

common/src/main/java/com/axolotlmaid/optionsprofiles/gui/EditProfileScreen.java

@@ -0,0 +1,55 @@
+package com.axolotlmaid.optionsprofiles.gui;
+
+import com.axolotlmaid.optionsprofiles.profiles.Profiles;
+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.screens.Screen;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+
+public class EditProfileScreen extends Screen {
+    private final Screen lastScreen;
+    private final Component profileName;
+
+    private EditBox profileNameEdit;
+
+    public EditProfileScreen(Screen screen, Component profileName) {
+        super(Component.literal(Component.translatable("gui.optionsprofiles.editing-profile-title").getString() + profileName.getString()));
+        this.lastScreen = screen;
+        this.profileName = profileName;
+    }
+
+    protected void init() {
+        this.profileNameEdit = new EditBox(this.font, this.width / 2 - 102, 116, 204, 20, Component.empty());
+        this.profileNameEdit.setValue(profileName.getString());
+        this.addWidget(this.profileNameEdit);
+
+        this.addRenderableWidget(Button.builder(Component.translatable("gui.optionsprofiles.overwrite-options"), (button) -> {
+            Profiles.writeProfile(profileName.getString());
+            this.minecraft.setScreen(this.lastScreen);
+        }).size(100, 20).pos(this.width / 2 - 50, 145).build());
+
+        this.addRenderableWidget(Button.builder(Component.translatable("gui.optionsprofiles.rename-profile"), (button) -> {
+            Profiles.renameProfile(profileName.getString(), this.profileNameEdit.getValue());
+            this.minecraft.setScreen(new EditProfileScreen(lastScreen, Component.literal(this.profileNameEdit.getValue())));
+        }).size(100, 20).pos(this.width / 2 - 50, 166).build());
+
+        this.addRenderableWidget(Button.builder(Component.translatable("gui.optionsprofiles.delete-profile").withStyle(ChatFormatting.RED), (button) -> {
+            Profiles.deleteProfile(profileName.getString());
+            this.minecraft.setScreen(this.lastScreen);
+        }).size(100, 20).pos(5, this.height - 25).build());
+
+        this.addRenderableWidget(Button.builder(CommonComponents.GUI_DONE, (button) -> {
+            this.minecraft.setScreen(this.lastScreen);
+        }).size(100, 20).pos(this.width / 2 - 50, this.height - 40).build());
+    }
+
+    public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) {
+        super.render(guiGraphics, mouseX, mouseY, delta);
+        this.profileNameEdit.render(guiGraphics, mouseX, mouseY, delta);
+        guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 8, 16777215);
+        guiGraphics.drawCenteredString(this.font, Component.translatable("gui.optionsprofiles.profile-name-text"), this.width / 2, 100, 16777215);
+    }
+}

common/src/main/java/com/axolotlmaid/optionsprofiles/gui/ProfilesList.java

@@ -0,0 +1,111 @@
+package com.axolotlmaid.optionsprofiles.gui;
+
+import com.axolotlmaid.optionsprofiles.OptionsProfilesMod;
+import com.axolotlmaid.optionsprofiles.profiles.Profiles;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.ContainerObjectSelectionList;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.gui.narration.NarratableEntry;
+import net.minecraft.network.chat.Component;
+
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Objects;
+
+public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.Entry> {
+    final ProfilesScreen profilesScreen;
+
+    public ProfilesList(ProfilesScreen profilesScreen, Minecraft minecraft) {
+        super(minecraft, profilesScreen.width + 45, profilesScreen.height - 52, 20, 20);
+        this.profilesScreen = profilesScreen;
+
+        refreshEntries();
+    }
+
+    public void refreshEntries() {
+        this.clearEntries();
+
+        Path profilesDirectory = Paths.get("options-profiles/");
+
+        try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(profilesDirectory)) {
+            for (Path profile : directoryStream) {
+                this.addEntry(new ProfilesList.ProfileEntry(Component.literal(profile.getFileName().toString())));
+            }
+        } catch (Exception e) {
+            OptionsProfilesMod.LOGGER.error("An error occurred when listing profiles", e);
+        }
+    }
+
+    protected int getScrollbarPosition() {
+        return super.getScrollbarPosition() + 15;
+    }
+
+    public int getRowWidth() {
+        return super.getRowWidth() + 32;
+    }
+
+    public class ProfileEntry extends Entry {
+        private final Component profileName;
+        private final Button editButton;
+        private final Button loadButton;
+
+        ProfileEntry(Component profileName) {
+            this.profileName = profileName;
+
+            this.editButton = Button.builder(Component.translatable("gui.optionsprofiles.edit-profile"), (button) -> {
+                minecraft.setScreen(new EditProfileScreen(profilesScreen, profileName));
+            }).size(75, 20).createNarration((supplier) -> Component.translatable("gui.optionsprofiles.edit-profile")).build();
+
+            this.loadButton = Button.builder(Component.translatable("gui.optionsprofiles.load-profile"), (button) -> {
+                Profiles.loadProfile(profileName.getString());
+
+                minecraft.options.load();
+                minecraft.options.loadSelectedResourcePacks(minecraft.getResourcePackRepository());
+                minecraft.reloadResourcePacks();
+
+                minecraft.options.save();
+
+                button.active = false;
+            }).size(75, 20).createNarration((supplier) -> Component.translatable("gui.optionsprofiles.load-profile")).build();
+
+            this.loadButton.active = !Profiles.isProfileLoaded(profileName.getString());
+        }
+
+        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;
+
+            int textY = y + entryHeight / 2;
+
+            Objects.requireNonNull(ProfilesList.this.minecraft.font);
+            guiGraphics.drawString(fontRenderer, this.profileName, x - 50, textY - 9 / 2, 16777215, false);
+
+            this.editButton.setX(x + 115);
+            this.editButton.setY(y);
+            this.editButton.render(guiGraphics, mouseX, mouseY, tickDelta);
+
+            this.loadButton.setX(x + 190);
+            this.loadButton.setY(y);
+            this.loadButton.render(guiGraphics, mouseX, mouseY, tickDelta);
+        }
+
+        public List<? extends GuiEventListener> children() {
+            return ImmutableList.of(this.editButton, this.loadButton);
+        }
+
+        public List<? extends NarratableEntry> narratables() {
+            return ImmutableList.of(this.editButton, this.loadButton);
+        }
+    }
+
+    public abstract static class Entry extends ContainerObjectSelectionList.Entry<ProfilesList.Entry> {
+        public Entry() {
+        }
+    }
+}

common/src/main/java/com/axolotlmaid/optionsprofiles/gui/ProfilesScreen.java

@@ -0,0 +1,39 @@
+package com.axolotlmaid.optionsprofiles.gui;
+
+import com.axolotlmaid.optionsprofiles.profiles.Profiles;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+
+public class ProfilesScreen extends Screen {
+    private final Screen lastScreen;
+    private ProfilesList profilesList;
+
+    public ProfilesScreen(Screen screen) {
+        super(Component.translatable("gui.optionsprofiles.profiles-menu"));
+        this.lastScreen = screen;
+    }
+
+    protected void init() {
+        this.profilesList = new ProfilesList(this, this.minecraft);
+        this.addWidget(this.profilesList);
+
+        // buttons
+        this.addRenderableWidget(Button.builder(Component.translatable("gui.optionsprofiles.save-current-options"), (button) -> {
+            Profiles.createProfile();
+            this.profilesList.refreshEntries();
+        }).size(150, 20).pos(this.width / 2 - 155, this.height - 29).build());
+
+        this.addRenderableWidget(Button.builder(CommonComponents.GUI_DONE, (button) -> {
+            this.minecraft.setScreen(this.lastScreen);
+        }).size(150, 20).pos(this.width / 2 + 5, this.height - 29).build());
+    }
+
+    public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) {
+        super.render(guiGraphics, mouseX, mouseY, delta);
+        this.profilesList.render(guiGraphics, mouseX, mouseY, delta);
+        guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 8, 16777215);
+    }
+}

common/src/main/java/com/axolotlmaid/optionsprofiles/mixin/MixinOptionsScreen.java

@@ -0,0 +1,25 @@
+package com.axolotlmaid.optionsprofiles.mixin;
+
+import com.axolotlmaid.optionsprofiles.gui.ProfilesScreen;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.screens.OptionsScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(OptionsScreen.class)
+public class MixinOptionsScreen extends Screen {
+    protected MixinOptionsScreen(Component component) {
+        super(component);
+    }
+
+    @Inject(at = @At("HEAD"), method = "init")
+    private void init(CallbackInfo info) {
+        this.addRenderableWidget(Button.builder(Component.translatable("gui.optionsprofiles.profiles-menu"), (button) -> {
+            this.minecraft.setScreen(new ProfilesScreen(this));
+        }).width(100).pos(5, 5).build());
+    }
+}

common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/Profiles.java

@@ -0,0 +1,166 @@
+package com.axolotlmaid.optionsprofiles.profiles;
+
+import com.axolotlmaid.optionsprofiles.OptionsProfilesMod;
+import org.apache.commons.io.FileUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+
+public class Profiles {
+    private static final Path PROFILES_DIRECTORY = Paths.get("options-profiles");
+    private static final Path OPTIONS_FILE = Paths.get("options.txt");
+    private static final Path OPTIFINE_OPTIONS_FILE = Paths.get("optionsof.txt");
+    private static final Path SODIUM_OPTIONS_FILE = Paths.get("config/sodium-options.json");
+    private static final Path SODIUM_EXTRA_OPTIONS_FILE = Paths.get("config/sodium-extra-options.json");
+
+    public static void createProfile() {
+        String profileName = "Profile 1";
+        Path profile = PROFILES_DIRECTORY.resolve(profileName);
+
+        // Increases the number in 'Profile 1' if it already exists
+        for (int i = 1; Files.exists(profile); i++) {
+            profileName = "Profile " + i;
+            profile = Paths.get(PROFILES_DIRECTORY.toString(), profileName);
+        }
+
+        try {
+            Files.createDirectory(profile);
+
+            if (Files.exists(profile)) {
+                OptionsProfilesMod.LOGGER.info("[Profile '{}']: created", profileName);
+                writeProfile(profileName);
+            } else {
+                OptionsProfilesMod.LOGGER.warn("[Profile '{}']: Profile already exists?", profileName);
+            }
+        } catch (IOException e) {
+            OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when creating a profile", profileName, e);
+        }
+    }
+
+    private static void copyOptionFile(Path profile, Path options) {
+        if (Files.exists(options)) {
+            Path profileOptions = profile.resolve(options.getFileName());
+
+            try {
+                Files.copy(options, profileOptions);
+            } catch (IOException e) {
+                OptionsProfilesMod.LOGGER.error("[Profile '{}']: Unable to copy '{}'", profile.getFileName().toString(), options.getFileName().toString(), e);
+            }
+        }
+    }
+
+    public static void writeProfile(String profileName) {
+        Path profile = PROFILES_DIRECTORY.resolve(profileName);
+
+        try {
+            // Removes old option files
+            FileUtils.cleanDirectory(profile.toFile());
+        } catch (IOException e) {
+            OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when clearing old options files", profileName, e);
+        }
+
+        copyOptionFile(profile, OPTIONS_FILE);
+        copyOptionFile(profile, OPTIFINE_OPTIONS_FILE);
+        copyOptionFile(profile, SODIUM_OPTIONS_FILE);
+        copyOptionFile(profile, SODIUM_EXTRA_OPTIONS_FILE);
+    }
+
+    public static boolean isProfileLoaded(String profileName) {
+        boolean profileLoaded = false;
+
+        Path profile = PROFILES_DIRECTORY.resolve(profileName);
+
+        List<Path> optionFiles = new ArrayList<>();
+        optionFiles.add(OPTIONS_FILE);
+
+        // The next few lines check if the specified file exists. If so, it adds it to the optionFiles ArrayList.
+        Optional.of(OPTIFINE_OPTIONS_FILE).filter(Files::exists).ifPresent(optionFiles::add);
+        Optional.of(SODIUM_OPTIONS_FILE).filter(Files::exists).ifPresent(optionFiles::add);
+        Optional.of(SODIUM_EXTRA_OPTIONS_FILE).filter(Files::exists).ifPresent(optionFiles::add);
+
+        // Check if the original option file and the profile option file have the same content
+        try {
+            for (Path optionFile : optionFiles) {
+                Path profileOptions = profile.resolve(optionFile.getFileName());
+
+                if (FileUtils.contentEquals(optionFile.toFile(), profileOptions.toFile())) {
+                    profileLoaded = true;
+                } else {
+                    return false;
+                }
+            }
+        } catch (IOException e) {
+            OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when checking if the profile is loaded", profileName, e);
+            return false;
+        }
+
+        return profileLoaded;
+    }
+
+    private static void loadOptionFile(String profileName, Path options) {
+        Path profile = PROFILES_DIRECTORY.resolve(profileName);
+        Path profileOptions = profile.resolve(options.getFileName());
+
+        if (Files.exists(profileOptions)) {
+            try {
+                // Replaces the original option file with the profile option file
+                Files.copy(profileOptions, options, StandardCopyOption.REPLACE_EXISTING);
+                OptionsProfilesMod.LOGGER.info("[Profile '{}']: '{}' loaded", profileName, options.getFileName());
+            } catch (IOException e) {
+                OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when loading the profile", profileName, e);
+            }
+        }
+    }
+
+    private static void loadOptionFile(String profileName, Path options, Consumer<Path> loader) {
+        Path profile = PROFILES_DIRECTORY.resolve(profileName);
+        Path profileOptions = profile.resolve(options.getFileName());
+
+        if (Files.exists(profileOptions)) {
+            loader.accept(profileOptions);
+            OptionsProfilesMod.LOGGER.info("[Profile '{}']: '{}' loaded", profileName, options.getFileName());
+        }
+    }
+
+    public static void loadProfile(String profileName) {
+        loadOptionFile(profileName, OPTIONS_FILE);
+        loadOptionFile(profileName, OPTIFINE_OPTIONS_FILE);
+        loadOptionFile(profileName, SODIUM_OPTIONS_FILE, SodiumConfigLoader::load);
+        loadOptionFile(profileName, SODIUM_EXTRA_OPTIONS_FILE, SodiumExtraConfigLoader::load);
+    }
+
+    public static void renameProfile(String profileName, String newProfileName) {
+        Path profile = PROFILES_DIRECTORY.resolve(profileName);
+        Path newProfile = PROFILES_DIRECTORY.resolve(newProfileName);
+
+        if (Files.exists(newProfile)) {
+            OptionsProfilesMod.LOGGER.warn("[Profile '{}']: A profile with that name already exists!", profileName);
+            return;
+        }
+
+        try {
+            Files.move(profile, newProfile);
+            OptionsProfilesMod.LOGGER.info("[Profile '{}']: renamed. Old name: {}", newProfileName, profileName);
+        } catch (IOException e) {
+            OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when renaming the profile", profileName, e);
+        }
+    }
+
+    public static void deleteProfile(String profileName) {
+        Path profile = PROFILES_DIRECTORY.resolve(profileName);
+
+        try {
+            FileUtils.deleteDirectory(profile.toFile());
+            OptionsProfilesMod.LOGGER.info("[Profile '{}']: deleted", profileName);
+        } catch (IOException e) {
+            OptionsProfilesMod.LOGGER.error("[Profile '{}']: Profile was not deleted", profileName, e);
+        }
+    }
+}

common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/SodiumConfigLoader.java

@@ -1,51 +1,46 @@
-package net.trafficlunar.optionsprofiles.profiles.loaders;
+package com.axolotlmaid.optionsprofiles.profiles;
 
-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.axolotlmaid.optionsprofiles.OptionsProfilesMod;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import net.caffeinemc.mods.sodium.client.SodiumClientMod;
-import net.caffeinemc.mods.sodium.client.gui.SodiumGameOptions;
+import me.jellysquid.mods.sodium.client.SodiumClientMod;
+import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions;
 
 import java.io.FileReader;
 import java.io.IOException;
 import java.nio.file.Path;
 
-public class SodiumLoader {
+public class SodiumConfigLoader {
     public static void load(Path file) {
         try (FileReader reader = new FileReader(file.toFile())) {
             Gson gson = new GsonBuilder().create();
-            Configuration configuration = gson.fromJson(reader, Configuration.class);
+            ConfigData configData = gson.fromJson(reader, ConfigData.class);
 
-            apply(configuration);
+            apply(configData);
         } catch (IOException e) {
             OptionsProfilesMod.LOGGER.error("An error occurred when loading Sodium's configuration", e);
         }
     }
 
-    private static void apply(Configuration configuration) {
-        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;
+    private static void apply(ConfigData configData) {
+        SodiumClientMod.options().quality.weatherQuality = SodiumGameOptions.GraphicsQuality.valueOf(configData.quality.weather_quality);
+        SodiumClientMod.options().quality.leavesQuality = SodiumGameOptions.GraphicsQuality.valueOf(configData.quality.leaves_quality);
+        SodiumClientMod.options().quality.enableVignette = configData.quality.enable_vignette;
 
-        SodiumClientMod.options().advanced.enableMemoryTracing = configuration.advanced.enable_memory_tracing;
-        SodiumClientMod.options().advanced.useAdvancedStagingBuffers = configuration.advanced.use_advanced_staging_buffers;
-        SodiumClientMod.options().advanced.cpuRenderAheadLimit = configuration.advanced.cpu_render_ahead_limit;
+        SodiumClientMod.options().advanced.enableMemoryTracing = configData.advanced.enable_memory_tracing;
+        SodiumClientMod.options().advanced.useAdvancedStagingBuffers = configData.advanced.use_advanced_staging_buffers;
+        SodiumClientMod.options().advanced.cpuRenderAheadLimit = configData.advanced.cpu_render_ahead_limit;
 
-        SodiumClientMod.options().performance.chunkBuilderThreads = configuration.performance.chunk_builder_threads;
-        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().performance.chunkBuilderThreads = configData.performance.chunk_builder_threads;
+        SodiumClientMod.options().performance.alwaysDeferChunkUpdates = configData.performance.always_defer_chunk_updates_v2;
+        SodiumClientMod.options().performance.animateOnlyVisibleTextures = configData.performance.animate_only_visible_textures;
+        SodiumClientMod.options().performance.useEntityCulling = configData.performance.use_entity_culling;
+        SodiumClientMod.options().performance.useFogOcclusion = configData.performance.use_fog_occlusion;
+        SodiumClientMod.options().performance.useBlockFaceCulling = configData.performance.use_block_face_culling;
+        SodiumClientMod.options().performance.useNoErrorGLContext = configData.performance.use_no_error_g_l_context;
 
-        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;
+        SodiumClientMod.options().notifications.hasClearedDonationButton = configData.notifications.has_cleared_donation_button;
+        SodiumClientMod.options().notifications.hasSeenDonationPrompt = configData.notifications.has_seen_donation_prompt;
 
         try {
             SodiumGameOptions.writeToDisk(SodiumClientMod.options());
@@ -54,12 +49,11 @@ public class SodiumLoader {
         }
     }
 
-    public static class Configuration {
+    public static class ConfigData {
         public Quality quality;
         public Advanced advanced;
         public Performance performance;
         public Notifications notifications;
-        public Debug debug;
 
         public static class Quality {
             public String weather_quality;
@@ -75,22 +69,17 @@ public class SodiumLoader {
 
         public static class Performance {
             public int chunk_builder_threads;
-            public DeferMode chunk_build_defer_mode;
+            public boolean always_defer_chunk_updates_v2;
             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/java/com/axolotlmaid/optionsprofiles/profiles/SodiumExtraConfigLoader.java

@@ -1,96 +1,99 @@
-package net.trafficlunar.optionsprofiles.profiles.loaders;
+package com.axolotlmaid.optionsprofiles.profiles;
 
+import com.axolotlmaid.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;
 import java.nio.file.Path;
-import java.util.EnumMap;
 import java.util.Map;
 
-public class SodiumExtraLoader {
+public class SodiumExtraConfigLoader {
     public static void load(Path file) {
         try (FileReader reader = new FileReader(file.toFile())) {
-            Gson gson = new GsonBuilder().registerTypeAdapter(ResourceLocation.class, new ResourceLocationSerializer()).create();
-            Configuration configuration = gson.fromJson(reader, Configuration.class);
+            Gson gson = new GsonBuilder().create();
+            ConfigData configData = gson.fromJson(reader, ConfigData.class);
 
-            apply(configuration);
+            apply(configData);
         } catch (IOException e) {
             OptionsProfilesMod.LOGGER.error("An error occurred when loading Sodium Extra's configuration", e);
         }
     }
 
-    private static void apply(Configuration configuration) {
-        SodiumExtraClientMod.options().animationSettings.animation = configuration.animation_settings.animation;
-        SodiumExtraClientMod.options().animationSettings.water = configuration.animation_settings.water;
-        SodiumExtraClientMod.options().animationSettings.lava = configuration.animation_settings.lava;
-        SodiumExtraClientMod.options().animationSettings.fire = configuration.animation_settings.fire;
-        SodiumExtraClientMod.options().animationSettings.portal = configuration.animation_settings.portal;
-        SodiumExtraClientMod.options().animationSettings.blockAnimations = configuration.animation_settings.block_animations;
-        SodiumExtraClientMod.options().animationSettings.sculkSensor = configuration.animation_settings.sculk_sensor;
+    private static void apply(ConfigData configData) {
+        SodiumExtraClientMod.options().animationSettings.animation = configData.animation_settings.animation;
+        SodiumExtraClientMod.options().animationSettings.water = configData.animation_settings.water;
+        SodiumExtraClientMod.options().animationSettings.lava = configData.animation_settings.lava;
+        SodiumExtraClientMod.options().animationSettings.fire = configData.animation_settings.fire;
+        SodiumExtraClientMod.options().animationSettings.portal = configData.animation_settings.portal;
+        SodiumExtraClientMod.options().animationSettings.blockAnimations = configData.animation_settings.block_animations;
+        SodiumExtraClientMod.options().animationSettings.sculkSensor = configData.animation_settings.sculk_sensor;
 
-        SodiumExtraClientMod.options().particleSettings.particles = configuration.particle_settings.particles;
-        SodiumExtraClientMod.options().particleSettings.rainSplash = configuration.particle_settings.rain_splash;
-        SodiumExtraClientMod.options().particleSettings.blockBreak = configuration.particle_settings.block_break;
-        SodiumExtraClientMod.options().particleSettings.blockBreaking = configuration.particle_settings.block_breaking;
-        SodiumExtraClientMod.options().particleSettings.otherMap = configuration.particle_settings.other;
+        SodiumExtraClientMod.options().particleSettings.particles = configData.particle_settings.particles;
+        SodiumExtraClientMod.options().particleSettings.rainSplash = configData.particle_settings.rain_splash;
+        SodiumExtraClientMod.options().particleSettings.blockBreak = configData.particle_settings.block_break;
+        SodiumExtraClientMod.options().particleSettings.blockBreaking = configData.particle_settings.block_breaking;
+        SodiumExtraClientMod.options().particleSettings.otherMap = configData.particle_settings.other;
 
-        SodiumExtraClientMod.options().detailSettings.sky = configuration.detail_settings.sky;
-        SodiumExtraClientMod.options().detailSettings.sun = configuration.detail_settings.sun;
-        SodiumExtraClientMod.options().detailSettings.moon = configuration.detail_settings.moon;
-        SodiumExtraClientMod.options().detailSettings.stars = configuration.detail_settings.stars;
-        SodiumExtraClientMod.options().detailSettings.rainSnow = configuration.detail_settings.rain_snow;
-        SodiumExtraClientMod.options().detailSettings.biomeColors = configuration.detail_settings.biome_colors;
-        SodiumExtraClientMod.options().detailSettings.skyColors = configuration.detail_settings.sky_colors;
+        SodiumExtraClientMod.options().detailSettings.sky = configData.detail_settings.sky;
+        SodiumExtraClientMod.options().detailSettings.sunMoon = configData.detail_settings.sun_moon;
+        SodiumExtraClientMod.options().detailSettings.stars = configData.detail_settings.stars;
+        SodiumExtraClientMod.options().detailSettings.rainSnow = configData.detail_settings.rain_snow;
+        SodiumExtraClientMod.options().detailSettings.biomeColors = configData.detail_settings.biome_colors;
+        SodiumExtraClientMod.options().detailSettings.skyColors = configData.detail_settings.sky_colors;
 
-        SodiumExtraClientMod.options().renderSettings.globalFog = configuration.render_settings.global_fog;
-        SodiumExtraClientMod.options().renderSettings.fogTypeConfig = configuration.render_settings.fog_type_config;
-        SodiumExtraClientMod.options().renderSettings.lightUpdates = configuration.render_settings.light_updates;
-        SodiumExtraClientMod.options().renderSettings.itemFrame = configuration.render_settings.item_frame;
-        SodiumExtraClientMod.options().renderSettings.armorStand = configuration.render_settings.armor_stand;
-        SodiumExtraClientMod.options().renderSettings.painting = configuration.render_settings.painting;
-        SodiumExtraClientMod.options().renderSettings.piston = configuration.render_settings.piston;
-        SodiumExtraClientMod.options().renderSettings.beaconBeam = configuration.render_settings.beacon_beam;
-        SodiumExtraClientMod.options().renderSettings.limitBeaconBeamHeight = configuration.render_settings.limit_beacon_beam_height;
-        SodiumExtraClientMod.options().renderSettings.enchantingTableBook = configuration.render_settings.enchanting_table_book;
-        SodiumExtraClientMod.options().renderSettings.itemFrameNameTag = configuration.render_settings.item_frame_name_tag;
-        SodiumExtraClientMod.options().renderSettings.playerNameTag = configuration.render_settings.player_name_tag;
+        SodiumExtraClientMod.options().renderSettings.fogDistance = configData.render_settings.fog_distance;
+        SodiumExtraClientMod.options().renderSettings.fogStart = configData.render_settings.fog_start;
+        SodiumExtraClientMod.options().renderSettings.multiDimensionFogControl = configData.render_settings.multi_dimension_fog_control;
+        SodiumExtraClientMod.options().renderSettings.dimensionFogDistanceMap = configData.render_settings.dimensionFogDistance;
+        SodiumExtraClientMod.options().renderSettings.lightUpdates = configData.render_settings.light_updates;
+        SodiumExtraClientMod.options().renderSettings.itemFrame = configData.render_settings.item_frame;
+        SodiumExtraClientMod.options().renderSettings.armorStand = configData.render_settings.armor_stand;
+        SodiumExtraClientMod.options().renderSettings.painting = configData.render_settings.painting;
+        SodiumExtraClientMod.options().renderSettings.piston = configData.render_settings.piston;
+        SodiumExtraClientMod.options().renderSettings.beaconBeam = configData.render_settings.beacon_beam;
+        SodiumExtraClientMod.options().renderSettings.enchantingTableBook = configData.render_settings.enchanting_table_book;
+        SodiumExtraClientMod.options().renderSettings.itemFrameNameTag = configData.render_settings.item_frame_name_tag;
+        SodiumExtraClientMod.options().renderSettings.playerNameTag = configData.render_settings.player_name_tag;
 
-        SodiumExtraClientMod.options().extraSettings.overlayCorner = SodiumExtraGameOptions.OverlayCorner.valueOf(configuration.extra_settings.overlay_corner);
-        SodiumExtraClientMod.options().extraSettings.textContrast = SodiumExtraGameOptions.TextContrast.valueOf(configuration.extra_settings.text_contrast);
-        SodiumExtraClientMod.options().extraSettings.showFps = configuration.extra_settings.show_fps;
-        SodiumExtraClientMod.options().extraSettings.showFPSExtended = configuration.extra_settings.show_f_p_s_extended;
-        SodiumExtraClientMod.options().extraSettings.showCoords = configuration.extra_settings.show_coords;
-        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.toasts = configuration.extra_settings.toasts;
-        SodiumExtraClientMod.options().extraSettings.advancementToast = configuration.extra_settings.advancement_toast;
-        SodiumExtraClientMod.options().extraSettings.recipeToast = configuration.extra_settings.recipe_toast;
-        SodiumExtraClientMod.options().extraSettings.systemToast = configuration.extra_settings.system_toast;
-        SodiumExtraClientMod.options().extraSettings.tutorialToast = configuration.extra_settings.tutorial_toast;
-        SodiumExtraClientMod.options().extraSettings.instantSneak = configuration.extra_settings.instant_sneak;
-        SodiumExtraClientMod.options().extraSettings.preventShaders = configuration.extra_settings.prevent_shaders;
-        SodiumExtraClientMod.options().extraSettings.steadyDebugHud = configuration.extra_settings.steady_debug_hud;
-        SodiumExtraClientMod.options().extraSettings.steadyDebugHudRefreshInterval = configuration.extra_settings.steady_debug_hud_refresh_interval;
+        SodiumExtraClientMod.options().extraSettings.overlayCorner = SodiumExtraGameOptions.OverlayCorner.valueOf(configData.extra_settings.overlay_corner);
+        SodiumExtraClientMod.options().extraSettings.textContrast = SodiumExtraGameOptions.TextContrast.valueOf(configData.extra_settings.text_contrast);
+        SodiumExtraClientMod.options().extraSettings.showFps = configData.extra_settings.show_fps;
+        SodiumExtraClientMod.options().extraSettings.showFPSExtended = configData.extra_settings.show_f_p_s_extended;
+        SodiumExtraClientMod.options().extraSettings.showCoords = configData.extra_settings.show_coords;
+        SodiumExtraClientMod.options().extraSettings.reduceResolutionOnMac = configData.extra_settings.reduce_resolution_on_mac;
+        SodiumExtraClientMod.options().extraSettings.useAdaptiveSync = configData.extra_settings.use_adaptive_sync;
+        SodiumExtraClientMod.options().extraSettings.cloudHeight = configData.extra_settings.cloud_height;
+        SodiumExtraClientMod.options().extraSettings.cloudDistance = configData.extra_settings.cloud_distance;
+        SodiumExtraClientMod.options().extraSettings.toasts = configData.extra_settings.toasts;
+        SodiumExtraClientMod.options().extraSettings.advancementToast = configData.extra_settings.advancement_toast;
+        SodiumExtraClientMod.options().extraSettings.recipeToast = configData.extra_settings.recipe_toast;
+        SodiumExtraClientMod.options().extraSettings.systemToast = configData.extra_settings.system_toast;
+        SodiumExtraClientMod.options().extraSettings.tutorialToast = configData.extra_settings.tutorial_toast;
+        SodiumExtraClientMod.options().extraSettings.instantSneak = configData.extra_settings.instant_sneak;
+        SodiumExtraClientMod.options().extraSettings.preventShaders = configData.extra_settings.prevent_shaders;
+        SodiumExtraClientMod.options().extraSettings.steadyDebugHud = configData.extra_settings.steady_debug_hud;
+        SodiumExtraClientMod.options().extraSettings.steadyDebugHudRefreshInterval = configData.extra_settings.steady_debug_hud_refresh_interval;
+
+        SodiumExtraClientMod.options().superSecretSettings.fetchSodiumExtraCrowdinTranslations = configData.super_secret_settings.fetch_sodium_extra_crowdin_translations;
+        SodiumExtraClientMod.options().superSecretSettings.sodiumExtraCrowdinProjectIdentifier = configData.super_secret_settings.sodium_extra_crowdin_project_identifier;
+        SodiumExtraClientMod.options().superSecretSettings.fetchSodiumCrowdinTranslations = configData.super_secret_settings.fetch_sodium_crowdin_translations;
+        SodiumExtraClientMod.options().superSecretSettings.sodiumCrowdinProjectIdentifier = configData.super_secret_settings.sodium_crowdin_project_identifier;
 
         SodiumExtraClientMod.options().writeChanges();
     }
 
-    public static class Configuration {
+    public static class ConfigData {
         public AnimationSettings animation_settings;
         public ParticleSettings particle_settings;
         public DetailSettings detail_settings;
         public RenderSettings render_settings;
         public ExtraSettings extra_settings;
+        public SuperSecretSettings super_secret_settings;
 
         public static class AnimationSettings {
             public boolean animation;
@@ -112,8 +115,7 @@ public class SodiumExtraLoader {
 
         public static class DetailSettings {
             public boolean sky;
-            public boolean sun;
-            public boolean moon;
+            public boolean sun_moon;
             public boolean stars;
             public boolean rain_snow;
             public boolean biome_colors;
@@ -121,15 +123,16 @@ public class SodiumExtraLoader {
         }
 
         public static class RenderSettings {
-            public boolean global_fog;
-            public EnumMap<FogType, FogTypeConfig> fog_type_config;
+            public int fog_distance;
+            public int fog_start;
+            public boolean multi_dimension_fog_control;
+            public Map<ResourceLocation, Integer> dimensionFogDistance;
             public boolean light_updates;
             public boolean item_frame;
             public boolean armor_stand;
             public boolean painting;
             public boolean piston;
             public boolean beacon_beam;
-            public boolean limit_beacon_beam_height;
             public boolean enchanting_table_book;
             public boolean item_frame_name_tag;
             public boolean player_name_tag;
@@ -144,6 +147,7 @@ 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;
@@ -154,5 +158,12 @@ public class SodiumExtraLoader {
             public boolean steady_debug_hud;
             public int steady_debug_hud_refresh_interval;
         }
+
+        public static class SuperSecretSettings {
+            public boolean fetch_sodium_extra_crowdin_translations;
+            public String sodium_extra_crowdin_project_identifier;
+            public boolean fetch_sodium_crowdin_translations;
+            public String sodium_crowdin_project_identifier;
+        }
     }
 }

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

@@ -1,18 +0,0 @@
-package net.trafficlunar.optionsprofiles;
-
-import dev.architectury.event.events.common.CommandRegistrationEvent;
-import net.minecraft.client.Minecraft;
-import net.trafficlunar.optionsprofiles.gui.ProfilesScreen;
-
-public class Commands {
-    public static void init() {
-        CommandRegistrationEvent.EVENT.register(((dispatcher, buildContext, selection) -> dispatcher.register(
-                net.minecraft.commands.Commands
-                        .literal("optionsprofiles")
-                        .executes(context -> {
-                            Minecraft.getInstance().execute(() -> Minecraft.getInstance().setScreen(new ProfilesScreen(null)));
-                            return 1;
-                        })
-        )));
-    }
-}

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

@@ -1,58 +0,0 @@
-package net.trafficlunar.optionsprofiles;
-
-import com.mojang.blaze3d.platform.InputConstants;
-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;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.stream.Stream;
-
-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
-            );
-            KeyMappingRegistry.register(PROFILE_KEYMAPPINGS[i]);
-        }
-
-        ClientTickEvent.CLIENT_POST.register(minecraft -> {
-            for (int i = 0; i < PROFILE_KEYMAPPINGS.length; i++) {
-                while (PROFILE_KEYMAPPINGS[i].consumeClick()) {
-                    loadProfilesByKeybind(i + 1);
-                }
-            }
-        });
-    }
-
-    private static void loadProfilesByKeybind(int keybindIndex) {
-        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);
-                        if (profileConfiguration.getKeybindIndex() == keybindIndex) {
-                            Profiles.loadProfile(profileName);
-                            OptionsProfilesMod.LOGGER.warn("[Profile '{}']: Loaded through keybind", profileName);
-                        }
-                    });
-        } catch (IOException e) {
-            OptionsProfilesMod.LOGGER.error("An error occurred when loading profiles through keybinds", e);
-        }
-    }
-}

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

@@ -1,115 +0,0 @@
-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";
-    public static final Logger LOGGER = LogManager.getLogger("Options Profiles");
-    private static OptionsProfilesModConfiguration CONFIG;
-
-    public static void init() {
-        // Create options-profiles directory
-        Path profilesDirectory = Paths.get("options-profiles");
-
-        if (Files.notExists(profilesDirectory)) {
-            try {
-                Files.createDirectory(profilesDirectory);
-            } catch (IOException e) {
-                LOGGER.error("An error occurred when creating the 'options-profiles' directory.", e);
-            }
-        }
-
-        // Load mod config
-        CONFIG = OptionsProfilesModConfiguration.load();
-
-        // Load profiles marked to load on startup
-        ClientLifecycleEvent.CLIENT_STARTED.register(client -> {
-            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();
-        Commands.init();
-    }
-
-    public static OptionsProfilesModConfiguration config() {
-        if (CONFIG == null) {
-            throw new IllegalStateException("Config not yet available");
-        } else {
-            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/OptionsProfilesModConfiguration.java

@@ -1,59 +0,0 @@
-package net.trafficlunar.optionsprofiles;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import net.trafficlunar.optionsprofiles.profiles.Profiles;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-public class OptionsProfilesModConfiguration {
-    private static Path configurationFile;
-
-    private boolean showProfilesButton = true;
-
-    public OptionsProfilesModConfiguration save() {
-        OptionsProfilesModConfiguration configuration = new OptionsProfilesModConfiguration();
-
-        Gson gson = new GsonBuilder()
-                .setPrettyPrinting()
-                .create();
-
-        try (BufferedWriter writer = Files.newBufferedWriter(configurationFile)) {
-            gson.toJson(this, writer);
-            OptionsProfilesMod.LOGGER.info("Main configuration saved");
-        } catch (IOException e) {
-            OptionsProfilesMod.LOGGER.error("Unable to write main configuration.json!", e);
-        }
-
-        return configuration;
-    }
-
-    public static OptionsProfilesModConfiguration load() {
-        OptionsProfilesModConfiguration configuration = new OptionsProfilesModConfiguration();
-        configurationFile = Profiles.PROFILES_DIRECTORY.resolve("configuration.json");
-
-        if (Files.notExists(configurationFile))
-            configuration.save();
-
-        try (BufferedReader reader = Files.newBufferedReader(configurationFile)) {
-            Gson gson = new Gson();
-            configuration = gson.fromJson(reader, OptionsProfilesModConfiguration.class);
-        } catch (IOException e) {
-            OptionsProfilesMod.LOGGER.error("An error occurred when reading the main configuration.json", e);
-        }
-
-        return configuration;
-    }
-
-    public boolean shouldShowProfilesButton() {
-        return showProfilesButton;
-    }
-
-    public void setShowProfilesButton(boolean showProfilesButton) {
-        this.showProfilesButton = showProfilesButton;
-    }
-}

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

@@ -1,138 +0,0 @@
-package net.trafficlunar.optionsprofiles.gui;
-
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.gui.components.*;
-import net.minecraft.client.gui.layouts.HeaderAndFooterLayout;
-import net.minecraft.client.gui.layouts.LayoutSettings;
-import net.minecraft.client.gui.layouts.LinearLayout;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.network.chat.Component;
-import net.trafficlunar.optionsprofiles.profiles.ProfileConfiguration;
-import net.trafficlunar.optionsprofiles.profiles.Profiles;
-
-public class EditProfileScreen extends Screen {
-    private final ProfilesScreen profilesScreen;
-    private final HeaderAndFooterLayout layout = new HeaderAndFooterLayout(this, 24, 33);
-
-    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()));
-        this.profilesScreen = profilesScreen;
-        this.profileName = profileName;
-        this.profileConfiguration = ProfileConfiguration.get(profileName.getString());
-    }
-
-    protected void init() {
-        LinearLayout linearLayoutHeader = this.layout.addToHeader(LinearLayout.vertical());
-        linearLayoutHeader.addChild(new StringWidget(this.title, this.font), LayoutSettings::alignHorizontallyCenter);
-
-        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(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(
-                Button.builder(
-                                Component.translatable("gui.optionsprofiles.overwrite-options"),
-                                (button) -> {
-                                    Profiles.writeProfile(profileName.getString(), true);
-                                    this.onClose();
-                                })
-                        .size(150, 20)
-                        .pos(this.width / 2 - 75, 145)
-                        .tooltip(Tooltip.create(Component.translatable("gui.optionsprofiles.overwrite-options.tooltip")))
-                        .build(),
-                LayoutSettings::alignHorizontallyCenter
-        );
-        linearLayoutButtons.addChild(
-                Button.builder(
-                                Component.translatable("gui.optionsprofiles.options-toggle").append("..."),
-                                (button) -> this.minecraft.setScreen(new OptionsToggleScreen(this, profileName, profileConfiguration)))
-                        .size(150, 20)
-                        .pos(this.width / 2 - 75, 187)
-                        .tooltip(Tooltip.create(Component.translatable("gui.optionsprofiles.options-toggle.tooltip")))
-                        .build(),
-                LayoutSettings::alignHorizontallyCenter
-        );
-
-        LinearLayout linearLayoutSettings = linearLayoutContent.addChild(LinearLayout.vertical().spacing(1), LayoutSettings::alignHorizontallyCenter);
-        linearLayoutSettings.addChild(
-                CycleButton.<Integer>builder(value -> Component.literal(value.toString()))
-                        .withValues(0, 1, 2, 3)
-                        .withInitialValue(this.profileConfiguration.getKeybindIndex())
-                        .create(0, 0, 150, 20, Component.translatable("gui.optionsprofiles.keybind-index"), (button, keybindIndex) -> {
-                            this.profileConfiguration.setKeybindIndex(keybindIndex);
-                        }),
-                LayoutSettings::alignHorizontallyCenter
-        );
-        linearLayoutSettings.addChild(
-                CycleButton.onOffBuilder(this.profileConfiguration.shouldLoadOnStartup())
-                        .create(0, 0, 150, 20, Component.translatable("gui.optionsprofiles.load-on-startup"), (button, boolean_) -> {
-                            this.profileConfiguration.setLoadOnStartup(boolean_);
-                        }),
-                LayoutSettings::alignHorizontallyCenter
-        );
-
-        this.layout.addToFooter(
-                Button.builder(
-                                CommonComponents.GUI_DONE,
-                                (button) -> this.onClose())
-                        .width(200)
-                        .build()
-        );
-        this.layout.addToFooter(
-                Button.builder(
-                                Component.translatable("gui.optionsprofiles.delete-profile")
-                                        .withStyle(ChatFormatting.RED),
-                                (button) -> {
-                                    Profiles.deleteProfile(profileName.getString());
-                                    this.onClose(true);
-                                })
-                        .width(50)
-                        .build(),
-                (layoutSettings) -> layoutSettings.alignHorizontallyLeft().paddingLeft(5)
-        );
-
-        this.layout.visitWidgets(this::addRenderableWidget);
-        this.repositionElements();
-    }
-
-    protected void repositionElements() {
-        this.layout.arrangeElements();
-    }
-
-    @Override
-    public void onClose() {
-        this.onClose(false);
-    }
-
-    public void onClose(boolean 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,158 +0,0 @@
-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;
-import com.google.common.collect.ImmutableList;
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
-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;
-import net.minecraft.network.chat.Component;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Stream;
-
-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, 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) {
-        allEntries.clear();
-
-        Path profile = Profiles.PROFILES_DIRECTORY.resolve(profileName);
-        Path optionsFile = profile.resolve("options.txt");
-
-        if (overriding) {
-            if (!overrideToggle) {          // If set to false, just set the list to nothing instead of removing them one by one.
-                profileConfiguration.setOptionsToLoad(new ArrayList<>());
-            }
-        }
-
-        try (Stream<String> lines = Files.lines(optionsFile)) {
-            lines.forEach((line) -> {
-                String[] option = line.split(":");
-
-                if (option.length > 1) {                        // If the option value exists (e.g. "lastServer")
-                    if (overrideToggle) {                       // We don't need to check for the overriding boolean since this should never be true while the overriding boolean is false.
-                        List<String> optionsToLoad = profileConfiguration.getOptionsToLoad();
-                        optionsToLoad.add(option[0]);           // Add every option because overrideToggle is set to true
-
-                        profileConfiguration.setOptionsToLoad(optionsToLoad);       // Configuration is saved in the OptionsToggleScreen.java when the player presses "Done"
-                    }
-
-                    // Add entry with option key and value and if the key is in the profile configuration
-                    allEntries.add(new OptionEntry(option[0], option[1], profileConfiguration.getOptionsToLoad().contains(option[0])));
-                } else {
-                    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() {
-        return super.scrollBarX() + 15;
-    }
-
-    public int getRowWidth() {
-        return 340;
-    }
-
-    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_) -> {
-                List<String> optionsToLoad = profileConfiguration.getOptionsToLoad();
-
-                // If toggled to true
-                if (boolean_) {
-                    button.setMessage(button.getMessage().copy().withStyle(ChatFormatting.GREEN));      // Set the button's color to green
-                    optionsToLoad.add(optionKey);
-                } else {
-                    button.setMessage(button.getMessage().copy().withStyle(ChatFormatting.RED));        // Set the button's color to red
-                    optionsToLoad.remove(optionKey);
-                }
-
-                profileConfiguration.setOptionsToLoad(optionsToLoad);
-            });
-
-            // Set tooltip to the option value (e.g. "ao" will show "true")
-            this.toggleButton.setTooltip(Tooltip.create(Component.literal(optionValue)));
-
-            if (toggled) {
-                this.toggleButton.setMessage(this.toggleButton.getMessage().copy().withStyle(ChatFormatting.GREEN));    // Set the button's color to green
-            } else {
-                this.toggleButton.setMessage(this.toggleButton.getMessage().copy().withStyle(ChatFormatting.RED));      // Set the button's color to red
-            }
-        }
-
-        public void renderContent(GuiGraphics guiGraphics, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            int posX = OptionsToggleList.this.scrollBarX() - this.toggleButton.getWidth() - 10;
-            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() {
-            return ImmutableList.of(this.toggleButton);
-        }
-
-        public List<? extends NarratableEntry> narratables() {
-            return ImmutableList.of(this.toggleButton);
-        }
-    }
-}

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

@@ -1,80 +0,0 @@
-package net.trafficlunar.optionsprofiles.gui;
-
-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()));
-        this.profileName = profileName;
-        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(42);
-        this.optionsToggleList = this.layout.addToContents(new OptionsToggleList(this, this.minecraft, profileName.getString(), this.profileConfiguration, this.searchBox));
-    }
-
-    protected void addFooter() {
-        LinearLayout linearLayout = this.layout.addToFooter(LinearLayout.horizontal().spacing(8));
-
-        LinearLayout linearLayoutAllButtons = linearLayout.addChild(LinearLayout.horizontal().spacing(1));
-        linearLayoutAllButtons.addChild(
-                Button.builder(
-                                Component.translatable("gui.optionsprofiles.all-off").withStyle(ChatFormatting.RED),
-                                (button) -> this.optionsToggleList.refreshEntries(true, false))
-                        .size(75, 20)
-                        .build()
-        );
-        linearLayoutAllButtons.addChild(
-                Button.builder(
-                                Component.translatable("gui.optionsprofiles.all-on").withStyle(ChatFormatting.GREEN),
-                                (button) -> this.optionsToggleList.refreshEntries(true, true))
-                        .size(75, 20)
-                        .build()
-        );
-
-        linearLayout.addChild(
-                Button.builder(
-                        CommonComponents.GUI_DONE,
-                        (button -> this.onClose())
-                ).build()
-        );
-    }
-
-    public void removed() {
-        this.profileConfiguration.save();
-    }
-
-    protected void repositionElements() {
-        this.layout.arrangeElements();
-        this.optionsToggleList.updateSize(this.width, this.layout);
-    }
-}

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

@@ -1,121 +0,0 @@
-package net.trafficlunar.optionsprofiles.gui;
-
-import net.trafficlunar.optionsprofiles.OptionsProfilesMod;
-import net.trafficlunar.optionsprofiles.profiles.ProfileConfiguration;
-import net.trafficlunar.optionsprofiles.profiles.Profiles;
-import com.google.common.collect.ImmutableList;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.narration.NarratableEntry;
-import net.minecraft.network.chat.Component;
-
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
-public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.ProfileEntry> {
-    private final ProfilesScreen profilesScreen;
-
-    public ProfilesList(ProfilesScreen profilesScreen, Minecraft minecraft) {
-        super(minecraft, profilesScreen.width, profilesScreen.layout.getContentHeight(), profilesScreen.layout.getHeaderHeight(), 20);
-        this.profilesScreen = profilesScreen;
-
-        refreshEntries();
-    }
-
-    public void refreshEntries() {
-        this.clearEntries();
-
-        try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Profiles.PROFILES_DIRECTORY)) {
-            List<Path> profileList = new ArrayList<>();
-            for (Path profile : directoryStream) {
-                if (Files.isDirectory(profile)) {
-                    profileList.add(profile);
-                }
-            }
-
-            // Sort the list alphabetically based on the profile names
-            profileList.sort(Comparator.comparing(p -> p.getFileName().toString()));
-
-            for (Path profile : profileList) {
-                this.addEntry(new ProfilesList.ProfileEntry(Component.literal(profile.getFileName().toString())));
-            }
-        } catch (Exception e) {
-            OptionsProfilesMod.LOGGER.error("An error occurred when listing profiles", e);
-        }
-
-//        checkEntriesLoaded();
-    }
-
-//    public void checkEntriesLoaded() {
-//        this.children().forEach(ProfileEntry::checkLoaded);
-//    }
-
-    protected int scrollBarX() {
-        return super.scrollBarX() + 15;
-    }
-
-    public int getRowWidth() {
-        return 340;
-    }
-
-    public class ProfileEntry extends ContainerObjectSelectionList.Entry<ProfilesList.ProfileEntry> {
-        private final Component profileName;
-        private final Button editButton;
-        private final Button loadButton;
-
-        ProfileEntry(Component profileName) {
-            this.profileName = profileName;
-
-            this.editButton = Button.builder(
-                            Component.translatable("gui.optionsprofiles.edit-profile"),
-                            (button) -> minecraft.setScreen(new EditProfileScreen(profilesScreen, profileName)))
-                    .size(75, 20)
-                    .build();
-
-            this.loadButton = Button.builder(
-                            Component.translatable("gui.optionsprofiles.load-profile"),
-                            (button) -> {
-                                Profiles.loadProfile(profileName.getString());
-                                OptionsProfilesMod.LOGGER.warn("[Profile '{}']: Loaded through button", profileName);
-
-//                                ProfilesList.this.checkEntriesLoaded();
-//                                button.active = false;
-                            })
-                    .size(75, 20)
-                    .build();
-        }
-
-        public void renderContent(GuiGraphics guiGraphics, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            int posX = ProfilesList.this.scrollBarX() - this.loadButton.getWidth() - 10;
-            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() {
-            return ImmutableList.of(this.editButton, this.loadButton);
-        }
-
-        public List<? extends NarratableEntry> narratables() {
-            return ImmutableList.of(this.editButton, this.loadButton);
-        }
-
-//        protected void checkLoaded() {
-//            this.loadButton.active = !Profiles.isProfileLoaded(profileName.getString());
-//        }
-    }
-}

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

@@ -1,61 +0,0 @@
-package net.trafficlunar.optionsprofiles.gui;
-
-import net.minecraft.client.gui.components.Button;
-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.Profiles;
-
-public class ProfilesScreen extends OptionsSubScreen {
-    private final Screen lastScreen;
-    public ProfilesList profilesList;
-
-    public ProfilesScreen(Screen lastScreen) {
-        super(lastScreen, null, Component.translatable("gui.optionsprofiles.profiles-menu"));
-        this.lastScreen = lastScreen;
-    }
-
-    protected void addOptions() {}
-
-    protected void addContents() {
-        this.layout.setHeaderHeight(24);
-        this.profilesList = this.layout.addToContents(new ProfilesList(this, this.minecraft));
-
-        this.addRenderableWidget(Button.builder(
-                        Component.translatable("gui.optionsprofiles.settings-button"),
-                        (button) -> this.minecraft.setScreen(new SettingsScreen(this)))
-                .width(75)
-                .pos(1, 1)
-                .build());
-    }
-
-    protected void addFooter() {
-        LinearLayout linearLayout = this.layout.addToFooter(LinearLayout.horizontal().spacing(8));
-        linearLayout.addChild(
-                Button.builder(
-                                Component.translatable("gui.optionsprofiles.save-current-options"),
-                                (button -> {
-                                    Profiles.createProfile();
-                                    this.profilesList.refreshEntries();
-                                }))
-                        .build()
-        );
-        linearLayout.addChild(
-                Button.builder(
-                                CommonComponents.GUI_DONE,
-                                (button -> this.onClose()))
-                        .build()
-        );
-    }
-
-    public void onClose() {
-        this.minecraft.setScreen(lastScreen);
-    }
-
-    protected void repositionElements() {
-        this.layout.arrangeElements();
-        this.profilesList.updateSize(this.width, this.layout);
-    }
-}

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

@@ -1,57 +0,0 @@
-package net.trafficlunar.optionsprofiles.gui;
-
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.CycleButton;
-import net.minecraft.client.gui.components.StringWidget;
-import net.minecraft.client.gui.components.Tooltip;
-import net.minecraft.client.gui.layouts.HeaderAndFooterLayout;
-import net.minecraft.client.gui.layouts.LayoutSettings;
-import net.minecraft.client.gui.layouts.LinearLayout;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.network.chat.Component;
-import net.trafficlunar.optionsprofiles.OptionsProfilesMod;
-
-public class SettingsScreen extends Screen {
-    private final Screen lastScreen;
-    private final HeaderAndFooterLayout layout = new HeaderAndFooterLayout(this, 24, 33);
-
-    public SettingsScreen(Screen lastScreen) {
-        super(Component.translatable("gui.optionsprofiles.settings-menu"));
-        this.lastScreen = lastScreen;
-    }
-
-    protected void init() {
-        LinearLayout linearLayoutHeader = this.layout.addToHeader(LinearLayout.vertical());
-        linearLayoutHeader.addChild(new StringWidget(this.title, this.font), LayoutSettings::alignHorizontallyCenter);
-
-        CycleButton<Boolean> showProfilesButtonButton = CycleButton.onOffBuilder(OptionsProfilesMod.config().shouldShowProfilesButton())
-                .create(0, 0, 150, 20, Component.translatable("gui.optionsprofiles.show-profiles-button"), (button, boolean_) -> {
-            OptionsProfilesMod.config().setShowProfilesButton(boolean_);
-        });
-
-        showProfilesButtonButton.setTooltip(Tooltip.create(Component.translatable("gui.optionsprofiles.show-profiles-button.tooltip")));
-        this.layout.addToContents(showProfilesButtonButton);
-
-        this.layout.addToFooter(
-                Button.builder(
-                                CommonComponents.GUI_DONE,
-                                (button) -> this.onClose())
-                        .width(200)
-                        .build()
-        );
-
-        this.layout.visitWidgets(this::addRenderableWidget);
-        this.repositionElements();
-    }
-
-    protected void repositionElements() {
-        this.layout.arrangeElements();
-    }
-
-    public void onClose() {
-        this.minecraft.setScreen(this.lastScreen);
-        OptionsProfilesMod.config().save();
-    }
-}

common/src/main/java/net/trafficlunar/optionsprofiles/mixin/MixinOptionsScreen.java

@@ -1,37 +0,0 @@
-package net.trafficlunar.optionsprofiles.mixin;
-
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.options.OptionsScreen;
-import net.minecraft.network.chat.Component;
-import net.trafficlunar.optionsprofiles.OptionsProfilesMod;
-import net.trafficlunar.optionsprofiles.gui.ProfilesScreen;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(OptionsScreen.class)
-public class MixinOptionsScreen extends Screen {
-    @Shadow @Final private Screen lastScreen;
-
-    protected MixinOptionsScreen(Component component) {
-        super(component);
-    }
-
-    @Inject(at = @At("HEAD"), method = "init")
-    private void init(CallbackInfo info) {
-        if (OptionsProfilesMod.config().shouldShowProfilesButton()) {
-            this.addRenderableWidget(
-                    Button.builder(
-                                    Component.translatable("gui.optionsprofiles.profiles-menu"),
-                                    (button) -> this.minecraft.setScreen(new ProfilesScreen(this)))
-                            .width(75)
-                            .pos(5, 5)
-                            .build()
-            );
-        }
-    }
-}

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

@@ -1,91 +0,0 @@
-package net.trafficlunar.optionsprofiles.profiles;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import net.trafficlunar.optionsprofiles.OptionsProfilesMod;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-
-public class ProfileConfiguration {
-    private static Path configurationFile;
-    private static String profileName;
-
-    private boolean loadOnStartup = false;
-    private String servers = "";
-    private int keybindIndex = 0;
-    private List<String> optionsToLoad = new ArrayList<>();
-
-    public ProfileConfiguration save() {
-        ProfileConfiguration configuration = new ProfileConfiguration();
-
-        Gson gson = new GsonBuilder()
-                .setPrettyPrinting()
-                .create();
-
-        try (BufferedWriter writer = Files.newBufferedWriter(configurationFile)) {
-            gson.toJson(this, writer);
-            OptionsProfilesMod.LOGGER.info("[Profile '{}']: Profile configuration saved", profileName);
-        } catch (IOException e) {
-            OptionsProfilesMod.LOGGER.error("Unable to write configuration.json to profile!", e);
-        }
-
-        return configuration;
-    }
-
-    public static ProfileConfiguration get(String profile_name) {
-        ProfileConfiguration configuration = new ProfileConfiguration();
-
-        configurationFile = Profiles.PROFILES_DIRECTORY.resolve(profile_name).resolve("configuration.json");
-        profileName = profile_name;
-
-        if (Files.notExists(configurationFile))
-            configuration.save();
-
-        try (BufferedReader reader = Files.newBufferedReader(configurationFile)) {
-            Gson gson = new Gson();
-            configuration = gson.fromJson(reader, ProfileConfiguration.class);
-        } catch (IOException e) {
-            OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when reading configuration.json", profileName, e);
-        }
-
-        return configuration;
-    }
-
-    public boolean shouldLoadOnStartup() {
-        return loadOnStartup;
-    }
-
-    public void setLoadOnStartup(boolean loadOnStartup) {
-        this.loadOnStartup = loadOnStartup;
-    }
-
-    public int getKeybindIndex() {
-        return keybindIndex;
-    }
-
-    public void setKeybindIndex(int keybindIndex) {
-        this.keybindIndex = keybindIndex;
-    }
-
-    public List<String> getOptionsToLoad() {
-        return optionsToLoad;
-    }
-
-    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

@@ -1,309 +0,0 @@
-package net.trafficlunar.optionsprofiles.profiles;
-
-import dev.architectury.platform.Platform;
-import net.minecraft.client.Minecraft;
-import net.trafficlunar.optionsprofiles.OptionsProfilesMod;
-import net.trafficlunar.optionsprofiles.profiles.loaders.DistantHorizonsLoader;
-import net.trafficlunar.optionsprofiles.profiles.loaders.IrisLoader;
-import net.trafficlunar.optionsprofiles.profiles.loaders.SodiumExtraLoader;
-import net.trafficlunar.optionsprofiles.profiles.loaders.SodiumLoader;
-import org.apache.commons.io.FileUtils;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
-
-public class Profiles {
-    public static final Path PROFILES_DIRECTORY = Paths.get("options-profiles/");
-    public static final Path OPTIONS_FILE = Paths.get("options.txt");
-    public static final Path OPTIFINE_OPTIONS_FILE = Paths.get("optionsof.txt");
-    public static final Path SODIUM_OPTIONS_FILE = Paths.get("config/sodium-options.json");
-    public static final Path SODIUM_EXTRA_OPTIONS_FILE = Paths.get("config/sodium-extra-options.json");
-    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 createProfile() {
-        String profileName = "Profile 1";
-        Path profile = PROFILES_DIRECTORY.resolve(profileName);
-
-        // Increases the number in 'Profile 1' if it already exists
-        for (int i = 1; Files.exists(profile); i++) {
-            profileName = "Profile " + i;
-            profile = Paths.get(PROFILES_DIRECTORY.toString(), profileName);
-        }
-
-        try {
-            Files.createDirectory(profile);
-
-            if (Files.exists(profile)) {
-                OptionsProfilesMod.LOGGER.info("[Profile '{}']: created", profileName);
-                writeProfile(profileName, false);
-            } else {
-                OptionsProfilesMod.LOGGER.warn("[Profile '{}']: Profile already exists?", profileName);
-            }
-        } catch (IOException e) {
-            OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when creating a profile", profileName, e);
-        }
-    }
-
-    private static void copyOptionFile(Path profile, Path options) {
-        if (Files.exists(options)) {
-            Path profileOptions = profile.resolve(options.getFileName());
-
-            try {
-                Files.copy(options, profileOptions);
-                OptionsProfilesMod.LOGGER.info("[Profile '{}']: Copied file '{}'", profile.getFileName().toString(), options.getFileName().toString());
-            } catch (IOException e) {
-                OptionsProfilesMod.LOGGER.error("[Profile '{}']: Unable to copy '{}'", profile.getFileName().toString(), options.getFileName().toString(), e);
-            }
-        }
-    }
-
-    public static void writeProfile(String profileName, boolean overwriting) {
-        Path profile = PROFILES_DIRECTORY.resolve(profileName);
-        Path profileOptions = profile.resolve("options.txt");
-
-        if (overwriting) {
-            try (Stream<Path> files = Files.list(profile)) {
-                files.filter(file -> !file.getFileName().toString().equals("configuration.json"))
-                        .forEach(file -> {
-                            try {
-                                Files.delete(file);
-                                OptionsProfilesMod.LOGGER.info("[Profile '{}']: Deleted file '{}'", profileName, file.getFileName().toString());
-                            } catch (IOException e) {
-                                OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when trying to delete the file '{}'", profileName, file.getFileName().toString(), e);
-                            }
-                        });
-            } catch (IOException e) {
-                OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when deleting old options files.", profileName, e);
-            }
-        }
-
-        copyOptionFile(profile, OPTIONS_FILE);
-        copyOptionFile(profile, OPTIFINE_OPTIONS_FILE);
-        if (Platform.isModLoaded("sodium"))
-            copyOptionFile(profile, SODIUM_OPTIONS_FILE);
-        if (Platform.isModLoaded("sodium-extra"))
-            copyOptionFile(profile, SODIUM_EXTRA_OPTIONS_FILE);
-        if (Platform.isModLoaded("iris"))
-            copyOptionFile(profile, IRIS_OPTIONS_FILE);
-        if (Platform.isModLoaded("distanthorizons"))
-            copyOptionFile(profile, DISTANT_HORIZONS_OPTIONS_FILE);
-
-        if (!overwriting) {
-            ProfileConfiguration profileConfiguration = ProfileConfiguration.get(profileName);
-
-            // Add every option value to configuration
-            try (Stream<String> lines = Files.lines(profileOptions)) {
-                List<String> optionsToLoad = profileConfiguration.getOptionsToLoad();
-
-                lines.forEach((line) -> {
-                    String[] option = line.split(":");
-                    optionsToLoad.add(option[0]);
-                });
-
-                profileConfiguration.save();
-            } catch (IOException e) {
-                OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when adding options to the configuration file", profileName, e);
-            }
-        }
-    }
-
-//    public static boolean isProfileLoaded(String profileName) {
-        // TODO: rewrite/fix; returns incorrect results
-
-//        Path profile = PROFILES_DIRECTORY.resolve(profileName);
-//        ProfileConfiguration profileConfiguration = ProfileConfiguration.get(profileName);
-//
-//        List<Path> optionFiles = new ArrayList<>();
-//        optionFiles.add(OPTIONS_FILE);
-//
-//        // The next few lines check if the specified file exists. If so, it adds it to the optionFiles ArrayList.
-//        Optional.of(OPTIFINE_OPTIONS_FILE).filter(Files::exists).ifPresent(optionFiles::add);
-//        Optional.of(SODIUM_OPTIONS_FILE).filter(file -> Platform.isModLoaded("sodium")).ifPresent(optionFiles::add);
-//        Optional.of(SODIUM_EXTRA_OPTIONS_FILE).filter(file -> Platform.isModLoaded("sodium-extra")).ifPresent(optionFiles::add);
-//        Optional.of(IRIS_OPTIONS_FILE).filter(file -> Platform.isModLoaded("iris")).ifPresent(optionFiles::add);
-//        Optional.of(DISTANT_HORIZONS_OPTIONS_FILE).filter(file -> Platform.isModLoaded("distanthorizons")).ifPresent(optionFiles::add);
-//
-//        // Check if the original option file and the profile option file have the same content
-//        try {
-//            for (Path optionFile : optionFiles) {
-//                Path profileOptions = profile.resolve(optionFile.getFileName());
-//
-//                if (optionFile.getFileName().equals(OPTIONS_FILE)) {
-//                    try (Stream<String> lines = Files.lines(optionFile)) {
-//                        List<String> optionsToLoad = profileConfiguration.getOptionsToLoad();
-//                        AtomicBoolean loaded = new AtomicBoolean(false);
-//
-//                        lines.forEach((line) -> {
-//                            String[] option = line.split(":");
-//
-//                            if (optionsToLoad.contains(option[0])) {
-//                                try (Stream<String> profileLines = Files.lines(profileOptions)) {
-//                                    loaded.set(profileLines.anyMatch(profileLine -> profileLine.equals(line)));
-//                                } catch (IOException e) {
-//                                    OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when checking each line in options.txt if the profiles is loaded", profileName, e);
-//                                }
-//                            }
-//                        });
-//
-//                        return loaded.get();
-//                    } catch (IOException e) {
-//                        OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when opening options.txt to check if the profile is loaded", profileName, e);
-//                    }
-//                } else {
-//                    if (!FileUtils.contentEquals(optionFile.toFile(), profileOptions.toFile())) {
-//                        return false;
-//                    }
-//                }
-//            }
-//        } catch (IOException e) {
-//            OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when checking if the profile is loaded", profileName, e);
-//            return false;
-//        }
-
-//        return false;
-//    }
-
-    private static void loadOptionFile(String profileName, Path options) {
-        ProfileConfiguration profileConfiguration = ProfileConfiguration.get(profileName);
-
-        Path profile = PROFILES_DIRECTORY.resolve(profileName);
-        Path profileOptions = profile.resolve(options.getFileName());
-
-        if (Files.exists(profileOptions)) {
-            // This if statement is for loading specific options.
-            if (options.getFileName().toString().equals("options.txt")) {       // If file is options.txt - only doing options.txt for now
-                Map<String, String> optionsToWrite = new HashMap<>();
-
-                // Read options.txt
-                try (Stream<String> lines = Files.lines(options)) {
-                    lines.forEach(line -> {
-                        String[] option = line.split(":");            // Split key and value
-
-                        if (option.length > 1) {
-                            optionsToWrite.put(option[0], option[1]);           // Add them to the map
-                        } else {
-                            optionsToWrite.put(option[0], "");
-                        }
-                    });
-                } catch (IOException e) {
-                    OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred reading options.txt to load the profile", profileName, e);
-                }
-
-                // Read profile options.txt
-                try (Stream<String> lines = Files.lines(profileOptions)) {
-                    lines.forEach(line -> {
-                        String[] option = line.split(":");            // Split key and value
-
-                        if (option.length > 1) {
-                            if (profileConfiguration.getOptionsToLoad().contains(option[0])) {
-                                optionsToWrite.put(option[0], option[1]);       // Updates old value set by reading options.txt
-                            }
-                        }
-                    });
-                } catch (IOException e) {
-                    OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred reading profile options.txt to load the profile", profileName, e);
-                }
-
-                // Write into options.txt
-                try {
-                    Files.write(options, () ->
-                            optionsToWrite
-                                    .entrySet()
-                                    .stream()
-                                    .<CharSequence>map(entry -> entry.getKey() + ":" + entry.getValue())
-                                    .iterator()
-                    );
-
-                    OptionsProfilesMod.LOGGER.info("[Profile '{}']: '{}' loaded with specific options", profileName, options.getFileName());
-                } catch (IOException e) {
-                    OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred writing hashmap into options.txt", profileName, e);
-                }
-
-                return;         // Return the function, thus not running the next few lines
-            }
-
-            try {
-                // Replaces the original option file with the profile option file
-                Files.copy(profileOptions, options, StandardCopyOption.REPLACE_EXISTING);
-                OptionsProfilesMod.LOGGER.info("[Profile '{}']: '{}' loaded by copying", profileName, options.getFileName());
-            } catch (IOException e) {
-                OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when loading the profile", profileName, e);
-            }
-        }
-    }
-
-    private static void loadOptionFile(String profileName, Path options, Consumer<Path> loader) {
-        Path profile = PROFILES_DIRECTORY.resolve(profileName);
-        Path profileOptions = profile.resolve(options.getFileName());
-
-        if (Files.exists(profileOptions)) {
-            loader.accept(profileOptions);
-            OptionsProfilesMod.LOGGER.info("[Profile '{}']: '{}' loaded using loader class", profileName, options.getFileName());
-        }
-    }
-
-    public static void loadProfile(String profileName) {
-        loadOptionFile(profileName, OPTIONS_FILE);
-        loadOptionFile(profileName, OPTIFINE_OPTIONS_FILE);
-
-        if (Platform.isModLoaded("sodium"))
-            loadOptionFile(profileName, SODIUM_OPTIONS_FILE, SodiumLoader::load);
-        if (Platform.isModLoaded("sodium-extra"))
-            loadOptionFile(profileName, SODIUM_EXTRA_OPTIONS_FILE, SodiumExtraLoader::load);
-        if (Platform.isModLoaded("iris"))
-            loadOptionFile(profileName, IRIS_OPTIONS_FILE, IrisLoader::load);
-        if (Platform.isModLoaded("distanthorizons")) {
-            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) {
-        Path profile = PROFILES_DIRECTORY.resolve(profileName);
-        Path newProfile = PROFILES_DIRECTORY.resolve(newProfileName);
-
-        if (Files.exists(newProfile)) {
-            OptionsProfilesMod.LOGGER.warn("[Profile '{}']: A profile with that name already exists!", profileName);
-            return;
-        }
-
-        try {
-            Files.move(profile, newProfile);
-            OptionsProfilesMod.LOGGER.info("[Profile '{}']: renamed. Old name: {}", newProfileName, profileName);
-        } catch (IOException e) {
-            OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when renaming the profile", profileName, e);
-        }
-    }
-
-    public static void deleteProfile(String profileName) {
-        Path profile = PROFILES_DIRECTORY.resolve(profileName);
-
-        try {
-            FileUtils.deleteDirectory(profile.toFile());
-            OptionsProfilesMod.LOGGER.info("[Profile '{}']: deleted", profileName);
-        } catch (IOException e) {
-            OptionsProfilesMod.LOGGER.error("[Profile '{}']: Profile was not deleted", profileName, e);
-        }
-    }
-}

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

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

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

@@ -1,35 +0,0 @@
-package net.trafficlunar.optionsprofiles.profiles.loaders;
-
-import net.trafficlunar.optionsprofiles.OptionsProfilesMod;
-import net.irisshaders.iris.Iris;
-import net.irisshaders.iris.api.v0.IrisApi;
-
-import java.io.FileReader;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Properties;
-
-public class IrisLoader {
-    public static void load(Path file) {
-        try (FileReader reader = new FileReader(file.toFile())) {
-            Properties properties = new Properties();
-            properties.load(reader);
-
-            apply(properties);
-        } catch (IOException e) {
-            OptionsProfilesMod.LOGGER.error("An error occurred when reading and loading Iris's configuration", e);
-        }
-    }
-
-    private static void apply(Properties properties) {
-        Iris.getIrisConfig().setShaderPackName(properties.getProperty("shaderPack"));
-        Iris.getIrisConfig().setDebugEnabled("true".equals(properties.getProperty("enableDebugOptions")));
-        IrisApi.getInstance().getConfig().setShadersEnabledAndApply("true".equals(properties.getProperty("enableShaders")));
-
-        try {
-            Iris.getIrisConfig().save();
-        } catch (IOException e) {
-            OptionsProfilesMod.LOGGER.error("An error occurred when loading Sodium's configuration", e);
-        }
-    }
-}

common/src/main/resources/architectury.common.json

@@ -0,0 +1,3 @@
+{
+  "accessWidener": "optionsprofiles.accesswidener"
+}

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

@@ -6,31 +6,7 @@
 
   "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",
-  "gui.optionsprofiles.delete-profile": "Delete",
-  "gui.optionsprofiles.keybind-index": "Keybind index",
-  "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",
-
-  "gui.optionsprofiles.settings-button": "Settings",
-  "gui.optionsprofiles.settings-menu": "Options Profiles Settings",
-  "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.",
-
-  "key.category.optionsprofiles.keys": "Options Profiles",
-  "key.optionsprofiles.profile_1": "Profile 1",
-  "key.optionsprofiles.profile_2": "Profile 2",
-  "key.optionsprofiles.profile_3": "Profile 3"
+  "gui.optionsprofiles.delete-profile": "Delete"
 }

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

@@ -7,15 +7,9 @@
   "gui.optionsprofiles.editing-profile-title": "Изменение профиля: ",
   "gui.optionsprofiles.profile-name-text": "Имя профиля",
   "gui.optionsprofiles.overwrite-options": "Перезаписать",
-  "gui.optionsprofiles.overwrite-options.tooltip": "Заменяет параметры профиля на ваши текущие параметры",
   "gui.optionsprofiles.rename-profile": "Переименовать",
   "gui.optionsprofiles.delete-profile": "удалить",
 
-  "gui.optionsprofiles.options-toggle": "Выберите параметры для переключения",
-  "gui.optionsprofiles.options-toggle.tooltip": "Выберите параметры, которые вы хотите загрузить в этот профиль",
-  "gui.optionsprofiles.all-on": "Включи всё",
-  "gui.optionsprofiles.all-off": "Все выключить",
-
   "modmenu.summaryTranslation.options-profiles": "Cохраняйте и загружайте профили настроек, не выходя из игры.",
   "modmenu.descriptionTranslation.options-profiles": "Мод, позволяющий сохранять профили текущих настроек и загружать их, не выходя из игры."
 }

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

@@ -7,15 +7,9 @@
   "gui.optionsprofiles.editing-profile-title": "Профильне үзгәртү: ",
   "gui.optionsprofiles.profile-name-text": "Профиль исеме",
   "gui.optionsprofiles.overwrite-options": "перезапись",
-  "gui.optionsprofiles.overwrite-options.tooltip": "Профиль вариантларын хәзерге вариантларыгыз белән алыштыра",
   "gui.optionsprofiles.rename-profile": "переименовывать",
   "gui.optionsprofiles.delete-profile": "бетерү",
 
-  "gui.optionsprofiles.options-toggle": "Күчерү вариантларын сайлагыз",
-  "gui.optionsprofiles.options-toggle.tooltip": "Бу профильгә йөгерергә теләгән вариантларны сайлагыз",
-  "gui.optionsprofiles.all-on": "Барысын да кабызыгыз",
-  "gui.optionsprofiles.all-off": "Барысын да сүндерегез",
-
   "modmenu.summaryTranslation.options-profiles": "Хәзерге көйләүләр профильләрен саклагыз һәм уеннан чыгусыз йөкләгез.",
   "modmenu.descriptionTranslation.options-profiles": "Хәзерге көйләүләр профильләрен сакларга һәм уеннан чыгусыз йөкләргә рөхсәт итә торган мод."
 }

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

@@ -1,18 +0,0 @@
-{
-  "gui.optionsprofiles.profiles-menu": "配置预设",
-  "gui.optionsprofiles.save-current-options": "保存当前配置",
-  "gui.optionsprofiles.load-profile": "✔（载入）",
-  "gui.optionsprofiles.edit-profile": "✎（编辑）",
-
-  "gui.optionsprofiles.editing-profile-title": "正在编辑：",
-  "gui.optionsprofiles.profile-name-text": "预设名",
-  "gui.optionsprofiles.overwrite-options": "覆盖",
-  "gui.optionsprofiles.overwrite-options.tooltip": "将配置文件选项替换为您当前的选项",
-  "gui.optionsprofiles.rename-profile": "重命名",
-  "gui.optionsprofiles.delete-profile": "删除",
-
-  "gui.optionsprofiles.options-toggle": "选择要切换的选项",
-  "gui.optionsprofiles.options-toggle.tooltip": "选择您要加载到此配置文件中的选项",
-  "gui.optionsprofiles.all-on": "全部开启",
-  "gui.optionsprofiles.all-off": "关掉一切"
-}

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

@@ -1,18 +0,0 @@
-{
-  "gui.optionsprofiles.profiles-menu": "配置檔",
-  "gui.optionsprofiles.save-current-options": "保存目前配置",
-  "gui.optionsprofiles.load-profile": "✔（載入）",
-  "gui.optionsprofiles.edit-profile": "✎（編輯）",
-
-  "gui.optionsprofiles.editing-profile-title": "正在編輯：",
-  "gui.optionsprofiles.profile-name-text": "預設名稱",
-  "gui.optionsprofiles.overwrite-options": "覆蓋",
-  "gui.optionsprofiles.overwrite-options.tooltip": "將配置文件選項替換為您目前的選項",
-  "gui.optionsprofiles.rename-profile": "重新命名",
-  "gui.optionsprofiles.delete-profile": "刪除",
-
-  "gui.optionsprofiles.options-toggle": "選擇要切換的選項",
-  "gui.optionsprofiles.options-toggle.tooltip": "選擇您要載入到此配置文件中的選項",
-  "gui.optionsprofiles.all-on": "全部 開啟",
-  "gui.optionsprofiles.all-off": "全部 關閉"
-}

common/src/main/resources/optionsprofiles-common.mixins.json

@@ -0,0 +1,14 @@
+{
+  "required": true,
+  "package": "com.axolotlmaid.optionsprofiles.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "minVersion": "0.8",
+  "client": [
+    "MixinOptionsScreen"
+  ],
+  "mixins": [
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

common/src/main/resources/optionsprofiles.accesswidener

@@ -0,0 +1 @@
+accessWidener   v2  named

common/src/main/resources/optionsprofiles.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "net.trafficlunar.optionsprofiles.mixin",
+  "package": "com.axolotlmaid.optionsprofiles.mixin",
   "compatibilityLevel": "JAVA_17",
   "minVersion": "0.8",
   "client": [

fabric/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.gradleup.shadow'
+    id 'com.github.johnrengelman.shadow'
 }
 
 architectury {
@@ -24,25 +24,12 @@ configurations {
     }
 }
 
-repositories {
-    maven {
-        name = "Terraformers"
-        url = "https://maven.terraformersmc.com/"
-    }
-}
-
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
 
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:$rootProject.fabric_api_version"
 
-    // Architectury API
-    modImplementation "dev.architectury:architectury-fabric:$rootProject.architectury_api_version"
-
-    // Mod Menu API
-    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/java/com/axolotlmaid/optionsprofiles/fabric/OptionsProfilesModFabric.java

@@ -1,6 +1,6 @@
-package net.trafficlunar.optionsprofiles.fabric;
+package com.axolotlmaid.optionsprofiles.fabric;
 
-import net.trafficlunar.optionsprofiles.OptionsProfilesMod;
+import com.axolotlmaid.optionsprofiles.OptionsProfilesMod;
 import net.fabricmc.api.ModInitializer;
 
 public class OptionsProfilesModFabric implements ModInitializer {

fabric/src/main/java/net/trafficlunar/optionsprofiles/fabric/ModMenuApiImpl.java

@@ -1,12 +0,0 @@
-package net.trafficlunar.optionsprofiles.fabric;
-
-import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import com.terraformersmc.modmenu.api.ModMenuApi;
-import net.trafficlunar.optionsprofiles.gui.ProfilesScreen;
-
-public class ModMenuApiImpl implements ModMenuApi {
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return ProfilesScreen::new;
-    }
-}

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

@@ -4,25 +4,29 @@
   "version": "${version}",
   "name": "Options Profiles",
   "description": "Load and save your options from in-game.",
-	"authors": ["trafficlunar"],
+  "authors": [
+    "AxolotlMaid"
+  ],
   "contact": {
-		"homepage": "https://github.com/trafficlunar/options-profiles",
-		"sources": "https://github.com/trafficlunar/options-profiles",
-		"issues": "https://github.com/trafficlunar/options-profiles/issues"
+    "homepage": "https://github.com/AxolotlMaid/options-profiles",
+    "sources": "https://github.com/AxolotlMaid/options-profiles",
+    "issues": "https://github.com/AxolotlMaid/options-profiles/issues"
   },
   "license": "GNU GPL 3.0",
   "icon": "assets/optionsprofiles/icon.png",
   "environment": "*",
   "entrypoints": {
-		"main": ["net.trafficlunar.optionsprofiles.fabric.OptionsProfilesModFabric"],
-		"modmenu": ["net.trafficlunar.optionsprofiles.fabric.ModMenuApiImpl"]
+    "main": [
+      "com.axolotlmaid.optionsprofiles.fabric.OptionsProfilesModFabric"
+    ]
   },
-	"mixins": ["optionsprofiles.mixins.json"],
+  "mixins": [
+    "optionsprofiles.mixins.json"
+  ],
   "depends": {
-		"fabricloader": ">=0.17.2",
-		"minecraft": "~1.21",
-		"java": ">=21",
-		"architectury": ">=18.0.3",
+    "fabricloader": ">=0.15.11",
+    "minecraft": "~1.20.4",
+    "java": ">=17",
     "fabric-api": "*"
   }
 }

fabric/src/main/resources/optionsprofiles.mixins.json

@@ -0,0 +1,13 @@
+{
+  "required": true,
+  "package": "com.axolotlmaid.optionsprofiles.mixin.fabric",
+  "compatibilityLevel": "JAVA_17",
+  "minVersion": "0.8",
+  "client": [
+  ],
+  "mixins": [
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

forge/build.gradle

@@ -0,0 +1,55 @@
+plugins {
+    id 'com.github.johnrengelman.shadow'
+}
+
+loom {
+    forge {
+        mixinConfig "optionsprofiles.mixins.json"
+    }
+}
+
+architectury {
+    platformSetupLoomIde()
+    forge()
+}
+
+configurations {
+    common {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentForge.extendsFrom common
+
+    // Files in this configuration will be bundled into your mod using the Shadow plugin.
+    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
+    shadowBundle {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+}
+
+dependencies {
+    forge "net.minecraftforge:forge:$rootProject.forge_version"
+
+    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
+    shadowBundle project(path: ':common', configuration: 'transformProductionForge')
+}
+
+processResources {
+    inputs.property 'version', project.version
+
+    filesMatching('META-INF/mods.toml') {
+        expand version: project.version
+    }
+}
+
+shadowJar {
+    configurations = [project.configurations.shadowBundle]
+    archiveClassifier = 'dev-shadow'
+}
+
+remapJar {
+    input.set shadowJar.archiveFile
+}

forge/gradle.properties

@@ -0,0 +1 @@
+loom.platform=forge

forge/src/main/java/com/axolotlmaid/optionsprofiles/forge/OptionsProfilesModForge.java

@@ -0,0 +1,11 @@
+package com.axolotlmaid.optionsprofiles.forge;
+
+import com.axolotlmaid.optionsprofiles.OptionsProfilesMod;
+import net.minecraftforge.fml.common.Mod;
+
+@Mod(OptionsProfilesMod.MOD_ID)
+public class OptionsProfilesModForge {
+    public OptionsProfilesModForge() {
+        OptionsProfilesMod.init();
+    }
+}

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

@@ -0,0 +1,28 @@
+modLoader = "javafml"
+loaderVersion = "[49,)"
+#issueTrackerURL = ""
+license = "GNU GPL 3.0"
+
+[[mods]]
+modId = "optionsprofiles"
+version = "${version}"
+displayName = "Options Profiles"
+authors = "AxolotlMaid"
+description = '''
+Load and save your options from in-game.
+'''
+logoFile = "icon.png"
+
+[[dependencies.optionsprofiles]]
+modId = "forge"
+mandatory = true
+versionRange = "[49,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.optionsprofiles]]
+modId = "minecraft"
+mandatory = true
+versionRange = "[1.20.4,)"
+ordering = "NONE"
+side = "BOTH"

forge/src/main/resources/optionsprofiles.mixins.json

@@ -0,0 +1,13 @@
+{
+  "required": true,
+  "package": "com.axolotlmaid.optionsprofiles.mixin.forge",
+  "compatibilityLevel": "JAVA_17",
+  "minVersion": "0.8",
+  "client": [
+  ],
+  "mixins": [
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

forge/src/main/resources/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "description": "Options Profiles",
+    "pack_format": 22
+  }
+}

gradle.properties

@@ -1,20 +1,16 @@
 org.gradle.jvmargs=-Xmx6G
 org.gradle.parallel=true
 
-# Fixes errors caused by Loom version differences
-loom.ignoreDependencyLoomVersionValidation=true
-
-# Mod properties
-mod_version=1.4.4
-maven_group=net.trafficlunar.optionsprofiles
+mod_version=1.2.1
+maven_group=com.axolotlmaid.optionsprofiles
 archives_name=optionsprofiles
-enabled_platforms=fabric,neoforge
+enabled_platforms=fabric,forge,neoforge
 
-# Minecraft properties
-minecraft_version=1.21.9
+minecraft_version=1.20.4
 
-# Dependencies
-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
+fabric_loader_version = 0.15.11
+fabric_api_version = 0.97.1+1.20.4
+
+forge_version = 1.20.4-49.0.50
+
+neoforge_version = 20.4.234

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,8 +83,10 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}.." > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -112,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/gradle-launcher-8.7.jar
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -131,21 +133,18 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
 fi
-fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,20 +197,16 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'" \"-javaagent:$APP_HOME/lib/agents/gradle-instrumentation-agent-8.7.jar\""
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.launcher.GradleMain \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -28,13 +28,13 @@ set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
 @rem This is normally unused
 set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%..
+set APP_HOME=%DIRNAME%
 
 @rem Resolve any "." and ".." in APP_HOME to make it shorter.
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" "-javaagent:%APP_HOME%/lib/agents/gradle-instrumentation-agent-8.7.jar"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -57,22 +57,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\lib\gradle-launcher-8.7.jar
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.launcher.GradleMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

neoforge/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.gradleup.shadow'
+    id 'com.github.johnrengelman.shadow'
 }
 
 architectury {
@@ -34,9 +34,6 @@ repositories {
 dependencies {
     neoForge "net.neoforged:neoforge:$rootProject.neoforge_version"
 
-    // Architectury API
-    modImplementation "dev.architectury:architectury-neoforge:$rootProject.architectury_api_version"
-
     common(project(path: ':common', configuration: 'namedElements')) { transitive false }
     shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')
 }
@@ -44,7 +41,7 @@ dependencies {
 processResources {
     inputs.property 'version', project.version
 
-    filesMatching('META-INF/neoforge.mods.toml') {
+    filesMatching('META-INF/mods.toml') {
         expand version: project.version
     }
 }

neoforge/src/main/java/com/axolotlmaid/optionsprofiles/neoforge/OptionsProfilesModNeoForge.java

@@ -0,0 +1,12 @@
+package com.axolotlmaid.optionsprofiles.neoforge;
+
+import net.neoforged.fml.common.Mod;
+
+import com.axolotlmaid.optionsprofiles.OptionsProfilesMod;
+
+@Mod(OptionsProfilesMod.MOD_ID)
+public final class OptionsProfilesModNeoForge {
+    public OptionsProfilesModNeoForge() {
+        OptionsProfilesMod.init();
+    }
+}

neoforge/src/main/java/net/trafficlunar/optionsprofiles/neoforge/OptionsProfilesModNeoForge.java

@@ -1,11 +0,0 @@
-package net.trafficlunar.optionsprofiles.neoforge;
-
-import net.trafficlunar.optionsprofiles.OptionsProfilesMod;
-import net.neoforged.fml.common.Mod;
-
-@Mod(OptionsProfilesMod.MOD_ID)
-public class OptionsProfilesModNeoForge {
-    public OptionsProfilesModNeoForge() {
-        OptionsProfilesMod.init();
-    }
-}

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

@@ -1,38 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[10,)"
-issueTrackerURL = "https://github.com/trafficlunar/options-profiles/issues"
-license = "GNU GPL 3.0"
-
-[[mods]]
-modId = "optionsprofiles"
-version = "${version}"
-displayName = "Options Profiles"
-authors = "trafficlunar"
-description = '''
-Load and save your options from in-game.
-'''
-logoFile = "icon.png"
-
-[[dependencies.optionsprofiles]]
-modId = "neoforge"
-type = "required"
-versionRange = "[21.9.0-beta,)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.optionsprofiles]]
-modId = "minecraft"
-type = "required"
-versionRange = "[1.21,)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.optionsprofiles]]
-modId = "architectury"
-type = "required"
-versionRange = "[18.0.3,)"
-ordering = "AFTER"
-side = "BOTH"
-
-[[mixins]]
-config = "optionsprofiles.mixins.json"

settings.gradle

@@ -2,13 +2,14 @@ pluginManagement {
     repositories {
         maven { url "https://maven.fabricmc.net/" }
         maven { url "https://maven.architectury.dev/" }
-        maven { url "https://maven.minecraftforge.net/" }
+        maven { url "https://files.minecraftforge.net/maven/" }
         gradlePluginPortal()
     }
 }
 
 include("common")
 include("fabric")
+include("forge")
 include("neoforge")
 
-rootProject.name = "optionsprofiles-v1.4.4-1.21.9"
+rootProject.name = "optionsprofiles-v1.2.1-1.20.4"