Compare commits

...

11 commits

Author SHA1 Message Date
axolotlmaid
a8fa28e834 Fix profiles not being checked if they are loaded every time 2024-07-16 21:12:24 +01:00
axolotlmaid
746ef7ad3c Bump version up to 1.3.1 2024-07-14 01:51:35 +01:00
axolotlmaid
7fecc454ff Fix Distant Horizons loading and add Embeddium loader in Profiles.java (#21) 2024-07-14 01:44:24 +01:00
axolotlmaid
50d483e9f9 Add Embeddium support (#20) 2024-07-14 01:43:42 +01:00
axolotlmaid
fc411bac3c Continuation of commit 2f650bb (#20)
I keep forgetting to stage my files >:(
2024-07-12 23:48:49 +01:00
axolotlmaid
2f650bb6d4 Fix issues, clean up, and add Sodium Extra loader (#20) 2024-07-12 23:44:30 +01:00
axolotlmaid
7c40794992 Some progress of updating 1.18.2 (#20) 2024-07-11 03:21:17 +01:00
AxolotlMaid
6fa55a1f20 Bump up Architectury version 2023-12-02 23:33:16 +00:00
AxolotlMaid
759017a537 Fix SodiumConfigLoader and Forge 2023-12-02 23:27:51 +00:00
AxolotlMaid
2eabc87e3e
Merge pull request #7 from tvoklov/1.18.2-fabric
fabric 1.18.2 port
2023-12-02 23:01:50 +00:00
tvoklov
cfa25b292e
fabric 1.18.2 port 2023-11-30 03:04:20 +04:00
37 changed files with 1291 additions and 515 deletions

View file

@ -1,27 +1,48 @@
# Options Profiles
# [1.18.2] Options Profiles
[![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/github_64h.png?raw=true)](https://github.com/AxolotlMaid/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)
---
### ⚠️⚠️ Mod requires Architectury API ⚠️⚠️
Options Profiles lets you load and save your options as profiles from in-game.
You may use this mod in modpacks.
Options Profiles is a Minecraft mod that lets you load and save your options as profiles from in-game.
## Features
- Profiles are saved in a folder called "options-profiles" in the specified ".minecraft" directory.
- Sodium support
- Forge, Fabric and Quilt support
- Resource packs support
- Save current options
- Edit profiles in-game (deleting, renaming, overwriting)
- Save and load profiles in-game
- Load specific options (like only load keybinds, resource packs or FOV and GUI scale)
- Edit profiles in-game (deleting, renaming, overwriting, pick options to only load)
- Fabric and Forge 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
- Embeddium
- Distant Horizons
- OptiFine
If you would like support for another mod, open an issue.
## Frequently Asked Questions
- 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?
> Versions 1.1 require Architectury API, however versions 1.2+ do not.
- For any other questions, create an issue or contact me at hello@axolotlmaid.com
## Gallery
Profiles Menu | Edit Profile Screen | Options Screen
:-------------------------:|:-------------------------:|:-------------------------:
<img src="https://raw.githubusercontent.com/AxolotlMaid/options-profiles/1.20.2/gallery/profiles-menu.png" alt="profiles list" width="500"/> | <img src="https://raw.githubusercontent.com/AxolotlMaid/options-profiles/1.20.2/gallery/edit-profile-screen.png" alt="edit profile screen" width="500"/> | <img src="https://raw.githubusercontent.com/AxolotlMaid/options-profiles/1.20.2/gallery/options-screen.png" alt="options screen" width="500"/>
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"/>

View file

@ -1,39 +1,27 @@
plugins {
id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
id 'dev.architectury.loom' version '1.6-SNAPSHOT' apply false
id 'architectury-plugin' version '3.4-SNAPSHOT'
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
}
architectury {
minecraft = rootProject.minecraft_version
}
subprojects {
apply plugin: "dev.architectury.loom"
loom {
silentMojangMappingsLicense()
}
dependencies {
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
// The following line declares the mojmap mappings, you may use other mappings as well
mappings loom.officialMojangMappings()
// The following line declares the yarn mappings you may select this one as well.
// mappings "net.fabricmc:yarn:1.20.1+build.10:v2"
}
minecraft = project.minecraft_version
}
allprojects {
apply plugin: "java"
apply plugin: "architectury-plugin"
apply plugin: "maven-publish"
base {
archivesName = rootProject.archives_base_name
group = rootProject.maven_group
version = rootProject.mod_version
}
version = rootProject.mod_version
group = rootProject.maven_group
subprojects {
apply plugin: 'dev.architectury.loom'
apply plugin: 'architectury-plugin'
apply plugin: 'maven-publish'
base {
// Set up a suffixed format for the mod jar names, e.g. `example-fabric`.
archivesName = "$rootProject.archives_name-$project.name"
}
repositories {
// Add repositories to retrieve artifacts from in here.
@ -43,12 +31,44 @@ allprojects {
// for more information about repositories.
}
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
options.release = 17
loom {
silentMojangMappingsLicense()
}
dependencies {
minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
mappings loom.officialMojangMappings()
}
java {
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
tasks.withType(JavaCompile).configureEach {
it.options.release = 17
}
// Configure Maven publishing.
publishing {
publications {
mavenJava(MavenPublication) {
artifactId = base.archivesName.get()
from components.java
}
}
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {
// Add repositories to publish to here.
// Notice: This block does NOT have the same function as the block in the top level.
// The repositories here will be used for publishing your artifact, not for
// retrieving dependencies.
}
}
}

View file

@ -1,9 +1,5 @@
architectury {
common(rootProject.enabled_platforms.split(","))
}
loom {
accessWidenerPath = file("src/main/resources/optionsprofiles.accesswidener")
common rootProject.enabled_platforms.split(',')
}
repositories {
@ -21,26 +17,14 @@ repositories {
}
dependencies {
// We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
// Do NOT use other classes from fabric loader
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
// Remove the next line if you don't want to depend on the API
modApi "dev.architectury:architectury:${rootProject.architectury_version}"
// 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"
// sodium
modImplementation "maven.modrinth:sodium:mc1.20.1-0.5.3"
}
publishing {
publications {
mavenCommon(MavenPublication) {
artifactId = rootProject.archives_base_name
from components.java
}
}
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {
// Add repositories to publish to here.
}
// Mod implementations
modImplementation "maven.modrinth:sodium:mc1.18.2-0.4.1" // Sodium
modImplementation "maven.modrinth:sodium-extra:mc1.18.2-0.4.18" // Sodium Extra
modImplementation "maven.modrinth:embeddium:0.3.18+mc1.18.2" // Embeddium
modImplementation "maven.modrinth:distanthorizons:2.1.2-a-1.18.2" // Distant Horizons
}

View file

@ -1,5 +1,9 @@
package com.axolotlmaid.optionsprofiles;
import com.axolotlmaid.optionsprofiles.profiles.Profiles;
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;
@ -7,6 +11,7 @@ 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");
@ -15,9 +20,11 @@ public class OptionsProfilesMod {
try {
Files.createDirectory(profilesDirectory);
} catch (IOException e) {
System.out.println("An error occurred when creating the 'options-profiles' directory.");
e.printStackTrace();
LOGGER.error("An error occurred when creating the 'options-profiles' directory.", e);
}
}
// Update / add configuration for existing profiles
Profiles.updateProfiles();
}
}

View file

@ -1,13 +1,16 @@
package com.axolotlmaid.optionsprofiles.gui;
import com.axolotlmaid.optionsprofiles.profiles.Profiles;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.ChatFormatting;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.GuiComponent;
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;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent;
public class EditProfileScreen extends Screen {
private final Screen lastScreen;
@ -16,40 +19,97 @@ public class EditProfileScreen extends Screen {
private EditBox profileNameEdit;
public EditProfileScreen(Screen screen, Component profileName) {
super(Component.literal(Component.translatable("gui.optionsprofiles.editing-profile-title").getString() + profileName.getString()));
super(new TextComponent(new TranslatableComponent("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, this.height - 130, 204, 20, Component.empty());
this.profileNameEdit = new EditBox(
this.font,
this.width / 2 - 102,
70,
204,
20,
new TextComponent(Component.EMPTY.getString())
);
this.profileNameEdit.setValue(profileName.getString());
this.addWidget(this.profileNameEdit);
this.addRenderableWidget(this.profileNameEdit);
this.addRenderableWidget(Button.builder(Component.translatable("gui.optionsprofiles.overwrite-options"), (button) -> {
new Profiles().writeOptionsFilesIntoProfile(profileName.getString());
this.addRenderableWidget(
new Button(
this.width / 2 - 75,
100,
150,
20,
new TranslatableComponent("gui.optionsprofiles.overwrite-options"),
(button) -> {
Profiles.writeProfile(profileName.getString(), true);
this.minecraft.setScreen(this.lastScreen);
}).size(100, 20).pos(this.width / 2 - 50, this.height - 85).build());
},
(button, poseStack, i, j) -> EditProfileScreen.this.renderTooltip(poseStack, new TranslatableComponent("gui.optionsprofiles.overwrite-options.tooltip"), i, j)
)
);
this.addRenderableWidget(Button.builder(Component.translatable("gui.optionsprofiles.rename-profile"), (button) -> {
new 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, this.height - 65).build());
this.addRenderableWidget(
new Button(
this.width / 2 - 75,
121,
150,
20,
new TranslatableComponent("gui.optionsprofiles.rename-profile"),
(button) -> {
Profiles.renameProfile(profileName.getString(), this.profileNameEdit.getValue());
this.minecraft.setScreen(new EditProfileScreen(lastScreen, new TextComponent(this.profileNameEdit.getValue())));
}
)
);
this.addRenderableWidget(Button.builder(Component.translatable("gui.optionsprofiles.delete-profile").withStyle(ChatFormatting.RED), (button) -> {
new Profiles().deleteProfile(profileName.getString());
this.addRenderableWidget(
new Button(
this.width / 2 - 75,
142,
150,
20,
new TranslatableComponent("gui.optionsprofiles.options-toggle").append("..."),
(button) -> {
this.minecraft.setScreen(new OptionsToggleScreen(this, profileName));
},
(button, poseStack, i, j) -> EditProfileScreen.this.renderTooltip(poseStack, new TranslatableComponent("gui.optionsprofiles.options-toggle.tooltip"), i, j)
)
);
this.addRenderableWidget(
new Button(
10,
this.height - 29,
50,
20,
new TranslatableComponent("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());
this.addRenderableWidget(
new Button(
this.width / 2 - 100,
this.height - 29,
200,
20,
CommonComponents.GUI_DONE,
(button) -> this.minecraft.setScreen(this.lastScreen)
)
);
}
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, this.height - 145, 16777215);
public void render(PoseStack poseStack, int mouseX, int mouseY, float delta) {
renderBackground(poseStack);
this.profileNameEdit.render(poseStack, mouseX, mouseY, delta);
GuiComponent.drawCenteredString(poseStack, this.font, this.title, this.width / 2, 8, 16777215);
GuiComponent.drawCenteredString(poseStack, this.font, new TranslatableComponent("gui.optionsprofiles.profile-name-text"), this.width / 2, 50, 16777215);
super.render(poseStack, mouseX, mouseY, delta);
}
}

View file

@ -0,0 +1,148 @@
package com.axolotlmaid.optionsprofiles.gui;
import com.axolotlmaid.optionsprofiles.OptionsProfilesMod;
import com.axolotlmaid.optionsprofiles.profiles.ProfileConfiguration;
import com.axolotlmaid.optionsprofiles.profiles.Profiles;
import com.google.common.collect.ImmutableList;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.GuiComponent;
import net.minecraft.client.gui.components.ContainerObjectSelectionList;
import net.minecraft.client.gui.components.CycleButton;
import net.minecraft.client.gui.components.events.GuiEventListener;
import net.minecraft.client.gui.narration.NarratableEntry;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TextComponent;
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.Entry> {
private final String profileName;
private final ProfileConfiguration profileConfiguration;
private final OptionsToggleScreen optionsToggleScreen;
public OptionsToggleList(OptionsToggleScreen optionsToggleScreen, Minecraft minecraft, String profileName) {
super(minecraft, optionsToggleScreen.width, optionsToggleScreen.height, 20, optionsToggleScreen.height - 32, 20);
this.profileName = profileName;
this.profileConfiguration = optionsToggleScreen.profileConfiguration;
this.optionsToggleScreen = optionsToggleScreen;
refreshEntries(false, false);
}
// If overriding boolean is set to true then this function will set every option in the list to overrideToggle (false or true)
public void refreshEntries(boolean overriding, boolean overrideToggle) {
this.clearEntries();
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
this.addEntry(new OptionEntry(option[0], option[1], profileConfiguration.getOptionsToLoad().contains(option[0])));
} else {
this.addEntry(new OptionEntry(option[0], "", profileConfiguration.getOptionsToLoad().contains(option[0])));
}
});
} catch (IOException e) {
OptionsProfilesMod.LOGGER.error("An error occurred when listing options", e);
}
}
protected int getScrollbarPosition() {
return super.getScrollbarPosition() + 15;
}
public int getRowWidth() {
return 340;
}
public class OptionEntry extends Entry {
private final Component optionKey;
private final Component optionValue;
private final CycleButton<Boolean> toggleButton;
OptionEntry(String optionKey, String optionValue, boolean toggled) {
this.optionKey = new TextComponent(optionKey);
this.optionValue = new TextComponent(optionValue);
this.toggleButton = CycleButton.onOffBuilder(toggled).displayOnlyValue().create(0, 0, 44, 20, TextComponent.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);
});
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 render(PoseStack poseStack, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
Font fontRenderer = OptionsToggleList.this.minecraft.font;
int posX = OptionsToggleList.this.getScrollbarPosition() - this.toggleButton.getWidth() - 10;
int posY = y - 2;
int textY = y + entryHeight / 2;
GuiComponent.drawString(poseStack, fontRenderer, this.optionKey, x, textY - 9 / 2, 16777215);
this.toggleButton.x = posX;
this.toggleButton.y = posY;
this.toggleButton.render(poseStack, mouseX, mouseY, tickDelta);
this.toggleButton.renderToolTip(poseStack, mouseX, mouseY);
// Set tooltip to the option value (e.g. "ao" will show "true") | even though it's non-existent in this version
if (this.toggleButton.isHoveredOrFocused()) {
optionsToggleScreen.renderTooltip(poseStack, optionValue, mouseX, mouseY);
}
}
public List<? extends GuiEventListener> children() {
return ImmutableList.of(this.toggleButton);
}
public List<? extends NarratableEntry> narratables() {
return ImmutableList.of(this.toggleButton);
}
}
public abstract static class Entry extends ContainerObjectSelectionList.Entry<OptionsToggleList.Entry> {
public Entry() {
}
}
}

View file

@ -0,0 +1,73 @@
package com.axolotlmaid.optionsprofiles.gui;
import com.axolotlmaid.optionsprofiles.profiles.ProfileConfiguration;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.ChatFormatting;
import net.minecraft.client.gui.GuiComponent;
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;
import net.minecraft.network.chat.TranslatableComponent;
public class OptionsToggleScreen extends Screen {
private final Screen lastScreen;
private final Component profileName;
private OptionsToggleList optionsToggleList;
public ProfileConfiguration profileConfiguration;
public OptionsToggleScreen(Screen lastScreen, Component profileName) {
super(new TranslatableComponent("gui.optionsprofiles.options-toggle").append(": ").append(profileName));
this.lastScreen = lastScreen;
this.profileName = profileName;
this.profileConfiguration = ProfileConfiguration.get(profileName.getString());
}
protected void init() {
this.optionsToggleList = new OptionsToggleList(this, this.minecraft, profileName.getString());
this.addWidget(this.optionsToggleList);
this.addRenderableWidget(
new Button(
this.width / 2 - 80,
this.height - 29,
75,
20,
new TranslatableComponent("gui.optionsprofiles.all-off").withStyle(ChatFormatting.RED),
(button) -> this.optionsToggleList.refreshEntries(true, false)
)
);
this.addRenderableWidget(
new Button(
this.width / 2 - 155,
this.height - 29,
75,
20,
new TranslatableComponent("gui.optionsprofiles.all-on").withStyle(ChatFormatting.GREEN),
(button) -> this.optionsToggleList.refreshEntries(true, true)
)
);
this.addRenderableWidget(
new Button(
this.width / 2 + 5,
this.height - 29,
150,
20,
CommonComponents.GUI_DONE,
(button) -> {
profileConfiguration.save();
this.minecraft.setScreen(this.lastScreen);
}
)
);
}
public void render(PoseStack poseStack, int mouseX, int mouseY, float delta) {
this.optionsToggleList.render(poseStack, mouseX, mouseY, delta);
GuiComponent.drawCenteredString(poseStack, this.font, this.title, this.width / 2, 8, 16777215);
super.render(poseStack, mouseX, mouseY, delta);
}
}

View file

@ -1,24 +1,29 @@
package com.axolotlmaid.optionsprofiles.gui;
import com.axolotlmaid.optionsprofiles.OptionsProfilesMod;
import com.axolotlmaid.optionsprofiles.profiles.ProfileConfiguration;
import com.axolotlmaid.optionsprofiles.profiles.Profiles;
import com.google.common.collect.ImmutableList;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.GuiComponent;
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 net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.Entry> {
public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.ProfileEntry> {
final ProfilesScreen profilesScreen;
public ProfilesList(ProfilesScreen profilesScreen, Minecraft minecraft) {
@ -31,16 +36,27 @@ public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.Entr
public void refreshEntries() {
this.clearEntries();
Path profilesDirectory = Paths.get("options-profiles/");
try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(profilesDirectory)) {
try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Profiles.PROFILES_DIRECTORY)) {
List<Path> profileList = new ArrayList<>();
for (Path profile : directoryStream) {
this.addEntry(new ProfilesList.ProfileEntry(Component.literal(profile.getFileName().toString())));
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(new TextComponent(profile.getFileName().toString())));
}
} catch (Exception e) {
System.out.println("An error occurred when listing profiles.");
e.printStackTrace();
OptionsProfilesMod.LOGGER.error("An error occurred when listing profiles", e);
}
checkEntriesLoaded();
}
public void checkEntriesLoaded() {
this.children().forEach(ProfileEntry::checkLoaded);
}
protected int getScrollbarPosition() {
@ -48,10 +64,10 @@ public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.Entr
}
public int getRowWidth() {
return super.getRowWidth() + 32;
return 340;
}
public class ProfileEntry extends Entry {
public class ProfileEntry extends ContainerObjectSelectionList.Entry<ProfilesList.ProfileEntry> {
private final Component profileName;
private final Button editButton;
private final Button loadButton;
@ -59,40 +75,60 @@ public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.Entr
ProfileEntry(Component profileName) {
this.profileName = profileName;
this.editButton = Button.builder(Component.translatable("gui.optionsprofiles.edit-profile"), (button) -> {
this.editButton = new Button(
0,
0,
75,
20,
new TranslatableComponent("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) -> {
new Profiles().loadProfile(profileName.getString());
this.loadButton = new Button(
0,
0,
75,
20,
new TranslatableComponent("gui.optionsprofiles.load-profile"),
(button) -> {
Profiles.loadProfile(profileName.getString());
minecraft.options.load();
if (ProfileConfiguration.get(profileName.getString()).getOptionsToLoad().contains("resourcePacks")) {
minecraft.options.loadSelectedResourcePacks(minecraft.getResourcePackRepository());
minecraft.reloadResourcePacks();
}
minecraft.options.save();
ProfilesList.this.checkEntriesLoaded();
button.active = false;
}).size(75, 20).createNarration((supplier) -> Component.translatable("gui.optionsprofiles.load-profile")).build();
}
);
this.loadButton.active = !new Profiles().isProfileLoaded(profileName.getString());
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) {
@Override
public void render(PoseStack poseStack, 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 posX = ProfilesList.this.getScrollbarPosition() - this.loadButton.getWidth() - 10;
int posY = y - 2;
int textY = y + entryHeight / 2;
Objects.requireNonNull(ProfilesList.this.minecraft.font);
guiGraphics.drawString(fontRenderer, this.profileName, x - 50, textY - 9 / 2, 16777215, false);
GuiComponent.drawString(poseStack, fontRenderer, this.profileName, x, textY - 9 / 2, 16777215);
this.editButton.setX(x + 115);
this.editButton.setY(y);
this.editButton.render(guiGraphics, mouseX, mouseY, tickDelta);
this.editButton.x = posX - this.editButton.getWidth();
this.editButton.y = posY;
this.editButton.render(poseStack, mouseX, mouseY, tickDelta);
this.loadButton.setX(x + 190);
this.loadButton.setY(y);
this.loadButton.render(guiGraphics, mouseX, mouseY, tickDelta);
this.loadButton.x = posX;
this.loadButton.y = posY;
this.loadButton.render(poseStack, mouseX, mouseY, tickDelta);
}
public List<? extends GuiEventListener> children() {
@ -102,10 +138,10 @@ public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.Entr
public List<? extends NarratableEntry> narratables() {
return ImmutableList.of(this.editButton, this.loadButton);
}
protected void checkLoaded() {
this.loadButton.active = !Profiles.isProfileLoaded(profileName.getString());
}
}
public abstract static class Entry extends ContainerObjectSelectionList.Entry<ProfilesList.Entry> {
public Entry() {
}
}
}

View file

@ -1,18 +1,19 @@
package com.axolotlmaid.optionsprofiles.gui;
import com.axolotlmaid.optionsprofiles.profiles.Profiles;
import net.minecraft.client.gui.GuiGraphics;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.gui.GuiComponent;
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;
import net.minecraft.network.chat.TranslatableComponent;
public class ProfilesScreen extends Screen {
private final Screen lastScreen;
private ProfilesList profilesList;
public ProfilesScreen(Screen screen) {
super(Component.translatable("gui.optionsprofiles.profiles-menu"));
super(new TranslatableComponent("gui.optionsprofiles.profiles-menu"));
this.lastScreen = screen;
}
@ -20,20 +21,36 @@ public class ProfilesScreen extends Screen {
this.profilesList = new ProfilesList(this, this.minecraft);
this.addWidget(this.profilesList);
// buttons
this.addRenderableWidget(Button.builder(Component.translatable("gui.optionsprofiles.save-current-options"), (button) -> {
new Profiles().createProfile();
this.addRenderableWidget(
new Button(
this.width / 2 - 155,
this.height - 29,
150,
20,
new TranslatableComponent("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.addRenderableWidget(
new Button(
this.width / 2 + 5,
this.height - 29,
150,
20,
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);
public void render(PoseStack poseStack, int mouseX, int mouseY, float delta) {
this.profilesList.render(poseStack, mouseX, mouseY, delta);
GuiComponent.drawCenteredString(poseStack, this.font, this.title, this.width / 2, 8, 16777215);
super.render(poseStack, mouseX, mouseY, delta);
}
}

View file

@ -5,6 +5,7 @@ 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 net.minecraft.network.chat.TranslatableComponent;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
@ -18,8 +19,17 @@ public class MixinOptionsScreen extends Screen {
@Inject(at = @At("HEAD"), method = "init")
private void init(CallbackInfo info) {
this.addRenderableWidget(Button.builder(Component.translatable("gui.optionsprofiles.profiles-menu"), (button) -> {
this.addRenderableWidget(
new Button(
5,
5,
75,
20,
new TranslatableComponent("gui.optionsprofiles.profiles-menu"),
(button) -> {
this.minecraft.setScreen(new ProfilesScreen(this));
}).width(100).pos(5, 5).build());
}
)
);
}
}

View file

@ -0,0 +1,77 @@
package com.axolotlmaid.optionsprofiles.profiles;
import com.axolotlmaid.optionsprofiles.OptionsProfilesMod;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
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 final Path profilesDirectory = Profiles.PROFILES_DIRECTORY;
private static Path configurationFile;
private static String profileName;
public static int configurationVersion = 1; // Used to update configuration in later revisions
private int version = configurationVersion; // ^ same here - this variable is used to show it in the configuration.json file
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();
Path profile = profilesDirectory.resolve(profile_name);
configurationFile = profile.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 int getVersion() {
return version;
}
public void setVersion(int version) {
this.version = version;
}
public List<String> getOptionsToLoad() {
return optionsToLoad;
}
public void setOptionsToLoad(List<String> optionsToLoad) {
this.optionsToLoad = optionsToLoad;
}
}

View file

@ -1,197 +1,295 @@
package com.axolotlmaid.optionsprofiles.profiles;
import dev.architectury.platform.Platform;
import com.axolotlmaid.optionsprofiles.OptionsProfilesMod;
import com.axolotlmaid.optionsprofiles.profiles.loaders.DistantHorizonsLoader;
import com.axolotlmaid.optionsprofiles.profiles.loaders.EmbeddiumLoader;
import com.axolotlmaid.optionsprofiles.profiles.loaders.SodiumExtraLoader;
import com.axolotlmaid.optionsprofiles.profiles.loaders.SodiumLoader;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.Comparator;
import java.util.List;
import java.nio.file.StandardCopyOption;
import java.util.*;
import java.util.function.Consumer;
import java.util.stream.Stream;
public class Profiles {
public void createProfile() {
String profileName = "Profile 1";
Path profile = Paths.get("options-profiles/" + profileName);
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 EMBEDDIUM_OPTIONS_FILE = Paths.get("config/embeddium-options.json");
public static final Path DISTANT_HORIZONS_OPTIONS_FILE = Paths.get("config/DistantHorizons.toml");
// This function goes through every profile and updates / adds the configuration file if it doesn't exist
public static void updateProfiles() {
try (Stream<Path> paths = Files.list(PROFILES_DIRECTORY)) {
paths.filter(Files::isDirectory)
.forEach(path -> {
String profileName = path.getFileName().toString();
// This gets the configuration but also creates the configuration file if it is not there
ProfileConfiguration profileConfiguration = ProfileConfiguration.get(profileName);
List<String> optionsToLoad = profileConfiguration.getOptionsToLoad();
// Checks for updates to the configuration
if (profileConfiguration.getVersion() != ProfileConfiguration.configurationVersion) {
Path configurationFile = path.resolve("configuration.json");
try {
Files.delete(configurationFile);
} catch (IOException e) {
OptionsProfilesMod.LOGGER.error("[Profile '{}']: Error deleting configuration file", profileName, e);
}
// Create the configuration.json again thus updating it
profileConfiguration = ProfileConfiguration.get(profileName);
// Add player's old configuration
profileConfiguration.setOptionsToLoad(optionsToLoad);
// Save configuration
profileConfiguration.save();
}
OptionsProfilesMod.LOGGER.warn("[Profile '{}']: Profile configuration updated / added", profileName);
});
} catch (IOException e) {
OptionsProfilesMod.LOGGER.error("An error occurred when updating profiles", e);
}
}
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("options-profiles/" + profileName);
profile = Paths.get(PROFILES_DIRECTORY.toString(), profileName);
}
try {
Files.createDirectory(profile);
if (Files.exists(profile)) {
System.out.println("Profile created.");
writeOptionsFilesIntoProfile(profileName);
OptionsProfilesMod.LOGGER.info("[Profile '{}']: created", profileName);
writeProfile(profileName, false);
} else {
System.out.println("Profile was not created successfully.");
OptionsProfilesMod.LOGGER.warn("[Profile '{}']: Profile already exists?", profileName);
}
} catch (IOException e) {
System.out.println("An error occurred when creating a profile.");
e.printStackTrace();
OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when creating a profile", profileName, e);
}
}
public void writeOptionsFilesIntoProfile(String profileName) {
Path profile = Paths.get("options-profiles/" + profileName);
private static void copyOptionFile(Path profile, Path options) {
if (Files.exists(options)) {
Path profileOptions = profile.resolve(options.getFileName());
// options.txt
Path options = Paths.get("options.txt");
Path profileOptions = Paths.get(profile.toAbsolutePath() + "/options.txt");
try (Stream<String> paths = Files.lines(options)) {
if (Files.exists(profileOptions))
Files.newBufferedWriter(profileOptions, StandardOpenOption.TRUNCATE_EXISTING);
paths.forEach(line -> {
try {
Files.write(profileOptions, line.getBytes(), StandardOpenOption.CREATE, StandardOpenOption.APPEND);
Files.write(profileOptions, "\n".getBytes(), StandardOpenOption.APPEND);
Files.copy(options, profileOptions);
OptionsProfilesMod.LOGGER.info("[Profile '{}']: Copied file '{}'", profile.getFileName().toString(), options.getFileName().toString());
} catch (IOException e) {
System.out.println("An error occurred when writing a profile.");
e.printStackTrace();
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) {
System.out.println("An error occurred when reading options.txt.");
e.printStackTrace();
OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when deleting old options files.", profileName, e);
}
}
// sodium-options.json
if (Platform.isFabric()) {
if (Platform.isModLoaded("sodium")) {
Path sodiumConfiguration = Paths.get("config/sodium-options.json");
Path sodiumConfigurationProfile = Paths.get(profile.toAbsolutePath() + "/sodium-options.json");
copyOptionFile(profile, OPTIONS_FILE);
copyOptionFile(profile, OPTIFINE_OPTIONS_FILE);
copyOptionFile(profile, SODIUM_OPTIONS_FILE);
copyOptionFile(profile, SODIUM_EXTRA_OPTIONS_FILE);
copyOptionFile(profile, EMBEDDIUM_OPTIONS_FILE);
copyOptionFile(profile, DISTANT_HORIZONS_OPTIONS_FILE);
try (Stream<String> paths = Files.lines(sodiumConfiguration)) {
if (Files.exists(sodiumConfigurationProfile))
Files.newBufferedWriter(sodiumConfigurationProfile, StandardOpenOption.TRUNCATE_EXISTING);
if (!overwriting) {
ProfileConfiguration profileConfiguration = ProfileConfiguration.get(profileName);
paths.forEach(line -> {
try {
Files.write(sodiumConfigurationProfile, line.getBytes(), StandardOpenOption.CREATE, StandardOpenOption.APPEND);
Files.write(sodiumConfigurationProfile, "\n".getBytes(), StandardOpenOption.APPEND);
} catch (IOException e) {
System.out.println("An error occurred when writing a profile.");
e.printStackTrace();
}
// 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) {
System.out.println("An error occurred when reading options.txt.");
e.printStackTrace();
}
OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when adding options to the configuration file", profileName, e);
}
}
}
public boolean isProfileLoaded(String profileName) {
Path profile = Paths.get("options-profiles/" + profileName);
public static boolean isProfileLoaded(String profileName) {
Path profile = PROFILES_DIRECTORY.resolve(profileName);
Path options = Paths.get("options.txt");
Path profileOptions = Paths.get(profile.toAbsolutePath() + "/options.txt");
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);
Optional.of(EMBEDDIUM_OPTIONS_FILE).filter(Files::exists).ifPresent(optionFiles::add);
Optional.of(DISTANT_HORIZONS_OPTIONS_FILE).filter(Files::exists).ifPresent(optionFiles::add);
// Check if the original option file and the profile option file have the same content
try {
List<String> linesOptions = Files.readAllLines(options);
List<String> linesProfileOptions = Files.readAllLines(profileOptions);
if (Platform.isFabric()) {
if (Platform.isModLoaded("sodium")) {
Path sodiumConfiguration = Paths.get("config/sodium-options.json");
Path sodiumConfigurationProfile = Paths.get(profile.toAbsolutePath() + "/sodium-options.json");
if (Files.exists(sodiumConfigurationProfile)) {
List<String> linesSodiumConfig = Files.readAllLines(sodiumConfiguration);
List<String> linesSodiumConfigProfile = Files.readAllLines(sodiumConfigurationProfile);
return linesOptions.equals(linesProfileOptions) && linesSodiumConfig.equals(linesSodiumConfigProfile);
for (Path optionFile : optionFiles) {
Path profileOptions = profile.resolve(optionFile.getFileName());
if (!FileUtils.contentEquals(optionFile.toFile(), profileOptions.toFile())) {
return false;
}
}
}
return linesOptions.equals(linesProfileOptions);
} catch (IOException e) {
e.printStackTrace();
}
OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when checking if the profile is loaded", profileName, e);
return false;
}
public void loadProfile(String profileName) {
Path profile = Paths.get("options-profiles/" + profileName);
return true;
}
// options.txt
Path options = Paths.get("options.txt");
Path profileOptions = Paths.get(profile.toAbsolutePath() + "/options.txt");
private static void loadOptionFile(String profileName, Path options) {
ProfileConfiguration profileConfiguration = ProfileConfiguration.get(profileName);
try (Stream<String> paths = Files.lines(profileOptions)) {
Files.newBufferedWriter(options, StandardOpenOption.TRUNCATE_EXISTING);
Path profile = PROFILES_DIRECTORY.resolve(profileName);
Path profileOptions = profile.resolve(options.getFileName());
paths.forEach(line -> {
try {
Files.write(options, line.getBytes(), StandardOpenOption.APPEND);
Files.write(options, "\n".getBytes(), StandardOpenOption.APPEND);
} catch (IOException e) {
System.out.println("An error occurred when loading a profile.");
e.printStackTrace();
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) {
System.out.println("An error occurred when loading a profile.");
e.printStackTrace();
OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred reading options.txt to load the profile", profileName, e);
}
// sodium-options.json
if (Platform.isFabric()) {
if (Platform.isModLoaded("sodium")) {
Path sodiumConfigurationProfile = Paths.get(profile.toAbsolutePath() + "/sodium-options.json");
// Read profile options.txt
try (Stream<String> lines = Files.lines(profileOptions)) {
lines.forEach(line -> {
String[] option = line.split(":"); // Split key and value
if (Files.exists(sodiumConfigurationProfile)) {
SodiumConfigLoader.load(sodiumConfigurationProfile);
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);
}
}
}
public void renameProfile(String profileName, String newProfileName) {
Path profile = Paths.get("options-profiles/" + profileName);
Path newProfile = Paths.get("options-profiles/" + newProfileName);
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(newProfile))
System.out.println("New profile already exists!");
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);
loadOptionFile(profileName, SODIUM_OPTIONS_FILE, SodiumLoader::load);
loadOptionFile(profileName, SODIUM_EXTRA_OPTIONS_FILE, SodiumExtraLoader::load);
loadOptionFile(profileName, EMBEDDIUM_OPTIONS_FILE, EmbeddiumLoader::load);
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
}
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);
if (Files.exists(newProfile)) {
System.out.println("Profile renamed.");
} else {
System.out.println("Profile was not renamed successfully.");
}
OptionsProfilesMod.LOGGER.info("[Profile '{}']: renamed. Old name: {}", newProfileName, profileName);
} catch (IOException e) {
System.out.println("Profile was not renamed successfully.");
e.printStackTrace();
OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when renaming the profile", profileName, e);
}
}
public void deleteProfile(String profileName) {
Path profile = Paths.get("options-profiles/" + profileName);
public static void deleteProfile(String profileName) {
Path profile = PROFILES_DIRECTORY.resolve(profileName);
try (Stream<Path> files = Files.walk(profile)) {
files
.sorted(Comparator.reverseOrder())
.map(Path::toFile)
.forEach(File::delete);
try {
FileUtils.deleteDirectory(profile.toFile());
OptionsProfilesMod.LOGGER.info("[Profile '{}']: deleted", profileName);
} catch (IOException e) {
System.out.println("Profile was not deleted.");
e.printStackTrace();
}
System.out.println("Profile deleted.");
OptionsProfilesMod.LOGGER.error("[Profile '{}']: Profile was not deleted", profileName, e);
}
}
}

View file

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

View file

@ -0,0 +1,71 @@
package com.axolotlmaid.optionsprofiles.profiles.loaders;
import com.axolotlmaid.optionsprofiles.OptionsProfilesMod;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
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 EmbeddiumLoader {
public static void load(Path file) {
try (FileReader reader = new FileReader(file.toFile())) {
Gson gson = new GsonBuilder().create();
Configuration configData = gson.fromJson(reader, Configuration.class);
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.GraphicsQuality.valueOf(configuration.quality.weather_quality);
SodiumClientMod.options().quality.leavesQuality = SodiumGameOptions.GraphicsQuality.valueOf(configuration.quality.leaves_quality);
SodiumClientMod.options().quality.enableVignette = configuration.quality.enable_vignette;
SodiumClientMod.options().advanced.arenaMemoryAllocator = SodiumGameOptions.ArenaMemoryAllocator.valueOf(configuration.advanced.arena_memory_allocator);
SodiumClientMod.options().advanced.allowDirectMemoryAccess = configuration.advanced.allow_direct_memory_access;
SodiumClientMod.options().advanced.enableMemoryTracing = configuration.advanced.enable_memory_tracing;
SodiumClientMod.options().advanced.useAdvancedStagingBuffers = configuration.advanced.use_advanced_staging_buffers;
SodiumClientMod.options().advanced.disableIncompatibleModWarnings = configuration.advanced.disable_incompatible_mod_warnings;
SodiumClientMod.options().advanced.cpuRenderAheadLimit = configuration.advanced.cpu_render_ahead_limit;
SodiumClientMod.options().performance.chunkBuilderThreads = configuration.performance.chunk_builder_threads;
SodiumClientMod.options().performance.alwaysDeferChunkUpdates = configuration.performance.always_defer_chunk_updates;
SodiumClientMod.options().performance.animateOnlyVisibleTextures = configuration.performance.animate_only_visible_textures;
SodiumClientMod.options().performance.useEntityCulling = configuration.performance.use_entity_culling;
SodiumClientMod.options().performance.useParticleCulling = configuration.performance.use_particle_culling;
SodiumClientMod.options().performance.useFogOcclusion = configuration.performance.use_fog_occlusion;
SodiumClientMod.options().performance.useBlockFaceCulling = configuration.performance.use_block_face_culling;
SodiumClientMod.options().performance.useCompactVertexFormat = configuration.performance.use_compact_vertex_format;
SodiumClientMod.options().performance.useTranslucentFaceSorting = configuration.performance.use_translucent_face_sorting;
SodiumClientMod.options().notifications.hideDonationButton = configuration.notifications.hide_donation_button;
try {
SodiumClientMod.options().writeChanges();
} catch (IOException e) {
OptionsProfilesMod.LOGGER.error("An error occurred when loading Embeddium's configuration", e);
}
}
public static class Configuration {
public SodiumLoader.Configuration.Quality quality;
public Advanced advanced;
public Performance performance;
public SodiumLoader.Configuration.Notifications notifications;
public static class Advanced extends SodiumLoader.Configuration.Advanced {
public boolean disable_incompatible_mod_warnings;
}
public static class Performance extends SodiumLoader.Configuration.Performance {
public boolean use_compact_vertex_format;
public boolean use_translucent_face_sorting;
}
}
}

View file

@ -0,0 +1,174 @@
package com.axolotlmaid.optionsprofiles.profiles.loaders;
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.SodiumExtraGameOptions;
import net.minecraft.resources.ResourceLocation;
import java.io.FileReader;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Map;
public class SodiumExtraLoader {
public static void load(Path file) {
try (FileReader reader = new FileReader(file.toFile())) {
Gson gson = new GsonBuilder().create();
Configuration configuration = gson.fromJson(reader, Configuration.class);
apply(configuration);
} catch (IOException e) {
OptionsProfilesMod.LOGGER.error("An error occurred when loading Sodium'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;
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().detailSettings.sky = configuration.detail_settings.sky;
SodiumExtraClientMod.options().detailSettings.sunMoon = configuration.detail_settings.sun_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().renderSettings.fogDistance = configuration.render_settings.fog_distance;
SodiumExtraClientMod.options().renderSettings.fogStart = configuration.render_settings.fog_start;
SodiumExtraClientMod.options().renderSettings.multiDimensionFogControl = configuration.render_settings.multi_dimension_fog_control;
SodiumExtraClientMod.options().renderSettings.dimensionFogDistanceMap = configuration.render_settings.dimensionFogDistance;
SodiumExtraClientMod.options().renderSettings.useLinearFlatColorBlender = configuration.render_settings.use_linear_flat_color_blender;
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.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().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.useFastRandom = configuration.extra_settings.use_fast_random;
SodiumExtraClientMod.options().notificationSettings.hideRSORecommendation = configuration.notification_settings.hide_r_s_o_recommendation;
SodiumExtraClientMod.options().superSecretSettings.fetchSodiumExtraCrowdinTranslations = configuration.super_secret_settings.fetch_sodium_extra_crowdin_translations;
SodiumExtraClientMod.options().superSecretSettings.sodiumExtraCrowdinProjectIdentifier = configuration.super_secret_settings.sodium_extra_crowdin_project_identifier;
SodiumExtraClientMod.options().superSecretSettings.fetchSodiumCrowdinTranslations = configuration.super_secret_settings.fetch_sodium_crowdin_translations;
SodiumExtraClientMod.options().superSecretSettings.sodiumCrowdinProjectIdentifier = configuration.super_secret_settings.sodium_crowdin_project_identifier;
SodiumExtraClientMod.options().writeChanges();
}
public static class Configuration {
public AnimationSettings animation_settings;
public ParticleSettings particle_settings;
public DetailSettings detail_settings;
public RenderSettings render_settings;
public ExtraSettings extra_settings;
public NotificationSettings notification_settings;
public SuperSecretSettings super_secret_settings;
public static class AnimationSettings {
public boolean animation;
public boolean water;
public boolean lava;
public boolean fire;
public boolean portal;
public boolean block_animations;
public boolean sculk_sensor;
}
public static class ParticleSettings {
public boolean particles;
public boolean rain_splash;
public boolean block_break;
public boolean block_breaking;
public Map<ResourceLocation, Boolean> other;
}
public static class DetailSettings {
public boolean sky;
public boolean sun_moon;
public boolean stars;
public boolean rain_snow;
public boolean biome_colors;
public boolean sky_colors;
}
public static class RenderSettings {
public int fog_distance;
public int fog_start;
public boolean multi_dimension_fog_control;
public Map<ResourceLocation, Integer> dimensionFogDistance;
public boolean use_linear_flat_color_blender;
public boolean light_updates;
public boolean item_frame;
public boolean armor_stand;
public boolean painting;
public boolean piston;
public boolean beacon_beam;
public boolean enchanting_table_book;
public boolean item_frame_name_tag;
public boolean player_name_tag;
}
public static class ExtraSettings {
public String overlay_corner;
public String text_contrast;
public boolean show_fps;
public boolean show_f_p_s_extended;
public boolean show_coords;
public boolean reduce_resolution_on_mac;
public boolean use_adaptive_sync;
public int cloud_height;
public boolean toasts;
public boolean advancement_toast;
public boolean recipe_toast;
public boolean system_toast;
public boolean tutorial_toast;
public boolean instant_sneak;
public boolean prevent_shaders;
public boolean use_fast_random;
}
public static class NotificationSettings {
public boolean hide_r_s_o_recommendation;
}
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;
}
}
}

View file

@ -1,5 +1,6 @@
package com.axolotlmaid.optionsprofiles.profiles;
package com.axolotlmaid.optionsprofiles.profiles.loaders;
import com.axolotlmaid.optionsprofiles.OptionsProfilesMod;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import me.jellysquid.mods.sodium.client.SodiumClientMod;
@ -9,45 +10,47 @@ import java.io.FileReader;
import java.io.IOException;
import java.nio.file.Path;
public class SodiumConfigLoader {
public class SodiumLoader {
public static void load(Path file) {
try (FileReader reader = new FileReader(file.toFile())) {
Gson gson = new GsonBuilder().create();
ConfigData configData = gson.fromJson(reader, ConfigData.class);
Configuration configuration = gson.fromJson(reader, Configuration.class);
apply(configData);
apply(configuration);
} catch (IOException e) {
e.printStackTrace();
OptionsProfilesMod.LOGGER.error("An error occurred when loading Sodium's configuration", e);
}
}
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;
private static void apply(Configuration configuration) {
SodiumClientMod.options().quality.weatherQuality = SodiumGameOptions.GraphicsQuality.valueOf(configuration.quality.weather_quality);
SodiumClientMod.options().quality.leavesQuality = SodiumGameOptions.GraphicsQuality.valueOf(configuration.quality.leaves_quality);
SodiumClientMod.options().quality.enableVignette = configuration.quality.enable_vignette;
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().advanced.arenaMemoryAllocator = SodiumGameOptions.ArenaMemoryAllocator.valueOf(configuration.advanced.arena_memory_allocator);
SodiumClientMod.options().advanced.allowDirectMemoryAccess = configuration.advanced.allow_direct_memory_access;
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().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().performance.chunkBuilderThreads = configuration.performance.chunk_builder_threads;
SodiumClientMod.options().performance.alwaysDeferChunkUpdates = configuration.performance.always_defer_chunk_updates;
SodiumClientMod.options().performance.animateOnlyVisibleTextures = configuration.performance.animate_only_visible_textures;
SodiumClientMod.options().performance.useEntityCulling = configuration.performance.use_entity_culling;
SodiumClientMod.options().performance.useParticleCulling = configuration.performance.use_particle_culling;
SodiumClientMod.options().performance.useFogOcclusion = configuration.performance.use_fog_occlusion;
SodiumClientMod.options().performance.useBlockFaceCulling = configuration.performance.use_block_face_culling;
SodiumClientMod.options().notifications.hideDonationButton = configData.notifications.hide_donation_button;
SodiumClientMod.options().notifications.hideDonationButton = configuration.notifications.hide_donation_button;
try {
SodiumClientMod.options().writeChanges();
} catch (IOException e) {
e.printStackTrace();
OptionsProfilesMod.LOGGER.error("An error occurred when loading Sodium's configuration", e);
}
}
public static class ConfigData {
public static class Configuration {
public Quality quality;
public Advanced advanced;
public Performance performance;
@ -60,6 +63,8 @@ public class SodiumConfigLoader {
}
public static class Advanced {
public String arena_memory_allocator;
public boolean allow_direct_memory_access;
public boolean enable_memory_tracing;
public boolean use_advanced_staging_buffers;
public int cpu_render_ahead_limit;
@ -67,12 +72,12 @@ public class SodiumConfigLoader {
public static class Performance {
public int chunk_builder_threads;
public boolean always_defer_chunk_updates_v2;
public boolean always_defer_chunk_updates;
public boolean animate_only_visible_textures;
public boolean use_entity_culling;
public boolean use_particle_culling;
public boolean use_fog_occlusion;
public boolean use_block_face_culling;
public boolean use_no_error_g_l_context;
}
public static class Notifications {

View file

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

View file

@ -7,6 +7,12 @@
"gui.optionsprofiles.editing-profile-title": "Editing Profile: ",
"gui.optionsprofiles.profile-name-text": "Profile Name",
"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.delete-profile": "Delete",
"gui.optionsprofiles.options-toggle": "Select options to toggle",
"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"
}

View file

@ -7,9 +7,15 @@
"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": "Мод, позволяющий сохранять профили текущих настроек и загружать их, не выходя из игры."
}

View file

@ -7,9 +7,15 @@
"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": "Хәзерге көйләүләр профильләрен сакларга һәм уеннан чыгусыз йөкләргә рөхсәт итә торган мод."
}

View file

@ -0,0 +1,18 @@
{
"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": "关掉一切"
}

View file

@ -0,0 +1,18 @@
{
"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": "全部 關閉"
}

View file

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

View file

@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow" version "7.1.2"
id 'com.github.johnrengelman.shadow'
}
architectury {
@ -7,71 +7,46 @@ architectury {
fabric()
}
loom {
accessWidenerPath = project(":common").loom.accessWidenerPath
}
configurations {
common
shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
common {
canBeResolved = true
canBeConsumed = false
}
compileClasspath.extendsFrom common
runtimeClasspath.extendsFrom common
developmentFabric.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 {
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
// Remove the next line if you don't want to depend on the API
modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
common(project(path: ":common", configuration: "namedElements")) { transitive false }
shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:$rootProject.fabric_api_version"
common(project(path: ':common', configuration: 'namedElements')) { transitive false }
shadowBundle project(path: ':common', configuration: 'transformProductionFabric')
}
processResources {
inputs.property "version", project.version
inputs.property 'version', project.version
filesMatching("fabric.mod.json") {
expand "version": project.version
filesMatching('fabric.mod.json') {
expand version: project.version
}
}
shadowJar {
exclude "architectury.common.json"
configurations = [project.configurations.shadowCommon]
archiveClassifier = "dev-shadow"
configurations = [project.configurations.shadowBundle]
archiveClassifier = 'dev-shadow'
}
remapJar {
injectAccessWidener = true
input.set shadowJar.archiveFile
dependsOn shadowJar
}
sourcesJar {
def commonSources = project(":common").sourcesJar
dependsOn commonSources
from commonSources.archiveFile.map { zipTree(it) }
}
components.java {
withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
skip()
}
}
publishing {
publications {
mavenFabric(MavenPublication) {
artifactId = rootProject.archives_base_name + "-" + project.name
from components.java
}
}
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {
// Add repositories to publish to here.
}
}

View file

@ -21,12 +21,12 @@
]
},
"mixins": [
"optionsprofiles.mixins.json",
"optionsprofiles-common.mixins.json"
"optionsprofiles.mixins.json"
],
"depends": {
"fabric": "*",
"minecraft": ">=1.20.1",
"architectury": ">=9.1.12"
"fabricloader": ">=0.15.11",
"minecraft": "~1.18.2",
"java": ">=17",
"fabric": "*"
}
}

View file

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

View file

@ -1,5 +1,11 @@
plugins {
id "com.github.johnrengelman.shadow" version "7.1.2"
id 'com.github.johnrengelman.shadow'
}
loom {
forge {
mixinConfig "optionsprofiles.mixins.json"
}
}
architectury {
@ -7,78 +13,43 @@ architectury {
forge()
}
loom {
accessWidenerPath = project(":common").loom.accessWidenerPath
forge {
convertAccessWideners = true
extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
mixinConfig "optionsprofiles-common.mixins.json"
mixinConfig "optionsprofiles.mixins.json"
}
}
configurations {
common
shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
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}"
// Remove the next line if you don't want to depend on the API
modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}"
forge "net.minecraftforge:forge:$rootProject.forge_version"
common(project(path: ":common", configuration: "namedElements")) { transitive false }
shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
common(project(path: ':common', configuration: 'namedElements')) { transitive false }
shadowBundle project(path: ':common', configuration: 'transformProductionForge')
}
processResources {
inputs.property "version", project.version
inputs.property 'version', project.version
filesMatching("META-INF/mods.toml") {
expand "version": project.version
filesMatching('META-INF/mods.toml') {
expand version: project.version
}
}
shadowJar {
exclude "fabric.mod.json"
exclude "architectury.common.json"
configurations = [project.configurations.shadowCommon]
archiveClassifier = "dev-shadow"
configurations = [project.configurations.shadowBundle]
archiveClassifier = 'dev-shadow'
}
remapJar {
input.set shadowJar.archiveFile
dependsOn shadowJar
}
sourcesJar {
def commonSources = project(":common").sourcesJar
dependsOn commonSources
from commonSources.archiveFile.map { zipTree(it) }
}
components.java {
withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
skip()
}
}
publishing {
publications {
mavenForge(MavenPublication) {
artifactId = rootProject.archives_base_name + "-" + project.name
from components.java
}
}
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {
// Add repositories to publish to here.
}
}

View file

@ -1,5 +1,5 @@
modLoader = "javafml"
loaderVersion = "[47,)"
loaderVersion = "[40,)"
#issueTrackerURL = ""
license = "GNU GPL 3.0"
@ -16,20 +16,13 @@ logoFile = "icon.png"
[[dependencies.optionsprofiles]]
modId = "forge"
mandatory = true
versionRange = "[47,)"
versionRange = "[40,)"
ordering = "NONE"
side = "BOTH"
[[dependencies.optionsprofiles]]
modId = "minecraft"
mandatory = true
versionRange = "[1.20.1,)"
versionRange = "[1.18.2,)"
ordering = "NONE"
side = "BOTH"
[[dependencies.optionsprofiles]]
modId = "architectury"
mandatory = true
versionRange = "[9.1.12,)"
ordering = "AFTER"
side = "BOTH"

View file

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

View file

@ -1,6 +1,7 @@
{
"pack": {
"description": "Options Profiles",
"pack_format": 15
"forge:data_pack_format": 9,
"pack_format": 8
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 578 KiB

View file

@ -1,23 +1,17 @@
# Done to increase the memory available to Gradle.
org.gradle.jvmargs=-Xmx6G
org.gradle.parallel=true
minecraft_version=1.20.2
# Mod properties
mod_version=1.3.1
maven_group=com.axolotlmaid.optionsprofiles
archives_name=optionsprofiles
enabled_platforms=fabric,forge
archives_base_name=optionsprofiles
mod_version=1.1
maven_group=com.axolotlmaid.optionsprofiles
# Minecraft properties
minecraft_version = 1.18.2
#architectury_version=9.1.12
#
#fabric_loader_version=0.14.23
#fabric_api_version=0.90.4+1.20.1
#
#forge_version=1.20.1-47.2.1
architectury_version=10.0.9
fabric_loader_version=0.14.24
fabric_api_version=0.90.7+1.20.2
forge_version=1.20.2-48.0.39
# Dependencies
fabric_loader_version = 0.15.11
fabric_api_version = 0.77.0+1.18.2
forge_version = 1.18.2-40.2.21

View file

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

29
gradlew vendored
View file

@ -83,10 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
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"'
# 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
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@ -133,18 +131,21 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
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.
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=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
@ -152,7 +153,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=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
done
fi
# 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.
# 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"'
# 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.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \

20
gradlew.bat vendored
View file

@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
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.
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
goto fail
@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
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.
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
goto fail

View file

@ -2,13 +2,13 @@ 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")
rootProject.name = 'optionsprofiles-v1.3.1-1.18.2'
rootProject.name = "optionsprofiles-v1.1-1.20.2"
include 'common'
include 'fabric'
include 'forge'