From 4d85053a4d728cd521529b669ce3954f157b56a0 Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 2 Jul 2024 10:12:16 -0700 Subject: [PATCH] Send last PoseStack pos to RenderLevelStageEvent AFTER_PARTICLES stage. Fixes #10031 --- .../net/minecraft/client/renderer/LevelRenderer.java.patch | 4 ++-- .../minecraftforge/client/event/RenderLevelStageEvent.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/renderer/LevelRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/LevelRenderer.java.patch index 29668772f0..0f977dbe1c 100644 --- a/patches/minecraft/net/minecraft/client/renderer/LevelRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/LevelRenderer.java.patch @@ -139,7 +139,7 @@ profilerfiller.popPush("particles"); - this.minecraft.particleEngine.render(p_109606_, p_109604_, f); + this.minecraft.particleEngine.render(p_109606_, p_109604_, f, frustum); -+ net.minecraftforge.client.event.RenderLevelStageEvent.Stage.AFTER_PARTICLES.dispatch(this, p_254120_, p_254120_, this.ticks, p_109604_, frustum); ++ net.minecraftforge.client.event.RenderLevelStageEvent.Stage.AFTER_PARTICLES.dispatch(this, posestack.last().pose(), p_254120_, this.ticks, p_109604_, frustum); RenderStateShard.PARTICLES_TARGET.clearRenderState(); } else { profilerfiller.popPush("translucent"); @@ -149,7 +149,7 @@ profilerfiller.popPush("particles"); - this.minecraft.particleEngine.render(p_109606_, p_109604_, f); + this.minecraft.particleEngine.render(p_109606_, p_109604_, f, frustum); -+ net.minecraftforge.client.event.RenderLevelStageEvent.Stage.AFTER_PARTICLES.dispatch(this, p_254120_, p_254120_, this.ticks, p_109604_, frustum); ++ net.minecraftforge.client.event.RenderLevelStageEvent.Stage.AFTER_PARTICLES.dispatch(this, posestack.last().pose(), p_254120_, this.ticks, p_109604_, frustum); } if (this.minecraft.options.getCloudsType() != CloudStatus.OFF) { diff --git a/src/main/java/net/minecraftforge/client/event/RenderLevelStageEvent.java b/src/main/java/net/minecraftforge/client/event/RenderLevelStageEvent.java index 2f0ed51b8f..e69c8c085d 100644 --- a/src/main/java/net/minecraftforge/client/event/RenderLevelStageEvent.java +++ b/src/main/java/net/minecraftforge/client/event/RenderLevelStageEvent.java @@ -77,8 +77,9 @@ public class RenderLevelStageEvent extends Event { } /** - * {@return the pose stack used for rendering} + * @deprecated Mojang has stopped passing around PosStacks. getProjectionMatrix should be enough. */ + @Deprecated(forRemoval = true, since = "1.21") public Matrix4f getPoseStack() { return poseStack; }