From de587eb50a61d5099ceb4e756cb8c60b6026d7f3 Mon Sep 17 00:00:00 2001 From: Ven Date: Sat, 26 Oct 2024 20:22:19 +0100 Subject: [PATCH] Fix pause menu having a black background, reverts PR #10115 --- .../blaze3d/platform/GlStateManager.java.patch | 12 ++++++++++++ .../mojang/blaze3d/systems/RenderSystem.java.patch | 14 ++++++++++++++ .../client/renderer/GameRenderer.java.patch | 10 ++++++---- 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 patches/minecraft/com/mojang/blaze3d/systems/RenderSystem.java.patch diff --git a/patches/minecraft/com/mojang/blaze3d/platform/GlStateManager.java.patch b/patches/minecraft/com/mojang/blaze3d/platform/GlStateManager.java.patch index aa078314f5..6b6ce56a7a 100644 --- a/patches/minecraft/com/mojang/blaze3d/platform/GlStateManager.java.patch +++ b/patches/minecraft/com/mojang/blaze3d/platform/GlStateManager.java.patch @@ -1,5 +1,17 @@ --- a/com/mojang/blaze3d/platform/GlStateManager.java +++ b/com/mojang/blaze3d/platform/GlStateManager.java +@@ -94,6 +_,11 @@ + } + } + ++ public static boolean _isBlendEnabled() { ++ RenderSystem.assertOnRenderThread(); ++ return BLEND.mode.enabled; ++ } ++ + public static void _disableBlend() { + RenderSystem.assertOnRenderThread(); + BLEND.mode.disable(); @@ -519,9 +_,17 @@ } } diff --git a/patches/minecraft/com/mojang/blaze3d/systems/RenderSystem.java.patch b/patches/minecraft/com/mojang/blaze3d/systems/RenderSystem.java.patch new file mode 100644 index 0000000000..c9e0b8b1c3 --- /dev/null +++ b/patches/minecraft/com/mojang/blaze3d/systems/RenderSystem.java.patch @@ -0,0 +1,14 @@ +--- a/com/mojang/blaze3d/systems/RenderSystem.java ++++ b/com/mojang/blaze3d/systems/RenderSystem.java +@@ -196,6 +_,11 @@ + GlStateManager._depthMask(p_69459_); + } + ++ public static boolean isBlendEnabled() { ++ assertOnRenderThread(); ++ return GlStateManager._isBlendEnabled(); ++ } ++ + public static void enableBlend() { + assertOnRenderThread(); + GlStateManager._enableBlend(); diff --git a/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch index 2ff61dfcc8..5b973bb884 100644 --- a/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch @@ -11,15 +11,17 @@ } } -@@ -171,8 +_,11 @@ +@@ -171,8 +_,13 @@ if (!(f < 1.0F)) { PostChain postchain = this.minecraft.getShaderManager().getPostChain(BLUR_POST_CHAIN_ID, LevelTargetBundle.MAIN_TARGETS); if (postchain != null) { -+ // FORGE: Blending the blur was removed in 1.21. This is necessary for screen layering to work properly. https://github.com/MinecraftForge/MinecraftForge/issues/10114 -+ RenderSystem.enableBlend(); ++ boolean wasBlendEnabled = RenderSystem.isBlendEnabled(); ++ if (wasBlendEnabled) ++ RenderSystem.disableBlend(); postchain.setUniform("Radius", f); postchain.process(this.minecraft.getMainRenderTarget(), this.resourcePool); -+ RenderSystem.disableBlend(); ++ if (wasBlendEnabled) ++ RenderSystem.enableBlend(); } } }