backport: adjust for 1.21.1

phew...

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

@@ -6,7 +6,7 @@ import eu.midnightdust.lib.util.MidnightColorUtil;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import org.joml.Math;
-import org.joml.Matrix3x2f;
+import org.joml.Matrix4f;
 
 import java.awt.Color;
 import java.lang.Double;
@@ -32,7 +32,8 @@ public class Blur {
     }
     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();
+            client.gameRenderer.renderBlur(client.getRenderTickCounter().getTickDelta(true));
+            client.getFramebuffer().beginWrite(false);
 
             if (BlurInfo.prevScreenHasBackground && BlurConfig.useGradient) Blur.renderRotatedGradient(context, width, height);
         }

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

@@ -13,7 +13,7 @@ public abstract class MixinGameOptions {
     @Shadow @Final private SimpleOption<Integer> menuBackgroundBlurriness;
     @Shadow @Final private SimpleOption<Double> chatLineSpacing;
 
-    @Redirect(method = "<init>", at = @At(value = "NEW", target = "net/minecraft/client/option/SimpleOption$ValidatingIntSliderCallbacks", ordinal = 3))
+    @Redirect(method = "<init>", at = @At(value = "NEW", target = "net/minecraft/client/option/SimpleOption$ValidatingIntSliderCallbacks", ordinal = 2))
     private SimpleOption.ValidatingIntSliderCallbacks blur$increaseMaxBlurriness(int minInclusive, int maxInclusive) {
         if (this.menuBackgroundBlurriness == null && this.chatLineSpacing != null)
             return new SimpleOption.ValidatingIntSliderCallbacks(minInclusive, 20);

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

@@ -1,21 +1,18 @@
 package eu.midnightdust.blur.mixin;
 
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import eu.midnightdust.blur.Blur;
 import eu.midnightdust.blur.BlurInfo;
-import net.minecraft.client.option.GameOptions;
 import net.minecraft.client.render.GameRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 @Mixin(GameRenderer.class)
 public class MixinGameRenderer {
-    @WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/GameOptions;getMenuBackgroundBlurrinessValue()I"))
+    @ModifyVariable(method = "renderBlur", at = @At("STORE"), ordinal = 1)
-    private int blur$modifyRadius(GameOptions instance, Operation<Integer> original) {
+    private float blur$modifyRadius(float radius) { // Modify the radius based on the animation progress
-        int radius = instance.getMenuBackgroundBlurrinessValue();
         if (!BlurInfo.screenChanged && BlurInfo.start >= 0) // Only update the progress after all tests have been completed
             Blur.updateProgress(BlurInfo.screenHasBlur);
-        return (int) (radius * BlurInfo.progress);
+        return radius * BlurInfo.progress;
     }
 }

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

@@ -19,8 +19,8 @@ public class MixinHandledScreen extends Screen {
     }
 
     @Inject(method = "renderBackground", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;drawBackground(Lnet/minecraft/client/gui/DrawContext;FII)V", shift = At.Shift.BEFORE))
-    private void blur$renderContainerBlur(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Applies the blur effect in containers (Inventory, Chest, etc.)
+    private void blur$renderContainerBlur(DrawContext context, int mouseX, int mouseY, float tickDelta, CallbackInfo ci) { // Applies the blur effect in containers (Inventory, Chest, etc.)
-        if (BlurConfig.blurContainers) this.applyBlur(context);
+        if (BlurConfig.blurContainers) this.applyBlur(tickDelta);
     }
     @Inject(at = @At("HEAD"), method = "render")
     public void blur$processScreenChange(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {

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

@@ -22,7 +22,8 @@ public class MixinInGameHud {
         if (client.currentScreen == null && client.world != null && BlurInfo.start >= 0 && BlurInfo.prevScreenHasBlur) {
             BlurInfo.doTest = false;
             BlurInfo.screenChanged = false;
-            context.applyBlur();
+            this.client.gameRenderer.renderBlur(tickCounter.getTickDelta(true));
+            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/MixinScreen.java

@@ -26,8 +26,6 @@ public abstract class MixinScreen {
     @Shadow protected MinecraftClient client;
     @Shadow public int width;
     @Shadow public int height;
-    @Shadow protected abstract void applyBlur(DrawContext context);
-
     @Shadow protected abstract void applyBlur(float delta);
 
     @Inject(at = @At("HEAD"), method = "render")

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

@@ -17,11 +17,11 @@ public abstract class MixinTitleScreen extends Screen {
         super(title);
     }
 
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/TitleScreen;renderPanoramaBackground(Lnet/minecraft/client/gui/DrawContext;F)V"))
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/TitleScreen;renderPanoramaBackground(Lnet/minecraft/client/gui/DrawContext;F)V", shift = At.Shift.AFTER))
-    private void blur$renderTitleBlur(DrawContext context, int mouseX, int mouseY, float deltaTicks, CallbackInfo ci) {
+    private void blur$renderTitleBlur(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (BlurConfig.blurTitleScreen) {
             Blur.updateProgress(true);
-            this.applyBlur(context);
+            this.applyBlur(delta);
             if (BlurConfig.darkenTitleScreen) this.renderDarkening(context);
         }
     }

fabric/src/main/resources/fabric.mod.json

@@ -33,7 +33,7 @@
     "blur.mixins.json"
   ],
   "depends": {
-    "minecraft": ">=1.21.2",
+    "minecraft": ">=1.21",
-    "midnightlib": ">=1.7.3"
+    "midnightlib": ">=1.7.5"
   }
 }

gradle.properties

@@ -19,7 +19,7 @@ modrinth_id=NK39zBp2
 fabric_loader_version=0.16.13
 fabric_api_version=0.115.4+1.21.1
 
-neoforge_version=21.1.153
+neoforge_version=21.1.192
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 # Libraries

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

@@ -14,7 +14,7 @@ public class BlurNeoForge {
         Blur.init();
     }
 
-    @EventBusSubscriber(modid = Blur.MOD_ID, bus = EventBusSubscriber.Bus.GAME, value = Dist.CLIENT)
+    @EventBusSubscriber(modid = Blur.MOD_ID, value = Dist.CLIENT)
     public static class ClientGameEvents {
         @SubscribeEvent
         public static void endClientTick(ClientTickEvent.Post event) {

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -26,13 +26,13 @@ side = "CLIENT"
 [[dependencies.blur]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.21.2,)"
+versionRange = "[1.21,1.21.1]"
 ordering = "NONE"
 side = "CLIENT"
 
 [[dependencies.blur]]
 modId = "midnightlib"
 mandatory = true
-versionRange = "[1.7.3,)"
+versionRange = "[1.7.5,)"
 ordering = "NONE"
 side = "CLIENT"