trafficlunar/options-profiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: loading option profiles without sodium (#35)

Browse source
This commit is contained in:
trafficlunar 2025-02-28 22:13:11 +00:00
parent b5d8f25a83
commit e44c57eca2
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
common/src/main/java/net/trafficlunar/optionsprofiles/profiles/Profiles.java
View file

@ -1,5 +1,6 @@
package net.trafficlunar.optionsprofiles.profiles; package net.trafficlunar.optionsprofiles.profiles;
import dev.architectury.platform.Platform;
import net.trafficlunar.optionsprofiles.OptionsProfilesMod; import net.trafficlunar.optionsprofiles.OptionsProfilesMod;
import net.trafficlunar.optionsprofiles.profiles.loaders.DistantHorizonsLoader; import net.trafficlunar.optionsprofiles.profiles.loaders.DistantHorizonsLoader;
import net.trafficlunar.optionsprofiles.profiles.loaders.IrisLoader; import net.trafficlunar.optionsprofiles.profiles.loaders.IrisLoader;
@ -123,10 +124,14 @@ public class Profiles {
copyOptionFile(profile, OPTIONS_FILE); copyOptionFile(profile, OPTIONS_FILE);
copyOptionFile(profile, OPTIFINE_OPTIONS_FILE); copyOptionFile(profile, OPTIFINE_OPTIONS_FILE);
copyOptionFile(profile, SODIUM_OPTIONS_FILE); if (Platform.isModLoaded("sodium"))
copyOptionFile(profile, SODIUM_EXTRA_OPTIONS_FILE); copyOptionFile(profile, SODIUM_OPTIONS_FILE);
copyOptionFile(profile, IRIS_OPTIONS_FILE); if (Platform.isModLoaded("sodium-extra"))
copyOptionFile(profile, DISTANT_HORIZONS_OPTIONS_FILE); 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) { if (!overwriting) {
ProfileConfiguration profileConfiguration = ProfileConfiguration.get(profileName); ProfileConfiguration profileConfiguration = ProfileConfiguration.get(profileName);
@ -156,10 +161,10 @@ public class Profiles {
// The next few lines check if the specified file exists. If so, it adds it to the optionFiles ArrayList. // 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(OPTIFINE_OPTIONS_FILE).filter(Files::exists).ifPresent(optionFiles::add);
Optional.of(SODIUM_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(Files::exists).ifPresent(optionFiles::add); Optional.of(SODIUM_EXTRA_OPTIONS_FILE).filter(file -> Platform.isModLoaded("sodium-extra")).ifPresent(optionFiles::add);
Optional.of(IRIS_OPTIONS_FILE).filter(Files::exists).ifPresent(optionFiles::add); Optional.of(IRIS_OPTIONS_FILE).filter(file -> Platform.isModLoaded("iris")).ifPresent(optionFiles::add);
Optional.of(DISTANT_HORIZONS_OPTIONS_FILE).filter(Files::exists).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 // Check if the original option file and the profile option file have the same content
try { try {
@ -283,12 +288,17 @@ public class Profiles {
public static void loadProfile(String profileName) { public static void loadProfile(String profileName) {
loadOptionFile(profileName, OPTIONS_FILE); loadOptionFile(profileName, OPTIONS_FILE);
loadOptionFile(profileName, OPTIFINE_OPTIONS_FILE); loadOptionFile(profileName, OPTIFINE_OPTIONS_FILE);
loadOptionFile(profileName, SODIUM_OPTIONS_FILE, SodiumLoader::load);
loadOptionFile(profileName, SODIUM_EXTRA_OPTIONS_FILE, SodiumExtraLoader::load);
loadOptionFile(profileName, IRIS_OPTIONS_FILE, IrisLoader::load);
loadOptionFile(profileName, DISTANT_HORIZONS_OPTIONS_FILE); // Overwrite / load original Disant Horizons option file if (Platform.isModLoaded("sodium"))
loadOptionFile(profileName, DISTANT_HORIZONS_OPTIONS_FILE, DistantHorizonsLoader::load); // Tell Distant Horizons mod to reload configuration 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
}
} }
public static void renameProfile(String profileName, String newProfileName) { public static void renameProfile(String profileName, String newProfileName) {