From 84cc94fba4688b07c1d18093f631e1990a4059ab Mon Sep 17 00:00:00 2001 From: backryun Date: Tue, 3 Jan 2023 23:45:22 +0900 Subject: [PATCH 1/6] Upsteram Fabric components --- gradle.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 32548cc..161d93c 100755 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop minecraft_version=1.19.3 - yarn_mappings=1.19.3+build.3 - loader_version=0.14.11 + yarn_mappings=1.19.3+build.5 + loader_version=0.14.12 # Mod Properties - mod_version = 2.6.2 + 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.69.0+1.19.3 + fabric_version=0.71.0+1.19.3 satin_version = 1.10.0 midnightlib_version=1.1.0-fabric From 3528305c93ce5cbc0cddd4822d9995b1680bb5eb Mon Sep 17 00:00:00 2001 From: backryun Date: Mon, 6 Feb 2023 22:27:26 +0900 Subject: [PATCH 2/6] Upstream Fabric dependencys --- build.gradle | 2 +- gradle.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 8ecc742..0319f55 100755 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.0-SNAPSHOT' + id 'fabric-loom' version '1.1-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 161d93c..f75b52b 100755 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/develop minecraft_version=1.19.3 yarn_mappings=1.19.3+build.5 - loader_version=0.14.12 + loader_version=0.14.14 # Mod Properties mod_version = 2.6.1 @@ -14,6 +14,6 @@ org.gradle.jvmargs=-Xmx1G # 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.71.0+1.19.3 + fabric_version=0.73.2+1.19.3 satin_version = 1.10.0 midnightlib_version=1.1.0-fabric From 521cc1530621f19ffbdf0db93633255a65ab3757 Mon Sep 17 00:00:00 2001 From: backryun Date: Tue, 28 Feb 2023 22:19:36 +0900 Subject: [PATCH 3/6] Upstream Gradle,Fabric Dependencys --- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index f75b52b..711fcb2 100755 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/develop minecraft_version=1.19.3 yarn_mappings=1.19.3+build.5 - loader_version=0.14.14 + loader_version=0.14.17 # Mod Properties mod_version = 2.6.1 @@ -14,6 +14,6 @@ org.gradle.jvmargs=-Xmx1G # 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.73.2+1.19.3 + fabric_version=0.75.1+1.19.3 satin_version = 1.10.0 midnightlib_version=1.1.0-fabric diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb70..f72df95 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 427d453f7996a3b396b53fb1207f26c39a981c89 Mon Sep 17 00:00:00 2001 From: backryun Date: Sun, 5 Mar 2023 19:59:41 +0900 Subject: [PATCH 4/6] Upstream Gradle version 8.0.2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f72df95..e1bef7e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 44ae96ef50e547c495e5909b3a0f68f293dc044c Mon Sep 17 00:00:00 2001 From: backryun Date: Wed, 8 Mar 2023 23:07:27 +0900 Subject: [PATCH 5/6] Update Gradle 8.0.2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f72df95..e1bef7e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 876c5256ae485c00d3a66da0715eb6ad445baf28 Mon Sep 17 00:00:00 2001 From: byquanton <32410361+byquanton@users.noreply.github.com> Date: Fri, 17 Mar 2023 22:42:15 +0100 Subject: [PATCH 6/6] 1.19.4 Port --- gradle.properties | 16 ++++++++-------- src/main/java/com/tterrag/blur/Blur.java | 1 - .../java/com/tterrag/blur/mixin/MixinScreen.java | 7 ------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index 711fcb2..b43bc78 100755 --- a/gradle.properties +++ b/gradle.properties @@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.19.3 - yarn_mappings=1.19.3+build.5 + minecraft_version=1.19.4 + yarn_mappings=1.19.4+build.1 loader_version=0.14.17 # Mod Properties - mod_version = 2.6.1 - maven_group = com.tterrag.blur - archives_base_name = blur + mod_version=2.7.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.75.1+1.19.3 - satin_version = 1.10.0 - midnightlib_version=1.1.0-fabric + fabric_version=0.76.0+1.19.4 + satin_version=1.11.0 + midnightlib_version=1.2.1-fabric diff --git a/src/main/java/com/tterrag/blur/Blur.java b/src/main/java/com/tterrag/blur/Blur.java index 1c5e39f..300f944 100644 --- a/src/main/java/com/tterrag/blur/Blur.java +++ b/src/main/java/com/tterrag/blur/Blur.java @@ -11,7 +11,6 @@ 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; diff --git a/src/main/java/com/tterrag/blur/mixin/MixinScreen.java b/src/main/java/com/tterrag/blur/mixin/MixinScreen.java index d89676d..c87e3f2 100755 --- a/src/main/java/com/tterrag/blur/mixin/MixinScreen.java +++ b/src/main/java/com/tterrag/blur/mixin/MixinScreen.java @@ -1,11 +1,6 @@ package com.tterrag.blur.mixin; -import com.tterrag.blur.config.BlurConfig; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.TextColor; -import net.minecraft.util.Formatting; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -26,8 +21,6 @@ public abstract class MixinScreen { @Shadow @Nullable protected MinecraftClient client; - @Shadow protected TextRenderer textRenderer; - @Inject(at = @At("HEAD"), method = "tick") private void blur$reloadShader(CallbackInfo ci) { if (this.getClass().toString().toLowerCase(Locale.ROOT).contains("midnightconfigscreen") && this.client != null) {