change: Update for Sodium 0.8.1 & Enable NeoForge builds

FlashyReese · FlashyReese · commit 992c5b8a3b9d · 2025-12-17T22:05:16.000-06:00
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -25,34 +25,34 @@ jobs:
         env:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-#      - name: Publish NeoForge to Modrinth, CurseForge & GitHub
-#        uses: Kir-Antipov/mc-publish@v3.3.0
-#        with:
-#          modrinth-id: PtjYWJkn
-#          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-#
-#          curseforge-id: 447673
-#          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
-#
-#          github-token: ${{ secrets.GITHUB_TOKEN }}
-#
-#          name: '[NeoForge] ${{ github.event.release.name }}'
-#          version: '${{ github.event.release.tag_name }}+neoforge'
-#          version-type: release
-#
-#          game-versions: '1.21.5'
-#
-#          loaders: neoforge
-#
-#          dependencies: |
-#            sodium
-#            reeses-sodium-options(optional)
-#            irisshaders(optional)
-#            iris(optional)
-#
-#          files: |
-#            neoforge/build/libs/!(*-@(dev|sources|javadoc|dev-shadow)).jar
-#            neoforge/build/libs/*-@(dev|sources|javadoc|dev-shadow).jar
+      - name: Publish NeoForge to Modrinth, CurseForge & GitHub
+        uses: Kir-Antipov/mc-publish@v3.3.0
+        with:
+          modrinth-id: PtjYWJkn
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+
+          curseforge-id: 447673
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+          name: '[NeoForge] ${{ github.event.release.name }}'
+          version: '${{ github.event.release.tag_name }}+neoforge'
+          version-type: release
+
+          game-versions: '1.21.11'
+
+          loaders: neoforge
+
+          dependencies: |
+            sodium
+            reeses-sodium-options(optional)
+            irisshaders(optional)
+            iris(optional)
+
+          files: |
+            neoforge/build/libs/!(*-@(dev|sources|javadoc|dev-shadow)).jar
+            neoforge/build/libs/*-@(dev|sources|javadoc|dev-shadow).jar
       - name: Publish Fabric to Modrinth, CurseForge & GitHub
         uses: Kir-Antipov/mc-publish@v3.3.0
         with:
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,9 +4,9 @@ plugins {
 }
 
 val MINECRAFT_VERSION by extra { "1.21.11" }
-val NEOFORGE_VERSION by extra { "21.11.0-beta" }
-val FABRIC_LOADER_VERSION by extra { "0.18.1" }
-val FABRIC_API_VERSION by extra { "0.139.4+1.21.11" }
+val NEOFORGE_VERSION by extra { "21.11.10-beta" }
+val FABRIC_LOADER_VERSION by extra { "0.18.2" }
+val FABRIC_API_VERSION by extra { "0.140.0+1.21.11" }
 
 // This value can be set to null to disable Parchment.
 val PARCHMENT_VERSION by extra { null }
@@ -15,7 +15,7 @@ val PARCHMENT_VERSION by extra { null }
 val MAVEN_GROUP by extra { "me.flashyreese.mods" }
 val ARCHIVE_NAME by extra { "sodium-extra" }
 val MOD_VERSION by extra { "0.8.0" }
-val SODIUM_VERSION by extra { "0.8.0+mc1.21.11" }
+val SODIUM_VERSION by extra { "0.8.1+mc1.21.11" }
 
 allprojects {
     apply(plugin = "java")
diff --git a/common/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java b/common/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java
@@ -58,12 +58,6 @@ public static CaffeineConfig mixinConfig() {
                     .addMixinOption("render.entity", true)
                     .addMixinOption("sky", true)
                     .addMixinOption("sky_colors", true)
-                    .addMixinOption("sodium", true)
-                    .addMixinOption("sodium.accessibility", true)
-                    .addMixinOption("sodium.fog", true)
-                    .addMixinOption("sodium.cloud", true)
-                    .addMixinOption("sodium.resolution", true)
-                    .addMixinOption("sodium.scrollable_page", true)
                     .addMixinOption("stars", true)
                     .addMixinOption("steady_debug_hud", true)
                     .addMixinOption("sun_moon", true)
diff --git a/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/cloud/MixinLevelRenderer.java b/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/cloud/MixinLevelRenderer.java
@@ -1,16 +1,19 @@
 package me.flashyreese.mods.sodiumextra.mixin.cloud;
 
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import net.minecraft.client.CloudStatus;
+import net.minecraft.client.renderer.CloudRenderer;
 import net.minecraft.client.renderer.LevelRenderer;
+import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(LevelRenderer.class)
-public class MixinLevelRenderer {
-    @ModifyArg(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;addCloudsPass(Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder;Lnet/minecraft/client/CloudStatus;Lnet/minecraft/world/phys/Vec3;JFIF)V"), index = 6)
-    private float modifyCloudHeight(float original) {
+public abstract class MixinLevelRenderer {
+    @Redirect(method = {"method_62205", "lambda$addCloudsPass$3"}, require = 1, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/CloudRenderer;render(ILnet/minecraft/client/CloudStatus;FLnet/minecraft/world/phys/Vec3;JF)V"))
+    private void modifyCloudHeight(CloudRenderer instance, int i, CloudStatus cloudStatus, float f, Vec3 vec3, long l, float g) {
         // todo: don't force overwrite
-        return SodiumExtraClientMod.options().extraSettings.cloudHeight;
+        instance.render(i, cloudStatus, SodiumExtraClientMod.options().extraSettings.cloudHeight, vec3, l, g);
     }
 }
diff --git a/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/sodium/accessibility/MixinSodiumGameOptionPages.java b/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/sodium/accessibility/MixinSodiumGameOptionPages.java
diff --git a/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/sodium/fog/MixinOcclusionCuller.java b/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/sodium/fog/MixinOcclusionCuller.java
diff --git a/common/src/main/resources/sodium-extra.mixins.json b/common/src/main/resources/sodium-extra.mixins.json
@@ -36,7 +36,6 @@
     "render.entity.MixinPaintingEntityRenderer",
     "sky.MixinSkyRenderer",
     "sky_colors.MixinAtmosphericFogEnvironment",
-    "sodium.fog.MixinOcclusionCuller",
     "steady_debug_hud.MixinDebugScreenOverlay",
     "toasts.MixinToastManager"
   ],
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -55,7 +55,7 @@
   ],
   "depends": {
     "fabricloader": ">=0.18",
-    "sodium": ">=0.8.0",
+    "sodium": ">=0.8.1",
     "minecraft": ">=1.21.11"
   },
   "breaks": {
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -26,9 +26,12 @@ side = "CLIENT"
 [[dependencies.sodium_extra]]
 modId = "sodium"
 type = "required"
-versionRange = "[0.8.0,)"
+versionRange = "[0.8.1,)"
 ordering = "NONE"
 side = "CLIENT"
 
 [[mixins]]
-config = "sodium-extra.mixins.json"
+config = "sodium-extra.mixins.json"
+
+[modproperties.sodium_extra]
+"sodium:config_api_user" = "me.flashyreese.mods.sodiumextra.client.config.SodiumExtraConfig"
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -10,4 +10,4 @@ pluginManagement {
 
 include("common")
 include("fabric")
-//include("neoforge")
+include("neoforge")
