From aaeeec63e08406df9e5650aad4f77f0256cc0432 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Thu, 8 Jun 2023 18:39:05 +0800 Subject: [PATCH] Update to 1.20 --- build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- .../lightfall/client/gui/LightfallHandshakeScreen.java | 9 +++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index f7b94e4..6a17714 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '[6.0,6.2]', changing: true classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' } } @@ -14,13 +14,13 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'org.spongepowered.mixin' group = 'io.izzel.lightfall' -version = '1.1.2' +version = '1.2.0' archivesBaseName = 'lightfallclient' java.toolchain.languageVersion = JavaLanguageVersion.of(17) minecraft { - mappings channel: 'official', version: "1.19.4" + mappings channel: 'official', version: "1.20" runs { client { workingDirectory project.file('run') @@ -45,7 +45,7 @@ repositories { } dependencies { - minecraft 'net.minecraftforge:forge:1.19.4-45.0.22' + minecraft 'net.minecraftforge:forge:1.20-46.0.1' annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102..fae0804 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.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/io/izzel/lightfall/client/gui/LightfallHandshakeScreen.java b/src/main/java/io/izzel/lightfall/client/gui/LightfallHandshakeScreen.java index 1eb59ac..99985f0 100644 --- a/src/main/java/io/izzel/lightfall/client/gui/LightfallHandshakeScreen.java +++ b/src/main/java/io/izzel/lightfall/client/gui/LightfallHandshakeScreen.java @@ -3,6 +3,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.GameNarrator; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.TitleScreen; @@ -51,11 +52,11 @@ public void setComponent(Component component) { this.component = component; } - public void render(@NotNull PoseStack poseStack, int p_96531_, int p_96532_, float p_96533_) { - this.renderDirtBackground(poseStack); - drawCenteredString(poseStack, this.font, component != null ? component : Component.translatable("connect.connecting"), + public void render(@NotNull GuiGraphics gui, int p_96531_, int p_96532_, float p_96533_) { + this.renderDirtBackground(gui); + gui.drawCenteredString(this.font, component != null ? component : Component.translatable("connect.connecting"), this.width / 2, this.height / 2 - 50, 16777215); - super.render(poseStack, p_96531_, p_96532_, p_96533_); + super.render(gui, p_96531_, p_96532_, p_96533_); } @Override