change: Update to Minecraft 26.2 and Sodium 0.9.0

FlashyReese · FlashyReese · commit 61dfdbab06fa · 2026-06-16T17:40:32.000-06:00
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -4,13 +4,13 @@ on: [pull_request, push]
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v6
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v3
+        uses: gradle/actions/wrapper-validation@v6
       - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v6
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v3
+        uses: gradle/actions/wrapper-validation@v6
       - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
@@ -40,7 +40,7 @@ jobs:
           version: '${{ github.event.release.tag_name }}+neoforge'
           version-type: release
 
-          game-versions: '26.1'
+          game-versions: '26.2'
 
           loaders: neoforge
 
@@ -68,6 +68,8 @@ jobs:
           version: '${{ github.event.release.tag_name }}+fabric'
           version-type: release
 
+          game-versions: '26.2'
+
           loaders: fabric
 
           dependencies: |
@@ -78,4 +80,4 @@ jobs:
 
           files: |
             fabric/build/libs/!(*-@(dev|sources|javadoc|dev-shadow)).jar
-            fabric/build/libs/*-@(dev|sources|javadoc|dev-shadow).jar
+            fabric/build/libs/*-@(dev|sources|javadoc|dev-shadow).jar
diff --git a/.github/workflows/self-hosted.yml b/.github/workflows/self-hosted.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v6
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v3
+        uses: gradle/actions/wrapper-validation@v6
       - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,18 +1,18 @@
 plugins {
     id("java")
-    id("net.fabricmc.fabric-loom") version ("1.15.4") apply (false)
+    id("net.fabricmc.fabric-loom") version ("1.17.11") apply (false)
 }
 
-val MINECRAFT_VERSION by extra { "26.1.1" }
-val NEOFORGE_VERSION by extra { "26.1.1.2-beta" }
-val FABRIC_LOADER_VERSION by extra { "0.18.6" }
-val FABRIC_API_VERSION by extra { "0.145.3+26.1.1" }
+val MINECRAFT_VERSION by extra { "26.2" }
+val NEOFORGE_VERSION by extra { "26.2.0.1-beta" }
+val FABRIC_LOADER_VERSION by extra { "0.19.3" }
+val FABRIC_API_VERSION by extra { "0.152.1+26.2" }
 
 // https://semver.org/
 val MAVEN_GROUP by extra { "me.flashyreese.mods" }
 val ARCHIVE_NAME by extra { "sodium-extra" }
 val MOD_VERSION by extra { "0.8.7" }
-val SODIUM_VERSION by extra { "0.8.9+mc26.1.1" }
+val SODIUM_VERSION by extra { "0.9.0+mc26.2" }
 
 allprojects {
     apply(plugin = "java")
@@ -26,6 +26,8 @@ tasks.withType<JavaCompile> {
 }
 
 subprojects {
+    val modVersion = createVersionString()
+
     apply(plugin = "maven-publish")
 
     repositories {
@@ -44,11 +46,11 @@ subprojects {
 
     tasks.processResources {
         filesMatching("META-INF/neoforge.mods.toml") {
-            expand(mapOf("version" to createVersionString()))
+            expand(mapOf("version" to modVersion))
         }
     }
 
-    version = createVersionString()
+    version = modVersion
     group = "me.flashyreese.mods"
 
     tasks.withType<JavaCompile> {
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -3,7 +3,7 @@ import net.fabricmc.loom.task.AbstractRemapJarTask
 plugins {
     id("java")
     id("idea")
-    id("net.fabricmc.fabric-loom") version "1.15.4"
+    id("net.fabricmc.fabric-loom") version "1.17.11"
 }
 
 val MINECRAFT_VERSION: String by rootProject.extra
@@ -14,10 +14,11 @@ val FABRIC_API_VERSION: String by rootProject.extra
 val SODIUM_VERSION: String by rootProject.extra
 
 dependencies {
-    minecraft(group = "com.mojang", name = "minecraft", version = MINECRAFT_VERSION)
-    compileOnly("io.github.llamalad7:mixinextras-common:0.5.0")
-    annotationProcessor("io.github.llamalad7:mixinextras-common:0.5.0")
-    compileOnly("net.fabricmc:sponge-mixin:0.13.2+mixin.0.8.5")
+    minecraft("com.mojang:minecraft:$MINECRAFT_VERSION")
+    compileOnly("net.fabricmc:fabric-loader:$FABRIC_LOADER_VERSION")
+    compileOnly("io.github.llamalad7:mixinextras-common:0.5.4")
+    annotationProcessor("io.github.llamalad7:mixinextras-common:0.5.4")
+    compileOnly("net.fabricmc:sponge-mixin:0.17.3+mixin.0.8.7")
 
     fun addDependentFabricModule(name: String) {
         val module = fabricApi.module(name, FABRIC_API_VERSION)
@@ -40,11 +41,6 @@ tasks.named("compileJava") {
 }
 
 loom {
-    mixin {
-        useLegacyMixinAp = false
-        //defaultRefmapName = "${rootProject.name}.refmap.json"
-    }
-
     accessWidenerPath = file("src/main/resources/${rootProject.name}.accesswidener")
 }
 
@@ -74,4 +70,4 @@ publishing {
             }
         }
     }
-}
+}
diff --git a/common/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraHud.java b/common/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraHud.java
@@ -47,7 +47,7 @@ public void onStartTick(Minecraft client) {
     }
 
     public void onHudRender(GuiGraphicsExtractor guiGraphics, DeltaTracker deltaTracker) {
-        if (!this.client.debugEntries.isOverlayVisible() && !this.client.options.hideGui) {
+        if (!this.client.debugEntries.isOverlayVisible() && !this.client.gui.hud.isHidden()) {
             SodiumExtraGameOptions.OverlayCorner overlayCorner = SodiumExtraClientMod.options().extraSettings.overlayCorner;
             // Calculate starting position based on the overlay corner
             int x;
diff --git a/common/src/main/java/me/flashyreese/mods/sodiumextra/common/util/ControlValueFormatterExtended.java b/common/src/main/java/me/flashyreese/mods/sodiumextra/common/util/ControlValueFormatterExtended.java
@@ -12,7 +12,7 @@ static ControlValueFormatter resolution() {
             if (monitor == null) {
                 return Component.translatable("options.fullscreen.unavailable");
             } else {
-                return v == 0 ? Component.translatable("options.fullscreen.current") : Component.literal(monitor.getMode(v - 1).toString());
+                return v == 0 ? Component.translatable("options.fullscreen.current") : Component.literal(monitor.mode(v - 1).toString());
             }
         };
     }
diff --git a/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/gui/MixinGui.java b/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/gui/MixinGui.java
@@ -1,5 +1,6 @@
 package me.flashyreese.mods.sodiumextra.mixin.gui;
 
+import com.llamalad7.mixinextras.sugar.Local;
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.gui.Gui;
@@ -12,7 +13,7 @@
 @Mixin(Gui.class)
 public class MixinGui {
     @Inject(method = "extractRenderState", at = @At("TAIL"))
-    private void onRender(GuiGraphicsExtractor guiGraphics, DeltaTracker deltaTracker, CallbackInfo ci) {
+    private void onRender(DeltaTracker deltaTracker, boolean renderHud, boolean renderScreens, CallbackInfo ci, @Local GuiGraphicsExtractor guiGraphics) {
         SodiumExtraClientMod.onHudRender(guiGraphics, deltaTracker);
     }
 }
diff --git a/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/optimizations/beacon_beam_rendering/LevelRendererAccessor.java b/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/optimizations/beacon_beam_rendering/LevelRendererAccessor.java
diff --git a/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/optimizations/beacon_beam_rendering/MixinBeaconRenderer.java b/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/optimizations/beacon_beam_rendering/MixinBeaconRenderer.java
@@ -1,32 +1,9 @@
 package me.flashyreese.mods.sodiumextra.mixin.optimizations.beacon_beam_rendering;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Axis;
-import me.flashyreese.mods.sodiumextra.compat.IrisCompat;
-import net.caffeinemc.mods.sodium.api.math.MatrixHelper;
-import net.caffeinemc.mods.sodium.api.util.ColorARGB;
-import net.caffeinemc.mods.sodium.api.vertex.buffer.VertexBufferWriter;
-import net.caffeinemc.mods.sodium.api.vertex.format.common.EntityVertex;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.blockentity.BeaconRenderer;
-import net.minecraft.client.renderer.culling.Frustum;
-import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.resources.Identifier;
-import net.minecraft.util.Mth;
 import net.minecraft.world.level.block.entity.BeaconBeamOwner;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.Vec3;
-import org.joml.Matrix3f;
-import org.joml.Matrix4f;
-import org.lwjgl.system.MemoryStack;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Group;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = BeaconRenderer.class, priority = 1500)
 public abstract class MixinBeaconRenderer<T extends BlockEntity & BeaconBeamOwner> {
diff --git a/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/particle/MixinClientLevel.java b/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/particle/MixinClientLevel.java
@@ -25,4 +25,11 @@ public void addBlockBreakingParticles(BlockPos blockPos, Direction direction, Ca
             ci.cancel();
         }
     }
+
+    @Inject(method = "tickWeatherEffects", at = @At(value = "HEAD"), cancellable = true)
+    public void tickRainSplashing(CallbackInfo ci) {
+        if (!SodiumExtraClientMod.options().particleSettings.particles || !SodiumExtraClientMod.options().particleSettings.rainSplash) {
+            ci.cancel();
+        }
+    }
 }
diff --git a/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/particle/MixinLevelRenderer.java b/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/particle/MixinLevelRenderer.java
@@ -1,27 +1,18 @@
 package me.flashyreese.mods.sodiumextra.mixin.particle;
 
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
-import net.minecraft.client.Camera;
-import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.WeatherEffectRenderer;
-import net.minecraft.server.level.ParticleStatus;
+import net.minecraft.client.renderer.state.level.WeatherRenderState;
+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.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 @Mixin(WeatherEffectRenderer.class)
 public class MixinLevelRenderer {
-    @Inject(method = "tickRainParticles", at = @At(value = "HEAD"), cancellable = true)
-    public void tickRainSplashing(ClientLevel clientLevel, Camera camera, int i, ParticleStatus particleStatus, int j, CallbackInfo ci) {
-        if (!(SodiumExtraClientMod.options().particleSettings.particles && SodiumExtraClientMod.options().particleSettings.rainSplash)) {
-            ci.cancel();
-        }
-    }
-
-    @Inject(method = "render", at = @At(value = "HEAD"), cancellable = true, locals = LocalCapture.NO_CAPTURE)
-    private void renderWeather(CallbackInfo ci) {
+    @Inject(method = "render", at = @At(value = "HEAD"), cancellable = true)
+    private void renderWeather(Vec3 cameraPos, WeatherRenderState weatherRenderState, CallbackInfo ci) {
         if (!(SodiumExtraClientMod.options().detailSettings.rainSnow)) {
             ci.cancel();
         }
diff --git a/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/sky/MixinSkyRenderer.java b/common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/sky/MixinSkyRenderer.java
@@ -2,7 +2,6 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.SkyRenderer;
 import net.minecraft.world.level.MoonPhase;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/common/src/main/resources/sodium-extra.mixins.json b/common/src/main/resources/sodium-extra.mixins.json
@@ -17,7 +17,6 @@
     "gui.MixinMinecraftClient",
     "instant_sneak.MixinCamera",
     "light_updates.MixinLevelLightEngine",
-    "optimizations.beacon_beam_rendering.LevelRendererAccessor",
     "optimizations.beacon_beam_rendering.MixinBeaconRenderer",
     "optimizations.beacon_beam_rendering.MixinVertexSerializerRegistryImpl",
     "particle.MixinClientLevel",
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("java")
     id("idea")
-    id("net.fabricmc.fabric-loom") version ("1.15.4")
+    id("net.fabricmc.fabric-loom") version ("1.17.11")
 }
 
 val MINECRAFT_VERSION: String by rootProject.extra
@@ -20,6 +20,8 @@ base {
 dependencies {
     minecraft("com.mojang:minecraft:${MINECRAFT_VERSION}")
     compileOnly("net.fabricmc:fabric-loader:$FABRIC_LOADER_VERSION")
+    runtimeOnly("net.fabricmc:fabric-loader:$FABRIC_LOADER_VERSION")
+    testCompileOnly("net.fabricmc:fabric-loader:$FABRIC_LOADER_VERSION")
 
     fun addEmbeddedFabricModule(name: String) {
         val module = fabricApi.module(name, FABRIC_API_VERSION)
@@ -41,25 +43,24 @@ tasks.test {
 loom {
     accessWidenerPath.set(project(":common").file("src/main/resources/${rootProject.name}.accesswidener"))
 
-    @Suppress("UnstableApiUsage")
-    mixin { defaultRefmapName.set("${rootProject.name}.refmap.json") }
-
     runs {
         named("client") {
             client()
-            configName = "Fabric Client"
-            ideConfigGenerated(true)
-            runDir("run")
+            displayName.set("Fabric Client")
+            generateRunConfig.set(true)
+            runDirectory.set(layout.projectDirectory.dir("run"))
         }
         named("server") {
             server()
-            configName = "Fabric Server"
-            ideConfigGenerated(true)
-            runDir("run")
+            displayName.set("Fabric Server")
+            generateRunConfig.set(true)
+            runDirectory.set(layout.projectDirectory.dir("run"))
         }
     }
 }
 
+val modVersion = project.version.toString()
+
 tasks {
     withType<JavaCompile> {
         source(project(":common").sourceSets.main.get().allSource)
@@ -70,10 +71,10 @@ tasks {
     processResources {
         from(project(":common").sourceSets.main.get().resources)
 
-        inputs.property("version", project.version)
+        inputs.property("version", modVersion)
 
         filesMatching("fabric.mod.json") {
-            expand(mapOf("version" to project.version))
+            expand(mapOf("version" to modVersion))
         }
     }
 
@@ -112,4 +113,4 @@ publishing {
             }
         }
     }
-}
+}
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -57,9 +57,9 @@
     "sodium-extra.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.18",
-    "sodium": ">=0.8.7",
-    "minecraft": ">=26.1"
+    "fabricloader": ">=0.19",
+    "sodium": ">=0.9.0",
+    "minecraft": ">=26.2"
   },
   "breaks": {
     "iris": "<1.7.0",
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void onStartTick(Minecraft client) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public void onHudRender(GuiGraphicsExtractor guiGraphics, DeltaTracker deltaTracker) {`
`50`		`- if (!this.client.debugEntries.isOverlayVisible() && !this.client.options.hideGui) {`
	`50`	`+ if (!this.client.debugEntries.isOverlayVisible() && !this.client.gui.hud.isHidden()) {`
`51`	`51`	`SodiumExtraGameOptions.OverlayCorner overlayCorner = SodiumExtraClientMod.options().extraSettings.overlayCorner;`
`52`	`52`	`// Calculate starting position based on the overlay corner`
`53`	`53`	`int x;`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ static ControlValueFormatter resolution() {`
`12`	`12`	`if (monitor == null) {`
`13`	`13`	`return Component.translatable("options.fullscreen.unavailable");`
`14`	`14`	`} else {`
`15`		`- return v == 0 ? Component.translatable("options.fullscreen.current") : Component.literal(monitor.getMode(v - 1).toString());`
	`15`	`+ return v == 0 ? Component.translatable("options.fullscreen.current") : Component.literal(monitor.mode(v - 1).toString());`
`16`	`16`	`}`
`17`	`17`	`};`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package me.flashyreese.mods.sodiumextra.mixin.gui;`
`2`	`2`
	`3`	`+import com.llamalad7.mixinextras.sugar.Local;`
`3`	`4`	`import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;`
`4`	`5`	`import net.minecraft.client.DeltaTracker;`
`5`	`6`	`import net.minecraft.client.gui.Gui;`
`@@ -12,7 +13,7 @@`
`12`	`13`	`@Mixin(Gui.class)`
`13`	`14`	`public class MixinGui {`
`14`	`15`	`@Inject(method = "extractRenderState", at = @At("TAIL"))`
`15`		`- private void onRender(GuiGraphicsExtractor guiGraphics, DeltaTracker deltaTracker, CallbackInfo ci) {`
	`16`	`+ private void onRender(DeltaTracker deltaTracker, boolean renderHud, boolean renderScreens, CallbackInfo ci, @Local GuiGraphicsExtractor guiGraphics) {`
`16`	`17`	`SodiumExtraClientMod.onHudRender(guiGraphics, deltaTracker);`
`17`	`18`	`}`
`18`	`19`	`}`