From 528958fa8c19299de08dcce38fd3b2d734414ed5 Mon Sep 17 00:00:00 2001
From: Martin Prokoph <motschen@midnightdust.eu>
Date: Sat, 19 Apr 2025 09:58:54 +0200
Subject: [PATCH] fix: improve gradient handling

---
 .../main/java/eu/midnightdust/blur/Blur.java  | 21 +++++++++++--------
 .../blur/mixin/MixinHandledScreen.java        |  2 +-
 .../midnightdust/blur/mixin/MixinScreen.java  |  4 +++-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/common/src/main/java/eu/midnightdust/blur/Blur.java b/common/src/main/java/eu/midnightdust/blur/Blur.java
index 72b788b..af5f62f 100644
--- a/common/src/main/java/eu/midnightdust/blur/Blur.java
+++ b/common/src/main/java/eu/midnightdust/blur/Blur.java
@@ -23,20 +23,19 @@ public class Blur {
 
     public static boolean doFade = false;
 
-    static float lastDelta;
-    public static void onRender(DrawContext context, int width, int height, MinecraftClient client, float delta) {
+    public static void onRender() {
         if (!BlurInfo.doTest && BlurInfo.screenChanged) { // After the tests for blur and background color have been completed
             Blur.onScreenChange();
             BlurInfo.screenChanged = false;
         }
-
+        BlurInfo.doTest = false; // Set the test state to completed, as tests will happen in the same tick.
+    }
+    public static void renderFadeout(DrawContext context, int width, int height, MinecraftClient client) {
         if (BlurInfo.start >= 0 && !BlurInfo.screenHasBlur && BlurInfo.prevScreenHasBlur) { // Fade out in non-blurred screens
             client.gameRenderer.renderBlur();
 
-            if (BlurInfo.prevScreenHasBackground && BlurConfig.useGradient && lastDelta != delta) Blur.renderRotatedGradient(context, width, height);
-            lastDelta = delta;
+            if (BlurInfo.prevScreenHasBackground && BlurConfig.useGradient) Blur.renderRotatedGradient(context, width, height);
         }
-        BlurInfo.doTest = false; // Set the test state to completed, as tests will happen in the same tick.
     }
 
     public static void onScreenChange() {
@@ -79,7 +78,10 @@ public class Blur {
         int b = (col.getRGB() >> 8) & 0xFF;
         int g = col.getRGB() & 0xFF;
         float prog = progress;
-        a *= prog; r *= prog; g *= prog; b *= prog;
+        a = (int) (prog * a);
+        r = (int) (prog * r);
+        g = (int) (prog * g);
+        b = (int) (prog * b);
         return a << 24 | r << 16 | b << 8 | g;
     }
     public static int getRotation() {
@@ -90,11 +92,12 @@ public class Blur {
         float diagonal = Math.sqrt((float) width*width + height*height);
         int smallestDimension = Math.min(width, height);
 
+        context.getMatrices().push();
         Matrix4f posMatrix = context.getMatrices().peek().getPositionMatrix();
         posMatrix.rotationZ(Math.toRadians(getRotation()));
-        posMatrix.setTranslation(width / 2f, height / 2f, 0); // Make the gradient's center the pivot point
+        posMatrix.setTranslation(width / 2f, height / 2f, -1); // Make the gradient's center the pivot point
         posMatrix.scale(diagonal / smallestDimension); // Scales the gradient to the maximum diagonal value needed
         context.fillGradient(-width / 2, -height / 2, width / 2, height / 2, Blur.getBackgroundColor(false), Blur.getBackgroundColor(true)); // Actually draw the gradient
-        posMatrix.rotationZ(0);
+        context.getMatrices().pop();
     }
 }
diff --git a/common/src/main/java/eu/midnightdust/blur/mixin/MixinHandledScreen.java b/common/src/main/java/eu/midnightdust/blur/mixin/MixinHandledScreen.java
index 052b33d..4e73fc7 100644
--- a/common/src/main/java/eu/midnightdust/blur/mixin/MixinHandledScreen.java
+++ b/common/src/main/java/eu/midnightdust/blur/mixin/MixinHandledScreen.java
@@ -24,6 +24,6 @@ public class MixinHandledScreen extends Screen {
     }
     @Inject(at = @At("HEAD"), method = "render")
     public void blur$processScreenChange(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (PlatformFunctions.getPlatformName().equals("neoforge")) Blur.onRender(context, width, height, this.client, delta);
+        if (PlatformFunctions.getPlatformName().equals("neoforge")) Blur.onRender();
     }
 }
diff --git a/common/src/main/java/eu/midnightdust/blur/mixin/MixinScreen.java b/common/src/main/java/eu/midnightdust/blur/mixin/MixinScreen.java
index 8d8899d..9a872e2 100755
--- a/common/src/main/java/eu/midnightdust/blur/mixin/MixinScreen.java
+++ b/common/src/main/java/eu/midnightdust/blur/mixin/MixinScreen.java
@@ -30,8 +30,10 @@ public abstract class MixinScreen {
 
     @Inject(at = @At("HEAD"), method = "render")
     public void blur$processScreenChange(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        Blur.onRender(context, width, height, this.client, delta);
+        Blur.onRender();
+        Blur.renderFadeout(context, width, height, client);
     }
+
     @Inject(at = @At("HEAD"), method = "applyBlur", cancellable = true)
     public void blur$getBlurEnabled(CallbackInfo ci) {
         if (BlurConfig.forceDisabledScreens.contains(this.getClass().getCanonicalName())) {