Fix weird duplications with TntMinecartRenderer mixin

shinkleihh · Sep 14, 2021 · 9dfcb86 · 9dfcb86
1 parent 409b793
commit 9dfcb86
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 33 deletions.
diff --git a/src/main/java/net/coderbot/iris/mixin/MixinTntMinecartEntityRenderer.java b/src/main/java/net/coderbot/iris/mixin/MixinTntMinecartEntityRenderer.java
diff --git a/src/main/java/net/coderbot/iris/mixin/MixinTntMinecartRenderer.java b/src/main/java/net/coderbot/iris/mixin/MixinTntMinecartRenderer.java
@@ -1,8 +1,9 @@
 package net.coderbot.iris.mixin;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.coderbot.batchedentityrendering.impl.Groupable;
 import net.coderbot.iris.layer.EntityColorRenderStateShard;
-import net.coderbot.iris.layer.InnerWrappedRenderType;
+import net.coderbot.iris.layer.EntityColorMultiBufferSource;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.entity.TntMinecartRenderer;
 import net.minecraft.world.level.block.state.BlockState;
@@ -14,9 +15,14 @@
 public abstract class MixinTntMinecartRenderer {
 	@ModifyVariable(method = "renderWhiteSolidBlock", at = @At("HEAD"))
 	private static MultiBufferSource iris$wrapProvider(MultiBufferSource provider, BlockState blockState, PoseStack matrices, MultiBufferSource bufferSource, int light, boolean drawFlash) {
+		if (!(provider instanceof Groupable)) {
+			// Entity color is not supported in this context, no buffering available.
+			return provider;
+		}
+
 		if (drawFlash) {
 			EntityColorRenderStateShard phase = new EntityColorRenderStateShard(false, 1.0F);
-			return type -> provider.getBuffer(new InnerWrappedRenderType("iris_entity_color", type, phase));
+			return new EntityColorMultiBufferSource(provider, phase);
 		} else {
 			return provider;
 		}

diff --git a/src/main/resources/mixins.iris.json b/src/main/resources/mixins.iris.json
@@ -22,7 +22,7 @@
     "MixinTextureAtlas",
     "MixinTheEndPortalRenderer",
     "MixinTitleScreen",
-    "MixinTntMinecartEntityRenderer",
+    "MixinTntMinecartRenderer",
     "MixinTweakFarPlane",
     "entity_render_context.MixinBlockEntityRenderDispatcher",
     "entity_render_context.MixinEntityRenderDispatcher",