diff --git a/build.gradle b/build.gradle index 1f5f2f2..b09c67e 100755 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.2-SNAPSHOT' + id 'fabric-loom' version '1.3-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}" diff --git a/gradle.properties b/gradle.properties index 4538c3f..a94510f 100755 --- a/gradle.properties +++ b/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.20 - yarn_mappings=1.20+build.1 - loader_version=0.14.21 + minecraft_version=1.20.2 + yarn_mappings=1.20.2+build.1 + loader_version=0.14.22 # Mod Properties - mod_version=3.1.0 + mod_version=3.1.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.83.0+1.20 - satin_version=1.13.0 - midnightlib_version=1.4.1-fabric + fabric_version=0.89.1+1.20.2 + satin_version=1.14.0 + midnightlib_version=1.5.0-fabric diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fae0804..532677e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +zipStorePath=wrapper/dists \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 92d3bb6..0115755 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,6 +4,7 @@ pluginManagement { name = 'Fabric' url = 'https://maven.fabricmc.net/' } + mavenCentral() gradlePluginPortal() } } diff --git a/src/main/java/com/tterrag/blur/mixin/MixinScreen.java b/src/main/java/com/tterrag/blur/mixin/MixinScreen.java index 0b9e215..0ac4759 100755 --- a/src/main/java/com/tterrag/blur/mixin/MixinScreen.java +++ b/src/main/java/com/tterrag/blur/mixin/MixinScreen.java @@ -2,7 +2,6 @@ package com.tterrag.blur.mixin; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Final; @@ -33,21 +32,21 @@ public abstract class MixinScreen { } } @Inject(at = @At("HEAD"), method = "renderBackground") - public void blur$getBackgroundEnabled(DrawContext context, 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);