Update to NeoForge 21.4.97-beta

Fixes #3046
CaffeineMC · Feb 26, 2025 · a918138 · a918138
1 parent d6e06da
commit a918138
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -2,7 +2,7 @@
 
 object BuildConfig {
     val MINECRAFT_VERSION: String = "1.21.4"
-    val NEOFORGE_VERSION: String = "21.4.47-beta"
+    val NEOFORGE_VERSION: String = "21.4.97-beta"
     val FABRIC_LOADER_VERSION: String = "0.16.9"
     val FABRIC_API_VERSION: String = "0.112.1+1.21.4"
 

diff --git a/...on/src/main/java/net/caffeinemc/mods/sodium/client/services/PlatformLevelRenderHooks.java b/...on/src/main/java/net/caffeinemc/mods/sodium/client/services/PlatformLevelRenderHooks.java
@@ -22,15 +22,17 @@ static PlatformLevelRenderHooks getInstance() {
 
     /**
      * Runs any events after drawing a chunk layer.
-     * @param renderLayer The current chunk layer that was drawn
-     * @param levelRenderer The level renderer
-     * @param modelMatrix The current modelview matrix
+     *
+     * @param renderLayer      The current chunk layer that was drawn
+     * @param level
+     * @param levelRenderer    The level renderer
+     * @param modelMatrix      The current modelview matrix
      * @param projectionMatrix The current projection matrix
-     * @param ticks The current tick count
-     * @param mainCamera The current camera
-     * @param cullingFrustum The current frustum
+     * @param ticks            The current tick count
+     * @param mainCamera       The current camera
+     * @param cullingFrustum   The current frustum
      */
-    void runChunkLayerEvents(RenderType renderLayer, LevelRenderer levelRenderer, Matrix4f modelMatrix, Matrix4f projectionMatrix, int ticks, Camera mainCamera, Frustum cullingFrustum);
+    void runChunkLayerEvents(RenderType renderLayer, Level level, LevelRenderer levelRenderer, Matrix4f modelMatrix, Matrix4f projectionMatrix, int ticks, Camera mainCamera, Frustum cullingFrustum);
 
     /**
      * Returns any NeoForge chunk renderers to run. <b>This is not thread safe.</b>

diff --git a/.../src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/world/LevelRendererMixin.java b/.../src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/world/LevelRendererMixin.java
@@ -128,7 +128,7 @@ private void renderSectionLayer(RenderType renderLayer, double x, double y, doub
             RenderDevice.exitManagedCode();
         }
 
-        PlatformLevelRenderHooks.getInstance().runChunkLayerEvents(renderLayer, ((LevelRenderer) (Object) this), modelMatrix, projectionMatrix, this.ticks, this.minecraft.gameRenderer.getMainCamera(), this.cullingFrustum);
+        PlatformLevelRenderHooks.getInstance().runChunkLayerEvents(renderLayer, this.level, ((LevelRenderer) (Object) this), modelMatrix, projectionMatrix, this.ticks, this.minecraft.gameRenderer.getMainCamera(), this.cullingFrustum);
     }
 
     @WrapOperation(

diff --git a/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/level/FabricLevelRenderHooks.java b/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/level/FabricLevelRenderHooks.java
@@ -16,7 +16,7 @@
 
 public class FabricLevelRenderHooks implements PlatformLevelRenderHooks {
     @Override
-    public void runChunkLayerEvents(RenderType renderLayer, LevelRenderer levelRenderer, Matrix4f modelMatrix, Matrix4f projectionMatrix, int ticks, Camera mainCamera, Frustum cullingFrustum) {
+    public void runChunkLayerEvents(RenderType renderLayer, Level level, LevelRenderer levelRenderer, Matrix4f modelMatrix, Matrix4f projectionMatrix, int ticks, Camera mainCamera, Frustum cullingFrustum) {
 
     }
 

diff --git a/...rge/src/main/java/net/caffeinemc/mods/sodium/neoforge/level/NeoForgeLevelRenderHooks.java b/...rge/src/main/java/net/caffeinemc/mods/sodium/neoforge/level/NeoForgeLevelRenderHooks.java
@@ -19,8 +19,8 @@
 
 public class NeoForgeLevelRenderHooks implements PlatformLevelRenderHooks {
     @Override
-    public void runChunkLayerEvents(RenderType renderType, LevelRenderer levelRenderer, Matrix4f modelMatrix, Matrix4f projectionMatrix, int renderTick, Camera camera, Frustum frustum) {
-        ClientHooks.dispatchRenderStage(renderType, levelRenderer, modelMatrix, projectionMatrix, renderTick, camera, frustum);
+    public void runChunkLayerEvents(RenderType renderType, Level level, LevelRenderer levelRenderer, Matrix4f modelMatrix, Matrix4f projectionMatrix, int renderTick, Camera camera, Frustum frustum) {
+        ClientHooks.dispatchRenderStage(renderType, level, levelRenderer, modelMatrix, projectionMatrix, renderTick, camera, frustum);
     }
 
     @Override