From 8aed964fa428bed8d2cd0e410bc55cef89f57d51 Mon Sep 17 00:00:00 2001 From: trafficlunar Date: Fri, 17 Oct 2025 15:47:37 +0100 Subject: [PATCH] fix: update mods and their loaders --- common/build.gradle | 10 +++++----- .../loaders/DistantHorizonsLoader.java | 4 ++-- .../profiles/loaders/SodiumExtraLoader.java | 11 +++++------ .../profiles/loaders/SodiumLoader.java | 19 +++++++++++++++---- gradle.properties | 2 +- settings.gradle | 2 +- 6 files changed, 29 insertions(+), 19 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index 3f3460e..a22325a 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -26,9 +26,9 @@ dependencies { modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version" // Mod implementations - modImplementation "maven.modrinth:sodium:mc1.21.6-0.6.13-fabric" // Sodium - modImplementation "maven.modrinth:sodium-extra:mc1.21.6-0.6.6+fabric" // Sodium Extra - modImplementation "maven.modrinth:iris:1.9.1+1.21.7-fabric" // Iris - modImplementation "maven.modrinth:distanthorizons:2.3.4-b-1.21.6" // Distant Horizons - modImplementation "maven.modrinth:controlify:2.2.1-fabric,1.21.6" // Controlify + modImplementation "maven.modrinth:sodium:mc1.21.8-0.7.2-fabric" // Sodium + modImplementation "maven.modrinth:sodium-extra:mc1.21.8-0.7.0+fabric" // Sodium Extra + modImplementation "maven.modrinth:iris:1.9.6+1.21.10-fabric" // Iris + modImplementation "maven.modrinth:distanthorizons:2.3.6-b-1.21.8" // Distant Horizons + modImplementation "maven.modrinth:controlify:2.4.2-fabric,1.21.6" // Controlify } diff --git a/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/DistantHorizonsLoader.java b/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/DistantHorizonsLoader.java index da5976b..4f565cb 100644 --- a/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/DistantHorizonsLoader.java +++ b/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/DistantHorizonsLoader.java @@ -1,11 +1,11 @@ package net.trafficlunar.optionsprofiles.profiles.loaders; -import com.seibel.distanthorizons.core.config.ConfigBase; +import com.seibel.distanthorizons.core.config.ConfigHandler; import java.nio.file.Path; public class DistantHorizonsLoader { public static void load(Path file) { - ConfigBase.INSTANCE.configFileINSTANCE.loadFromFile(); + ConfigHandler.INSTANCE.configFileHandler.loadFromFile(); } } diff --git a/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumExtraLoader.java b/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumExtraLoader.java index 86e45af..d523265 100644 --- a/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumExtraLoader.java +++ b/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumExtraLoader.java @@ -1,13 +1,14 @@ package net.trafficlunar.optionsprofiles.profiles.loaders; -import me.flashyreese.mods.sodiumextra.client.gui.FogTypeConfig; -import net.minecraft.world.level.material.FogType; -import net.trafficlunar.optionsprofiles.OptionsProfilesMod; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod; +import me.flashyreese.mods.sodiumextra.client.gui.FogTypeConfig; import me.flashyreese.mods.sodiumextra.client.gui.SodiumExtraGameOptions; +import me.flashyreese.mods.sodiumextra.common.util.ResourceLocationSerializer; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.material.FogType; +import net.trafficlunar.optionsprofiles.OptionsProfilesMod; import java.io.FileReader; import java.io.IOException; @@ -18,7 +19,7 @@ import java.util.Map; public class SodiumExtraLoader { public static void load(Path file) { try (FileReader reader = new FileReader(file.toFile())) { - Gson gson = new GsonBuilder().create(); + Gson gson = new GsonBuilder().registerTypeAdapter(ResourceLocation.class, new ResourceLocationSerializer()).create(); Configuration configuration = gson.fromJson(reader, Configuration.class); apply(configuration); @@ -71,7 +72,6 @@ public class SodiumExtraLoader { SodiumExtraClientMod.options().extraSettings.reduceResolutionOnMac = configuration.extra_settings.reduce_resolution_on_mac; SodiumExtraClientMod.options().extraSettings.useAdaptiveSync = configuration.extra_settings.use_adaptive_sync; SodiumExtraClientMod.options().extraSettings.cloudHeight = configuration.extra_settings.cloud_height; - SodiumExtraClientMod.options().extraSettings.cloudDistance = configuration.extra_settings.cloud_distance; SodiumExtraClientMod.options().extraSettings.toasts = configuration.extra_settings.toasts; SodiumExtraClientMod.options().extraSettings.advancementToast = configuration.extra_settings.advancement_toast; SodiumExtraClientMod.options().extraSettings.recipeToast = configuration.extra_settings.recipe_toast; @@ -144,7 +144,6 @@ public class SodiumExtraLoader { public boolean reduce_resolution_on_mac; public boolean use_adaptive_sync; public int cloud_height; - public int cloud_distance; public boolean toasts; public boolean advancement_toast; public boolean recipe_toast; diff --git a/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumLoader.java b/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumLoader.java index 98201fc..f8d5f28 100644 --- a/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumLoader.java +++ b/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumLoader.java @@ -1,5 +1,7 @@ package net.trafficlunar.optionsprofiles.profiles.loaders; +import net.caffeinemc.mods.sodium.client.render.chunk.DeferMode; +import net.caffeinemc.mods.sodium.client.render.chunk.translucent_sorting.QuadSplittingMode; import net.trafficlunar.optionsprofiles.OptionsProfilesMod; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -23,8 +25,8 @@ public class SodiumLoader { } private static void apply(Configuration configuration) { - SodiumClientMod.options().quality.weatherQuality = SodiumGameOptions.GraphicsQuality.valueOf(configuration.quality.weather_quality); - SodiumClientMod.options().quality.leavesQuality = SodiumGameOptions.GraphicsQuality.valueOf(configuration.quality.leaves_quality); + SodiumClientMod.options().quality.weatherQuality = SodiumGameOptions.WeatherQuality.valueOf(configuration.quality.weather_quality); + SodiumClientMod.options().quality.leavesQuality = SodiumGameOptions.LeavesQuality.valueOf(configuration.quality.leaves_quality); SodiumClientMod.options().quality.enableVignette = configuration.quality.enable_vignette; SodiumClientMod.options().advanced.enableMemoryTracing = configuration.advanced.enable_memory_tracing; @@ -32,16 +34,19 @@ public class SodiumLoader { SodiumClientMod.options().advanced.cpuRenderAheadLimit = configuration.advanced.cpu_render_ahead_limit; SodiumClientMod.options().performance.chunkBuilderThreads = configuration.performance.chunk_builder_threads; - SodiumClientMod.options().performance.alwaysDeferChunkUpdates = configuration.performance.always_defer_chunk_updates_v2; + SodiumClientMod.options().performance.chunkBuildDeferMode = configuration.performance.chunk_build_defer_mode; SodiumClientMod.options().performance.animateOnlyVisibleTextures = configuration.performance.animate_only_visible_textures; SodiumClientMod.options().performance.useEntityCulling = configuration.performance.use_entity_culling; SodiumClientMod.options().performance.useFogOcclusion = configuration.performance.use_fog_occlusion; SodiumClientMod.options().performance.useBlockFaceCulling = configuration.performance.use_block_face_culling; SodiumClientMod.options().performance.useNoErrorGLContext = configuration.performance.use_no_error_g_l_context; + SodiumClientMod.options().performance.quadSplittingMode = configuration.performance.quad_splitting_mode; SodiumClientMod.options().notifications.hasClearedDonationButton = configuration.notifications.has_cleared_donation_button; SodiumClientMod.options().notifications.hasSeenDonationPrompt = configuration.notifications.has_seen_donation_prompt; + SodiumClientMod.options().debug.terrainSortingEnabled = configuration.debug.terrain_sorting_enabled; + try { SodiumGameOptions.writeToDisk(SodiumClientMod.options()); } catch (IOException e) { @@ -54,6 +59,7 @@ public class SodiumLoader { public Advanced advanced; public Performance performance; public Notifications notifications; + public Debug debug; public static class Quality { public String weather_quality; @@ -69,17 +75,22 @@ public class SodiumLoader { public static class Performance { public int chunk_builder_threads; - public boolean always_defer_chunk_updates_v2; + public DeferMode chunk_build_defer_mode; public boolean animate_only_visible_textures; public boolean use_entity_culling; public boolean use_fog_occlusion; public boolean use_block_face_culling; public boolean use_no_error_g_l_context; + public QuadSplittingMode quad_splitting_mode; } public static class Notifications { public boolean has_cleared_donation_button; public boolean has_seen_donation_prompt; } + + public static class Debug { + public boolean terrain_sorting_enabled; + } } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1a03add..9eb4fbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.parallel=true loom.ignoreDependencyLoomVersionValidation=true # Mod properties -mod_version=1.4.3 +mod_version=1.4.4 maven_group=net.trafficlunar.optionsprofiles archives_name=optionsprofiles enabled_platforms=fabric,neoforge diff --git a/settings.gradle b/settings.gradle index 5fb6faf..be16f09 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,4 +11,4 @@ include("common") include("fabric") include("neoforge") -rootProject.name = "optionsprofiles-v1.4.3-1.21.6" +rootProject.name = "optionsprofiles-v1.4.4-1.21.6"