Merge pull request #133 from Motschen/backport/1.21.1

backport: Blur+ v5.2.2 for 1.21.1

build.gradle

@@ -3,7 +3,7 @@ import groovy.json.JsonOutput
 
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
+	id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
 	id "me.shedaniel.unified-publishing" version "0.1.+" apply false
 	id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }

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

@@ -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);
         }
@@ -98,6 +99,7 @@ public class Blur {
         posMatrix.setTranslation(width / 2f, height / 2f, -1000); // 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();
     }
 }

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

@@ -1,10 +1,18 @@
 package eu.midnightdust.blur.config;
 
 import com.google.common.collect.Lists;
+import eu.midnightdust.blur.Blur;
 import eu.midnightdust.lib.config.MidnightConfig;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.widget.SliderWidget;
+import net.minecraft.client.gui.widget.TextIconButtonWidget;
+import net.minecraft.client.option.GameOptions;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 
+import java.lang.annotation.Annotation;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Function;
 
 import static java.lang.Math.*;
@@ -33,10 +41,6 @@ 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();
 
-    @Comment(category = STYLE, centered = true)
-    public static Comment _blur;
-    @Entry(category = STYLE, isSlider = true, min = 0, max = 20)
-    public static int radius = 5;
     @Comment(category = STYLE, centered = true)
     public static Comment _gradient;
     @Entry(category = STYLE)
@@ -68,13 +72,6 @@ public class BlurConfig extends MidnightConfig {
     @Entry(category = ANIMATIONS)
     public static BlurConfig.Easing animationCurve = Easing.FLAT;
 
-    @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!
@@ -102,4 +99,51 @@ public class BlurConfig extends MidnightConfig {
             return functionOut.apply(x).doubleValue();
         }
     }
+    private static GameOptions options;
+
+    @Override
+    public void onTabInit(String tabName, MidnightConfigListWidget list, MidnightConfigScreen screen) {
+        options = MinecraftClient.getInstance().options;
+        if (Objects.equals(tabName, STYLE)) {
+            EntryInfo centered = new EntryInfo(null, Blur.MOD_ID);
+            centered.comment = new Comment(){
+                @Override
+                public boolean centered() {
+                    return true;
+                }
+                public Class<? extends Annotation> annotationType() {return null;}
+                public String category() {return "";}
+                public String name() {return "";}
+                public String url() {return "";}
+                public String requiredMod() {return "";}
+            };
+            RadiusSliderWidget slider = new RadiusSliderWidget(screen.width - 185, 0, 150, 20);
+
+            TextIconButtonWidget resetButton = TextIconButtonWidget.builder(Text.translatable("controls.reset"), (button -> {
+                options.getMenuBackgroundBlurriness().setValue(5);
+                screen.updateList();
+            }), true).texture(Identifier.of("midnightlib","icon/reset"), 12, 12).dimension(20, 20).build();
+            resetButton.setPosition(screen.width - 205 + 150 + 25, 0);
+            slider.resetButton = resetButton;
+            slider.updateMessage();
+
+            list.addButton(Lists.newArrayList(), Text.translatable("blur.midnightconfig._blur"), centered);
+            list.addButton(Lists.newArrayList(slider, resetButton), Text.translatable("blur.midnightconfig.radius"), new EntryInfo(null, Blur.MOD_ID));
+        }
+    }
+
+    public static class RadiusSliderWidget extends SliderWidget {
+        TextIconButtonWidget resetButton;
+        public RadiusSliderWidget(int x, int y, int width, int height) {
+            super(x, y, width, height, Text.empty(), options.getMenuBackgroundBlurrinessValue() / 20d);
+        }
+        public void updateMessage() {
+            this.setMessage(Text.of(String.valueOf(options.getMenuBackgroundBlurrinessValue())));
+            if (resetButton != null) resetButton.active = options.getMenuBackgroundBlurrinessValue() != 5;
+        }
+
+        public void applyValue() {
+            options.getMenuBackgroundBlurriness().setValue(Double.valueOf(this.value * 20).intValue());
+        }
+    }
 }

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

@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 @Mixin(GameRenderer.class)
 public class MixinGameRenderer {
-    @ModifyVariable(method = "renderBlur", at = @At("STORE"), ordinal = 0)
+    @ModifyVariable(method = "renderBlur", at = @At("STORE"), ordinal = 1)
     private float blur$modifyRadius(float radius) { // Modify the radius based on the animation progress
         if (!BlurInfo.screenChanged && BlurInfo.start >= 0) // Only update the progress after all tests have been completed
             Blur.updateProgress(BlurInfo.screenHasBlur);

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();
+        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;
-            this.client.gameRenderer.renderBlur();
+            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/MixinMidnightConfig$EntryInfo.java

@@ -1,26 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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,14 +26,13 @@ public abstract class MixinScreen {
     @Shadow protected MinecraftClient client;
     @Shadow public int width;
     @Shadow public int height;
-    @Shadow protected abstract void applyBlur();
+    @Shadow protected abstract void applyBlur(float delta);
 
     @Inject(at = @At("HEAD"), method = "render")
     public void blur$processScreenChange(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         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())) {
@@ -42,7 +41,6 @@ public abstract class MixinScreen {
         if (!BlurConfig.excludedScreens.contains(this.getClass().getCanonicalName()))
             BlurInfo.screenHasBlur = true; // Test if the screen has blur
     }
-
     @WrapOperation(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;renderBackgroundTexture(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/util/Identifier;IIFFII)V"), method = "renderDarkening(Lnet/minecraft/client/gui/DrawContext;IIII)V")
     private void blur$applyGradient(DrawContext context, Identifier texture, int x, int y, float u, float v, int width, int height, Operation<Void> original) {
         if (BlurConfig.useGradient) {
@@ -58,7 +56,7 @@ public abstract class MixinScreen {
     private void blur$renderGradient(DrawContext context) {
         BlurInfo.screenHasBackground = true; // Test if the screen has a background
         if (BlurConfig.forceEnabledScreens.contains(this.getClass().getCanonicalName()))
-            this.applyBlur();
+            this.applyBlur(client.getRenderTickCounter().getTickDelta(true));
 
         Blur.renderRotatedGradient(context, width, height); // Replaces the default gradient with our rotated one
     }

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

@@ -17,11 +17,11 @@ public abstract class MixinTitleScreen extends Screen {
         super(title);
     }
 
-    @Inject(method = "renderPanoramaBackground", at = @At("TAIL"))
+    @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, float delta, CallbackInfo ci) { // Applies the blur effect in containers (Inventory, Chest, etc.)
+    private void blur$renderTitleBlur(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (BlurConfig.blurTitleScreen) {
             Blur.updateProgress(true);
-            this.applyBlur();
+            this.applyBlur(delta);
             if (BlurConfig.darkenTitleScreen) this.renderDarkening(context);
         }
     }

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

@@ -1,11 +0,0 @@
-package eu.midnightdust.blur.mixin;
-
-import net.minecraft.client.gui.screen.Screen;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-@Mixin(Screen.class)
-public interface ScreenAccessor {
-    @Invoker("applyBlur")
-    void forceApplyBlur();
-}

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

@@ -28,9 +28,9 @@
   "blur.midnightconfig.gradientEndAlpha": "Farbverlauf-Endstransparenz",
   "blur.midnightconfig.gradientRotation": "Farbverlauf-Rotation",
   "blur.midnightconfig.excludedScreens": "Ausgeschlossene Bildschirme",
-  "blur.midnightconfig._general": "§7⛏ Generell",
+  "blur.midnightconfig._general": "⛏ Generell",
-  "blur.midnightconfig._advanced": "§7⚒ Fortgeschritten",
+  "blur.midnightconfig._advanced": "⚒ Fortgeschritten",
-  "blur.midnightconfig._blur": "§7▒ Unschärfe",
+  "blur.midnightconfig._blur": "▒ Unschärfe",
-  "blur.midnightconfig._gradient": "§7\uD83D\uDFE2 Farbverlauf",
+  "blur.midnightconfig._gradient": "\uD83D\uDFE2 Farbverlauf",
-  "blur.midnightconfig._animations": "§7\uD83D\uDCFD Animationen"
+  "blur.midnightconfig._animations": "\uD83D\uDCFD Animationen"
 }

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

@@ -34,9 +34,9 @@
   "blur.midnightconfig.forceEnabledScreens.tooltip": "Screens where the vanilla blur effect should be force-enabled\nMight not work 100% of the time",
   "blur.midnightconfig.forceDisabledScreens": "Force-disabled Screens",
   "blur.midnightconfig.forceDisabledScreens.tooltip": "Screens where the vanilla blur effect should be force-disabled",
-  "blur.midnightconfig._general": "§7⛏ General",
+  "blur.midnightconfig._general": "⛏ General",
-  "blur.midnightconfig._advanced": "§7⚒ Advanced",
+  "blur.midnightconfig._advanced": "⚒ Advanced",
-  "blur.midnightconfig._blur": "§7▒ Blur",
+  "blur.midnightconfig._blur": "▒ Blur",
-  "blur.midnightconfig._gradient": "§7\uD83D\uDFE2 Gradient",
+  "blur.midnightconfig._gradient": "\uD83D\uDFE2 Gradient",
-  "blur.midnightconfig._animations": "§7\uD83D\uDCFD Animations"
+  "blur.midnightconfig._animations": "\uD83D\uDCFD Animations"
 }

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

@@ -8,12 +8,9 @@
     "MixinGameRenderer",
     "MixinHandledScreen",
     "MixinInGameHud",
-    "MixinMidnightConfig",
-    "MixinMidnightConfig$EntryInfo",
     "MixinMinecraftClient",
     "MixinScreen",
-    "MixinTitleScreen",
+    "MixinTitleScreen"
-    "ScreenAccessor"
   ],
   "injectors": {
     "defaultRequire": 1

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

@@ -22,7 +22,9 @@
   "authors": [
     "Motschen",
     "tterrag1098",
-    "Pyrofab",
+    "Pyrofab"
+  ],
+  "contributors": [
     "backryun",
     "byquanton"
   ],
@@ -31,6 +33,7 @@
     "blur.mixins.json"
   ],
   "depends": {
-    "minecraft": ">=1.21.2"
+    "minecraft": ">=1.21",
+    "midnightlib": ">=1.7.5"
   }
 }

gradle.properties

@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
-minecraft_version=1.21.4
+minecraft_version=1.21.1
-supported_versions=1.21.5
+supported_versions=1.21
-yarn_mappings=1.21.4+build.1
+yarn_mappings=1.21.1+build.3
 enabled_platforms=fabric,neoforge
 
 # Mod Properties
-mod_version=5.2.0
+mod_version=5.2.2+1.21.1
 maven_group=eu.midnightdust.blur
 archives_base_name=blur
 release_type=release
@@ -16,12 +16,12 @@ curseforge_id=393563
 modrinth_id=NK39zBp2
 
 # Modloaders
-fabric_loader_version=0.16.9
+fabric_loader_version=0.16.13
-fabric_api_version=0.111.0+1.21.4
+fabric_api_version=0.115.4+1.21.1
 
-neoforge_version=21.4.10-beta
+neoforge_version=21.1.192
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 # Libraries
-midnightlib_version = 1.7.0+1.21.4
+midnightlib_version = 1.7.5+1.21.1
 modmenu_version = 11.0.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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,6 +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.5,)"
 ordering = "NONE"
 side = "CLIENT"