From bfa60b48cffef3886b6723cfec2070fb94ac4d96 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Thu, 23 Apr 2026 17:54:41 -0500 Subject: [PATCH] Fix iris transparent blending --- .../common/render/blaze/BlazeDhTerrainRenderer.java | 3 +++ .../common/render/openGl/terrain/GlDhTerrainShaderProgram.java | 3 +++ coreSubProjects | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java index 1feba4dd5..989225473 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java @@ -19,6 +19,7 @@ import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.VertexFormat; import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeBufferRenderEvent; +import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeRenderPassEvent; import com.seibel.distanthorizons.common.render.blaze.util.BlazeDhVertexFormatUtil; import com.seibel.distanthorizons.common.render.blaze.util.BlazeUniformUtil; import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPipelineBuilderWrapper; @@ -267,6 +268,8 @@ public class BlazeDhTerrainRenderer implements IDhTerrainRenderer { profiler.popPush("rendering"); + ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderPassEvent.class, renderEventParam); + // create a render pass try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass( this::getRenderPassName, diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/terrain/GlDhTerrainShaderProgram.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/terrain/GlDhTerrainShaderProgram.java index df547a171..2b156b11d 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/terrain/GlDhTerrainShaderProgram.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/terrain/GlDhTerrainShaderProgram.java @@ -289,6 +289,9 @@ public class GlDhTerrainShaderProgram extends GlShaderProgram implements IDhApiS GLMC.disableBlend(); } + // needs to be triggered after DH attempts to set the GL state so that Iris + // can override it as needed + ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderPassEvent.class, renderEventParam); diff --git a/coreSubProjects b/coreSubProjects index bf2affa6d..9e60c698d 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit bf2affa6d10fa3aaeb034966a124cd9b45ef753b +Subproject commit 9e60c698dee1ffbd3945fd16b55b929423c27306