change: Update for Sodium 0.5.6

build.gradle

@@ -12,7 +12,7 @@ buildscript {
 
 plugins {
     id 'signing'
-    id 'fabric-loom' version '1.4-SNAPSHOT'
+    id 'fabric-loom' version '1.5-SNAPSHOT'
     id 'maven-publish'
     id 'io.github.juuxel.loom-quiltflower' version '1.10.0'
 }
@@ -58,8 +58,8 @@ dependencies {
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-    //modImplementation "me.jellysquid.mods:sodium-fabric:0.5.3+git.95de8a8"
-    modImplementation "maven.modrinth:sodium:${project.sodium_version}"
+    modImplementation "me.jellysquid.mods:sodium-fabric:0.5.6-snapshot+mc1.20.3-build.1"
+    //modImplementation "maven.modrinth:sodium:${project.sodium_version}"
     /*modImplementation("me.flashyreese.mods:reeses-sodium-options:${project.reeses_sodium_options}") {
         exclude group: "net.coderbot.iris_mc1_19", module: "iris"
     }*/

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx1G
     # check these on https://modmuss50.me/fabric.html
     minecraft_version=1.20.4
     yarn_mappings=1.20.4+build.3
-    loader_version=0.15.3
+    loader_version=0.15.6
 
 # Mod Properties
     version_type=release
@@ -16,5 +16,5 @@ org.gradle.jvmargs=-Xmx1G
 # Dependencies
     reeses_sodium_options=1.5.1+mc1.20-build.74
     sodium_version=mc1.20.3-0.5.5
-    fabric_version=0.92.0+1.20.4
+    fabric_version=0.95.1+1.20.4
     crowdin_translate=1.4+1.19.3

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 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.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
@@ -144,15 +145,15 @@ 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
     case $MAX_FD in  #(
       '' | 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
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# 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.
+# 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" \

src/main/java/me/flashyreese/mods/sodiumextra/mixin/sodium/fog/MixinOcclusionCuller.java

@@ -18,17 +18,17 @@ private static int nearestToZero(int min, int max) {
         return 0;
     }
 
-    @Inject(method = "isOutsideRenderDistance", at = @At(value = "HEAD"), cancellable = true)
-    private static void isOutsideRenderDistance(CameraTransform camera, RenderSection section, float maxDistance, CallbackInfoReturnable<Boolean> cir) {
+    @Inject(method = "isWithinRenderDistance", at = @At(value = "HEAD"), cancellable = true)
+    private static void isWithinRenderDistance(CameraTransform camera, RenderSection section, float maxDistance, CallbackInfoReturnable<Boolean> cir) {
         int fogDistance = SodiumExtraClientMod.options().renderSettings.multiDimensionFogControl ?
                 SodiumExtraClientMod.options().renderSettings.dimensionFogDistanceMap.getOrDefault(MinecraftClient.getInstance().world.getDimension().effects(), 0) :
                 SodiumExtraClientMod.options().renderSettings.fogDistance;
         if (fogDistance == 33) {
             int ox = section.getOriginX() - camera.intX;
             int oz = section.getOriginZ() - camera.intZ;
-            float dx = (float)nearestToZero(ox, ox + 16) - camera.fracX;
-            float dz = (float)nearestToZero(oz, oz + 16) - camera.fracZ;
-            boolean result =  dx * dx + dz * dz > maxDistance * maxDistance;
+            float dx = nearestToZero(ox, ox + 16) - camera.fracX;
+            float dz = nearestToZero(oz, oz + 16) - camera.fracZ;
+            boolean result = ((dx * dx) + (dz * dz)) < (maxDistance * maxDistance);
             cir.setReturnValue(result);
         }
     }

src/main/java/me/flashyreese/mods/sodiumextra/mixin/sodium/scrollable_page/MixinSodiumOptionsGUI.java

@@ -4,10 +4,12 @@
 import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI;
 import me.jellysquid.mods.sodium.client.gui.options.OptionPage;
 import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement;
+import me.jellysquid.mods.sodium.client.gui.prompt.ScreenPrompt;
 import me.jellysquid.mods.sodium.client.util.Dim2i;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -20,6 +22,9 @@ public abstract class MixinSodiumOptionsGUI extends Screen {
     @Shadow
     private OptionPage currentPage;
 
+    @Shadow
+    private @Nullable ScreenPrompt prompt;
+
     protected MixinSodiumOptionsGUI(Text title) {
         super(title);
     }
@@ -44,6 +49,9 @@ private void renderOptionTooltip(DrawContext drawContext, ControlElement<?> elem
     // This override prevents focused element from staying focused because we are using a ParentElement for scroll frames
     @Override
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
+        if (this.prompt != null) {
+            return this.prompt.mouseClicked(mouseX, mouseY, button);
+        }
         return super.mouseClicked(mouseX, mouseY, button);
     }
 }

src/main/resources/fabric.mod.json

@@ -51,7 +51,7 @@
   "depends": {
     "fabricloader": ">=0.14",
     "fabric-api": "*",
-    "sodium": ">=0.5.3",
+    "sodium": ">=0.5.6",
     "minecraft": ">=1.20.2"
   },
   "breaks": {