From 5e3c95a345166c4cb9ec563cb470b9bd92f1e84a Mon Sep 17 00:00:00 2001 From: IMS212 Date: Thu, 15 Aug 2024 20:15:20 -0700 Subject: [PATCH] Merge final changes to vertex alpha --- .../render/chunk/compile/pipeline/DefaultFluidRenderer.java | 4 +--- .../mods/sodium/fabric/render/FabricColorProviders.java | 2 +- .../mods/sodium/fabric/render/FluidRendererImpl.java | 2 +- .../mods/sodium/neoforge/render/FluidRendererImpl.java | 2 +- .../mods/sodium/neoforge/render/ForgeColorProviders.java | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/compile/pipeline/DefaultFluidRenderer.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/compile/pipeline/DefaultFluidRenderer.java index 35e3d958cd..b49cde9421 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/compile/pipeline/DefaultFluidRenderer.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/compile/pipeline/DefaultFluidRenderer.java @@ -58,13 +58,11 @@ public class DefaultFluidRenderer { private final float[] brightness = new float[4]; private final ChunkVertexEncoder.Vertex[] vertices = ChunkVertexEncoder.Vertex.uninitializedQuad(); - private final ColorProviderRegistry colorProviderRegistry; - public DefaultFluidRenderer(ColorProviderRegistry colorProviderRegistry, LightPipelineProvider lighters) { + public DefaultFluidRenderer(LightPipelineProvider lighters) { this.quad.setLightFace(Direction.UP); this.lighters = lighters; - this.colorProviderRegistry = colorProviderRegistry; } private boolean isFluidOccluded(BlockAndTintGetter world, int x, int y, int z, Direction dir, BlockState blockState, Fluid fluid) { diff --git a/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/render/FabricColorProviders.java b/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/render/FabricColorProviders.java index ddc6ef80e0..9781b80354 100644 --- a/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/render/FabricColorProviders.java +++ b/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/render/FabricColorProviders.java @@ -23,7 +23,7 @@ public FabricFluidAdapter(FluidRenderHandler handler) { @Override public void getColors(LevelSlice slice, BlockPos pos, BlockPos.MutableBlockPos scratchPos, FluidState state, ModelQuadView quad, int[] output) { - Arrays.fill(output, this.handler.getFluidColor(slice, pos, state)); + Arrays.fill(output, 0xFF000000 |this.handler.getFluidColor(slice, pos, state)); } } } diff --git a/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/render/FluidRendererImpl.java b/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/render/FluidRendererImpl.java index 70388b5eb2..3c37a1947f 100644 --- a/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/render/FluidRendererImpl.java +++ b/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/render/FluidRendererImpl.java @@ -33,7 +33,7 @@ public class FluidRendererImpl extends FluidRenderer { public FluidRendererImpl(ColorProviderRegistry colorProviderRegistry, LightPipelineProvider lighters) { this.colorProviderRegistry = colorProviderRegistry; - defaultRenderer = new DefaultFluidRenderer(colorProviderRegistry, lighters); + defaultRenderer = new DefaultFluidRenderer(lighters); defaultContext = new DefaultRenderContext(); } diff --git a/neoforge/src/main/java/net/caffeinemc/mods/sodium/neoforge/render/FluidRendererImpl.java b/neoforge/src/main/java/net/caffeinemc/mods/sodium/neoforge/render/FluidRendererImpl.java index a3e413a1b5..44e64c4540 100644 --- a/neoforge/src/main/java/net/caffeinemc/mods/sodium/neoforge/render/FluidRendererImpl.java +++ b/neoforge/src/main/java/net/caffeinemc/mods/sodium/neoforge/render/FluidRendererImpl.java @@ -32,7 +32,7 @@ public class FluidRendererImpl extends FluidRenderer { public FluidRendererImpl(ColorProviderRegistry colorProviderRegistry, LightPipelineProvider lighters) { this.colorProviderRegistry = colorProviderRegistry; - defaultRenderer = new DefaultFluidRenderer(colorProviderRegistry, lighters); + defaultRenderer = new DefaultFluidRenderer(lighters); } public void render(LevelSlice level, BlockState blockState, FluidState fluidState, BlockPos blockPos, BlockPos offset, TranslucentGeometryCollector collector, ChunkBuildBuffers buffers) { diff --git a/neoforge/src/main/java/net/caffeinemc/mods/sodium/neoforge/render/ForgeColorProviders.java b/neoforge/src/main/java/net/caffeinemc/mods/sodium/neoforge/render/ForgeColorProviders.java index 703d0369f3..53e4348db0 100644 --- a/neoforge/src/main/java/net/caffeinemc/mods/sodium/neoforge/render/ForgeColorProviders.java +++ b/neoforge/src/main/java/net/caffeinemc/mods/sodium/neoforge/render/ForgeColorProviders.java @@ -24,7 +24,7 @@ public ForgeFluidAdapter(IClientFluidTypeExtensions handler) { @Override public void getColors(LevelSlice slice, BlockPos pos, BlockPos.MutableBlockPos scratchPos, FluidState state, ModelQuadView quad, int[] output) { - Arrays.fill(output, ColorARGB.withAlpha(this.handler.getTintColor(state, slice, pos), 255)); + Arrays.fill(output,this.handler.getTintColor(state, slice, pos)); } } }