From 60d1a3de3c2e30d3b5eee7a4df58ba5d61bfafe4 Mon Sep 17 00:00:00 2001 From: Eldrinn Elantey <46845681+Eldrinn-Elantey@users.noreply.github.com> Date: Mon, 9 Nov 2026 06:39:33 +0400 Subject: [PATCH] Restore FluidLogged fluid rendering (#2354) * Restore FluidLogged fluid rendering * Check region type before reading logged fluid --- .../AngelicaChunkBuilderMeshingTask.java | 92 ++++++++++++------- 1 file changed, 59 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java index 4c5ebecc2..42e98deb9 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java @@ -14,12 +14,14 @@ import com.gtnewhorizons.angelica.rendering.celeritas.iris.ContextAwareChunkVert import com.gtnewhorizons.angelica.rendering.celeritas.threading.RenderPassHelper; import com.gtnewhorizons.angelica.rendering.celeritas.world.WorldSlice; import com.gtnewhorizons.angelica.rendering.tesr.SectionBuiltBlockEntity; +import com.gtnewhorizons.angelica.compat.ModStatus; import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.utils.NaturalTextureUtils; import com.prupe.mcpatcher.mal.block.RenderBlocksUtils; import it.unimi.dsi.fastutil.floats.FloatArrayList; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.objects.Reference2ReferenceMap; +import mega.fluidlogged.api.FLBlockAccess; import net.coderbot.iris.block_rendering.BlockMaterialMapping; import net.coderbot.iris.block_rendering.BlockRenderingSettings; import net.coderbot.iris.block_rendering.NbtConditionalIdMap; @@ -39,6 +41,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ReportedException; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fluids.Fluid; import org.embeddedt.embeddium.impl.render.chunk.RenderSection; import org.embeddedt.embeddium.impl.render.chunk.compile.ChunkBuildBuffers; import org.embeddedt.embeddium.impl.render.chunk.compile.ChunkBuildContext; @@ -254,39 +257,13 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask>> 6] |= 1L << bit; any = true; @@ -361,6 +342,14 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask>> 6] & (1L << bit)) != 0; } + private static Block getLoggedFluidBlock(IBlockAccess region, int x, int y, int z) { + if (!ModStatus.isFluidLoggedLoaded || !(region instanceof FLBlockAccess fluidAccess)) { + return null; + } + final Fluid fluid = fluidAccess.fl$getFluid(x, y, z); + return fluid != null ? fluid.getBlock() : null; + } + ChunkJobResult captureDeferred(DeferredSectionMesh m) { final long start = System.nanoTime(); @@ -497,6 +486,43 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask blockTypeIds, List deferredBlocks, Tessellator tessellator, RenderBlocks renderBlocks, ChunkBuildBuffers buffers, AngelicaChunkBuildContext buildContext, BlockRenderContext blockRenderContext, int originX, int originY, int originZ, NbtConditionalIdMap teMap, long currentTick) { + // Check for shader pack override + final BlockRenderLayer override = blockTypeIds != null ? blockTypeIds.get(block) : null; + int deferredPasses = 0; + Material deferredOverride = null; + + for (int pass = 0; pass < AngelicaChunkBuildContext.NUM_PASSES; pass++) { + final boolean canRender; + Material materialOverride = null; + + if (override != null) { + // Shader pack override controls both pass and material + canRender = (pass == override.toVanillaPass()); + if (canRender) { + materialOverride = buffers.getRenderPassConfiguration().getMaterialForRenderType(override); + } + } else { + // Normal block rendering + canRender = !canRenderOffThread || block.canRenderInPass(pass); + } + + if (canRender) { + final boolean isShaderPackOverride = materialOverride != null; + if (!canRenderOffThread) { + deferredPasses |= 1 << pass; + deferredOverride = materialOverride; + continue; + } + + renderBlock(block, meta, x, y, z, pass, tessellator, renderBlocks, buffers, buildContext, blockRenderContext, originX, originY, originZ, materialOverride, isShaderPackOverride, teMap, currentTick); + } + } + if (deferredPasses != 0) { + deferredBlocks.add(new DeferredBlock(x, y, z, block, meta, deferredPasses, deferredOverride)); + } + } + protected void renderBlock(Block block, int metadata, int x, int y, int z, int pass, Tessellator tessellator, RenderBlocks renderBlocks, ChunkBuildBuffers buffers, AngelicaChunkBuildContext buildContext, BlockRenderContext blockRenderContext, int originX, int originY, int originZ, Material materialOverride, boolean isShaderPackOverride, NbtConditionalIdMap teMap, long currentTick) { final Material passMaterial = resolvePassMaterial(block, pass, buffers, materialOverride); final int teBlockId = resolveTeBlockId(teMap, renderBlocks.blockAccess, block, metadata, x, y, z, buffers, pass, materialOverride, currentTick);