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

fix: update mods and their loaders

Browse source
This commit is contained in:
trafficlunar 2025-10-17 15:47:37 +01:00
parent e5223a5aeb
commit 8aed964fa4
6 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/build.gradle
View file

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

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

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

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

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

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

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

2
gradle.properties
View file

@ -5,7 +5,7 @@ org.gradle.parallel=true
loom.ignoreDependencyLoomVersionValidation=true loom.ignoreDependencyLoomVersionValidation=true
# Mod properties # Mod properties
mod_version=1.4.3 mod_version=1.4.4
maven_group=net.trafficlunar.optionsprofiles maven_group=net.trafficlunar.optionsprofiles
archives_name=optionsprofiles archives_name=optionsprofiles
enabled_platforms=fabric,neoforge enabled_platforms=fabric,neoforge

2
settings.gradle
View file

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