Merge pull request #90 from TheLegendofSaram/fabric-1.20.4

Mexican Spanish translation

.github/workflows/gradle.yml

@@ -1,8 +1,8 @@
 on:
   push:
-    branches: [ "fabric-1.19.3" ]
+    branches: [ "fabric-1.20.4" ]
   pull_request:
-    branches: [ "fabric-1.19.3" ]
+    branches: [ "fabric-1.20.4" ]
 
 permissions:
   contents: read

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.1-SNAPSHOT'
+	id 'fabric-loom' version '1.4-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -13,10 +13,10 @@ group = project.maven_group
 repositories {
 	maven {
 		name = 'Ladysnake Mods'
-		url = 'https://ladysnake.jfrog.io/artifactory/mods'
+		url = 'https://maven.ladysnake.org/releases'
 		content {
-			includeGroup 'io.github.ladysnake'
-			includeGroupByRegex 'io\\.github\\.onyxstudios.*'
+			includeGroup 'org.ladysnake'
+			includeGroupByRegex 'dev\\.onyxstudios.*'
 		}
 	}
 	maven {
@@ -36,8 +36,8 @@ dependencies {
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	modImplementation "io.github.ladysnake:satin:${satin_version}"
-	include "io.github.ladysnake:satin:${satin_version}"
+	modImplementation "org.ladysnake:satin:${satin_version}"
+	include "org.ladysnake:satin:${satin_version}"
 
 	implementation 'com.google.code.findbugs:jsr305:3.0.2'
 	modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"

gradle.properties

@@ -1,19 +1,20 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.19.4
-	yarn_mappings=1.19.4+build.1
-	loader_version=0.14.17
+	minecraft_version=1.20.4
+	yarn_mappings=1.20.4+build.3
+	loader_version=0.15.3
 	
 # Mod Properties
-	mod_version=3.0.0
+	mod_version=3.2.0
 	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.76.0+1.19.4
-	satin_version=1.11.0
-	midnightlib_version=1.2.1-fabric
+	fabric_version=0.91.3+1.20.4
+	satin_version=1.15.0
+	midnightlib_version=1.5.3-fabric

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

settings.gradle

@@ -4,6 +4,7 @@ pluginManagement {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
+		mavenCentral()
         gradlePluginPortal()
     }
 }

src/main/java/com/tterrag/blur/Blur.java

@@ -11,6 +11,8 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.util.Identifier;
 
+import java.util.Objects;
+
 public class Blur implements ClientModInitializer {
 
     public static final String MODID = "blur";
@@ -39,7 +41,7 @@ public class Blur implements ClientModInitializer {
 
     public static void onScreenChange(Screen newGui) {
         if (client.world != null) {
-            boolean excluded = newGui == null || BlurConfig.blurExclusions.stream().anyMatch(exclusion -> newGui.getClass().getName().contains(exclusion));
+            boolean excluded = newGui == null || BlurConfig.blurExclusions.stream().anyMatch(exclusion -> newGui.getClass().getName().startsWith(exclusion));
             if (!excluded) {
                 screenHasBackground = false;
                 if (BlurConfig.showScreenTitle) System.out.println(newGui.getClass().getName());
@@ -49,7 +51,7 @@ public class Blur implements ClientModInitializer {
                     doFade = false;
                 }
                 prevScreen = newGui.getClass().getName();
-            } else if (newGui == null && BlurConfig.fadeOutTimeMillis > 0 && !BlurConfig.blurExclusions.contains(prevScreen)) {
+            } else if (newGui == null && BlurConfig.fadeOutTimeMillis > 0 && !Objects.equals(prevScreen, "")) {
                 blur.setUniformValue("Radius", (float) BlurConfig.radius);
                 start = System.currentTimeMillis();
                 doFade = true;
@@ -57,25 +59,26 @@ public class Blur implements ClientModInitializer {
                 screenHasBackground = false;
                 start = -1;
                 doFade = true;
+                prevScreen = "";
             }
         }
     }
 
     private static float getProgress(boolean fadeIn) {
+        float x;
         if (fadeIn) {
-            float x = Math.min((System.currentTimeMillis() - start) / (float) BlurConfig.fadeTimeMillis, 1);
+            x = Math.min((System.currentTimeMillis() - start) / (float) BlurConfig.fadeTimeMillis, 1);
             if (BlurConfig.ease) x *= (2 - x);  // easeInCubic
-            return x;
         }
         else {
-            float x = Math.max(1+(start - System.currentTimeMillis()) / (float) BlurConfig.fadeOutTimeMillis, 0);
+            x = Math.max(1 + (start - System.currentTimeMillis()) / (float) BlurConfig.fadeOutTimeMillis, 0);
             if (BlurConfig.ease) x *= (2 - x);  // easeOutCubic
             if (x <= 0) {
                 start = 0;
                 screenHasBackground = false;
             }
-            return x;
         }
+        return x;
     }
 
     public static int getBackgroundColor(boolean second, boolean fadeIn) {

src/main/java/com/tterrag/blur/config/BlurConfig.java

@@ -7,33 +7,34 @@ import net.minecraft.client.gui.screen.ChatScreen;
 import java.util.List;
 
 public class BlurConfig extends MidnightConfig {
-    public static final String style = "style";
-    public static final String screens = "screens";
+    public static final String STYLE = "style";
+    public static final String SCREENS = "screens";
 
-
-    @Entry(category = screens)
+    @Entry(category = SCREENS)
     public static List<String> blurExclusions = Lists.newArrayList(ChatScreen.class.getName(),
         "com.replaymod.lib.de.johni0702.minecraft.gui.container.AbstractGuiOverlay$UserInputGuiScreen",
         "ai.arcblroth.projectInception.client.InceptionInterfaceScreen",
         "net.optifine.gui.GuiChatOF",
+        "baritone.",
         "io.github.darkkronicle.advancedchatcore.chat.AdvancedChatScreen",
-        "net.coderbot.iris.gui.screen.ShaderPackScreen");
-    @Entry(category = style, min = 0, max = 5000, width = 4)
+        "net.coderbot.iris.gui.screen.ShaderPackScreen",
+        "eu.midnightdust.midnightcontrols.client.gui.TouchscreenOverlay");
+    @Entry(category = STYLE, min = 0, max = 5000, width = 4)
     public static int fadeTimeMillis = 200;
-    @Entry(category = style, min = 0, max = 5000, width = 4)
-    public static int fadeOutTimeMillis = 0;
-    @Entry(category = style)
+    @Entry(category = STYLE, min = 0, max = 5000, width = 4)
+    public static int fadeOutTimeMillis = 200;
+    @Entry(category = STYLE)
     public static boolean ease = true;
-    @Entry(category = style, isSlider = true, min = 0, max = 100)
+    @Entry(category = STYLE, isSlider = true, min = 0, max = 100)
     public static int radius = 8;
-    @Entry(category = style, isColor = true, width = 7, min = 7)
+    @Entry(category = STYLE, isColor = true, width = 7, min = 7)
     public static String gradientStart = "#000000";
-    @Entry(category = style, isSlider = true, min = 0, max = 255)
+    @Entry(category = STYLE, isSlider = true, min = 0, max = 255)
     public static int gradientStartAlpha = 75;
-    @Entry(category = style, isColor = true, width = 7, min = 7)
+    @Entry(category = STYLE, isColor = true, width = 7, min = 7)
     public static String gradientEnd = "#000000";
-    @Entry(category = style, isSlider = true, min = 0, max = 255)
+    @Entry(category = STYLE, isSlider = true, min = 0, max = 255)
     public static int gradientEndAlpha = 75;
-    @Entry(category = screens)
+    @Entry(category = SCREENS)
     public static boolean showScreenTitle = false;
 }

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

@@ -3,9 +3,8 @@ package com.tterrag.blur.mixin;
 import com.tterrag.blur.Blur;
 import com.tterrag.blur.config.BlurConfig;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.InGameHud;
-import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -14,14 +13,14 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(InGameHud.class)
-public class MixinInGameHud extends DrawableHelper {
+public class MixinInGameHud {
     @Shadow private int scaledWidth;
     @Shadow private int scaledHeight;
     @Final @Shadow private MinecraftClient client;
-    @Inject(at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;setShaderTexture(ILnet/minecraft/util/Identifier;)V", ordinal = 0, shift = At.Shift.BEFORE), method = "render")
-    public void blur$onRender(MatrixStack matrices, float tickDelta, CallbackInfo ci) {
-        if (client.currentScreen == null && client.world != null && Blur.start > 0 && !BlurConfig.blurExclusions.contains(Blur.prevScreen) && Blur.screenHasBackground) {
-            fillGradient(matrices, 0, 0, this.scaledWidth, this.scaledHeight, Blur.getBackgroundColor(false, false), Blur.getBackgroundColor(true, false));
+    @Inject(at = @At("TAIL"), method = "render")
+    public void blur$onRender(DrawContext context, float tickDelta, CallbackInfo ci) {
+        if (client.currentScreen == null && client.world != null && Blur.start > 0 && (Blur.prevScreen == null || BlurConfig.blurExclusions.stream().noneMatch(exclusion -> Blur.prevScreen.startsWith(exclusion))) && Blur.screenHasBackground) {
+            context.fillGradient(0, 0, this.scaledWidth, this.scaledHeight, Blur.getBackgroundColor(false, false), Blur.getBackgroundColor(true, false));
         }
     }
 }

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

@@ -1,7 +1,7 @@
 package com.tterrag.blur.mixin;
 
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
@@ -32,21 +32,21 @@ public abstract class MixinScreen {
         }
     }
     @Inject(at = @At("HEAD"), method = "renderBackground")
-    public void blur$getBackgroundEnabled(MatrixStack matrices, CallbackInfo ci) {
+    public void blur$getBackgroundEnabled(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (this.client != null && this.client.world != null) {
             Blur.screenHasBackground = true;
         }
     }
 
     @ModifyConstant(
-            method = "renderBackground",
+            method = "renderInGameBackground",
             constant = @Constant(intValue = -1072689136))
     private int blur$getFirstBackgroundColor(int color) {
         return Blur.getBackgroundColor(false, true);
     }
 
     @ModifyConstant(
-            method = "renderBackground",
+            method = "renderInGameBackground",
             constant = @Constant(intValue = -804253680))
     private int blur$getSecondBackgroundColor(int color) {
         return Blur.getBackgroundColor(true, true);

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

@@ -0,0 +1,15 @@
+{
+  "blur.midnightconfig.title": "Configuración de Desenfoque",
+  "blur.midnightconfig.category.style": "Estilo",
+  "blur.midnightconfig.category.screens": "Pantallas",
+  "blur.midnightconfig.blurExclusions": "Exclusiones de Desenfoque",
+  "blur.midnightconfig.fadeTimeMillis": "Tiempo de Desvanecimiento (en milisegundos)",
+  "blur.midnightconfig.fadeOutTimeMillis": "Tiempo de Desvanecimiento Saliente (en milisegundos)",
+  "blur.midnightconfig.ease": "Animación Suave",
+  "blur.midnightconfig.radius": "Radio",
+  "blur.midnightconfig.gradientStart": "Color de Inicio del Degradado",
+  "blur.midnightconfig.gradientEnd": "Color de Fin del Degradado",
+  "blur.midnightconfig.gradientStartAlpha": "Alfa de Inicio del Degradado",
+  "blur.midnightconfig.gradientEndAlpha": "Alfa de Fin del Degradado",
+  "blur.midnightconfig.showScreenTitle": "Mostrar título de pantalla"
+}

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

@@ -1,7 +1,10 @@
 {
-  "blur.midnightconfig.title": "模糊配置",
+  "blur.midnightconfig.title": "模糊 (Blur) 配置",
+  "blur.midnightconfig.category.style": "样式",
+  "blur.midnightconfig.category.screens": "屏幕",
   "blur.midnightconfig.blurExclusions": "模糊排除",
-  "blur.midnightconfig.fadeTimeMillis": "淡入时间(毫秒)",
+  "blur.midnightconfig.fadeTimeMillis": "淡入时间（毫秒）",
+    "blur.midnightconfig.fadeOutTimeMillis": "淡出时间（毫秒）",
   "blur.midnightconfig.ease": "简单动画",
   "blur.midnightconfig.radius": "半径",
   "blur.midnightconfig.gradientStart": "渐变起始色",