diff --git a/gradle.properties b/gradle.properties index 5c9102a..4f8e535 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,18 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.19.3 -yarn_mappings=1.19.3+build.5 -loader_version=0.14.19 +minecraft_version=1.20 +yarn_mappings=1.20+build.1 +loader_version=0.14.21 # Mod Properties +<<<<<<< Updated upstream mod_version=1.0.2 +======= +mod_version=1.0.3 +>>>>>>> Stashed changes maven_group=dev.axolotlmaid.optionsprofiles archives_base_name=options-profiles # Dependencies -fabric_version=0.76.1+1.19.3 \ No newline at end of file +fabric_version=0.83.0+1.20 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cb..249e583 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33..ae04661 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip -networkTimeout=10000 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68..a69d9cb 100644 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,11 +80,11 @@ do esac done -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,16 +143,12 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..f127cfd 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,7 +26,6 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/src/main/java/dev/axolotlmaid/optionsprofiles/gui/EditProfileScreen.java b/src/main/java/dev/axolotlmaid/optionsprofiles/gui/EditProfileScreen.java index 1b9d5c8..f8e8618 100644 --- a/src/main/java/dev/axolotlmaid/optionsprofiles/gui/EditProfileScreen.java +++ b/src/main/java/dev/axolotlmaid/optionsprofiles/gui/EditProfileScreen.java @@ -1,6 +1,7 @@ package dev.axolotlmaid.optionsprofiles.gui; import dev.axolotlmaid.optionsprofiles.Profiles; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.GameModeSelectionScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -45,10 +46,11 @@ public class EditProfileScreen extends Screen { }).position(5, this.height - 25).size(100, 20).build()); } - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - this.renderBackground(matrices); - drawCenteredTextWithShadow(matrices, this.textRenderer, Text.of(this.title.getString() + profileName.getString()).asOrderedText(), this.width / 2 , 8, 16777215); - drawCenteredTextWithShadow(matrices, this.textRenderer, Text.translatable("gui.options-profiles.profile-name-text").asOrderedText(), this.width / 2 - 70, this.height / 4 + 10, 16777215); - super.render(matrices, mouseX, mouseY, delta); + @Override + public void render(DrawContext context, int mouseX, int mouseY, float delta) { + this.renderBackground(context); + context.drawCenteredTextWithShadow(textRenderer, Text.of(this.title.getString() + profileName.getString()).asOrderedText(), this.width / 2 , 8, 16777215); + context.drawCenteredTextWithShadow(textRenderer, Text.translatable("gui.options-profiles.profile-name-text").asOrderedText(), this.width / 2 - 70, this.height / 4 + 10, 16777215); + super.render(context, mouseX, mouseY, delta); } } diff --git a/src/main/java/dev/axolotlmaid/optionsprofiles/gui/ProfilesListWidget.java b/src/main/java/dev/axolotlmaid/optionsprofiles/gui/ProfilesListWidget.java index 5660f2a..130871c 100644 --- a/src/main/java/dev/axolotlmaid/optionsprofiles/gui/ProfilesListWidget.java +++ b/src/main/java/dev/axolotlmaid/optionsprofiles/gui/ProfilesListWidget.java @@ -6,11 +6,11 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ElementListWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import org.apache.commons.io.FilenameUtils; @@ -29,12 +29,6 @@ public class ProfilesListWidget extends ElementListWidget { - ProfilesListWidget.this.client.setScreen(new EditProfileScreen(parent, profileName)); - }).position(0, 0).size(75, 20).build(); + this.editButton = new ButtonWidget.Builder(Text.translatable("gui.options-profiles.edit-profile-text"), (button) -> ProfilesListWidget.this.client.setScreen(new EditProfileScreen(parent, profileName))).position(0, 0).size(75, 20).build(); this.loadButton = new ButtonWidget.Builder(Text.translatable("gui.options-profiles.load-profile-text"), (button) -> { new Profiles().overwriteOptionsFile(profileName.getString()); @@ -74,21 +66,19 @@ public class ProfilesListWidget extends ElementListWidget children() { diff --git a/src/main/java/dev/axolotlmaid/optionsprofiles/gui/ProfilesScreen.java b/src/main/java/dev/axolotlmaid/optionsprofiles/gui/ProfilesScreen.java index 1ed703e..7cb11f0 100644 --- a/src/main/java/dev/axolotlmaid/optionsprofiles/gui/ProfilesScreen.java +++ b/src/main/java/dev/axolotlmaid/optionsprofiles/gui/ProfilesScreen.java @@ -1,6 +1,7 @@ package dev.axolotlmaid.optionsprofiles.gui; import dev.axolotlmaid.optionsprofiles.Profiles; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.util.math.MatrixStack; @@ -34,10 +35,11 @@ public class ProfilesScreen extends Screen { }).position(this.width / 2 - 155 + 160, this.height - 29).size(150, 20).build()); } - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - this.renderBackground(matrices); - this.profilesList.render(matrices, mouseX, mouseY, delta); - drawCenteredTextWithShadow(matrices, this.textRenderer, this.title.asOrderedText(), this.width / 2, 8, 16777215); - super.render(matrices, mouseX, mouseY, delta); + @Override + public void render(DrawContext context, int mouseX, int mouseY, float delta) { + this.renderBackground(context); + this.profilesList.render(context, mouseX, mouseY, delta); + context.drawCenteredTextWithShadow(textRenderer, this.title.asOrderedText(), this.width / 2, 8, 16777215); + super.render(context, mouseX, mouseY, delta); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7f1ed6b..d9ecbcb 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,8 +23,8 @@ "options-profiles.mixins.json" ], "depends": { - "fabricloader": ">=0.14.19", - "minecraft": "~1.19.3", + "fabricloader": ">=0.14.21", + "minecraft": "~1.20", "java": ">=17", "fabric-api": "*" },