Merge branch 'trunk' into 1.18.2

# Conflicts: # src/main/java/net/coderbot/iris/mixin/entity_render_context/MixinBlockEntityRenderDispatcher.java
IrisShaders · Dec 7, 2022 · 82ff39a · 82ff39a
2 parents 22b39f8 + 1d83e84
commit 82ff39a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/.../java/net/coderbot/iris/mixin/entity_render_context/MixinBlockEntityRenderDispatcher.java b/.../java/net/coderbot/iris/mixin/entity_render_context/MixinBlockEntityRenderDispatcher.java
@@ -1,6 +1,7 @@
 package net.coderbot.iris.mixin.entity_render_context;
 
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import net.coderbot.batchedentityrendering.impl.Groupable;
 import net.coderbot.iris.block_rendering.BlockRenderingSettings;
 import net.coderbot.iris.layer.BlockEntityRenderStateShard;
 import net.coderbot.iris.layer.OuterWrappedRenderType;
@@ -33,6 +34,11 @@ public class MixinBlockEntityRenderDispatcher {
 		target = "Lnet/minecraft/world/level/block/entity/BlockEntityType;isValid(Lnet/minecraft/world/level/block/state/BlockState;)Z"),
 		allow = 1, require = 1)
 	private <E extends BlockEntity> MultiBufferSource iris$wrapBufferSource(MultiBufferSource bufferSource, BlockEntity blockEntity) {
+		if (!(bufferSource instanceof Groupable)) {
+			// Fully batched entity rendering is not being used, do not use this wrapper!!!
+			return bufferSource;
+		}
+
 		Object2IntMap<BlockState> blockStateIds = BlockRenderingSettings.INSTANCE.getBlockStateIds();
 
 		if (blockStateIds == null ) {

diff --git a/src/main/java/net/coderbot/iris/mixin/entity_render_context/MixinEntityRenderDispatcher.java b/src/main/java/net/coderbot/iris/mixin/entity_render_context/MixinEntityRenderDispatcher.java
@@ -1,6 +1,7 @@
 package net.coderbot.iris.mixin.entity_render_context;
 
 import it.unimi.dsi.fastutil.objects.Object2IntFunction;
+import net.coderbot.batchedentityrendering.impl.Groupable;
 import net.coderbot.iris.block_rendering.BlockRenderingSettings;
 import net.coderbot.iris.layer.EntityRenderStateShard;
 import net.coderbot.iris.layer.OuterWrappedRenderType;
@@ -26,6 +27,11 @@ public class MixinEntityRenderDispatcher {
 	@ModifyVariable(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/PoseStack;pushPose()V", shift = At.Shift.AFTER),
 		allow = 1, require = 1)
 	private MultiBufferSource iris$beginEntityRender(MultiBufferSource bufferSource, Entity entity) {
+		if (!(bufferSource instanceof Groupable)) {
+			// Fully batched entity rendering is not being used, do not use this wrapper!!!
+			return bufferSource;
+		}
+
 		ResourceLocation entityId = Registry.ENTITY_TYPE.getKey(entity.getType());
 
 		Object2IntFunction<NamespacedId> entityIds = BlockRenderingSettings.INSTANCE.getEntityIds();

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "iris",
-  "version": "1.4.4-development-environment",
+  "version": "1.4.5-development-environment",
 
   "name": "Iris",
   "description": "A modern shaders mod for Minecraft intended to be compatible with existing OptiFine shader packs",