.github/workflows/gradle.yml

@@ -8,18 +8,19 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
+          check-latest: true
       - name: Build with Gradle
-        run: |
-          chmod +x gradlew
-          ./gradlew build
+        run: ./gradlew build
       - name: Upload Build Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: 'Sodium Extra Artifacts'
           path: build/libs

.github/workflows/publish.yml

@@ -11,16 +11,17 @@ jobs:
     runs-on: self-hosted
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
+          check-latest: true
       - name: Upload assets to releases
-        run: |
-          chmod +x gradlew
-          ./gradlew build publishAllPublicationsToFlashyReeseReleasesRepository
+        run: ./gradlew build publishAllPublicationsToFlashyReeseReleasesRepository
         env:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

.github/workflows/self-hosted.yml

@@ -9,18 +9,19 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
+          check-latest: true
       - name: Build with Gradle
-        run: |
-          chmod +x gradlew
-          ./gradlew build
+        run: ./gradlew build
       - name: Upload Auild Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: 'Sodium Extra Artifacts'
           path: build/libs

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,7 +58,7 @@ 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.fcb3ad2"
+    //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

@@ -2,19 +2,19 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
     # check these on https://modmuss50.me/fabric.html
-    minecraft_version=1.20.2
-    yarn_mappings=1.20.2+build.4
-    loader_version=0.14.24
+    minecraft_version=1.20.1
+    yarn_mappings=1.20.1+build.10
+    loader_version=0.15.6
 
 # Mod Properties
     version_type=release
     revision=1
-    mod_version=0.5.3
+    mod_version=0.5.4
     maven_group=me.flashyreese.mods
     archives_base_name=sodium-extra
 
 # Dependencies
-    reeses_sodium_options=1.5.1+mc1.20-build.74
-    sodium_version=mc1.20.2-0.5.3
-    fabric_version=0.90.4+1.20.2
+    reeses_sodium_options=1.7.1+mc1.20.1-build.99
+    sodium_version=mc1.20.1-0.5.6
+    fabric_version=0.91.0+1.20.1
     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
@@ -199,13 +200,13 @@ 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"'
+DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-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" \

gradlew.bat

@@ -34,7 +34,7 @@ set APP_HOME=%DIRNAME%
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -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
 

src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraHud.java

@@ -48,7 +48,7 @@ public void onStartTick(MinecraftClient client) {
     }
     @Override
     public void onHudRender(DrawContext drawContext, float tickDelta) {
-        if (!client.getDebugHud().shouldShowDebugHud()) {
+        if (!this.client.hasReducedDebugInfo()) {
             SodiumExtraGameOptions.OverlayCorner overlayCorner = SodiumExtraClientMod.options().extraSettings.overlayCorner;
             // Calculate starting position based on the overlay corner
             int x;

src/main/java/me/flashyreese/mods/sodiumextra/client/gui/scrollable_page/OptionPageScrollFrame.java

@@ -175,12 +175,12 @@ public boolean mouseReleased(double mouseX, double mouseY, int button) {
     }
 
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
-        if (super.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount)) {
+    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
+        if (super.mouseScrolled(mouseX, mouseY, amount)) {
             return true;
         }
         if (this.canScroll) {
-            return this.scrollBar.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount);
+            return this.scrollBar.mouseScrolled(mouseX, mouseY, amount);
         }
         return false;
     }

src/main/java/me/flashyreese/mods/sodiumextra/client/gui/scrollable_page/ScrollBarComponent.java

@@ -75,10 +75,10 @@ public boolean mouseDragged(double mouseX, double mouseY, int button, double del
     }
 
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
+    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
         if (this.dim.containsCursor(mouseX, mouseY) || this.extendedScrollArea != null && this.extendedScrollArea.containsCursor(mouseX, mouseY)) {
             if (this.offset <= this.maxScrollBarOffset && this.offset >= 0) {
-                int value = (int) (this.offset - verticalAmount * 6); // todo: horizontalAmount
+                int value = (int) (this.offset - amount * 6); // todo: horizontalAmount
                 this.setOffset(value);
                 return true;
             }

src/main/java/me/flashyreese/mods/sodiumextra/mixin/fog/MixinBackgroundRenderer.java

@@ -33,7 +33,7 @@ private static void applyFog(Camera camera, BackgroundRenderer.FogType fogType,
         if (camera.getSubmersionType() == CameraSubmersionType.NONE && (thickFog || fogType == BackgroundRenderer.FogType.FOG_TERRAIN)) {
             float fogStart = (float) SodiumExtraClientMod.options().renderSettings.fogStart / 100;
             if (fogDistance == 33) {
-                RenderSystem.setShaderFogColor(0f, 0f, 0f, 0f);
+                RenderSystem.setShaderFogColor(1f, 1f, 1f, 0f);
                 //RenderSystem.setShaderFogStart(Short.MAX_VALUE - 1 * fogStart);
                 //RenderSystem.setShaderFogEnd(Short.MAX_VALUE);
             } else {

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/assets/sodium-extra/lang/cs_cz.json

@@ -1,4 +1,6 @@
 {
+  "modmenu.descriptionTranslation.sodium-extra": "Sodium Extra si klade za cíl přenést většinu vnímatelných možností z OptiFine do Sodia; navíc poskytuje další funkce, jako jsou vizuální opravy chyb a jiné možnosti zvýšení výkonu, které zatím nejsou dostupné v Sodiu.",
+  "modmenu.summaryTranslation.sodium-extra": "Funkce, které by neměly být v Sodiu.",
   "options.dimensions.minecraft.overworld": "Běžný svět",
   "options.dimensions.minecraft.the_end": "End",
   "options.dimensions.minecraft.the_nether": "Nether",
@@ -58,6 +60,8 @@
   "options.particles.minecraft.dust.tooltip": "Redstonové ložisko, napájený redstonový prášek, redstonové louče, napájené redstonové zesilovače.",
   "options.particles.minecraft.dust_color_transition": "Sculkový prach",
   "options.particles.minecraft.dust_color_transition.tooltip": "Aktivovaní sculkového čidla.",
+  "options.particles.minecraft.dust_plume": "Dust Plume",
+  "options.particles.minecraft.dust_plume.tooltip": "Shown when adding items to decorated pots.",
   "options.particles.minecraft.effect": "Efekt lektvaru",
   "options.particles.minecraft.effect.tooltip": "Vrhací lektvary, doznívající lektvary, lektvary očarování a mágové.",
   "options.particles.minecraft.egg_crack": "Praskání vejce",
@@ -108,6 +112,12 @@
   "options.particles.minecraft.glow.tooltip": "Záře světélkující chobotnice.",
   "options.particles.minecraft.glow_squid_ink": "Inkoust světélkující chobotnice",
   "options.particles.minecraft.glow_squid_ink.tooltip": "Při ublížení světélkující chobotnici.",
+  "options.particles.minecraft.gust": "Gust",
+  "options.particles.minecraft.gust.tooltip": "Created when a wind charge hits a block.",
+  "options.particles.minecraft.gust_dust": "Gust Dust",
+  "options.particles.minecraft.gust_dust.tooltip": "Gust Dust",
+  "options.particles.minecraft.gust_emitter": "Gust Emitter",
+  "options.particles.minecraft.gust_emitter.tooltip": "Gust Emitter",
   "options.particles.minecraft.happy_villager": "Štastný vesničan",
   "options.particles.minecraft.happy_villager.tooltip": "Aplikování kostní moučky na plodinu, obchodování s vesničany, krmení dětských zvířat, chůze nebo skákání na vejcích želvy.",
   "options.particles.minecraft.heart": "Srdce",
@@ -182,6 +192,8 @@
   "options.particles.minecraft.sweep_attack.tooltip": "Plošný úder mečem.",
   "options.particles.minecraft.totem_of_undying": "Totem nesmrtelnosti",
   "options.particles.minecraft.totem_of_undying.tooltip": "Aktivace totemu nesmrtelnosti, když s ním hráč přelstí smrt.",
+  "options.particles.minecraft.trial_spawner_detection": "Trial Spawner Detection",
+  "options.particles.minecraft.trial_spawner_detection.tooltip": "Trial Spawner Detection",
   "options.particles.minecraft.underwater": "Pod vodou",
   "options.particles.minecraft.underwater.tooltip": "Viditelné pod vodou.",
   "options.particles.minecraft.vibration": "Vibrace",
@@ -194,6 +206,8 @@
   "options.particles.minecraft.wax_on.tooltip": "Při navoskování měděného bloku pláství medu.",
   "options.particles.minecraft.white_ash": "Bílý popel",
   "options.particles.minecraft.white_ash.tooltip": "Přirozeně generované v biomu čedičové delty.",
+  "options.particles.minecraft.white_smoke": "White Smoke",
+  "options.particles.minecraft.white_smoke.tooltip": "White Smoke",
   "options.particles.minecraft.witch": "Čarodějnice",
   "options.particles.minecraft.witch.tooltip": "Čarodějnice.",
   "sodium-extra.option.advanced_item_tooltips": "Pokročilé popisky předmětů",
@@ -216,6 +230,8 @@
   "sodium-extra.option.block_animations.tooltip": "Přepnout animaci bloku.",
   "sodium-extra.option.block_break.tooltip": "Zpracovávat částice zničení bloků.",
   "sodium-extra.option.block_breaking.tooltip": "Zpracovávat částice rozbíjení bloků",
+  "sodium-extra.option.cloud_distance": "Cloud Distance",
+  "sodium-extra.option.cloud_distance.tooltip": "Controls the distance away from the player that clouds are rendered.",
   "sodium-extra.option.cloud_height": "Výška mraků",
   "sodium-extra.option.cloud_height.tooltip": "Upravit výšku mraků",
   "sodium-extra.option.details": "Detaily",
@@ -300,7 +316,5 @@
   "sodium-extra.overlay.light_updates": "Aktualizace světel zakázány",
   "sodium-extra.suggestRSO.header": "Návrh: Nainstalujte Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "Je velmi doporučeno nainstalovat Reese's Sodium Options společně se Sodium Extra. Kvůli rostoucímu množství funkcí, již nezapadají do možností Sodium.",
-  "sodium-extra.units.ticks": "%s tik(ů)",
-  "modmenu.summaryTranslation.sodium-extra": "Funkce, které by neměly být v Sodiu.",
-  "modmenu.descriptionTranslation.sodium-extra": "Sodium Extra si klade za cíl přenést většinu vnímatelných možností z OptiFine do Sodia; navíc poskytuje další funkce, jako jsou vizuální opravy chyb a jiné možnosti zvýšení výkonu, které zatím nejsou dostupné v Sodiu."
-}
+  "sodium-extra.units.ticks": "%s tik(ů)"
+}