diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/StateAwareTessellator.java b/src/main/java/com/gtnewhorizons/angelica/rendering/StateAwareTessellator.java index 0d951a5a3..e5b275e35 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/StateAwareTessellator.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/StateAwareTessellator.java @@ -16,4 +16,8 @@ public interface StateAwareTessellator { void angelica$setCeleritasMeshing(boolean active); int[] angelica$getVertexStates(); + + int[] angelica$getShaderOverrideBlockIds(); + + void angelica$setShaderOverrideBlockId(short blockId); } diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuildContext.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuildContext.java index fb05992a6..f7302715b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuildContext.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuildContext.java @@ -115,6 +115,7 @@ public class AngelicaChunkBuildContext extends ChunkBuildContext { @SuppressWarnings("unchecked") public void copyRawBuffer(int[] rawBuffer, int vertexCount, int[] vertexStates, + int[] shaderOverrideBlockIds, ChunkBuildBuffers buffers, Material material, boolean isShaderPackOverride, boolean blockAllowsSmoothLighting) { if (vertexCount == 0) { @@ -145,6 +146,8 @@ public class AngelicaChunkBuildContext extends ChunkBuildContext { final int worldY = originY + blockY; final int worldZ = originZ + blockZ; + final short originalBlockId = blockRenderContext.blockId; + int stateIdx = 0; int facesAtBaseMaterial = 0; @@ -239,6 +242,9 @@ public class AngelicaChunkBuildContext extends ChunkBuildContext { } final var builder = buffers.get(correctMaterial); + final int shaderOverrideBlockId = shaderOverrideBlockIds[quadIdx * 4]; + blockRenderContext.blockId = shaderOverrideBlockId != -1 ? (short) shaderOverrideBlockId : originalBlockId; + if (correctMaterial != material && builder.getEncoder() instanceof IrisExtendedChunkVertexEncoder iris) { iris.setContext(blockRenderContext); } 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 b79274df0..5cdeb740d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java @@ -270,6 +270,7 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask blockMetaMatches = BlockRenderingSettings.INSTANCE.getBlockMetaMatches(); - if (blockMetaMatches == null) { - return -1; - } - contextHolder = new BlockContextHolder(blockMetaMatches); - - } - contextHolder.set(block, meta, (short) block.getRenderType()); - return contextHolder.blockId; - } - public static void setShaderMaterialOverride(Block block, int meta) { if (!enabled) return; - int blockId = getShaderMaterialOverrideId(block, meta); + final Reference2ObjectMap blockMetaMatches = BlockRenderingSettings.INSTANCE.getBlockMetaMatches(); + if (blockMetaMatches == null) + return; - if (TessellatorManager.get() instanceof CapturingTessellator tess) - tess.setShaderBlockId(blockId); + final Int2IntMap metaMap = blockMetaMatches.get(block); + final int blockId = metaMap != null ? metaMap.get(meta) : -1; + + if (TessellatorManager.get() instanceof StateAwareTessellator tess) + tess.angelica$setShaderOverrideBlockId((short) blockId); } public static void resetShaderMaterialOverride() { if (!enabled) return; - if (TessellatorManager.get() instanceof CapturingTessellator tess) - tess.setShaderBlockId(-1); + if (TessellatorManager.get() instanceof StateAwareTessellator tess) + tess.angelica$setShaderOverrideBlockId((short) -1); } } diff --git a/src/main/java/net/coderbot/iris/block_context/BlockContextHolder.java b/src/main/java/net/coderbot/iris/block_context/BlockContextHolder.java deleted file mode 100644 index a95ca951b..000000000 --- a/src/main/java/net/coderbot/iris/block_context/BlockContextHolder.java +++ /dev/null @@ -1,39 +0,0 @@ -package net.coderbot.iris.block_context; - -import it.unimi.dsi.fastutil.ints.Int2IntMap; -import it.unimi.dsi.fastutil.objects.Reference2ObjectMap; -import net.minecraft.block.Block; - -/** - * Holds block context for shader material ID lookups. - */ -public class BlockContextHolder { - private final Reference2ObjectMap blockMetaMatches; - public int blockId; - public short renderType; - - public BlockContextHolder(Reference2ObjectMap blockMetaMatches) { - this.blockMetaMatches = blockMetaMatches; - this.blockId = -1; - this.renderType = -1; - } - - /** - * Set the material ID for a block. - * @param block The block - * @param meta The block metadata - * @param renderType The render type - */ - public void set(Block block, int meta, short renderType) { - Int2IntMap metaMap = this.blockMetaMatches != null ? this.blockMetaMatches.get(block) : null; - int id = metaMap != null ? metaMap.get(meta) : -1; - - this.blockId = id; - this.renderType = renderType; - } - - public void reset() { - this.blockId = -1; - this.renderType = -1; - } -} diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinTessellator.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinTessellator.java index 2821d2f27..82c4093a7 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinTessellator.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinTessellator.java @@ -14,6 +14,12 @@ public class MixinTessellator implements StateAwareTessellator { @Unique private final IntArrayList vertexStates = new IntArrayList(); + @Unique + private final IntArrayList shaderOverrideBlockIds = new IntArrayList(); + + @Unique + private short currentShaderOverrideBlockId = -1; + @Unique private boolean appliedAo; @@ -33,11 +39,14 @@ public class MixinTessellator implements StateAwareTessellator { state |= StateAwareTessellator.RENDERED_WITH_VANILLA_AO; } this.vertexStates.add(state); + this.shaderOverrideBlockIds.add(currentShaderOverrideBlockId); } @Inject(method = "reset", at = @At("RETURN")) private void resetVertexStates(CallbackInfo ci) { this.vertexStates.clear(); + this.shaderOverrideBlockIds.clear(); + this.currentShaderOverrideBlockId = -1; } @Override @@ -49,4 +58,14 @@ public class MixinTessellator implements StateAwareTessellator { public int[] angelica$getVertexStates() { return this.vertexStates.elements(); } + + @Override + public int[] angelica$getShaderOverrideBlockIds() { + return this.shaderOverrideBlockIds.elements(); + } + + @Override + public void angelica$setShaderOverrideBlockId(short blockId) { + this.currentShaderOverrideBlockId = blockId; + } }