diff --git a/.gitignore b/.gitignore index 723a327..192a912 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ bin/ run/ logs/ + diff --git a/build.gradle b/build.gradle index 225c707..1d761c1 100644 --- a/build.gradle +++ b/build.gradle @@ -6,21 +6,12 @@ plugins { version = project.mod_version group = project.maven_group -repositories { - // Add repositories to retrieve artifacts from in here. - // You should only use this when depending on other mods because - // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html - // for more information about repositories. -} +repositories {} dependencies { - // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" } @@ -39,10 +30,6 @@ processResources { def targetJavaVersion = 17 tasks.withType(JavaCompile).configureEach { - // ensure that the encoding is set to UTF-8, no matter what the system default is - // this fixes some edge cases with special characters not displaying correctly - // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html - // If Javadoc is generated, this must be specified in that task too. it.options.encoding = "UTF-8" if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { it.options.release.set(targetJavaVersion) @@ -55,9 +42,6 @@ java { toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) } archivesBaseName = project.archives_base_name - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task - // if it is present. - // If you remove this line, sources will not be generated. withSourcesJar() } @@ -70,7 +54,6 @@ jar { } } -// configure the maven publication publishing { publications { mavenJava(MavenPublication) { @@ -78,11 +61,5 @@ publishing { } } - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. - // Notice: This block does NOT have the same function as the block in the top level. - // The repositories here will be used for publishing your artifact, not for - // retrieving dependencies. - } -} + repositories {} +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..9bbc975 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 82d65ca..37f853b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1 +1,7 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..faf9300 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +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=SC2039,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=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9b42019 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +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% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java b/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java index 2b777eb..d810bde 100644 --- a/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java +++ b/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java @@ -2,7 +2,9 @@ package org.saturnclient.saturnclient.menus; import org.saturnclient.ui.SaturnAnimation; import org.saturnclient.ui.SaturnUi; +import org.saturnclient.ui.Textures; import org.saturnclient.ui.widgets.SaturnButton; +import org.saturnclient.ui.widgets.SaturnImageButton; import net.minecraft.text.Text; @@ -13,9 +15,36 @@ public class MainMenu extends SaturnUi { @Override protected void init() { + int buttonWidth = 96; + int buttonHeight = 25; + draw( new SaturnButton("Settings", () -> { client.setScreen(new SettingsMenu()); - }).setX(10).setY(10).setWidth(96).setHeight(25).setAnimation(SaturnAnimation.FADE_SLIDE.distance(15))); + }).setX((width - buttonWidth) / 2).setY((height - buttonHeight) / 2).setWidth(buttonWidth) + .setHeight(buttonHeight) + .setAnimation(SaturnAnimation.FADE_SLIDE.distance(15))); + + draw( + new SaturnImageButton(Textures.EMOTE, 14, 14, + () -> { + client.setScreen(new SettingsMenu()); + }) + .setX((width - buttonWidth - (buttonHeight * 2) - 6) / 2) + .setY((height - buttonHeight) / 2) + .setWidth(buttonHeight) + .setHeight(buttonHeight) + .setAnimation(SaturnAnimation.FADE_SLIDE.distance(15))); + + draw( + new SaturnImageButton(Textures.COSMETICS, 14, 14, + () -> { + client.setScreen(new SettingsMenu()); + }) + .setX((width / 2) + (buttonWidth / 2) + 3) + .setY((height - buttonHeight) / 2) + .setWidth(buttonHeight) + .setHeight(buttonHeight) + .setAnimation(SaturnAnimation.FADE_SLIDE.distance(15))); } } \ No newline at end of file diff --git a/src/main/java/org/saturnclient/saturnclient/menus/SettingsMenu.java b/src/main/java/org/saturnclient/saturnclient/menus/SettingsMenu.java index bbf89a6..6114a60 100644 --- a/src/main/java/org/saturnclient/saturnclient/menus/SettingsMenu.java +++ b/src/main/java/org/saturnclient/saturnclient/menus/SettingsMenu.java @@ -1,15 +1,13 @@ package org.saturnclient.saturnclient.menus; import org.saturnclient.ui.SaturnUi; +import org.saturnclient.ui.Textures; import org.saturnclient.ui.widgets.SaturnImageButton; import org.saturnclient.ui.widgets.SaturnInputBox; import net.minecraft.text.Text; -import net.minecraft.util.Identifier; public class SettingsMenu extends SaturnUi { - public static Identifier searchTexture = Identifier.of("saturnclient", "textures/gui/components/search.png"); - public static Identifier closeTexture = Identifier.of("saturnclient", "textures/gui/components/close.png"); public SaturnImageButton searchButton; public SaturnInputBox searchInputBox; @@ -23,15 +21,15 @@ public class SettingsMenu extends SaturnUi { searchInputBox.visible = false; draw(searchInputBox); - searchButton = (SaturnImageButton) new SaturnImageButton(searchTexture, 10, + searchButton = (SaturnImageButton) new SaturnImageButton(Textures.SEARCH, 10, 10, () -> { searchInputBox.visible = !searchInputBox.visible; if (searchInputBox.visible) { - searchButton.sprite = closeTexture; + searchButton.sprite = Textures.CLOSE; } else { searchInputBox.clearText(); - searchButton.sprite = searchTexture; + searchButton.sprite = Textures.SEARCH; } }).setWidth(30).setHeight(30).setX(30).setY(30); diff --git a/src/main/java/org/saturnclient/ui/SaturnUi.java b/src/main/java/org/saturnclient/ui/SaturnUi.java index ce448e9..d5ad953 100644 --- a/src/main/java/org/saturnclient/ui/SaturnUi.java +++ b/src/main/java/org/saturnclient/ui/SaturnUi.java @@ -24,6 +24,8 @@ public class SaturnUi extends Screen { @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { + renderBackground(context, mouseX, mouseY, delta); + for (SaturnWidget widget : new ArrayList<>(widgets)) { if (!widget.visible) { continue; diff --git a/src/main/java/org/saturnclient/ui/SaturnWidget.java b/src/main/java/org/saturnclient/ui/SaturnWidget.java index 749b02b..ea2811a 100644 --- a/src/main/java/org/saturnclient/ui/SaturnWidget.java +++ b/src/main/java/org/saturnclient/ui/SaturnWidget.java @@ -3,14 +3,14 @@ package org.saturnclient.ui; import net.minecraft.client.gui.DrawContext; public class SaturnWidget { - public int x; - public int y; - public int width; - public int height; + public int x = 0; + public int y = 0; + public int width = 0; + public int height = 0; public float alpha = 1.0f; public SaturnAnimation animation = null; public boolean visible = true; - + public void render(DrawContext context, boolean hovering) { } diff --git a/src/main/java/org/saturnclient/ui/Textures.java b/src/main/java/org/saturnclient/ui/Textures.java new file mode 100644 index 0000000..9d04dbd --- /dev/null +++ b/src/main/java/org/saturnclient/ui/Textures.java @@ -0,0 +1,15 @@ +package org.saturnclient.ui; + +import net.minecraft.util.Identifier; + +public class Textures { + public static final Identifier SETTINGS = Identifier.of("saturnclient", "textures/gui/components/settings.png"); + public static final Identifier COSMETICS = Identifier.of("saturnclient", "textures/gui/components/cosmetics.png"); + public static final Identifier EMOTE = Identifier.of("saturnclient", "textures/gui/components/emote.png"); + public static final Identifier SEARCH = Identifier.of("saturnclient", "textures/gui/components/search.png"); + public static final Identifier CLOSE = Identifier.of("saturnclient", "textures/gui/components/close.png"); + + // Button Textures + public static final Identifier BUTTON_BORDER = Identifier.ofVanilla("widget/saturn/button_border"); + public static final Identifier BUTTON = Identifier.ofVanilla("widget/saturn/button"); +} diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java b/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java index 1cb1bf2..f58c88d 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java @@ -1,21 +1,18 @@ package org.saturnclient.ui.widgets; +import org.lwjgl.opengl.GL11; import org.saturnclient.ui.SaturnWidget; +import org.saturnclient.ui.Textures; + +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.gui.screen.ButtonTextures; import net.minecraft.client.render.RenderLayer; -import net.minecraft.util.Identifier; import net.minecraft.util.math.ColorHelper; import net.minecraft.util.math.MathHelper; public class SaturnButton extends SaturnWidget { - public static final Identifier BORDER_TEXTURE = Identifier.ofVanilla("widget/saturn/button_border"); - public static final ButtonTextures TEXTURES = new ButtonTextures( - Identifier.ofVanilla("widget/saturn/button"), Identifier.ofVanilla("widget/saturn/button_disabled"), - Identifier.ofVanilla("widget/saturn/button")); - public boolean active = true; public String text; public Runnable onPress; @@ -29,18 +26,21 @@ public class SaturnButton extends SaturnWidget { public void render(DrawContext context, boolean hovering) { MinecraftClient minecraftClient = MinecraftClient.getInstance(); - context.drawGuiTexture(RenderLayer::getGuiTextured, TEXTURES.get(this.active, hovering), this.x, + RenderSystem.setShaderTexture(0, Textures.BUTTON); + RenderSystem.texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR_MIPMAP_LINEAR); + + context.drawGuiTexture(RenderLayer::getGuiTextured, Textures.BUTTON, this.x, this.y, this.width, this.height, ColorHelper.getWhite(this.alpha)); if (hovering) { - context.drawGuiTexture(RenderLayer::getGuiTextured, BORDER_TEXTURE, this.x, + context.drawGuiTexture(RenderLayer::getGuiTextured, Textures.BUTTON_BORDER, this.x, this.y, this.width, this.height, ColorHelper.getArgb(255, 251, 60, 79)); } int i = this.active ? 16777215 : 10526880; context.drawText(minecraftClient.textRenderer, this.text, this.x + ((this.width - minecraftClient.textRenderer.getWidth(this.text)) / 2), - this.y + ((this.height - 7) / 2), + this.y + ((this.height - minecraftClient.textRenderer.fontHeight + 1) / 2), i | MathHelper.ceil(this.alpha * 255.0F) << 24, false); } diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnImageButton.java b/src/main/java/org/saturnclient/ui/widgets/SaturnImageButton.java index e9aa9a5..746de54 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnImageButton.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnImageButton.java @@ -19,8 +19,7 @@ public class SaturnImageButton extends SaturnButton { @Override public void render(DrawContext context, boolean hovering) { - context.drawGuiTexture(RenderLayer::getGuiTextured, SaturnButton.TEXTURES.get(this.active, hovering), this.x, - this.y, this.width, this.height, ColorHelper.getWhite(this.alpha)); + super.render(context, hovering); context.drawTexture(RenderLayer::getGuiTextured, sprite, x + (width - imageWidth) / 2, y + (height - imageHeight) / 2, 0, 0, imageWidth, imageHeight, imageWidth, diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java b/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java index ba46442..8821e1c 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java @@ -2,17 +2,15 @@ package org.saturnclient.ui.widgets; import org.lwjgl.glfw.GLFW; import org.saturnclient.ui.SaturnWidget; +import org.saturnclient.ui.Textures; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.RenderLayer; -import net.minecraft.util.Identifier; import net.minecraft.util.math.ColorHelper; public class SaturnInputBox extends SaturnWidget { - public static final Identifier TEXTURE = Identifier.ofVanilla("widget/saturn/button"); - public String text = ""; public String placeholder = ""; public int cursorPosition = 0; @@ -64,7 +62,7 @@ public class SaturnInputBox extends SaturnWidget { @Override public void render(DrawContext context, boolean hovering) { - context.drawGuiTexture(RenderLayer::getGuiTextured, TEXTURE, this.x, + context.drawGuiTexture(RenderLayer::getGuiTextured, Textures.BUTTON, this.x, this.y, this.width, this.height, ColorHelper.getWhite(this.alpha)); int scrollOffset = getScrollOffset(); diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png index 537a50e..93d42dd 100644 Binary files a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png and b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png differ diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png.mcmeta b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png.mcmeta index 46f3896..ed7677e 100644 --- a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png.mcmeta +++ b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png.mcmeta @@ -4,7 +4,7 @@ "type": "nine_slice", "width": 80, "height": 80, - "border": 15 + "border": 9 } } } diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png index fac642f..b3553dc 100644 Binary files a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png and b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png differ diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png.mcmeta b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png.mcmeta index 46f3896..ed7677e 100644 --- a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png.mcmeta +++ b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png.mcmeta @@ -4,7 +4,7 @@ "type": "nine_slice", "width": 80, "height": 80, - "border": 15 + "border": 9 } } } diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_disabled.png b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_disabled.png deleted file mode 100644 index cdc8d4c..0000000 Binary files a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_disabled.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_disabled.png.mcmeta b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_disabled.png.mcmeta deleted file mode 100644 index 9768602..0000000 --- a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_disabled.png.mcmeta +++ /dev/null @@ -1,10 +0,0 @@ -{ - "gui": { - "scaling": { - "type": "nine_slice", - "width": 300, - "height": 30, - "border": 9 - } - } -} diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_highlighted.png b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_highlighted.png deleted file mode 100644 index 1aab27e..0000000 Binary files a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_highlighted.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_highlighted.png.mcmeta b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_highlighted.png.mcmeta deleted file mode 100644 index 9768602..0000000 --- a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_highlighted.png.mcmeta +++ /dev/null @@ -1,10 +0,0 @@ -{ - "gui": { - "scaling": { - "type": "nine_slice", - "width": 300, - "height": 30, - "border": 9 - } - } -} diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/cosmetics.png b/src/main/resources/assets/saturnclient/textures/gui/components/cosmetics.png new file mode 100644 index 0000000..f6f213d Binary files /dev/null and b/src/main/resources/assets/saturnclient/textures/gui/components/cosmetics.png differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/emote.png b/src/main/resources/assets/saturnclient/textures/gui/components/emote.png new file mode 100644 index 0000000..3ae47e2 Binary files /dev/null and b/src/main/resources/assets/saturnclient/textures/gui/components/emote.png differ