feat: various improvements

- Update to MidnightLib 1.7.0 and use its features to make the config screen more reliable
- Fix background gradient being opaque briefly when fading out while not in a world
- Fix 1.21.5 compat (still compatible with 1.21.4 as well :D)

README.md

@@ -1,5 +1,3 @@
-![Banner art for the mod Blur+](https://i.ibb.co/GM4HVDC/PoBrnNM.png)  
-
 Ever thought that the world behind your inventory was just too distracting?  
 Or that the default Minecraft blur effect is just too boring?  
 Then this mod is just right for you!

common/src/main/java/eu/midnightdust/blur/Blur.java

@@ -3,6 +3,7 @@ package eu.midnightdust.blur;
 import eu.midnightdust.blur.config.BlurConfig;
 import eu.midnightdust.blur.util.RainbowColor;
 import eu.midnightdust.lib.util.MidnightColorUtil;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import org.joml.Math;
 import org.joml.Matrix4f;
@@ -15,12 +16,29 @@ import static eu.midnightdust.blur.util.RainbowColor.hue;
 import static eu.midnightdust.blur.util.RainbowColor.hue2;
 
 public class Blur {
+    public static final String MOD_ID = "blur";
     public static void init() {
-        BlurConfig.init("blur", BlurConfig.class);
+        BlurConfig.init(MOD_ID, BlurConfig.class);
     }
 
     public static boolean doFade = false;
 
+    static float lastDelta;
+    public static void onRender(DrawContext context, int width, int height, MinecraftClient client, float delta) {
+        if (!BlurInfo.doTest && BlurInfo.screenChanged) { // After the tests for blur and background color have been completed
+            Blur.onScreenChange();
+            BlurInfo.screenChanged = false;
+        }
+
+        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;
+        }
+        BlurInfo.doTest = false; // Set the test state to completed, as tests will happen in the same tick.
+    }
+
     public static void onScreenChange() {
         if (screenHasBlur) {
             if (doFade) {
@@ -61,10 +79,7 @@ public class Blur {
         int b = (col.getRGB() >> 8) & 0xFF;
         int g = col.getRGB() & 0xFF;
         float prog = progress;
-        a *= prog;
+        a *= prog; r *= prog; g *= prog; b *= prog;
-        r *= prog;
-        g *= prog;
-        b *= prog;
         return a << 24 | r << 16 | b << 8 | g;
     }
     public static int getRotation() {

common/src/main/java/eu/midnightdust/blur/config/BlurConfig.java

@@ -2,6 +2,7 @@ package eu.midnightdust.blur.config;
 
 import com.google.common.collect.Lists;
 import eu.midnightdust.lib.config.MidnightConfig;
+import net.minecraft.client.MinecraftClient;
 
 import java.util.List;
 import java.util.function.Function;
@@ -16,22 +17,34 @@ public class BlurConfig extends MidnightConfig {
 
     @Entry(category = SCREENS)
     public static boolean blurContainers = true;
+    @Entry(category = SCREENS)
+    public static boolean blurTitleScreen = false;
+    @Condition(requiredOption = "blurTitleScreen", visibleButLocked = true)
+    @Entry(category = SCREENS)
+    public static boolean darkenTitleScreen = false;
     @Entry(category = ANIMATIONS, min = 0, max = 2000, isSlider = true)
     public static int fadeTimeMillis = 300;
     @Entry(category = ANIMATIONS, min = 0, max = 2000, isSlider = true)
     public static int fadeOutTimeMillis = 300;
     @Entry(category = ANIMATIONS)
     public static BlurConfig.Easing animationCurve = Easing.FLAT;
+    @Entry(category = STYLE, isSlider = true, min = 0, max = 20)
+    public static int radius = 5;
     @Entry(category = STYLE)
     public static boolean useGradient = true;
+    @Condition(requiredOption = "useGradient", visibleButLocked = true)
     @Entry(category = STYLE, isColor = true, width = 7, min = 7)
     public static String gradientStart = "#000000";
+    @Condition(requiredOption = "useGradient", visibleButLocked = true)
     @Entry(category = STYLE, isSlider = true, min = 0, max = 255)
     public static int gradientStartAlpha = 75;
+    @Condition(requiredOption = "useGradient", visibleButLocked = true)
     @Entry(category = STYLE, isColor = true, width = 7, min = 7)
     public static String gradientEnd = "#000000";
+    @Condition(requiredOption = "useGradient", visibleButLocked = true)
     @Entry(category = STYLE, isSlider = true, min = 0, max = 255)
     public static int gradientEndAlpha = 75;
+    @Condition(requiredOption = "useGradient", visibleButLocked = true)
     @Entry(category = STYLE, isSlider = true, min = 0, max = 360)
     public static int gradientRotation = 0;
     @Entry(category = STYLE)
@@ -43,6 +56,13 @@ public class BlurConfig extends MidnightConfig {
     @Entry(category = SCREENS) // Screens where the vanilla blur effect should be force disabled
     public static List<String> forceDisabledScreens = Lists.newArrayList();
 
+    @Override
+    public void writeChanges(String modid) {
+        super.writeChanges(modid);
+        if (MinecraftClient.getInstance().options != null)
+            MinecraftClient.getInstance().options.getMenuBackgroundBlurriness().setValue(radius);
+    }
+
     public enum Easing {
         // Based on https://gist.github.com/dev-hydrogen/21a66f83f0386123e0c0acf107254843
         // Thank you very much!

common/src/main/java/eu/midnightdust/blur/mixin/MixinHandledScreen.java

@@ -1,6 +1,8 @@
 package eu.midnightdust.blur.mixin;
 
+import eu.midnightdust.blur.Blur;
 import eu.midnightdust.blur.config.BlurConfig;
+import eu.midnightdust.lib.util.PlatformFunctions;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
@@ -20,4 +22,8 @@ public class MixinHandledScreen extends Screen {
     private void blur$renderContainerBlur(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Applies the blur effect in containers (Inventory, Chest, etc.)
         if (BlurConfig.blurContainers) this.applyBlur();
     }
+    @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);
+    }
 }

common/src/main/java/eu/midnightdust/blur/mixin/MixinInGameHud.java

@@ -23,7 +23,6 @@ public class MixinInGameHud {
             BlurInfo.doTest = false;
             BlurInfo.screenChanged = false;
             this.client.gameRenderer.renderBlur();
-            this.client.getFramebuffer().beginWrite(false);
 
             if (BlurInfo.prevScreenHasBackground) Blur.renderRotatedGradient(context, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
         }

common/src/main/java/eu/midnightdust/blur/mixin/MixinMidnightConfig$EntryInfo.java

@@ -0,0 +1,26 @@
+package eu.midnightdust.blur.mixin;
+
+import eu.midnightdust.blur.Blur;
+import eu.midnightdust.lib.config.MidnightConfig;
+import net.minecraft.client.MinecraftClient;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Objects;
+
+@Mixin(value = MidnightConfig.EntryInfo.class, remap = false)
+public abstract class MixinMidnightConfig$EntryInfo {
+    @Shadow @Final public String modid;
+    @Shadow @Final public String fieldName;
+    @Shadow Object value;
+
+    @Inject(at = @At(value = "TAIL"), method = "updateFieldValue")
+    private void blur$instantlyApplyRadius(CallbackInfo ci) {
+        if (Objects.equals(modid, Blur.MOD_ID) && Objects.equals(fieldName, "radius"))
+            MinecraftClient.getInstance().options.getMenuBackgroundBlurriness().setValue((int) value);
+    }
+}

common/src/main/java/eu/midnightdust/blur/mixin/MixinMidnightConfig.java

@@ -0,0 +1,17 @@
+package eu.midnightdust.blur.mixin;
+
+import eu.midnightdust.blur.config.BlurConfig;
+import eu.midnightdust.lib.config.MidnightConfig;
+import net.minecraft.client.MinecraftClient;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MidnightConfig.class)
+public abstract class MixinMidnightConfig {
+    @Inject(at = @At(value = "INVOKE", target = "Lcom/google/gson/Gson;fromJson(Ljava/io/Reader;Ljava/lang/Class;)Ljava/lang/Object;", shift = At.Shift.AFTER), remap = false, method = "loadValuesFromJson")
+    private static void blur$syncRadius(CallbackInfo ci) {
+        BlurConfig.radius = MinecraftClient.getInstance().options.getMenuBackgroundBlurrinessValue();
+    }
+}

common/src/main/java/eu/midnightdust/blur/mixin/MixinScreen.java

@@ -26,18 +26,7 @@ public abstract class MixinScreen {
 
     @Inject(at = @At("HEAD"), method = "render")
     public void blur$processScreenChange(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (!BlurInfo.doTest && BlurInfo.screenChanged) { // After the tests for blur and background color have been completed
+        Blur.onRender(context, width, height, this.client, delta);
-            Blur.onScreenChange();
-            BlurInfo.screenChanged = false;
-        }
-
-        if (BlurInfo.start >= 0 && !BlurInfo.screenHasBlur && BlurInfo.prevScreenHasBlur) { // Fade out in non-blurred screens
-            this.client.gameRenderer.renderBlur();
-            this.client.getFramebuffer().beginWrite(false);
-
-            if (BlurInfo.prevScreenHasBackground) Blur.renderRotatedGradient(context, width, height);
-        }
-        BlurInfo.doTest = false; // Set the test state to completed, as tests will happen in the same tick.
     }
     @Inject(at = @At("HEAD"), method = "renderInGameBackground")
     public void blur$getBackgroundEnabled(DrawContext context, CallbackInfo ci) {

common/src/main/java/eu/midnightdust/blur/mixin/MixinTitleScreen.java

@@ -0,0 +1,28 @@
+package eu.midnightdust.blur.mixin;
+
+import eu.midnightdust.blur.Blur;
+import eu.midnightdust.blur.config.BlurConfig;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.TitleScreen;
+import net.minecraft.text.Text;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(TitleScreen.class)
+public abstract class MixinTitleScreen extends Screen {
+    protected MixinTitleScreen(Text title) {
+        super(title);
+    }
+
+    @Inject(method = "renderPanoramaBackground", at = @At("TAIL"))
+    private void blur$renderTitleBlur(DrawContext context, float delta, CallbackInfo ci) { // Applies the blur effect in containers (Inventory, Chest, etc.)
+        if (BlurConfig.blurTitleScreen) {
+            Blur.updateProgress(true);
+            this.applyBlur();
+            if (BlurConfig.darkenTitleScreen) this.renderDarkening(context);
+        }
+    }
+}

common/src/main/resources/assets/blur/lang/de_de.json

@@ -3,6 +3,8 @@
   "blur.midnightconfig.category.animations": "Animationen",
   "blur.midnightconfig.category.style": "Stil",
   "blur.midnightconfig.blurContainers": "Unschärfe in Containern",
+  "blur.midnightconfig.blurTitleScreen": "Unschärfe im Titelbildschirm",
+  "blur.midnightconfig.darkenTitleScreen": "Abgedunkelter Titelhintergrund",
   "blur.midnightconfig.fadeTimeMillis": "Überblendzeit (in Millisekunden)",
   "blur.midnightconfig.fadeOutTimeMillis": "Ausblendzeit (in Millisekunden)",
   "blur.midnightconfig.animationCurve": "Animationskurve",

common/src/main/resources/assets/blur/lang/en_us.json

@@ -4,6 +4,8 @@
   "blur.midnightconfig.category.style": "Style",
   "blur.midnightconfig.category.screens": "Screens",
   "blur.midnightconfig.blurContainers": "Apply Blur to Containers",
+  "blur.midnightconfig.blurTitleScreen": "Apply Blur to Title Screen",
+  "blur.midnightconfig.darkenTitleScreen": "Darken Title Screen Background",
   "blur.midnightconfig.fadeTimeMillis": "Fade Time (in milliseconds)",
   "blur.midnightconfig.fadeOutTimeMillis": "Fade Out Time (in milliseconds)",
   "blur.midnightconfig.animationCurve": "Animation Curve",
@@ -18,6 +20,7 @@
   "blur.midnightconfig.enum.Easing.BACK": "Back",
   "blur.midnightconfig.enum.Easing.ELASTIC": "Elastic",
   "blur.midnightconfig.radius": "Radius",
+  "blur.midnightconfig.radius.label.tooltip": "Mirror of \"Menu Background Blur\" found in Minecraft's Accessibility Settings",
   "blur.midnightconfig.rainbowMode": "Rainbow Mode \uD83C\uDF08",
   "blur.midnightconfig.useGradient": "Gradient as Background",
   "blur.midnightconfig.gradientStart": "Gradient Start Color",

common/src/main/resources/blur.mixins.json

@@ -4,13 +4,16 @@
   "package": "eu.midnightdust.blur.mixin",
   "compatibilityLevel": "JAVA_21",
   "client": [
-    "MixinScreen",
+    "MixinGameOptions",
-    "ScreenAccessor",
-    "MixinHandledScreen",
-    "MixinMinecraftClient",
     "MixinGameRenderer",
+    "MixinHandledScreen",
     "MixinInGameHud",
-    "MixinGameOptions"
+    "MixinMidnightConfig",
+    "MixinMidnightConfig$EntryInfo",
+    "MixinMinecraftClient",
+    "MixinScreen",
+    "MixinTitleScreen",
+    "ScreenAccessor"
   ],
   "injectors": {
     "defaultRequire": 1

fabric/build.gradle

@@ -83,7 +83,8 @@ unifiedPublishing {
             curseforge {
                 token = CURSEFORGE_TOKEN
                 id = rootProject.curseforge_id
-                gameVersions.addAll "Java 21", project.minecraft_version, project.supported_versions
+                gameVersions.addAll "Java 21", project.minecraft_version
+                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
             }
         }
 
@@ -93,7 +94,8 @@ unifiedPublishing {
                 token = MODRINTH_TOKEN
                 id = rootProject.modrinth_id
                 version = "$rootProject.version-$project.name"
-                gameVersions.addAll project.minecraft_version, project.supported_versions
+                gameVersions.addAll project.minecraft_version
+                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
             }
         }
     }

gradle.properties

@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
-minecraft_version=1.21.3
+minecraft_version=1.21.4
-supported_versions=1.21.2
+supported_versions=1.21.5
-yarn_mappings=1.21.3+build.2
+yarn_mappings=1.21.4+build.1
 enabled_platforms=fabric,neoforge
 
 # Mod Properties
-mod_version=5.0.1
+mod_version=5.2.0
 maven_group=eu.midnightdust.blur
 archives_base_name=blur
 release_type=release
@@ -17,11 +17,11 @@ modrinth_id=NK39zBp2
 
 # Modloaders
 fabric_loader_version=0.16.9
-fabric_api_version=0.107.0+1.21.3
+fabric_api_version=0.111.0+1.21.4
 
-neoforge_version=21.3.11-beta
+neoforge_version=21.4.10-beta
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 # Libraries
-midnightlib_version = 1.6.4
+midnightlib_version = 1.7.0+1.21.4
 modmenu_version = 11.0.2

neoforge/build.gradle

@@ -96,7 +96,8 @@ unifiedPublishing {
             curseforge {
                 token = CURSEFORGE_TOKEN
                 id = rootProject.curseforge_id
-                gameVersions.addAll "Java 21", project.minecraft_version, project.supported_versions
+                gameVersions.addAll "Java 21", project.minecraft_version
+                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
             }
         }
 
@@ -106,7 +107,8 @@ unifiedPublishing {
                 token = MODRINTH_TOKEN
                 id = rootProject.modrinth_id
                 version = "$rootProject.version-$project.name"
-                gameVersions.addAll project.minecraft_version, project.supported_versions
+                gameVersions.addAll project.minecraft_version
+                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
             }
         }
     }

neoforge/src/main/java/eu/midnightdust/blur/neoforge/BlurNeoForge.java

@@ -8,13 +8,13 @@ import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.client.event.ClientTickEvent;
 
-@Mod(value = "blur", dist = Dist.CLIENT)
+@Mod(value = Blur.MOD_ID, dist = Dist.CLIENT)
 public class BlurNeoForge {
     public BlurNeoForge() {
         Blur.init();
     }
 
-    @EventBusSubscriber(modid = "blur", bus = EventBusSubscriber.Bus.GAME, value = Dist.CLIENT)
+    @EventBusSubscriber(modid = Blur.MOD_ID, bus = EventBusSubscriber.Bus.GAME, value = Dist.CLIENT)
     public static class ClientGameEvents {
         @SubscribeEvent
         public static void endClientTick(ClientTickEvent.Post event) {