From 10d966a1587bdd91839bb799c6fca7bfeca93611 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Thu, 15 Oct 2026 15:37:25 -0400 Subject: [PATCH] fix: added mixin members not being prefixed with sodium$ --- .../api/vertex/buffer/VertexBufferWriter.java | 25 ++++---- .../model/color/DefaultColorProviders.java | 4 +- .../light/flat/FlatFluidLightPipeline.java | 2 +- .../model/light/flat/FlatLightPipeline.java | 2 +- .../light/smooth/SmoothLightPipeline.java | 30 ++++----- .../client/model/quad/BakedQuadView.java | 10 +-- .../sodium/client/model/quad/ModelQuad.java | 30 ++++----- .../client/model/quad/ModelQuadView.java | 64 +++++++++---------- .../quad/blender/BlendedColorProvider.java | 6 +- .../model/quad/properties/ModelQuadFlags.java | 6 +- .../quad/properties/ModelQuadOrientation.java | 4 +- .../chunk/compile/pipeline/BlockRenderer.java | 16 ++--- .../pipeline/DefaultFluidRenderer.java | 16 ++--- .../client/render/helper/GeometryHelper.java | 6 +- .../client/render/helper/NormalHelper.java | 24 +++---- .../client/render/helper/TextureHelper.java | 26 ++++---- .../immediate/model/BakedModelEncoder.java | 16 ++--- .../immediate/model/EntityRenderer.java | 2 +- .../model/AbstractBlockRenderContext.java | 4 +- .../render/model/MutableQuadViewImpl.java | 22 +++---- .../client/render/model/QuadEncoder.java | 20 +++--- .../client/render/model/QuadViewImpl.java | 32 +++++----- .../texture/SodiumSpriteFinderImpl.java | 4 +- .../render/vertex/VertexConsumerUtils.java | 2 +- .../mixin/core/render/VertexFormatMixin.java | 4 +- .../consumer/BufferBuilderMixin.java | 2 +- .../SheetedDecalTextureGeneratorMixin.java | 10 +-- .../SpriteCoordinateExpanderMixin.java | 11 ++-- .../shadows/ShadowFeatureRendererMixin.java | 2 +- .../render/gui/font/BakedGlyphMixin.java | 4 +- .../intrinsics/BufferBuilderMixin.java | 2 +- .../QuadParticleRenderStateMixin.java | 2 +- .../fabric/block/FabricBlockAccess.java | 2 +- .../fabric/model/FabricMutableProvider.java | 2 +- .../mixin/core/model/quad/BakedQuadMixin.java | 41 ++++++------ .../client/render/frapi/FRAPIEmitter.java | 2 +- .../client/render/frapi/SodiumRenderer.java | 2 +- .../render/frapi/mesh/MeshViewImpl.java | 2 +- .../render/frapi/mesh/MutableMeshImpl.java | 4 +- .../ExtendedBlockModelFeatureRenderer.java | 12 ++-- .../render/ExtendedItemFeatureRenderer.java | 9 +-- .../render/NonTerrainBlockRenderContext.java | 2 +- .../wrapper/ExtendedMutableQuadViewImpl.java | 2 +- .../frapi/wrapper/ExtendedQuadViewImpl.java | 2 +- .../render/frapi/wrapper/QuadViewWrapper.java | 18 +++--- .../mixin/frapi/MutableQuadViewImplMixin.java | 2 +- .../sodium/mixin/frapi/QuadViewImplMixin.java | 2 +- .../mixin/core/model/quad/BakedQuadMixin.java | 40 ++++++------ .../neoforge/block/NeoForgeBlockAccess.java | 2 +- .../model/NeoForgeDynamicColorProvider.java | 2 +- 50 files changed, 276 insertions(+), 282 deletions(-) diff --git a/common/src/api/java/net/caffeinemc/mods/sodium/api/vertex/buffer/VertexBufferWriter.java b/common/src/api/java/net/caffeinemc/mods/sodium/api/vertex/buffer/VertexBufferWriter.java index dcdd772e00..59c986334d 100644 --- a/common/src/api/java/net/caffeinemc/mods/sodium/api/vertex/buffer/VertexBufferWriter.java +++ b/common/src/api/java/net/caffeinemc/mods/sodium/api/vertex/buffer/VertexBufferWriter.java @@ -14,12 +14,12 @@ public interface VertexBufferWriter { * @return An implementation of {@link VertexBufferWriter} which will write vertices into {@param consumer} * @throws IllegalArgumentException If the vertex consumer does not implement the necessary interface */ - static VertexBufferWriter of(VertexConsumer consumer) { - if (consumer instanceof VertexBufferWriter writer && writer.canUseIntrinsics()) { + static VertexBufferWriter sodium$of(VertexConsumer consumer) { + if (consumer instanceof VertexBufferWriter writer && writer.sodium$canUseIntrinsics()) { return writer; } - throw createUnsupportedVertexConsumerThrowable(consumer); + throw sodium$createUnsupportedVertexConsumerThrowable(consumer); } /** @@ -30,15 +30,15 @@ static VertexBufferWriter of(VertexConsumer consumer) { * if the vertex consumer does not implement the necessary interface */ @Nullable - static VertexBufferWriter tryOf(VertexConsumer consumer) { - if (consumer instanceof VertexBufferWriter writer && writer.canUseIntrinsics()) { + static VertexBufferWriter sodium$tryOf(VertexConsumer consumer) { + if (consumer instanceof VertexBufferWriter writer && writer.sodium$canUseIntrinsics()) { return writer; } return null; } - private static RuntimeException createUnsupportedVertexConsumerThrowable(VertexConsumer consumer) { + private static RuntimeException sodium$createUnsupportedVertexConsumerThrowable(VertexConsumer consumer) { var clazz = consumer.getClass(); var name = clazz.getName(); @@ -61,7 +61,7 @@ private static RuntimeException createUnsupportedVertexConsumerThrowable(VertexC * @param count The number of vertices to copy * @param format The format of the vertices */ - void push(MemoryStack stack, long ptr, int count, VertexFormat format); + void sodium$push(MemoryStack stack, long ptr, int count, VertexFormat format); /** * If this {@link VertexBufferWriter} passes through data to nested {@link VertexConsumer} implementations, @@ -69,7 +69,7 @@ private static RuntimeException createUnsupportedVertexConsumerThrowable(VertexC * methods. * @return true if the inner consumer is also a valid {@link VertexBufferWriter} that can use intrinsics */ - default boolean canUseIntrinsics() { + default boolean sodium$canUseIntrinsics() { return true; } @@ -84,15 +84,14 @@ default boolean canUseIntrinsics() { * @param count The number of vertices to push * @param format The format of the vertices */ - static void copyInto(VertexBufferWriter writer, - MemoryStack stack, long ptr, int count, - VertexFormat format) - { + static void sodium$copyInto(VertexBufferWriter writer, + MemoryStack stack, long ptr, int count, + VertexFormat format) { var length = count * format.getVertexSize(); var copy = stack.nmalloc(length); MemoryIntrinsics.copyMemory(ptr, copy, length); - writer.push(stack, copy, count, format); + writer.sodium$push(stack, copy, count, format); } } diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/color/DefaultColorProviders.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/color/DefaultColorProviders.java index 7e514ee1f1..3e015d5358 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/color/DefaultColorProviders.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/color/DefaultColorProviders.java @@ -58,12 +58,12 @@ public VanillaAdapter(BlockTintSource[] colors) { @Override public void getColors(LevelSlice slice, BlockPos pos, BlockPos.MutableBlockPos scratchPos, BlockState state, ModelQuadView quad, int[] output, boolean smooth) { - if (quad.getTintIndex() >= this.color.length) { + if (quad.sodium$getTintIndex() >= this.color.length) { Arrays.fill(output, -1); return; } - Arrays.fill(output, 0xFF000000 | this.color[quad.getTintIndex()].colorInWorld(state, slice, pos)); + Arrays.fill(output, 0xFF000000 | this.color[quad.sodium$getTintIndex()].colorInWorld(state, slice, pos)); } } } diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/light/flat/FlatFluidLightPipeline.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/light/flat/FlatFluidLightPipeline.java index a2fcd8c4ea..b2ba3e3662 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/light/flat/FlatFluidLightPipeline.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/light/flat/FlatFluidLightPipeline.java @@ -31,7 +31,7 @@ public void calculate(ModelQuadView quad, BlockPos pos, QuadLightData out, Direc if (cullFace != null) { Arrays.fill(out.br, this.getShade(this.lightCache.getLevel(), lightFace, shadeDirectionOverride)); } else { - int flags = quad.getFlags(); + int flags = quad.sodium$getFlags(); if ((flags & ModelQuadFlags.IS_ALIGNED) != 0 || ((flags & ModelQuadFlags.IS_PARALLEL) != 0 && unpackFC(this.lightCache.get(pos)))) { Arrays.fill(out.br, this.getShade(this.lightCache.getLevel(), lightFace, shadeDirectionOverride)); } else { diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/light/flat/FlatLightPipeline.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/light/flat/FlatLightPipeline.java index b1fe3582a2..acbe404358 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/light/flat/FlatLightPipeline.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/light/flat/FlatLightPipeline.java @@ -42,7 +42,7 @@ public void calculate(ModelQuadView quad, BlockPos pos, QuadLightData out, Direc lightmap = this.getOffsetLightmap(pos, cullFace); Arrays.fill(out.br, this.getShade(this.lightCache.getLevel(), lightFace, shadeDirectionOverride)); } else { - int flags = quad.getFlags(); + int flags = quad.sodium$getFlags(); // If the face is aligned, use the light data above it // To match vanilla behavior, also treat the face as aligned if it is parallel and the block state is a full cube if ((flags & ModelQuadFlags.IS_ALIGNED) != 0 || ((flags & ModelQuadFlags.IS_PARALLEL) != 0 && unpackFC(this.lightCache.get(pos)))) { diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/light/smooth/SmoothLightPipeline.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/light/smooth/SmoothLightPipeline.java index a2dc01de03..8234331463 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/light/smooth/SmoothLightPipeline.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/light/smooth/SmoothLightPipeline.java @@ -70,7 +70,7 @@ public SmoothLightPipeline(LightDataAccess cache) { public void calculate(ModelQuadView quad, BlockPos pos, QuadLightData out, Direction cullFace, Direction lightFace, @Nullable Direction shadeDirectionOverride, boolean enhanced) { this.updateCachedData(pos.asLong()); - int flags = quad.getFlags(); + int flags = quad.sodium$getFlags(); final AoNeighborInfo neighborInfo = AoNeighborInfo.get(lightFace); @@ -113,9 +113,9 @@ private void applyAlignedFullFace(AoNeighborInfo neighborInfo, BlockPos pos, Dir private void applyAlignedPartialFace(AoNeighborInfo neighborInfo, ModelQuadView quad, BlockPos pos, Direction dir, QuadLightData out, @Nullable Direction shadeDirectionOverride) { for (int i = 0; i < 4; i++) { // Clamp the vertex positions to the block's boundaries to prevent weird errors in lighting - float cx = clamp(quad.getX(i)); - float cy = clamp(quad.getY(i)); - float cz = clamp(quad.getZ(i)); + float cx = clamp(quad.sodium$getX(i)); + float cy = clamp(quad.sodium$getY(i)); + float cz = clamp(quad.sodium$getZ(i)); float[] weights = this.weights; neighborInfo.calculateCornerWeights(cx, cy, cz, weights); @@ -135,9 +135,9 @@ private void applyAlignedPartialFace(AoNeighborInfo neighborInfo, ModelQuadView private void applyParallelFace(AoNeighborInfo neighborInfo, ModelQuadView quad, BlockPos pos, Direction dir, QuadLightData out, @Nullable Direction shadeDirectionOverride) { for (int i = 0; i < 4; i++) { // Clamp the vertex positions to the block's boundaries to prevent weird errors in lighting - float cx = clamp(quad.getX(i)); - float cy = clamp(quad.getY(i)); - float cz = clamp(quad.getZ(i)); + float cx = clamp(quad.sodium$getX(i)); + float cy = clamp(quad.sodium$getY(i)); + float cz = clamp(quad.sodium$getZ(i)); float[] weights = this.weights; neighborInfo.calculateCornerWeights(cx, cy, cz, weights); @@ -164,9 +164,9 @@ private void applyParallelFace(AoNeighborInfo neighborInfo, ModelQuadView quad, private void applyNonParallelFace(AoNeighborInfo neighborInfo, ModelQuadView quad, BlockPos pos, Direction dir, QuadLightData out, @Nullable Direction shadeDirectionOverride) { for (int i = 0; i < 4; i++) { // Clamp the vertex positions to the block's boundaries to prevent weird errors in lighting - float cx = clamp(quad.getX(i)); - float cy = clamp(quad.getY(i)); - float cz = clamp(quad.getZ(i)); + float cx = clamp(quad.sodium$getX(i)); + float cy = clamp(quad.sodium$getY(i)); + float cz = clamp(quad.sodium$getZ(i)); float[] weights = this.weights; neighborInfo.calculateCornerWeights(cx, cy, cz, weights); @@ -230,7 +230,7 @@ private void applyInsetPartialFaceVertex(BlockPos pos, Direction dir, float n1d, private final AoFaceData tmpFace = new AoFaceData(); private AoFaceData gatherInsetFace(ModelQuadView quad, BlockPos blockPos, int vertexIndex, Direction lightFace, @Nullable Direction shadeDirectionOverride) { - final float w1 = AoNeighborInfo.get(lightFace).getDepth(quad.getX(vertexIndex), quad.getY(vertexIndex), quad.getZ(vertexIndex)); + final float w1 = AoNeighborInfo.get(lightFace).getDepth(quad.sodium$getX(vertexIndex), quad.sodium$getY(vertexIndex), quad.sodium$getZ(vertexIndex)); if (Mth.equal(w1, 0)) { return this.getCachedFaceData(blockPos, lightFace, true, shadeDirectionOverride); @@ -254,7 +254,7 @@ private void applyIrregularFace(BlockPos blockPos, ModelQuadView quad, QuadLight for (int i = 0; i < 4; i++) { // TODO: Avoid this if the accurate normal is the face normal - Vector3f normal = NormI8.unpack(quad.getAccurateNormal(i), this.vertexNormal); + Vector3f normal = NormI8.unpack(quad.sodium$getAccurateNormal(i), this.vertexNormal); float ao = 0, sky = 0, block = 0, maxAo = 0; float maxSky = 0, maxBlock = 0; @@ -263,7 +263,7 @@ private void applyIrregularFace(BlockPos blockPos, ModelQuadView quad, QuadLight if (!Mth.equal(0f, x)) { final Direction face = x > 0 ? Direction.EAST : Direction.WEST; final AoFaceData fd = this.gatherInsetFace(quad, blockPos, i, face, shadeDirectionOverride); - AoNeighborInfo.get(face).calculateCornerWeights(quad.getX(i), quad.getY(i), quad.getZ(i), w); + AoNeighborInfo.get(face).calculateCornerWeights(quad.sodium$getX(i), quad.sodium$getY(i), quad.sodium$getZ(i), w); final float n = x * x; final float a = fd.getBlendedShade(w) * this.getAmbientBrightness(face, shadeDirectionOverride); final float s = fd.getBlendedSkyLight(w); @@ -281,7 +281,7 @@ private void applyIrregularFace(BlockPos blockPos, ModelQuadView quad, QuadLight if (!Mth.equal(0f, y)) { final Direction face = y > 0 ? Direction.UP : Direction.DOWN; final AoFaceData fd = this.gatherInsetFace(quad, blockPos, i, face, shadeDirectionOverride); - AoNeighborInfo.get(face).calculateCornerWeights(quad.getX(i), quad.getY(i), quad.getZ(i), w); + AoNeighborInfo.get(face).calculateCornerWeights(quad.sodium$getX(i), quad.sodium$getY(i), quad.sodium$getZ(i), w); final float n = y * y; final float a = fd.getBlendedShade(w) * this.getAmbientBrightness(face, shadeDirectionOverride); final float s = fd.getBlendedSkyLight(w); @@ -299,7 +299,7 @@ private void applyIrregularFace(BlockPos blockPos, ModelQuadView quad, QuadLight if (!Mth.equal(0f, z)) { final Direction face = z > 0 ? Direction.SOUTH : Direction.NORTH; final AoFaceData fd = this.gatherInsetFace(quad, blockPos, i, face, shadeDirectionOverride); - AoNeighborInfo.get(face).calculateCornerWeights(quad.getX(i), quad.getY(i), quad.getZ(i), w); + AoNeighborInfo.get(face).calculateCornerWeights(quad.sodium$getX(i), quad.sodium$getY(i), quad.sodium$getZ(i), w); final float n = z * z; final float a = fd.getBlendedShade(w) * this.getAmbientBrightness(face, shadeDirectionOverride); final float s = fd.getBlendedSkyLight(w); diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/BakedQuadView.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/BakedQuadView.java index f0607d0dff..9194752a64 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/BakedQuadView.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/BakedQuadView.java @@ -3,13 +3,13 @@ import net.caffeinemc.mods.sodium.client.model.quad.properties.ModelQuadFacing; public interface BakedQuadView extends ModelQuadView { - ModelQuadFacing getNormalFace(); + ModelQuadFacing sodium$getNormalFace(); - int getFaceNormal(); + int sodium$getFaceNormal(); - boolean hasShade(); + boolean sodium$hasShade(); - boolean hasAO(); + boolean sodium$hasAO(); - int getLightEmission(); + int sodium$getLightEmission(); } diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/ModelQuad.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/ModelQuad.java index aad850c99a..a9e1cc79d3 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/ModelQuad.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/ModelQuad.java @@ -84,72 +84,72 @@ public void setLightFace(Direction direction) { } @Override - public int getTintIndex() { + public int sodium$getTintIndex() { return this.tintIdx; } @Override - public float getX(int idx) { + public float sodium$getX(int idx) { return Float.intBitsToFloat(this.data[ModelQuadUtil.vertexOffset(idx) + ModelQuadUtil.POSITION_INDEX]); } @Override - public float getY(int idx) { + public float sodium$getY(int idx) { return Float.intBitsToFloat(this.data[ModelQuadUtil.vertexOffset(idx) + ModelQuadUtil.POSITION_INDEX + 1]); } @Override - public float getZ(int idx) { + public float sodium$getZ(int idx) { return Float.intBitsToFloat(this.data[ModelQuadUtil.vertexOffset(idx) + ModelQuadUtil.POSITION_INDEX + 2]); } @Override - public int getColor(int idx) { + public int sodium$getColor(int idx) { return this.data[ModelQuadUtil.vertexOffset(idx) + ModelQuadUtil.COLOR_INDEX]; } @Override - public float getTexU(int idx) { + public float sodium$getTexU(int idx) { return Float.intBitsToFloat(this.data[ModelQuadUtil.vertexOffset(idx) + ModelQuadUtil.TEXTURE_INDEX]); } @Override - public float getTexV(int idx) { + public float sodium$getTexV(int idx) { return Float.intBitsToFloat(this.data[ModelQuadUtil.vertexOffset(idx) + ModelQuadUtil.TEXTURE_INDEX + 1]); } @Override - public int getVertexNormal(int idx) { + public int sodium$getVertexNormal(int idx) { return this.data[ModelQuadUtil.vertexOffset(idx) + ModelQuadUtil.NORMAL_INDEX]; } @Override - public int getFaceNormal() { + public int sodium$getFaceNormal() { return this.faceNormal; } @Override - public int getLight(int idx) { + public int sodium$getLight(int idx) { return this.data[ModelQuadUtil.vertexOffset(idx) + ModelQuadUtil.LIGHT_INDEX]; } @Override - public int getFlags() { + public int sodium$getFlags() { return this.flags; } @Override - public TextureAtlasSprite getSprite() { + public TextureAtlasSprite sodium$getSprite() { return this.sprite; } @Override - public Direction getLightFace() { + public Direction sodium$getLightFace() { return this.direction; } @Override - public int getMaxLightQuad(int idx) { - return this.getLight(idx); + public int sodium$getMaxLightQuad(int idx) { + return this.sodium$getLight(idx); } } diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/ModelQuadView.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/ModelQuadView.java index 9912a0ac74..162b74fed0 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/ModelQuadView.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/ModelQuadView.java @@ -12,88 +12,88 @@ public interface ModelQuadView { /** * @return The x-position of the vertex at index {@param idx} */ - float getX(int idx); + float sodium$getX(int idx); /** * @return The y-position of the vertex at index {@param idx} */ - float getY(int idx); + float sodium$getY(int idx); /** * @return The z-position of the vertex at index {@param idx} */ - float getZ(int idx); + float sodium$getZ(int idx); /** * @return The integer-encoded color of the vertex at index {@param idx} */ - int getColor(int idx); + int sodium$getColor(int idx); /** * @return The texture x-coordinate for the vertex at index {@param idx} */ - float getTexU(int idx); + float sodium$getTexU(int idx); /** * @return The texture y-coordinate for the vertex at index {@param idx} */ - float getTexV(int idx); + float sodium$getTexV(int idx); /** * @return The packed normal set for the vertex at index {@param idx}. */ - int getVertexNormal(int idx); + int sodium$getVertexNormal(int idx); /** * @return The computed normal. */ - int getFaceNormal(); + int sodium$getFaceNormal(); /** * @return The packed light set for the vertex at index {@param idx}. */ - int getLight(int idx); + int sodium$getLight(int idx); /** * @return The integer bit flags containing the {@link ModelQuadFlags} for this quad */ - int getFlags(); + int sodium$getFlags(); /** * @return The tint index of this quad. */ - int getTintIndex(); + int sodium$getTintIndex(); /** * @return The sprite texture used by this quad, or null if none is attached */ - TextureAtlasSprite getSprite(); + TextureAtlasSprite sodium$getSprite(); /** * @return The face used by this quad for lighting effects */ - Direction getLightFace(); + Direction sodium$getLightFace(); - default boolean hasColor() { - return this.getTintIndex() != -1; + default boolean sodium$hasColor() { + return this.sodium$getTintIndex() != -1; } - default int calculateNormal() { - final float x0 = this.getX(0); - final float y0 = this.getY(0); - final float z0 = this.getZ(0); + default int sodium$calculateNormal() { + final float x0 = this.sodium$getX(0); + final float y0 = this.sodium$getY(0); + final float z0 = this.sodium$getZ(0); - final float x1 = this.getX(1); - final float y1 = this.getY(1); - final float z1 = this.getZ(1); + final float x1 = this.sodium$getX(1); + final float y1 = this.sodium$getY(1); + final float z1 = this.sodium$getZ(1); - final float x2 = this.getX(2); - final float y2 = this.getY(2); - final float z2 = this.getZ(2); + final float x2 = this.sodium$getX(2); + final float y2 = this.sodium$getY(2); + final float z2 = this.sodium$getZ(2); - final float x3 = this.getX(3); - final float y3 = this.getY(3); - final float z3 = this.getZ(3); + final float x3 = this.sodium$getX(3); + final float y3 = this.sodium$getY(3); + final float z3 = this.sodium$getZ(3); final float dx0 = x2 - x0; final float dy0 = y2 - y0; @@ -122,10 +122,10 @@ default int calculateNormal() { * @param i The vertex index. * @return the per-vertex normal if it is set, otherwise the face normal. */ - default int getAccurateNormal(int i) { - int normal = this.getVertexNormal(i); + default int sodium$getAccurateNormal(int i) { + int normal = this.sodium$getVertexNormal(i); - return normal == 0 ? this.getFaceNormal() : normal; + return normal == 0 ? this.sodium$getFaceNormal() : normal; } /** @@ -133,5 +133,5 @@ default int getAccurateNormal(int i) { * @param idx The vertex index. * @return Lightmap value. */ - int getMaxLightQuad(int idx); + int sodium$getMaxLightQuad(int idx); } diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/blender/BlendedColorProvider.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/blender/BlendedColorProvider.java index f885b1c3e6..356c27ac5d 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/blender/BlendedColorProvider.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/blender/BlendedColorProvider.java @@ -25,9 +25,9 @@ public void getColors(LevelSlice slice, BlockPos pos, BlockPos.MutableBlockPos s private int getVertexColor(LevelSlice slice, BlockPos pos, BlockPos.MutableBlockPos scratchPos, ModelQuadView quad, T state, int vertexIndex) { // The vertex position // We add a half-texel offset since we are sampling points within a color texture - final float x = quad.getX(vertexIndex) - 0.5f; - final float y = quad.getY(vertexIndex) - 0.5f; - final float z = quad.getZ(vertexIndex) - 0.5f; + final float x = quad.sodium$getX(vertexIndex) - 0.5f; + final float y = quad.sodium$getY(vertexIndex) - 0.5f; + final float z = quad.sodium$getZ(vertexIndex) - 0.5f; // Integer component of vertex position final int intX = Mth.floor(x); diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/properties/ModelQuadFlags.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/properties/ModelQuadFlags.java index 856aed983c..c44e777aad 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/properties/ModelQuadFlags.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/properties/ModelQuadFlags.java @@ -47,9 +47,9 @@ public static int getQuadFlags(ModelQuadView quad, Direction face) { float maxZ = -32.0F; for (int i = 0; i < 4; ++i) { - float x = quad.getX(i); - float y = quad.getY(i); - float z = quad.getZ(i); + float x = quad.sodium$getX(i); + float y = quad.sodium$getY(i); + float z = quad.sodium$getZ(i); minX = Math.min(minX, x); minY = Math.min(minY, y); diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/properties/ModelQuadOrientation.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/properties/ModelQuadOrientation.java index 58a9515337..c470384823 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/properties/ModelQuadOrientation.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/model/quad/properties/ModelQuadOrientation.java @@ -60,8 +60,8 @@ public static ModelQuadOrientation orientByBrightness(float[] brightnesses, Mode } // If one side of the quad is darker, flip the sides - int lm02 = quad.getLight(0) + quad.getLight(2); - int lm13 = quad.getLight(1) + quad.getLight(3); + int lm02 = quad.sodium$getLight(0) + quad.sodium$getLight(2); + int lm13 = quad.sodium$getLight(1) + quad.sodium$getLight(3); if (lm02 <= lm13) { return NORMAL; } else { diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/compile/pipeline/BlockRenderer.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/compile/pipeline/BlockRenderer.java index 00cd381117..1aa61aa46a 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/compile/pipeline/BlockRenderer.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/compile/pipeline/BlockRenderer.java @@ -122,7 +122,7 @@ protected void processQuad(MutableQuadViewImpl quad) { } private void tintQuad(MutableQuadViewImpl quad) { - int tintIndex = quad.getTintIndex(); + int tintIndex = quad.sodium$getTintIndex(); if (tintIndex != -1) { ColorProvider colorProvider = this.colorProvider; @@ -150,18 +150,18 @@ private void bufferQuad(MutableQuadViewImpl quad, float[] brightnesses, Material int srcIndex = orientation.getVertexIndex(dstIndex); ChunkVertexEncoder.Vertex out = vertices[dstIndex]; - out.x = quad.getX(srcIndex) + offset.x; - out.y = quad.getY(srcIndex) + offset.y; - out.z = quad.getZ(srcIndex) + offset.z; + out.x = quad.sodium$getX(srcIndex) + offset.x; + out.y = quad.sodium$getY(srcIndex) + offset.y; + out.z = quad.sodium$getZ(srcIndex) + offset.z; // FRAPI uses ARGB color format; convert to ABGR. out.color = ColorARGB.toABGR(quad.baseColor(srcIndex)); out.ao = brightnesses[srcIndex]; - out.u = quad.getTexU(srcIndex); - out.v = quad.getTexV(srcIndex); + out.u = quad.sodium$getTexU(srcIndex); + out.v = quad.sodium$getTexV(srcIndex); - out.light = quad.getLight(srcIndex); + out.light = quad.sodium$getLight(srcIndex); } var atlasSprite = quad.sprite(SpriteFinderCache.forBlockAtlas()); @@ -173,7 +173,7 @@ private void bufferQuad(MutableQuadViewImpl quad, float[] brightnesses, Material // collect all translucent quads into the translucency sorting system if enabled, // and discard the quad if it's invalid (i.e. not visible) if (pass.isTranslucent() && this.collector != null && - this.collector.appendQuad(vertices, normalFace, quad.getFaceNormal())) { + this.collector.appendQuad(vertices, normalFace, quad.sodium$getFaceNormal())) { return; } 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 96c8671b1d..3e63911baa 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 @@ -884,7 +884,7 @@ private void updateQuad(ModelQuadViewMutable quad, LevelSlice level, BlockPos po if (facing.isAligned()) { normal = facing.getPackedAlignedNormal(); } else { - normal = quad.calculateNormal(); + normal = quad.sodium$calculateNormal(); } quad.setFaceNormal(normal); @@ -909,18 +909,18 @@ private void writeQuad(ChunkModelBuilder builder, TranslucentGeometryCollector c for (int i = 0; i < 4; i++) { var out = vertices[flip ? (3 - i + 1) & 0b11 : i]; - out.x = offset.getX() + quad.getX(i); - out.y = offset.getY() + quad.getY(i); - out.z = offset.getZ() + quad.getZ(i); + out.x = offset.getX() + quad.sodium$getX(i); + out.y = offset.getY() + quad.sodium$getY(i); + out.z = offset.getZ() + quad.sodium$getZ(i); out.color = this.quadColors[i]; out.ao = this.brightness[i]; - out.u = quad.getTexU(i); - out.v = quad.getTexV(i); + out.u = quad.sodium$getTexU(i); + out.v = quad.sodium$getTexV(i); out.light = this.quadLightData.lm[i]; } - TextureAtlasSprite sprite = quad.getSprite(); + TextureAtlasSprite sprite = quad.sodium$getSprite(); if (sprite != null) { builder.addSprite(sprite); @@ -933,7 +933,7 @@ private void writeQuad(ChunkModelBuilder builder, TranslucentGeometryCollector c normal = facing.getPackedAlignedNormal(); } else { // This was updated earlier in updateQuad. There is no situation where the normal vector should have changed. - normal = quad.getFaceNormal(); + normal = quad.sodium$getFaceNormal(); } if (flip) { diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/helper/GeometryHelper.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/helper/GeometryHelper.java index 5a6b28da6b..bc2e3e980b 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/helper/GeometryHelper.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/helper/GeometryHelper.java @@ -54,9 +54,9 @@ public static boolean isQuadParallelToFace(Direction face, QuadViewImpl quad) { *

Derived from the quad face normal and expects convex quads with all points co-planar. */ public static Direction lightFace(ModelQuadView quad) { - final float normalX = NormI8.unpackX(quad.getFaceNormal()); - final float normalY = NormI8.unpackY(quad.getFaceNormal()); - final float normalZ = NormI8.unpackZ(quad.getFaceNormal()); + final float normalX = NormI8.unpackX(quad.sodium$getFaceNormal()); + final float normalY = NormI8.unpackY(quad.sodium$getFaceNormal()); + final float normalZ = NormI8.unpackZ(quad.sodium$getFaceNormal()); return switch (GeometryHelper.longestAxis(normalX, normalY, normalZ)) { case X -> normalX > 0 ? Direction.EAST : Direction.WEST; case Y -> normalY > 0 ? Direction.UP : Direction.DOWN; diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/helper/NormalHelper.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/helper/NormalHelper.java index 79a2802677..e7b79fc13c 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/helper/NormalHelper.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/helper/NormalHelper.java @@ -47,18 +47,18 @@ public static void computeFaceNormal(@NonNull Vector3f saveTo, QuadViewImpl q) { return; } - final float x0 = q.getX(0); - final float y0 = q.getY(0); - final float z0 = q.getZ(0); - final float x1 = q.getX(1); - final float y1 = q.getY(1); - final float z1 = q.getZ(1); - final float x2 = q.getX(2); - final float y2 = q.getY(2); - final float z2 = q.getZ(2); - final float x3 = q.getX(3); - final float y3 = q.getY(3); - final float z3 = q.getZ(3); + final float x0 = q.sodium$getX(0); + final float y0 = q.sodium$getY(0); + final float z0 = q.sodium$getZ(0); + final float x1 = q.sodium$getX(1); + final float y1 = q.sodium$getY(1); + final float z1 = q.sodium$getZ(1); + final float x2 = q.sodium$getX(2); + final float y2 = q.sodium$getY(2); + final float z2 = q.sodium$getZ(2); + final float x3 = q.sodium$getX(3); + final float y3 = q.sodium$getY(3); + final float z3 = q.sodium$getZ(3); final float dx0 = x2 - x0; final float dy0 = y2 - y0; diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/helper/TextureHelper.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/helper/TextureHelper.java index f42410e69c..e59daddba9 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/helper/TextureHelper.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/helper/TextureHelper.java @@ -78,7 +78,7 @@ public static void bakeSprite(MutableQuadViewImpl quad, TextureAtlasSprite sprit applyModifier(quad, UVLOCKERS[quad.getNominalFace().get3DDataValue()]); } else if ((BAKE_NORMALIZED & bakeFlags) == 0) { // flag is NOT set, UVs are assumed to not be normalized yet as is the default, normalize through dividing by 16 // Scales from 0-16 to 0-1 - applyModifier(quad, (q, i) -> q.setUV(i, q.getTexU(i) * NORMALIZER, q.getTexV(i) * NORMALIZER)); + applyModifier(quad, (q, i) -> q.setUV(i, q.sodium$getTexU(i) * NORMALIZER, q.sodium$getTexV(i) * NORMALIZER)); } final int rotation = bakeFlags & 3; @@ -91,12 +91,12 @@ public static void bakeSprite(MutableQuadViewImpl quad, TextureAtlasSprite sprit if ((BAKE_FLIP_U & bakeFlags) != 0) { // Inverts U coordinates. Assumes normalized (0-1) values. - applyModifier(quad, (q, i) -> q.setUV(i, 1 - q.getTexU(i), q.getTexV(i))); + applyModifier(quad, (q, i) -> q.setUV(i, 1 - q.sodium$getTexU(i), q.sodium$getTexV(i))); } if ((BAKE_FLIP_V & bakeFlags) != 0) { // Inverts V coordinates. Assumes normalized (0-1) values. - applyModifier(quad, (q, i) -> q.setUV(i, q.getTexU(i), 1 - q.getTexV(i))); + applyModifier(quad, (q, i) -> q.setUV(i, q.sodium$getTexU(i), 1 - q.sodium$getTexV(i))); } interpolate(quad, sprite); @@ -113,7 +113,7 @@ private static void interpolate(MutableQuadViewImpl q, TextureAtlasSprite sprite final float vSpan = sprite.getV1() - vMin; for (int i = 0; i < 4; i++) { - q.setUV(i, uMin + q.getTexU(i) * uSpan, vMin + q.getTexV(i) * vSpan); + q.setUV(i, uMin + q.sodium$getTexU(i) * uSpan, vMin + q.sodium$getTexV(i) * vSpan); } } @@ -130,19 +130,19 @@ private static void applyModifier(MutableQuadViewImpl quad, VertexModifier modif private static final VertexModifier[] ROTATIONS = new VertexModifier[] { null, - (q, i) -> q.setUV(i, q.getTexV(i), 1 - q.getTexU(i)), //90 - (q, i) -> q.setUV(i, 1 - q.getTexU(i), 1 - q.getTexV(i)), //180 - (q, i) -> q.setUV(i, 1 - q.getTexV(i), q.getTexU(i)) // 270 + (q, i) -> q.setUV(i, q.sodium$getTexV(i), 1 - q.sodium$getTexU(i)), //90 + (q, i) -> q.setUV(i, 1 - q.sodium$getTexU(i), 1 - q.sodium$getTexV(i)), //180 + (q, i) -> q.setUV(i, 1 - q.sodium$getTexV(i), q.sodium$getTexU(i)) // 270 }; private static final VertexModifier[] UVLOCKERS = new VertexModifier[6]; static { - UVLOCKERS[Direction.EAST.get3DDataValue()] = (q, i) -> q.setUV(i, 1 - q.getZ(i), 1 - q.getY(i)); - UVLOCKERS[Direction.WEST.get3DDataValue()] = (q, i) -> q.setUV(i, q.getZ(i), 1 - q.getY(i)); - UVLOCKERS[Direction.NORTH.get3DDataValue()] = (q, i) -> q.setUV(i, 1 - q.getX(i), 1 - q.getY(i)); - UVLOCKERS[Direction.SOUTH.get3DDataValue()] = (q, i) -> q.setUV(i, q.getX(i), 1 - q.getY(i)); - UVLOCKERS[Direction.DOWN.get3DDataValue()] = (q, i) -> q.setUV(i, q.getX(i), 1 - q.getZ(i)); - UVLOCKERS[Direction.UP.get3DDataValue()] = (q, i) -> q.setUV(i, q.getX(i), q.getZ(i)); + UVLOCKERS[Direction.EAST.get3DDataValue()] = (q, i) -> q.setUV(i, 1 - q.sodium$getZ(i), 1 - q.sodium$getY(i)); + UVLOCKERS[Direction.WEST.get3DDataValue()] = (q, i) -> q.setUV(i, q.sodium$getZ(i), 1 - q.sodium$getY(i)); + UVLOCKERS[Direction.NORTH.get3DDataValue()] = (q, i) -> q.setUV(i, 1 - q.sodium$getX(i), 1 - q.sodium$getY(i)); + UVLOCKERS[Direction.SOUTH.get3DDataValue()] = (q, i) -> q.setUV(i, q.sodium$getX(i), 1 - q.sodium$getY(i)); + UVLOCKERS[Direction.DOWN.get3DDataValue()] = (q, i) -> q.setUV(i, q.sodium$getX(i), 1 - q.sodium$getZ(i)); + UVLOCKERS[Direction.UP.get3DDataValue()] = (q, i) -> q.setUV(i, q.sodium$getX(i), q.sodium$getZ(i)); } } diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/immediate/model/BakedModelEncoder.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/immediate/model/BakedModelEncoder.java index 3ab90c3305..58320f6148 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/immediate/model/BakedModelEncoder.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/immediate/model/BakedModelEncoder.java @@ -34,34 +34,34 @@ public static void writeQuadVertices(VertexBufferWriter writer, PoseStack.Pose m for (int i = 0; i < 4; i++) { // The position vector - float x = quad.getX(i); - float y = quad.getY(i); - float z = quad.getZ(i); + float x = quad.sodium$getX(i); + float y = quad.sodium$getY(i); + float z = quad.sodium$getZ(i); // take the base quad's material's emission and apply it to the instance's light - int newLight = instance.getLightCoordsWithEmission(i, quad.getLightEmission()); + int newLight = instance.getLightCoordsWithEmission(i, quad.sodium$getLightEmission()); // NeoForge patches the default VertexConsumer.putBakedQuad to do ARGB.multiply(instance.getColor(vertex), quad.bakedColors().color(vertex)), but Sodium short-circuits that path via BufferBuilderMixin, so the multiplication is lost. Blocks that encode their tint only in element.color(...) (XyCraft ores) lose all color, and blocks combining a BlockTintSource with a baked color get only one factor applied. // The platform flag is needed because Fabric's default implementation does not perform this multiplication. int color = instance.getColor(i); if (USE_COLOR_MULTIPLICATION) { - color = ColorMixer.mulComponentWise(color, quad.getColor(i)); + color = ColorMixer.mulComponentWise(color, quad.sodium$getColor(i)); } int newColor = ColorARGB.toABGR(color); // The packed transformed normal vector - int normal = MatrixHelper.transformNormal(matNormal, matrices.trustedNormals, quad.getAccurateNormal(i)); + int normal = MatrixHelper.transformNormal(matNormal, matrices.trustedNormals, quad.sodium$getAccurateNormal(i)); // The transformed position vector float xt = MatrixHelper.transformPositionX(matPosition, x, y, z); float yt = MatrixHelper.transformPositionY(matPosition, x, y, z); float zt = MatrixHelper.transformPositionZ(matPosition, x, y, z); - EntityVertex.write(ptr, xt, yt, zt, newColor, quad.getTexU(i), quad.getTexV(i), instance.overlayCoords(), newLight, normal); + EntityVertex.write(ptr, xt, yt, zt, newColor, quad.sodium$getTexU(i), quad.sodium$getTexV(i), instance.overlayCoords(), newLight, normal); ptr += EntityVertex.STRIDE; } - writer.push(stack, buffer, 4, EntityVertex.FORMAT); + writer.sodium$push(stack, buffer, 4, EntityVertex.FORMAT); } } } diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/immediate/model/EntityRenderer.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/immediate/model/EntityRenderer.java index 15e186820c..822bc003c6 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/immediate/model/EntityRenderer.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/immediate/model/EntityRenderer.java @@ -31,7 +31,7 @@ public static void renderCuboid(PoseStack.Pose matrices, VertexBufferWriter writ final var vertexCount = emitQuads(vertexBuffer, cuboid, overlay, light); if (vertexCount > 0) { - writer.push(stack, vertexBuffer, vertexCount, EntityVertex.FORMAT); + writer.sodium$push(stack, vertexBuffer, vertexCount, EntityVertex.FORMAT); } } } diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/AbstractBlockRenderContext.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/AbstractBlockRenderContext.java index eb37e52846..15190c6bfa 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/AbstractBlockRenderContext.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/AbstractBlockRenderContext.java @@ -198,7 +198,7 @@ protected void prepareAoInfo(boolean modelAo) { protected void shadeQuad(MutableQuadViewImpl quad, LightMode lightMode, boolean emissive, SodiumShadeMode shadeMode) { LightPipeline lighter = this.lighters.getLighter(lightMode); QuadLightData data = this.quadLightData; - lighter.calculate(quad, this.pos, data, quad.getCullFace(), quad.getLightFace(), quad.shadeDirectionOverride(), shadeMode == SodiumShadeMode.ENHANCED); + lighter.calculate(quad, this.pos, data, quad.getCullFace(), quad.sodium$getLightFace(), quad.shadeDirectionOverride(), shadeMode == SodiumShadeMode.ENHANCED); if (emissive) { for (int i = 0; i < 4; i++) { @@ -208,7 +208,7 @@ protected void shadeQuad(MutableQuadViewImpl quad, LightMode lightMode, boolean int[] lightmaps = data.lm; for (int i = 0; i < 4; i++) { - quad.setLight(i, ColorHelper.maxBrightness(quad.getLight(i), lightmaps[i])); + quad.setLight(i, ColorHelper.maxBrightness(quad.sodium$getLight(i), lightmaps[i])); } } } diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/MutableQuadViewImpl.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/MutableQuadViewImpl.java index 5764bd0f91..f06ac25308 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/MutableQuadViewImpl.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/MutableQuadViewImpl.java @@ -271,12 +271,12 @@ private void fromVanillaInternal(BakedQuadView quadData) { boolean hasNormals = false; for (int i = 0; i < 4; i++) { - this.setPos(i, quadData.getX(i), quadData.getY(i), quadData.getZ(i)); - this.setColor(i, quadData.getColor(i)); - this.setUV(i, quadData.getTexU(i), quadData.getTexV(i)); - this.setLight(i, quadData.getMaxLightQuad(i)); + this.setPos(i, quadData.sodium$getX(i), quadData.sodium$getY(i), quadData.sodium$getZ(i)); + this.setColor(i, quadData.sodium$getColor(i)); + this.setUV(i, quadData.sodium$getTexU(i), quadData.sodium$getTexV(i)); + this.setLight(i, quadData.sodium$getMaxLightQuad(i)); - int normal = quadData.getVertexNormal(i); + int normal = quadData.sodium$getVertexNormal(i); if (normal != 0) hasNormals = true; this.setNormal(i, NormI8.unpackX(normal), NormI8.unpackY(normal), NormI8.unpackZ(normal)); } @@ -289,7 +289,7 @@ public final MutableQuadViewImpl fromBakedQuad(BakedQuad quad) { this.setNominalFace(quad.direction()); this.setShadeDirectionOverride(quad.materialInfo().shadeDirectionOverride()); this.setTintIndex(quad.materialInfo().tintIndex()); - this.setAmbientOcclusion(((BakedQuadView) (Object) quad).hasAO() ? TriState.DEFAULT : TriState.FALSE); // TODO: TRUE, or DEFAULT? + this.setAmbientOcclusion(((BakedQuadView) (Object) quad).sodium$hasAO() ? TriState.DEFAULT : TriState.FALSE); // TODO: TRUE, or DEFAULT? this.setItemRenderType(quad.materialInfo().itemRenderType()); this.setRenderType(quad.materialInfo().layer()); this.setAnimated(quad.materialInfo().sprite().contents().isAnimated()); @@ -297,10 +297,10 @@ public final MutableQuadViewImpl fromBakedQuad(BakedQuad quad) { // Copy geometry cached inside the quad BakedQuadView bakedView = (BakedQuadView) (Object) quad; - NormI8.unpack(bakedView.getFaceNormal(), this.faceNormal); - this.data[this.baseIndex + HEADER_FACE_NORMAL] = EncodingFormat.normalFace(bakedView.getFaceNormal(), bakedView.getNormalFace()); - int headerBits = EncodingFormat.lightFace(this.data[this.baseIndex + HEADER_BITS], bakedView.getLightFace()); - this.data[this.baseIndex + HEADER_BITS] = EncodingFormat.geometryFlags(headerBits, bakedView.getFlags()); + NormI8.unpack(bakedView.sodium$getFaceNormal(), this.faceNormal); + this.data[this.baseIndex + HEADER_FACE_NORMAL] = EncodingFormat.normalFace(bakedView.sodium$getFaceNormal(), bakedView.sodium$getNormalFace()); + int headerBits = EncodingFormat.lightFace(this.data[this.baseIndex + HEADER_BITS], bakedView.sodium$getLightFace()); + this.data[this.baseIndex + HEADER_BITS] = EncodingFormat.geometryFlags(headerBits, bakedView.sodium$getFlags()); this.isGeometryInvalid = false; SodiumQuadAtlas atlas = SodiumQuadAtlas.of(quad.materialInfo().sprite().atlasLocation()); @@ -322,7 +322,7 @@ public final MutableQuadViewImpl fromBakedQuad(BakedQuad quad) { public MutableQuadViewImpl translate(float x, float y, float z) { for (int i = 0; i < 4; i++) { - this.setPos(i, this.getX(i) + x, this.getY(i) + y, this.getZ(i) + z); + this.setPos(i, this.sodium$getX(i) + x, this.sodium$getY(i) + y, this.sodium$getZ(i) + z); } return this; diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/QuadEncoder.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/QuadEncoder.java index 51baf93346..a75cee5586 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/QuadEncoder.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/QuadEncoder.java @@ -42,9 +42,9 @@ public static void writeQuadVertices(MutableQuadViewImpl quad, VertexBufferWrite for (int i = 0; i < 4; i++) { // The position vector - float x = quad.getX(i); - float y = quad.getY(i); - float z = quad.getZ(i); + float x = quad.sodium$getX(i); + float y = quad.sodium$getY(i); + float z = quad.sodium$getZ(i); // The transformed position vector float xt = MatrixHelper.transformPositionX(matPosition, x, y, z); @@ -55,11 +55,11 @@ public static void writeQuadVertices(MutableQuadViewImpl quad, VertexBufferWrite normal = MatrixHelper.transformNormal(matNormal, trustedNormals, quad.packedNormal(i)); } - EntityVertex.write(ptr, xt, yt, zt, ColorARGB.toABGR(quad.baseColor(i)), quad.getTexU(i), quad.getTexV(i), overlay, quad.getLight(i), normal); + EntityVertex.write(ptr, xt, yt, zt, ColorARGB.toABGR(quad.baseColor(i)), quad.sodium$getTexU(i), quad.sodium$getTexV(i), overlay, quad.sodium$getLight(i), normal); ptr += EntityVertex.STRIDE; } - writer.push(stack, buffer, 4, EntityVertex.FORMAT); + writer.sodium$push(stack, buffer, 4, EntityVertex.FORMAT); } } @@ -96,9 +96,9 @@ private static void writeQuadVerticesSlow(MutableQuadViewImpl quad, VertexConsum for (int i = 0; i < 4; i++) { // The position vector - float x = quad.getX(i); - float y = quad.getY(i); - float z = quad.getZ(i); + float x = quad.sodium$getX(i); + float y = quad.sodium$getY(i); + float z = quad.sodium$getZ(i); // The transformed position vector float xt = MatrixHelper.transformPositionX(matPosition, x, y, z); @@ -108,9 +108,9 @@ private static void writeQuadVerticesSlow(MutableQuadViewImpl quad, VertexConsum vertexConsumer.addVertex(xt, yt, zt); vertexConsumer.setColor(quad.baseColor(i)); - vertexConsumer.setUv(quad.getTexU(i), quad.getTexV(i)); + vertexConsumer.setUv(quad.sodium$getTexU(i), quad.sodium$getTexV(i)); vertexConsumer.setOverlay(overlay); - vertexConsumer.setLight(quad.getLight(i)); + vertexConsumer.setLight(quad.sodium$getLight(i)); if (useNormals) { int packedNormal = quad.packedNormal(i); diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/QuadViewImpl.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/QuadViewImpl.java index b549ce45e8..8cf906b743 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/QuadViewImpl.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/model/QuadViewImpl.java @@ -58,7 +58,7 @@ public class QuadViewImpl implements ModelQuadView { */ public void load() { this.isGeometryInvalid = false; - this.nominalFace = this.getLightFace(); + this.nominalFace = this.sodium$getLightFace(); NormI8.unpack(this.packedFaceNormal(), this.faceNormal); } @@ -220,17 +220,17 @@ public final int getTag() { } @Override - public float getX(int idx) { + public float sodium$getX(int idx) { return Float.intBitsToFloat(this.data[this.baseIndex + idx * VERTEX_STRIDE + VERTEX_X]); } @Override - public float getY(int idx) { + public float sodium$getY(int idx) { return Float.intBitsToFloat(this.data[this.baseIndex + idx * VERTEX_STRIDE + VERTEX_Y]); } @Override - public float getZ(int idx) { + public float sodium$getZ(int idx) { return Float.intBitsToFloat(this.data[this.baseIndex + idx * VERTEX_STRIDE + VERTEX_Z]); } @@ -239,58 +239,58 @@ public float posByIndex(int vertexIndex, int coordinateIndex) { // TODO: check } @Override - public int getColor(int idx) { + public int sodium$getColor(int idx) { return this.baseColor(idx); } @Override - public float getTexU(int idx) { + public float sodium$getTexU(int idx) { return Float.intBitsToFloat(this.data[this.baseIndex + idx * VERTEX_STRIDE + VERTEX_U]); } @Override - public float getTexV(int idx) { + public float sodium$getTexV(int idx) { return Float.intBitsToFloat(this.data[this.baseIndex + idx * VERTEX_STRIDE + VERTEX_V]); } @Override - public int getVertexNormal(int idx) { + public int sodium$getVertexNormal(int idx) { return this.data[this.normalIndex(idx)]; } @Override - public int getFaceNormal() { + public int sodium$getFaceNormal() { return this.packedFaceNormal(); } @Override - public int getLight(int idx) { + public int sodium$getLight(int idx) { return this.data[this.baseIndex + idx * VERTEX_STRIDE + VERTEX_LIGHTMAP]; } @Override - public int getTintIndex() { + public int sodium$getTintIndex() { return this.data[this.baseIndex + HEADER_TINT_INDEX]; } @Override - public TextureAtlasSprite getSprite() { + public TextureAtlasSprite sodium$getSprite() { throw new UnsupportedOperationException("Not available for QuadViewImpl."); } @Override - public Direction getLightFace() { + public Direction sodium$getLightFace() { this.computeGeometry(); return EncodingFormat.lightFace(this.data[this.baseIndex + HEADER_BITS]); } @Override - public int getMaxLightQuad(int idx) { - return this.getLight(idx); + public int sodium$getMaxLightQuad(int idx) { + return this.sodium$getLight(idx); } @Override - public int getFlags() { + public int sodium$getFlags() { return this.geometryFlags(); } diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/texture/SodiumSpriteFinderImpl.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/texture/SodiumSpriteFinderImpl.java index 1aa421a40a..43d0b7bc38 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/texture/SodiumSpriteFinderImpl.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/texture/SodiumSpriteFinderImpl.java @@ -56,8 +56,8 @@ public TextureAtlasSprite find(ModelQuadView quad) { float v = 0; for (int i = 0; i < 4; i++) { - u += quad.getTexU(i); - v += quad.getTexV(i); + u += quad.sodium$getTexU(i); + v += quad.sodium$getTexV(i); } return this.find(u * 0.25f, v * 0.25f); diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/vertex/VertexConsumerUtils.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/vertex/VertexConsumerUtils.java index ebd74b043a..f6db482385 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/client/render/vertex/VertexConsumerUtils.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/client/render/vertex/VertexConsumerUtils.java @@ -13,7 +13,7 @@ public class VertexConsumerUtils { * @return a {@link VertexBufferWriter}, or null if the consumer does not support this */ public static @Nullable VertexBufferWriter convertOrLog(VertexConsumer consumer) { - VertexBufferWriter writer = VertexBufferWriter.tryOf(consumer); + VertexBufferWriter writer = VertexBufferWriter.sodium$tryOf(consumer); if (writer == null) { VertexConsumerTracker.logBadConsumer(consumer); diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/VertexFormatMixin.java b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/VertexFormatMixin.java index fcc657224d..8f8182e414 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/VertexFormatMixin.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/VertexFormatMixin.java @@ -23,8 +23,8 @@ private void afterInit(List elements, int vertexSize, int s .allocateGlobalId((VertexFormat) (Object) this); } - @Unique + @Override public int sodium$getGlobalId() { - return this.sodium$globalId; + return sodium$globalId; } } diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/immediate/consumer/BufferBuilderMixin.java b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/immediate/consumer/BufferBuilderMixin.java index a52fb8192a..94f9c4eb00 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/immediate/consumer/BufferBuilderMixin.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/immediate/consumer/BufferBuilderMixin.java @@ -49,7 +49,7 @@ public abstract class BufferBuilderMixin implements VertexBufferWriter, BufferBu } @Override - public void push(MemoryStack stack, long src, int count, VertexFormat format) { + public void sodium$push(MemoryStack stack, long src, int count, VertexFormat format) { var length = count * this.vertexSize; // The buffer may change in the even, so we need to make sure that the diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/immediate/consumer/SheetedDecalTextureGeneratorMixin.java b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/immediate/consumer/SheetedDecalTextureGeneratorMixin.java index ac5df176fa..678844a1e3 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/immediate/consumer/SheetedDecalTextureGeneratorMixin.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/immediate/consumer/SheetedDecalTextureGeneratorMixin.java @@ -47,21 +47,21 @@ public class SheetedDecalTextureGeneratorMixin implements VertexBufferWriter { @Inject(method = "", at = @At("RETURN")) private void onInit(CallbackInfo ci) { - this.canUseIntrinsics = VertexBufferWriter.tryOf(this.delegate) != null; + this.canUseIntrinsics = VertexBufferWriter.sodium$tryOf(this.delegate) != null; } @Override - public boolean canUseIntrinsics() { + public boolean sodium$canUseIntrinsics() { return this.canUseIntrinsics; } @Override - public void push(MemoryStack stack, long ptr, int count, VertexFormat format) { + public void sodium$push(MemoryStack stack, long ptr, int count, VertexFormat format) { transform(ptr, count, format, this.normalInversePose, this.cameraInversePose, this.textureScale); - VertexBufferWriter.of(this.delegate) - .push(stack, ptr, count, format); + VertexBufferWriter.sodium$of(this.delegate) + .sodium$push(stack, ptr, count, format); } /** diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/immediate/consumer/SpriteCoordinateExpanderMixin.java b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/immediate/consumer/SpriteCoordinateExpanderMixin.java index cbe1cf339d..6d5c31dbaf 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/immediate/consumer/SpriteCoordinateExpanderMixin.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/core/render/immediate/consumer/SpriteCoordinateExpanderMixin.java @@ -6,7 +6,6 @@ import net.caffeinemc.mods.sodium.api.vertex.buffer.VertexBufferWriter; import net.caffeinemc.mods.sodium.client.render.vertex.VertexFormatOffsetCache; import net.minecraft.client.renderer.SpriteCoordinateExpander; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.UvMapping; import org.lwjgl.system.MemoryStack; import org.spongepowered.asm.mixin.Final; @@ -31,20 +30,20 @@ public class SpriteCoordinateExpanderMixin implements VertexBufferWriter { @Inject(method = "", at = @At("RETURN")) private void onInit(VertexConsumer delegate, UvMapping mapping, CallbackInfo ci) { - this.canUseIntrinsics = VertexBufferWriter.tryOf(this.delegate) != null; + this.canUseIntrinsics = VertexBufferWriter.sodium$tryOf(this.delegate) != null; } @Override - public boolean canUseIntrinsics() { + public boolean sodium$canUseIntrinsics() { return this.canUseIntrinsics; } @Override - public void push(MemoryStack stack, final long ptr, int count, VertexFormat format) { + public void sodium$push(MemoryStack stack, final long ptr, int count, VertexFormat format) { transform(ptr, count, format, this.mapping); - VertexBufferWriter.of(this.delegate) - .push(stack, ptr, count, format); + VertexBufferWriter.sodium$of(this.delegate) + .sodium$push(stack, ptr, count, format); } /** diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/entity/shadows/ShadowFeatureRendererMixin.java b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/entity/shadows/ShadowFeatureRendererMixin.java index 5aade6e4c5..7671bae499 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/entity/shadows/ShadowFeatureRendererMixin.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/entity/shadows/ShadowFeatureRendererMixin.java @@ -107,7 +107,7 @@ private static void renderShadowPart(Matrix4fc matPosition, writeShadowVertex(ptr, matPosition, maxX, minY, minZ, u2, v1, color, normal); ptr += EntityVertex.STRIDE; - writer.push(stack, buffer, 4, EntityVertex.FORMAT); + writer.sodium$push(stack, buffer, 4, EntityVertex.FORMAT); } } diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/gui/font/BakedGlyphMixin.java b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/gui/font/BakedGlyphMixin.java index f4ecb9e576..c616b9e5f5 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/gui/font/BakedGlyphMixin.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/gui/font/BakedGlyphMixin.java @@ -99,7 +99,7 @@ private void drawFast(boolean italic, write(ptr, pose, x2 + w1 + offset, h1 - offset, z, color, this.u1, this.v0, packedLightCoords); ptr += GlyphVertex.STRIDE; - writer.push(stack, buffer, 4, GlyphVertex.FORMAT); + writer.sodium$push(stack, buffer, 4, GlyphVertex.FORMAT); } } @@ -147,7 +147,7 @@ private void drawEffectFast(BakedSheetGlyph.EffectInstance effect, write(ptr, pose, x1 + offset, h2 + offset, z, color, this.u1, this.v0, packedLightCoords); ptr += GlyphVertex.STRIDE; - writer.push(stack, mem, 4, GlyphVertex.FORMAT); + writer.sodium$push(stack, mem, 4, GlyphVertex.FORMAT); } } diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/immediate/buffer_builder/intrinsics/BufferBuilderMixin.java b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/immediate/buffer_builder/intrinsics/BufferBuilderMixin.java index b361e18535..2172585136 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/immediate/buffer_builder/intrinsics/BufferBuilderMixin.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/immediate/buffer_builder/intrinsics/BufferBuilderMixin.java @@ -60,7 +60,7 @@ public void putBakedQuad(PoseStack.@NonNull Pose pose, @NonNull BakedQuad quad, return; } - VertexBufferWriter writer = VertexBufferWriter.of(this); + VertexBufferWriter writer = VertexBufferWriter.sodium$of(this); BakedQuadView quadX = (BakedQuadView) (Object) quad; diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/particle/QuadParticleRenderStateMixin.java b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/particle/QuadParticleRenderStateMixin.java index 895d1d847e..b7fd6f0a3c 100644 --- a/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/particle/QuadParticleRenderStateMixin.java +++ b/common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/render/particle/QuadParticleRenderStateMixin.java @@ -85,7 +85,7 @@ protected void render(VertexConsumer builder, ParticleVertex.put(ptr, TEMP_VECTOR.x, TEMP_VECTOR.y, TEMP_VECTOR.z, u0, v1, color, light); ptr += ParticleVertex.STRIDE; - writer.push(stack, buffer, 4, ParticleVertex.FORMAT); + writer.sodium$push(stack, buffer, 4, ParticleVertex.FORMAT); } } } diff --git a/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/block/FabricBlockAccess.java b/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/block/FabricBlockAccess.java index c949bab1bc..ecab2cf623 100644 --- a/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/block/FabricBlockAccess.java +++ b/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/block/FabricBlockAccess.java @@ -84,7 +84,7 @@ public boolean platformHasBlockData() { @Override public float getNormalVectorShade(ModelQuadView quad, BlockAndTintGetter level, boolean shade) { - return this.normalShade(level, NormI8.unpackX(quad.getFaceNormal()), NormI8.unpackY(quad.getFaceNormal()), NormI8.unpackZ(quad.getFaceNormal()), shade); + return this.normalShade(level, NormI8.unpackX(quad.sodium$getFaceNormal()), NormI8.unpackY(quad.sodium$getFaceNormal()), NormI8.unpackZ(quad.sodium$getFaceNormal()), shade); } @Override diff --git a/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/model/FabricMutableProvider.java b/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/model/FabricMutableProvider.java index 9fee7af886..9fb1e49996 100644 --- a/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/model/FabricMutableProvider.java +++ b/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/model/FabricMutableProvider.java @@ -20,7 +20,7 @@ public class FabricMutableProvider implements ColorProvider { @Override public void getColors(LevelSlice slice, BlockPos pos, BlockPos.MutableBlockPos scratchPos, BlockState state, ModelQuadView quad, int[] output, boolean smooth) { - int tintIndex = quad.getTintIndex(); + int tintIndex = quad.sodium$getTintIndex(); final BlockTintsFactory factory = BlockColorRegistry.getFactory(state); if (factory == null) { diff --git a/fabric/src/main/java/net/caffeinemc/mods/sodium/mixin/core/model/quad/BakedQuadMixin.java b/fabric/src/main/java/net/caffeinemc/mods/sodium/mixin/core/model/quad/BakedQuadMixin.java index 4322c216d8..97491471bf 100644 --- a/fabric/src/main/java/net/caffeinemc/mods/sodium/mixin/core/model/quad/BakedQuadMixin.java +++ b/fabric/src/main/java/net/caffeinemc/mods/sodium/mixin/core/model/quad/BakedQuadMixin.java @@ -52,100 +52,99 @@ private void init(Vector3fc position0, Direction direction, BakedQuad.MaterialInfo materialInfo, CallbackInfo ci) { - this.normal = this.calculateNormal(); + this.normal = this.sodium$calculateNormal(); this.normalFace = ModelQuadFacing.fromPackedNormal(this.normal); this.flags = ModelQuadFlags.getQuadFlags(this, direction); } @Override - public float getX(int idx) { + public float sodium$getX(int idx) { return this.position(idx).x(); } @Override - public float getY(int idx) { + public float sodium$getY(int idx) { return this.position(idx).y(); } @Override - public float getZ(int idx) { + public float sodium$getZ(int idx) { return this.position(idx).z(); } @Override - public int getColor(int idx) { + public int sodium$getColor(int idx) { return 0xFFFFFFFF; } @Override - public int getVertexNormal(int idx) { + public int sodium$getVertexNormal(int idx) { return this.normal; } @Override - public int getLight(int idx) { + public int sodium$getLight(int idx) { return 0; } @Override - public TextureAtlasSprite getSprite() { + public TextureAtlasSprite sodium$getSprite() { return this.materialInfo.sprite(); } @Override - public float getTexU(int idx) { + public float sodium$getTexU(int idx) { return UVPair.unpackU(this.packedUV(idx)); } @Override - public float getTexV(int idx) { + public float sodium$getTexV(int idx) { return UVPair.unpackV(this.packedUV(idx)); } @Override - public int getFlags() { + public int sodium$getFlags() { return this.flags; } @Override - public int getTintIndex() { + public int sodium$getTintIndex() { return this.materialInfo.tintIndex(); } @Override - public ModelQuadFacing getNormalFace() { + public ModelQuadFacing sodium$getNormalFace() { return this.normalFace; } @Override - public int getFaceNormal() { + public int sodium$getFaceNormal() { return this.normal; } @Override - public Direction getLightFace() { + public Direction sodium$getLightFace() { return this.direction; } @Override - public int getMaxLightQuad(int idx) { - return LightCoordsUtil.lightCoordsWithEmission(this.getLight(idx), this.materialInfo.lightEmission()); + public int sodium$getMaxLightQuad(int idx) { + return LightCoordsUtil.lightCoordsWithEmission(this.sodium$getLight(idx), this.materialInfo.lightEmission()); } @Override - public int getLightEmission() { + public int sodium$getLightEmission() { return this.materialInfo.lightEmission(); } @Override - @Unique(silent = true) // The target class has a function with the same name in a remapped environment - public boolean hasShade() { + public boolean sodium$hasShade() { return true; } @Override - public boolean hasAO() { + public boolean sodium$hasAO() { return true; } } diff --git a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/FRAPIEmitter.java b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/FRAPIEmitter.java index 979a039bc8..ec9dfedf97 100644 --- a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/FRAPIEmitter.java +++ b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/FRAPIEmitter.java @@ -16,6 +16,6 @@ public class FRAPIEmitter implements PlatformModelEmitter { @Override public void emitModel(BlockStateModel model, Predicate cullTest, MutableQuadViewImpl quad, RandomSource random, BlockAndTintGetter blockView, BlockPos pos, BlockState state, Bufferer defaultBuffer) { - ((FabricBlockStateModel) model).emitQuads(((ExtendedMutableQuadViewImpl) quad).getWrapper(), blockView, pos, state, random, cullTest); + ((FabricBlockStateModel) model).emitQuads(((ExtendedMutableQuadViewImpl) quad).sodium$getWrapper(), blockView, pos, state, random, cullTest); } } diff --git a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/SodiumRenderer.java b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/SodiumRenderer.java index 262ddb1b9f..3b48dda55b 100644 --- a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/SodiumRenderer.java +++ b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/SodiumRenderer.java @@ -36,7 +36,7 @@ */ public class SodiumRenderer implements Renderer { public static final SodiumRenderer INSTANCE = new SodiumRenderer(); - public static final Consumer BUFFERER = quad -> ((ExtendedMutableQuadViewImpl) quad).getWrapper().transformAndEmit(); + public static final Consumer BUFFERER = quad -> ((ExtendedMutableQuadViewImpl) quad).sodium$getWrapper().transformAndEmit(); private SodiumRenderer() { } diff --git a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/mesh/MeshViewImpl.java b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/mesh/MeshViewImpl.java index 68cfedd9e8..21ed83bebd 100644 --- a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/mesh/MeshViewImpl.java +++ b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/mesh/MeshViewImpl.java @@ -52,7 +52,7 @@ public void forEach(Consumer action) { QuadViewWrapper cursor; if (pool.isEmpty()) { - cursor = ((ExtendedQuadViewImpl) new QuadViewImpl()).getWrapper(); + cursor = ((ExtendedQuadViewImpl) new QuadViewImpl()).sodium$getWrapper(); } else { cursor = pool.pop(); } diff --git a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/mesh/MutableMeshImpl.java b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/mesh/MutableMeshImpl.java index 0c77ba0f23..efd34566d4 100644 --- a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/mesh/MutableMeshImpl.java +++ b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/mesh/MutableMeshImpl.java @@ -69,13 +69,13 @@ private void ensureCapacity(int stride) { @Override public QuadEmitter emitter() { this.emitter.clear(); - return ((ExtendedMutableQuadViewImpl) this.emitter).getWrapper(); + return ((ExtendedMutableQuadViewImpl) this.emitter).sodium$getWrapper(); } @Override public void forEachMutable(Consumer action) { // emitDirectly will not be called by forEach, so just reuse the main emitter. - this.forEach((a) -> action.accept((MutableQuadView) a), ((ExtendedMutableQuadViewImpl) this.emitter).getWrapper()); // TODO: probably wrong + this.forEach((a) -> action.accept((MutableQuadView) a), ((ExtendedMutableQuadViewImpl) this.emitter).sodium$getWrapper()); // TODO: probably wrong this.emitter.data = this.data; this.emitter.baseIndex = this.limit; } diff --git a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/ExtendedBlockModelFeatureRenderer.java b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/ExtendedBlockModelFeatureRenderer.java index 1a5c536b11..cbe21ebf02 100644 --- a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/ExtendedBlockModelFeatureRenderer.java +++ b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/ExtendedBlockModelFeatureRenderer.java @@ -74,7 +74,7 @@ protected void buildGroup(FeatureFrameContext context, List ExtendedItemFeatureRenderer.this.bufferMain(this); - case OUTLINE -> ExtendedItemFeatureRenderer.this.bufferOutline(((ExtendedMutableQuadViewImpl) (Object) this).getWrapper()); + case OUTLINE -> ExtendedItemFeatureRenderer.this.bufferOutline(((ExtendedMutableQuadViewImpl) (Object) this).sodium$getWrapper()); } } }; @@ -85,7 +82,7 @@ private void prepareSubmit(ExtendedItemSubmit submit) { this.outputType = OutputType.MAIN; } - QuadEmitter emitter = ((ExtendedMutableQuadViewImpl) this.emitter).getWrapper(); + QuadEmitter emitter = ((ExtendedMutableQuadViewImpl) this.emitter).sodium$getWrapper(); emitter.clear(); List vanillaQuads = submit.quads(); @@ -101,7 +98,7 @@ private void prepareSubmit(ExtendedItemSubmit submit) { } private void bufferMain(MutableQuadViewImpl q) { - var quad = ((ExtendedMutableQuadViewImpl) q).getWrapper(); + var quad = ((ExtendedMutableQuadViewImpl) q).sodium$getWrapper(); if (quad.emissive()) { quad.lightmap(LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT); } else { diff --git a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/NonTerrainBlockRenderContext.java b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/NonTerrainBlockRenderContext.java index d09975780d..2073b297b2 100644 --- a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/NonTerrainBlockRenderContext.java +++ b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/NonTerrainBlockRenderContext.java @@ -181,7 +181,7 @@ protected void processQuad(MutableQuadViewImpl quad) { } private void tintQuad(MutableQuadViewImpl quad) { - int tintIndex = quad.getTintIndex(); + int tintIndex = quad.sodium$getTintIndex(); if (tintIndex != -1) { int tint = this.getTintColor(this.level, this.state, this.pos, tintIndex); diff --git a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/wrapper/ExtendedMutableQuadViewImpl.java b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/wrapper/ExtendedMutableQuadViewImpl.java index 2f2da107a4..6f6d079204 100644 --- a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/wrapper/ExtendedMutableQuadViewImpl.java +++ b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/wrapper/ExtendedMutableQuadViewImpl.java @@ -1,5 +1,5 @@ package net.caffeinemc.mods.sodium.client.render.frapi.wrapper; public interface ExtendedMutableQuadViewImpl { - MutableQuadViewWrapper getWrapper(); + MutableQuadViewWrapper sodium$getWrapper(); } diff --git a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/wrapper/ExtendedQuadViewImpl.java b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/wrapper/ExtendedQuadViewImpl.java index 38747d3b94..4f4125933f 100644 --- a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/wrapper/ExtendedQuadViewImpl.java +++ b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/wrapper/ExtendedQuadViewImpl.java @@ -1,5 +1,5 @@ package net.caffeinemc.mods.sodium.client.render.frapi.wrapper; public interface ExtendedQuadViewImpl { - QuadViewWrapper getWrapper(); + QuadViewWrapper sodium$getWrapper(); } diff --git a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/wrapper/QuadViewWrapper.java b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/wrapper/QuadViewWrapper.java index aa80b195da..6169fa4075 100644 --- a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/wrapper/QuadViewWrapper.java +++ b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/wrapper/QuadViewWrapper.java @@ -33,17 +33,17 @@ public QuadViewWrapper(QuadViewImpl quad) { @Override public float x(int vertexIndex) { - return this.quad.getX(vertexIndex); + return this.quad.sodium$getX(vertexIndex); } @Override public float y(int vertexIndex) { - return this.quad.getY(vertexIndex); + return this.quad.sodium$getY(vertexIndex); } @Override public float z(int vertexIndex) { - return this.quad.getZ(vertexIndex); + return this.quad.sodium$getZ(vertexIndex); } @Override @@ -58,17 +58,17 @@ public Vector3f copyPos(int vertexIndex, @Nullable Vector3f target) { @Override public int color(int vertexIndex) { - return this.quad.getColor(vertexIndex); + return this.quad.sodium$getColor(vertexIndex); } @Override public float u(int vertexIndex) { - return this.quad.getTexU(vertexIndex); + return this.quad.sodium$getTexU(vertexIndex); } @Override public float v(int vertexIndex) { - return this.quad.getTexV(vertexIndex); + return this.quad.sodium$getTexV(vertexIndex); } @Override @@ -78,7 +78,7 @@ public Vector2f copyUv(int vertexIndex, @Nullable Vector2f target) { @Override public int lightmap(int vertexIndex) { - return this.quad.getLight(vertexIndex); + return this.quad.sodium$getLight(vertexIndex); } @Override @@ -113,7 +113,7 @@ public Vector3fc faceNormal() { @Override public @NonNull Direction lightFace() { - return this.quad.getLightFace(); + return this.quad.sodium$getLightFace(); } @Override @@ -182,7 +182,7 @@ public QuadAtlas atlas() { @Override public int tintIndex() { - return this.quad.getTintIndex(); + return this.quad.sodium$getTintIndex(); } @Override diff --git a/frapi/src/main/java/net/caffeinemc/mods/sodium/mixin/frapi/MutableQuadViewImplMixin.java b/frapi/src/main/java/net/caffeinemc/mods/sodium/mixin/frapi/MutableQuadViewImplMixin.java index bc1ca5c8ad..9238db078a 100644 --- a/frapi/src/main/java/net/caffeinemc/mods/sodium/mixin/frapi/MutableQuadViewImplMixin.java +++ b/frapi/src/main/java/net/caffeinemc/mods/sodium/mixin/frapi/MutableQuadViewImplMixin.java @@ -12,7 +12,7 @@ public class MutableQuadViewImplMixin implements ExtendedMutableQuadViewImpl { private MutableQuadViewWrapper wrapper; @Override - public MutableQuadViewWrapper getWrapper() { + public MutableQuadViewWrapper sodium$getWrapper() { if (this.wrapper == null) this.wrapper = new MutableQuadViewWrapper((MutableQuadViewImpl) (Object) this); return this.wrapper; } diff --git a/frapi/src/main/java/net/caffeinemc/mods/sodium/mixin/frapi/QuadViewImplMixin.java b/frapi/src/main/java/net/caffeinemc/mods/sodium/mixin/frapi/QuadViewImplMixin.java index 1e0d780afa..ff4c7951d0 100644 --- a/frapi/src/main/java/net/caffeinemc/mods/sodium/mixin/frapi/QuadViewImplMixin.java +++ b/frapi/src/main/java/net/caffeinemc/mods/sodium/mixin/frapi/QuadViewImplMixin.java @@ -12,7 +12,7 @@ public class QuadViewImplMixin implements ExtendedQuadViewImpl { private QuadViewWrapper wrapper; @Override - public QuadViewWrapper getWrapper() { + public QuadViewWrapper sodium$getWrapper() { if (this.wrapper == null) this.wrapper = new QuadViewWrapper((QuadViewImpl) (Object) this); return this.wrapper; } diff --git a/neoforge/src/mod/java/net/caffeinemc/mods/sodium/mixin/core/model/quad/BakedQuadMixin.java b/neoforge/src/mod/java/net/caffeinemc/mods/sodium/mixin/core/model/quad/BakedQuadMixin.java index 739fd800ec..344b14cd3e 100644 --- a/neoforge/src/mod/java/net/caffeinemc/mods/sodium/mixin/core/model/quad/BakedQuadMixin.java +++ b/neoforge/src/mod/java/net/caffeinemc/mods/sodium/mixin/core/model/quad/BakedQuadMixin.java @@ -63,100 +63,100 @@ private void init(Vector3fc position0, BakedNormals bakedNormals, BakedColors bakedColors, CallbackInfo ci) { - this.sodium$normal = this.calculateNormal(); + this.sodium$normal = this.sodium$calculateNormal(); this.sodium$normalFace = ModelQuadFacing.fromPackedNormal(this.sodium$normal); this.sodium$flags = ModelQuadFlags.getQuadFlags(this, direction); } @Override - public float getX(int idx) { + public float sodium$getX(int idx) { return this.position(idx).x(); } @Override - public float getY(int idx) { + public float sodium$getY(int idx) { return this.position(idx).y(); } @Override - public float getZ(int idx) { + public float sodium$getZ(int idx) { return this.position(idx).z(); } @Override - public int getColor(int idx) { + public int sodium$getColor(int idx) { return this.bakedColors.color(idx); // default is -1 for now } @Override - public int getVertexNormal(int idx) { + public int sodium$getVertexNormal(int idx) { //this.vertices[ModelQuadUtil.vertexOffset(idx) + ModelQuadUtil.NORMAL_INDEX]; return this.bakedNormals == BakedNormals.UNSPECIFIED ? -1 : this.bakedNormals.normal(idx); } @Override - public int getLight(int idx) { + public int sodium$getLight(int idx) { return 0;//this.vertices[ModelQuadUtil.vertexOffset(idx) + ModelQuadUtil.LIGHT_INDEX]; } @Override - public TextureAtlasSprite getSprite() { + public TextureAtlasSprite sodium$getSprite() { return this.materialInfo.sprite(); } @Override - public float getTexU(int idx) { + public float sodium$getTexU(int idx) { return UVPair.unpackU(this.packedUV(idx)); } @Override - public float getTexV(int idx) { + public float sodium$getTexV(int idx) { return UVPair.unpackV(this.packedUV(idx)); } @Override - public int getFlags() { + public int sodium$getFlags() { return this.sodium$flags; } @Override - public int getTintIndex() { + public int sodium$getTintIndex() { return this.materialInfo.tintIndex(); } @Override - public ModelQuadFacing getNormalFace() { + public ModelQuadFacing sodium$getNormalFace() { return this.sodium$normalFace; } @Override - public int getFaceNormal() { + public int sodium$getFaceNormal() { return this.sodium$normal; } @Override - public Direction getLightFace() { + public Direction sodium$getLightFace() { return this.direction; } @Override - public int getMaxLightQuad(int idx) { - return LightCoordsUtil.lightCoordsWithEmission(this.getLight(idx), this.materialInfo.lightEmission()); + public int sodium$getMaxLightQuad(int idx) { + return LightCoordsUtil.lightCoordsWithEmission(this.sodium$getLight(idx), this.materialInfo.lightEmission()); } @Override - public int getLightEmission() { + public int sodium$getLightEmission() { return this.materialInfo.lightEmission(); } @Override - public boolean hasShade() { + public boolean sodium$hasShade() { return true; } @Override - public boolean hasAO() { + public boolean sodium$hasAO() { return this.materialInfo.ambientOcclusion(); } } diff --git a/neoforge/src/mod/java/net/caffeinemc/mods/sodium/neoforge/block/NeoForgeBlockAccess.java b/neoforge/src/mod/java/net/caffeinemc/mods/sodium/neoforge/block/NeoForgeBlockAccess.java index b7104b469b..8a81cfdf37 100644 --- a/neoforge/src/mod/java/net/caffeinemc/mods/sodium/neoforge/block/NeoForgeBlockAccess.java +++ b/neoforge/src/mod/java/net/caffeinemc/mods/sodium/neoforge/block/NeoForgeBlockAccess.java @@ -85,7 +85,7 @@ public boolean platformHasBlockData() { @Override public float getNormalVectorShade(ModelQuadView quad, BlockAndTintGetter level, boolean shade) { - return this.normalShade(level, NormI8.unpackX(quad.getFaceNormal()), NormI8.unpackY(quad.getFaceNormal()), NormI8.unpackZ(quad.getFaceNormal()), shade); + return this.normalShade(level, NormI8.unpackX(quad.sodium$getFaceNormal()), NormI8.unpackY(quad.sodium$getFaceNormal()), NormI8.unpackZ(quad.sodium$getFaceNormal()), shade); } @Override diff --git a/neoforge/src/mod/java/net/caffeinemc/mods/sodium/neoforge/model/NeoForgeDynamicColorProvider.java b/neoforge/src/mod/java/net/caffeinemc/mods/sodium/neoforge/model/NeoForgeDynamicColorProvider.java index 7e1a811b6c..1535b520df 100644 --- a/neoforge/src/mod/java/net/caffeinemc/mods/sodium/neoforge/model/NeoForgeDynamicColorProvider.java +++ b/neoforge/src/mod/java/net/caffeinemc/mods/sodium/neoforge/model/NeoForgeDynamicColorProvider.java @@ -19,7 +19,7 @@ public class NeoForgeDynamicColorProvider implements ColorProvider { @Override public void getColors(LevelSlice slice, BlockPos pos, BlockPos.MutableBlockPos scratchPos, BlockState state, ModelQuadView quad, int[] output, boolean smooth) { - int tintIndex = quad.getTintIndex(); + int tintIndex = quad.sodium$getTintIndex(); if (this.slice != slice || this.state != state || !this.pos.equals(pos)) { this.pos.set(pos);