Merge pull request #56 from FITFC/fabric-1.19

updated pt_br

.github/workflows/gradle.yml

@@ -0,0 +1,29 @@
+on:
+  push:
+    branches: [ "fabric-1.19" ]
+  pull_request:
+    branches: [ "fabric-1.19" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build --stacktrace --info
+    - name: Upload a Build Artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: Blur-Artifact
+        path: build/libs/blur-*.*.jar
+        if-no-files-found: error

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.12-SNAPSHOT'
+	id 'fabric-loom' version '1.0-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.19
-	yarn_mappings=1.19+build.1
-	loader_version=0.14.6
+	minecraft_version=1.19.2
+	yarn_mappings=1.19.2+build.28
+	loader_version=0.14.10
 	
 # Mod Properties
-	mod_version = 2.5.0
+	mod_version = 2.6.1
 	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.55.1+1.19
-	satin_version = 1.8.0
-	midnightlib_version=0.5.2
+	fabric_version=0.66.0+1.19.2
+	satin_version = 1.9.0
+	midnightlib_version=1.0.0-fabric

gradle/wrapper/gradle-wrapper.properties

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

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

@@ -11,7 +11,7 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.util.Identifier;
-
+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -35,6 +35,7 @@ public class Blur implements ClientModInitializer {
         defaultExclusions.add("ai.arcblroth.projectInception.client.InceptionInterfaceScreen");
         defaultExclusions.add("net.optifine.gui.GuiChatOF");
         defaultExclusions.add("io.github.darkkronicle.advancedchatcore.chat.AdvancedChatScreen");
+        defaultExclusions.add("net.coderbot.iris.gui.screen.ShaderPackScreen");
         BlurConfig.init("blur", BlurConfig.class);
 
         ShaderEffectRenderCallback.EVENT.register((deltaTick) -> {
@@ -46,6 +47,7 @@ public class Blur implements ClientModInitializer {
     }
 
     private boolean doFade = false;
+
     public void onScreenChange(Screen newGui) {
         if (MinecraftClient.getInstance().world != null) {
             boolean excluded = newGui == null || BlurConfig.blurExclusions.stream().anyMatch(exclusion -> newGui.getClass().getName().contains(exclusion));
@@ -64,7 +66,9 @@ public class Blur implements ClientModInitializer {
     }
 
     private float getProgress() {
-        return Math.min((System.currentTimeMillis() - start) / (float) BlurConfig.fadeTimeMillis, 1);
+        float x = Math.min((System.currentTimeMillis() - start) / (float) BlurConfig.fadeTimeMillis, 1);
+        if (BlurConfig.ease) x *= (2 - x);  // easeOutCubic
+        return x;
     }
 
     public int getBackgroundColor(boolean second) {

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

@@ -10,6 +10,8 @@ public class BlurConfig extends MidnightConfig {
     public static List<String> blurExclusions = Blur.defaultExclusions;
     @Entry(min = 0, max = 5000, width = 4)
     public static int fadeTimeMillis = 200;
+    @Entry
+    public static boolean ease = true;
     @Entry(min = 0, max = 500, width = 3)
     public static int radius = 8;
     @Entry(isColor = true, width = 7, min = 7)

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

@@ -2,9 +2,10 @@
   "blur.midnightconfig.title": "Blur Konfiguration",
   "blur.midnightconfig.blurExclusions": "Blur-Ausnahmen",
   "blur.midnightconfig.fadeTimeMillis": "Überblendzeit (in Millisekunden)",
+  "blur.midnightconfig.ease": "Geschmeidige Animation",
   "blur.midnightconfig.radius": "Radius",
-  "blur.midnightconfig.gradientStartColor": "Farbverlauf-Anfangsfarbe",
-  "blur.midnightconfig.gradientEndColor": "Farbverlauf-Endfarbe",
+  "blur.midnightconfig.gradientStart": "Farbverlauf-Anfangsfarbe",
+  "blur.midnightconfig.gradientEnd": "Farbverlauf-Endfarbe",
   "blur.midnightconfig.gradientStartAlpha": "Farbverlauf-Anfangstransparenz",
   "blur.midnightconfig.gradientEndAlpha": "Farbverlauf-Endstransparenz",
   "blur.midnightconfig.showScreenTitle": "Zeige Bildschirmtitel"

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

@@ -2,6 +2,7 @@
   "blur.midnightconfig.title": "Blur Config",
   "blur.midnightconfig.blurExclusions": "Blur Exclusions",
   "blur.midnightconfig.fadeTimeMillis": "Fade Time (in milliseconds)",
+  "blur.midnightconfig.ease": "Ease Animation",
   "blur.midnightconfig.radius": "Radius",
   "blur.midnightconfig.gradientStart": "Gradient Start Color",
   "blur.midnightconfig.gradientEnd": "Gradient End Color",

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

@@ -0,0 +1,11 @@
+{
+  "blur.midnightconfig.title": "Blur 설정",
+  "blur.midnightconfig.blurExclusions": "블러 제외",
+  "blur.midnightconfig.fadeTimeMillis": "페이드 시간 (밀리초 단위)",
+  "blur.midnightconfig.radius": "범위",
+  "blur.midnightconfig.gradientStart": "그라디언트 시작 색상",
+  "blur.midnightconfig.gradientEnd": "그라디언트 종료 색상",
+  "blur.midnightconfig.gradientStartAlpha": "그라디언트 시작 알파",
+  "blur.midnightconfig.gradientEndAlpha": "그라디언트 종료 알파",
+  "blur.midnightconfig.showScreenTitle": "화면 타이틀 보기"
+}

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

@@ -1,8 +1,12 @@
 {
-  "blur.midnightconfig.title": "Definições de desfoque",
-  "blur.midnightconfig.blurExclusions": "Exclusões de desfoque",
-  "blur.midnightconfig.fadeTimeMillis": "Esmaecimento (em milissegundos)",
+  "blur.midnightconfig.title": "Configuração de desfoque",
+  "blur.midnightconfig.blurExclusions": "Desfocar exclusões",
+  "blur.midnightconfig.fadeTimeMillis": "Tempo de desvanecimento (em milissegundos)",
+  "blur.midnightconfig.ease": "Animação fácil",
   "blur.midnightconfig.radius": "Raio",
-  "blur.midnightconfig.gradientStart": "Cor de início do gradiente",
-  "blur.midnightconfig.gradientEnd": "Cor de término do gradiente"
-}
+  "blur.midnightconfig.gradientStart": "Cor inicial do gradiente",
+  "blur.midnightconfig.gradientEnd": "Cor final do gradiente",
+  "blur.midnightconfig.gradientStartAlpha": "Alfa de início gradiente",
+  "blur.midnightconfig.gradientEndAlpha": "Alfa de Gradiente Final",
+  "blur.midnightconfig.showScreenTitle": "Mostrar título da tela"
+}

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

@@ -0,0 +1,12 @@
+{
+  "blur.midnightconfig.title": "Конфігурація Blur",
+  "blur.midnightconfig.blurExclusions": "Винятки розмиття",
+  "blur.midnightconfig.fadeTimeMillis": "Час появи розмиття (у мілісекундах)",
+  "blur.midnightconfig.ease": "Пом'якшення анімації",
+  "blur.midnightconfig.radius": "Радіус",
+  "blur.midnightconfig.gradientStart": "Початковий колір градієнта",
+  "blur.midnightconfig.gradientEnd": "Кінцевий колір градієнта",
+  "blur.midnightconfig.gradientStartAlpha": "Початкова прозорість градієнта",
+  "blur.midnightconfig.gradientEndAlpha": "Кінцева прозорість градієнтаa",
+  "blur.midnightconfig.showScreenTitle": "Показати назву екрана"
+}

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

@@ -1,7 +1,12 @@
 {
   "blur.midnightconfig.title": "模糊配置",
+  "blur.midnightconfig.blurExclusions": "模糊排除",
   "blur.midnightconfig.fadeTimeMillis": "淡入时间(毫秒)",
+  "blur.midnightconfig.ease": "简单动画",
   "blur.midnightconfig.radius": "半径",
   "blur.midnightconfig.gradientStart": "渐变起始色",
-  "blur.midnightconfig.gradientEnd": "渐变结束色"
+  "blur.midnightconfig.gradientEnd": "渐变结束色",
+  "blur.midnightconfig.gradientStartAlpha": "渐变起始阿尔法通道",
+  "blur.midnightconfig.gradientEndAlpha": "渐变结束阿尔法通道",
+  "blur.midnightconfig.showScreenTitle": "显示屏幕标题"
 }