Merge pull request #246 from CommandGenius/1.21

Sodium 0.6 Compatibility

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
+	id 'fabric-loom' version '1.7-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -10,5 +10,5 @@ mod_version = 0.10.1+1.21
 maven_group = foundationgames
 archives_base_name = enhancedblockentities
 
-modmenu_version=11.0.0-beta.1
-sodium_version=mc1.21-0.5.9
+modmenu_version=11.0.1
+sodium_version=mc1.21-0.6.0-beta.1-fabric

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/foundationgames/enhancedblockentities/mixin/compat/sodium/RenderSectionManagerMixin.java

@@ -2,9 +2,9 @@
 
 import foundationgames.enhancedblockentities.util.WorldUtil;
 import foundationgames.enhancedblockentities.util.duck.ChunkRebuildTaskAccess;
-import me.jellysquid.mods.sodium.client.render.chunk.RenderSection;
-import me.jellysquid.mods.sodium.client.render.chunk.RenderSectionManager;
-import me.jellysquid.mods.sodium.client.render.chunk.compile.ChunkBuildOutput;
+import net.caffeinemc.mods.sodium.client.render.chunk.RenderSection;
+import net.caffeinemc.mods.sodium.client.render.chunk.RenderSectionManager;
+import net.caffeinemc.mods.sodium.client.render.chunk.compile.BuilderTaskOutput;
 import net.minecraft.util.math.ChunkSectionPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;
@@ -17,9 +17,9 @@
 @Pseudo
 @Mixin(value = RenderSectionManager.class, remap = false)
 public class RenderSectionManagerMixin {
-    @ModifyVariable(method = "submitRebuildTasks",
-            at = @At(value = "INVOKE", shift = At.Shift.BEFORE, ordinal = 0, target = "Lme/jellysquid/mods/sodium/client/render/chunk/RenderSection;isDisposed()Z"),
-            index = 4, require = 0
+    @ModifyVariable(method = "submitSectionTasks(Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/executor/ChunkJobCollector;Lnet/caffeinemc/mods/sodium/client/render/chunk/ChunkUpdateType;Z)V",
+            at = @At(value = "INVOKE", shift = At.Shift.BEFORE, ordinal = 0, target = "Lnet/caffeinemc/mods/sodium/client/render/chunk/RenderSection;isDisposed()Z"),
+            index = 5, require = 0
     )
     private RenderSection enhanced_bes$compat_sodium$cacheUpdatingChunk(RenderSection section) {
         if (WorldUtil.CHUNK_UPDATE_TASKS.size() > 0) {
@@ -35,10 +35,10 @@ public class RenderSectionManagerMixin {
     }
 
     @ModifyVariable(method = "processChunkBuildResults",
-            at = @At(value = "INVOKE_ASSIGN", shift = At.Shift.BEFORE, ordinal = 0, target = "Lme/jellysquid/mods/sodium/client/render/chunk/RenderSection;getBuildCancellationToken()Lme/jellysquid/mods/sodium/client/util/task/CancellationToken;"),
-            index = 4, require = 0
+            at = @At(value = "INVOKE_ASSIGN", shift = At.Shift.BEFORE, ordinal = 0, target = "Lnet/caffeinemc/mods/sodium/client/render/chunk/RenderSection;getTaskCancellationToken()Lnet/caffeinemc/mods/sodium/client/util/task/CancellationToken;"),
+            index = 5, require = 0
     )
-    private ChunkBuildOutput enhanced_bes$runPostRebuildTask(ChunkBuildOutput output) {
+    private BuilderTaskOutput enhanced_bes$runPostRebuildTask(BuilderTaskOutput output) {
         ((ChunkRebuildTaskAccess) output.render).enhanced_bes$runAfterRebuildTask();
 
         return output;

src/main/java/foundationgames/enhancedblockentities/mixin/compat/sodium/RenderSectionMixin.java

@@ -1,7 +1,7 @@
 package foundationgames.enhancedblockentities.mixin.compat.sodium;
 
 import foundationgames.enhancedblockentities.util.duck.ChunkRebuildTaskAccess;
-import me.jellysquid.mods.sodium.client.render.chunk.RenderSection;
+import net.caffeinemc.mods.sodium.client.render.chunk.RenderSection;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;

src/main/resources/fabric.mod.json

@@ -33,7 +33,7 @@
   "depends": {
     "fabricloader": ">=0.7.4",
     "fabric-api": "*",
-    "minecraft": ">=1.21-rc.1"
+    "minecraft": ">=1.21"
   },
   "breaks": {
     "optifabric": "*"