From d810eaf876c3cb2eaf730fe208fdb78505e369ca Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Tue, 26 Dec 2023 12:00:00 -0500 Subject: [PATCH] Use client world for main thread renders --- .../client/render/chunk/tasks/ChunkRenderRebuildTask.java | 4 ++-- .../me/jellysquid/mods/sodium/client/world/WorldSlice.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/tasks/ChunkRenderRebuildTask.java b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/tasks/ChunkRenderRebuildTask.java index b12e5b60f..23a19dccf 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/tasks/ChunkRenderRebuildTask.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/tasks/ChunkRenderRebuildTask.java @@ -229,7 +229,7 @@ public class ChunkRenderRebuildTask extends ChunkR int baseY = this.render.getOriginY(); int baseZ = this.render.getOriginZ(); BlockPos renderOffset = this.offset; - RenderBlocks rb = new RenderBlocks(slice); + RenderBlocks rb = new RenderBlocks(slice.getWorld()); for (int relY = 0; relY < 16; relY++) { if (cancellationSource.isCancelled()) { return; @@ -258,7 +258,7 @@ public class ChunkRenderRebuildTask extends ChunkR long seed = MathUtil.hashPos(pos.x, pos.y, pos.z); if(AngelicaConfig.enableIris) buffers.iris$setMaterialId(block, ExtendedDataHelper.BLOCK_RENDER_TYPE); - if (cache.getBlockRenderer().renderModel(cache.getWorldSlice(), Tessellator.instance, rb, block, meta, pos, buffers.get(pass), true, seed)) { + if (cache.getBlockRenderer().renderModel(slice.getWorld(), Tessellator.instance, rb, block, meta, pos, buffers.get(pass), true, seed)) { bounds.addBlock(relX, relY, relZ); } } diff --git a/src/main/java/me/jellysquid/mods/sodium/client/world/WorldSlice.java b/src/main/java/me/jellysquid/mods/sodium/client/world/WorldSlice.java index c8761bf93..e27f6f7aa 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/world/WorldSlice.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/world/WorldSlice.java @@ -355,4 +355,8 @@ public class WorldSlice implements IBlockAccess { case UNKNOWN -> 1.0f; }; } + + public World getWorld() { + return this.world; + } }