Remove MixinInGameHud mixin (#9)

dima-dencep · Nov 27, 2023 · 5a985b6 · 5a985b6
1 parent 5397ab1
commit 5a985b6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 32 deletions.
diff --git a/src/main/java/com/tterrag/blur/Blur.java b/src/main/java/com/tterrag/blur/Blur.java
@@ -8,6 +8,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.util.Identifier;
+import net.minecraftforge.client.event.RenderGuiEvent;
 import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Mod;
@@ -37,7 +38,11 @@ public Blur() {
                 blur.render(event.tickDelta);
             }
         });
-
+        MinecraftForge.EVENT_BUS.<RenderGuiEvent.Post>addListener(event -> {
+            if (client.currentScreen == null && client.world != null && Blur.start > 0 && BlurConfig.INSTANCE.blurExclusions.get().stream().noneMatch(exclusion -> Blur.prevScreen.startsWith(exclusion)) && Blur.screenHasBackground) {
+                event.getGuiGraphics().fillGradient(0, 0, event.getWindow().getScaledWidth(), event.getWindow().getScaledHeight(), Blur.getBackgroundColor(false, false), Blur.getBackgroundColor(true, false));
+            }
+        });
         MinecraftForge.EVENT_BUS.<ScreenEvent.BackgroundRendered>addListener(event -> Blur.screenHasBackground = true);
         MinecraftForge.EVENT_BUS.<ScreenEvent.Opening>addListener(event -> {
             if (event.getCurrentScreen() != null) {

diff --git a/src/main/java/com/tterrag/blur/mixin/MixinInGameHud.java b/src/main/java/com/tterrag/blur/mixin/MixinInGameHud.java
diff --git a/src/main/java/com/tterrag/blur/mixin/MixinScreen.java b/src/main/java/com/tterrag/blur/mixin/MixinScreen.java
@@ -12,14 +12,22 @@
 public abstract class MixinScreen {
     @ModifyConstant(
             method = "renderBackground",
-            constant = @Constant(intValue = -1072689136))
+            constant = @Constant(
+                    intValue = -1072689136
+            ),
+            require = 0
+    )
     private int blur$getFirstBackgroundColor(int color) {
         return Blur.getBackgroundColor(false, true);
     }
 
     @ModifyConstant(
             method = "renderBackground",
-            constant = @Constant(intValue = -804253680))
+            constant = @Constant(
+                    intValue = -804253680
+            ),
+            require = 0
+    )
     private int blur$getSecondBackgroundColor(int color) {
         return Blur.getBackgroundColor(true, true);
     }

diff --git a/src/main/resources/mixins.blur.json b/src/main/resources/mixins.blur.json
@@ -4,8 +4,7 @@
   "package": "com.tterrag.blur.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "MixinScreen",
-    "MixinInGameHud"
+    "MixinScreen"
   ],
   "injectors": {
     "defaultRequire": 1