Blur 2.3.0 - Update to MidnightLib v0.2.5

Add live config preview
Russian translations by @Felix14-v2
Brazilian translations by @Percario

build.gradle

@@ -19,11 +19,8 @@ repositories {
 			includeGroupByRegex 'io\\.github\\.onyxstudios.*'
 		}
 	}
-	maven {
+	flatDir {
-		url = 'https://maven.terraformersmc.com/releases'
+		dirs 'local_maven'
-		content {
-			includeGroup 'com.terraformersmc'
-		}
 	}
 }
 
@@ -35,10 +32,9 @@ dependencies {
 	modImplementation "io.github.ladysnake:satin:${satin_version}"
 	include "io.github.ladysnake:satin:${satin_version}"
 
-	modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
-	modRuntime "com.terraformersmc:modmenu:${project.modmenu_version}"
-
 	implementation 'com.google.code.findbugs:jsr305:3.0.2'
+	modImplementation "eu.midnightdust:midnightlib:${midnightlib_version}"
+    include "eu.midnightdust:midnightlib:${midnightlib_version}"
 }
 
 processResources {

gradle.properties

@@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.17-pre3
+	minecraft_version=1.17.1
-	yarn_mappings=1.17-pre3+build.2
+    yarn_mappings=1.17.1+build.61
-	loader_version=0.11.3
+    loader_version=0.11.7
 	
 # Mod Properties
-	mod_version = 2.2.1-1.17+fabric
+	mod_version = 2.3.0-1.17+fabric
 	maven_group = com.tterrag.blur
 	archives_base_name = Blur
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version = 0.34.8+1.17
+	fabric_version=0.40.1+1.17
-	modmenu_version = 2.0.0-beta.7
+	satin_version = 1.6.4
-	satin_version = 1.6.0-nightly.1.17-pre3
+	midnightlib_version=0.2.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/tterrag/blur/mixin/MixinMinecraftClient.java

@@ -4,19 +4,17 @@ import org.objectweb.asm.Opcodes;
 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.At.Shift;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import com.tterrag.blur.Blur;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.resource.ReloadableResourceManager;
 
 @Mixin(MinecraftClient.class)
 public class MixinMinecraftClient {
 
-    @Inject(method = "openScreen",
+    @Inject(method = "setScreen",
             at = @At(value = "FIELD",
                      target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;",
                      opcode = Opcodes.PUTFIELD))

src/main/java/com/tterrag/blur/mixin/MixinScreen.java

@@ -1,15 +1,33 @@
 package com.tterrag.blur.mixin;
 
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.util.math.MatrixStack;
+import org.jetbrains.annotations.Nullable;
 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.Constant;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
 import com.tterrag.blur.Blur;
 
 import net.minecraft.client.gui.screen.Screen;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Locale;
 
 @Mixin(Screen.class)
-public class MixinScreen {
+public abstract class MixinScreen {
+
+    @Shadow @Nullable protected MinecraftClient client;
+
+    @Inject(at = @At("HEAD"), method = "render")
+    private void reloadShader(MatrixStack matrixStack, int i, int j, float f, CallbackInfo ci) {
+        if (this.getClass().toString().toLowerCase(Locale.ROOT).contains("midnight") && this.client != null) {
+            Blur.INSTANCE.onScreenChange(this.client.currentScreen);
+        }
+    }
 
     @ModifyConstant(
             method = "renderBackground(Lnet/minecraft/client/util/math/MatrixStack;I)V",

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

@@ -1,6 +1,6 @@
 {
   "blur.midnightconfig.title": "Blur Config",
-  "blur.midnightconfig.blurExclusions": "Blur Exclusions are currently not configurable in-game!",
+  "blur.midnightconfig.blurExclusions": "§cBlur Exclusions are currently not configurable in-game!",
   "blur.midnightconfig.fadeTimeMillis": "Fade Time (in milliseconds)",
   "blur.midnightconfig.radius": "Radius",
   "blur.midnightconfig.gradientStartColor": "Gradient Start Color",

src/main/resources/assets/blur/lang/pt_br.json

@@ -0,0 +1,8 @@
+{
+  "blur.midnightconfig.title": "Definições de desfoque",
+  "blur.midnightconfig.blurExclusions": "Exclusões de desfoque não são configuráveis em jogo no momento.",
+  "blur.midnightconfig.fadeTimeMillis": "Esmaecimento (em milissegundos)",
+  "blur.midnightconfig.radius": "Raio",
+  "blur.midnightconfig.gradientStartColor": "Cor de início do gradiente",
+  "blur.midnightconfig.gradientEndColor": "Cor de término do gradiente"
+}

src/main/resources/assets/blur/lang/ru_ru.json

@@ -0,0 +1,8 @@
+{
+  "blur.midnightconfig.title": "Настройки Blur",
+  "blur.midnightconfig.blurExclusions": "В настоящее время исключения для размытия не настраиваются в игре.",
+  "blur.midnightconfig.fadeTimeMillis": "Время размытия (в милисекундах)",
+  "blur.midnightconfig.radius": "Радиус размытия",
+  "blur.midnightconfig.gradientStartColor": "Верхний цвет градиента",
+  "blur.midnightconfig.gradientEndColor": "Нижний цвет градиента"
+}

src/main/resources/fabric.mod.json

@@ -9,9 +9,6 @@
   "entrypoints": {
     "client": [
       "com.tterrag.blur.Blur::INSTANCE"
-    ],
-    "modmenu": [
-      "com.tterrag.blur.config.ModMenuIntegration"
     ]
   },
   "contact": {