Motschen/Blur
1
0
Fork 0
mirror of https://github.com/Motschen/Blur.git synced 2025-12-15 19:25:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.20.2

Browse Source 
Bump satin dependency to version 1.14.0
Bump midnightlib dependency to version 1.5.0
Bump version to 3.1.1
This commit is contained in:
TheMrEngMan
2023-09-25 03:57:02 -04:00
parent b4efd59322
commit d726e20410
5 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

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

15
gradle.properties
View File

@@ -1,19 +1,20 @@
# Done to increase the memory available to gradle. # Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx1G
org.gradle.parallel=true
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.20 minecraft_version=1.20.2
yarn_mappings=1.20+build.1 yarn_mappings=1.20.2+build.1
loader_version=0.14.21 loader_version=0.14.22
# Mod Properties # Mod Properties
mod_version=3.1.0 mod_version=3.1.1
maven_group=com.tterrag.blur maven_group=com.tterrag.blur
archives_base_name=blur archives_base_name=blur
# Dependencies # Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api # 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 fabric_version=0.89.1+1.20.2
satin_version=1.13.0 satin_version=1.14.0
midnightlib_version=1.4.1-fabric midnightlib_version=1.5.0-fabric

6
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

1
settings.gradle
View File

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

7
src/main/java/com/tterrag/blur/mixin/MixinScreen.java
View File

@@ -2,7 +2,6 @@ package com.tterrag.blur.mixin;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
@@ -33,21 +32,21 @@ public abstract class MixinScreen {
} }
} }
@Inject(at = @At("HEAD"), method = "renderBackground") @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) { if (this.client != null && this.client.world != null) {
Blur.screenHasBackground = true; Blur.screenHasBackground = true;
} }
} }
@ModifyConstant( @ModifyConstant(
method = "renderBackground", method = "renderInGameBackground",
constant = @Constant(intValue = -1072689136)) constant = @Constant(intValue = -1072689136))
private int blur$getFirstBackgroundColor(int color) { private int blur$getFirstBackgroundColor(int color) {
return Blur.getBackgroundColor(false, true); return Blur.getBackgroundColor(false, true);
} }
@ModifyConstant( @ModifyConstant(
method = "renderBackground", method = "renderInGameBackground",
constant = @Constant(intValue = -804253680)) constant = @Constant(intValue = -804253680))
private int blur$getSecondBackgroundColor(int color) { private int blur$getSecondBackgroundColor(int color) {
return Blur.getBackgroundColor(true, true); return Blur.getBackgroundColor(true, true);