diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e6bb95..8fc3827 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,34 +1,30 @@ -name: Build -on: - - push - - pull_request +# Automatically build the project and run any configured tests for every push +# and submitted pull request. This can help catch issues that only occur on +# certain platforms or Java versions, and provides a first line of defence +# against bad commits. + +name: build +on: [pull_request, push] + jobs: build: - strategy: - matrix: - java: - - 17 - os: - - ubuntu-20.04 - - windows-latest - runs-on: ${{ matrix.os }} + runs-on: ubuntu-24.04 steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: Validate gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Setup jdk ${{ matrix.java }} - uses: actions/setup-java@v1 + - name: checkout repository + uses: actions/checkout@v4 + - name: validate gradle wrapper + uses: gradle/actions/wrapper-validation@v4 + - name: setup jdk + uses: actions/setup-java@v4 with: - java-version: ${{ matrix.java }} - - name: Make Gradle wrapper executable - if: ${{ runner.os != 'Windows' }} + java-version: '21' + distribution: 'microsoft' + - name: make gradle wrapper executable run: chmod +x ./gradlew - - name: Build + - name: build run: ./gradlew build - - name: Upload build artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '16' }} - uses: actions/upload-artifact@v2 + - name: capture build artifacts + uses: actions/upload-artifact@v4 with: name: Artifacts - path: build/libs/ + path: build/libs/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 504c80a..cbb820a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,13 @@ plugins { - id 'fabric-loom' version '0.10.+' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 - -archivesBaseName = project.archives_base_name version = project.mod_version group = project.maven_group -minecraft { +base { + archivesName = project.archives_base_name } repositories { @@ -35,19 +32,12 @@ processResources { inputs.property "version", project.version filesMatching("fabric.mod.json") { - expand "version": project.version + expand "version": inputs.properties.version } } 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" - - // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. - it.options.release = 17 + it.options.release = 21 } java { @@ -55,25 +45,25 @@ java { // if it is present. // If you remove this line, sources will not be generated. withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } jar { + inputs.property "archivesName", project.base.archivesName + from("LICENSE") { - rename { "${it}_${project.archivesBaseName}"} + rename { "${it}_${inputs.properties.archivesName}"} } } // configure the maven publication publishing { publications { - mavenJava(MavenPublication) { - // add all the jars that should be included when publishing to maven - artifact(remapJar) { - builtBy remapJar - } - artifact(sourcesJar) { - builtBy remapSourcesJar - } + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name + from components.java } } @@ -84,4 +74,4 @@ publishing { // The repositories here will be used for publishing your artifact, not for // retrieving dependencies. } -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 304ed9a..62dd682 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,17 @@ org.gradle.jvmargs = -Xmx1G +org.gradle.parallel = true #Fabric properties -minecraft_version = 1.18.1 -yarn_mappings = 1.18.1+build.12 -loader_version = 0.12.12 +minecraft_version = 1.21.1 +yarn_mappings = 1.21.1+build.3 +loader_version = 0.16.13 #Mod properties -mod_version = 1.18.1-0.1.4 +mod_version = 1.21.1-0.1.4 maven_group = minimalmenu archives_base_name = minimalmenu #Dependencies -fabric_api_version = 0.45.0+1.18 -mod_menu_version = 3.0.1 -cloth_config_version = 6.1.48 +fabric_api_version = 0.115.6+1.21.1 +mod_menu_version = 11.0.3 +cloth_config_version = 15.0.140 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f3d88b1..a4b76b9 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 a33384a..c1048ec 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-7.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/gradlew b/gradlew index 645f6ca..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# 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. @@ -15,80 +15,115 @@ # 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 UN*X -## +# +# 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 -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +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 -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$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"' +# 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" +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 - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -97,87 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - 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=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 -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -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" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +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 - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + 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 - i=`expr $i + 1` + # 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 - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# 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, 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" "$@" \ No newline at end of file +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index a14a3d0..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,103 +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 - -@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=. -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%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -: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 %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega \ No newline at end of file +@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/settings.gradle b/settings.gradle index 2875cde..56266b4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,6 +4,7 @@ pluginManagement { name = 'Fabric' url = 'https://maven.fabricmc.net/' } + mavenCentral() gradlePluginPortal() } } \ No newline at end of file diff --git a/src/main/java/minimalmenu/MinimalMenu.java b/src/main/java/minimalmenu/MinimalMenu.java index 1da0284..0ec7d69 100644 --- a/src/main/java/minimalmenu/MinimalMenu.java +++ b/src/main/java/minimalmenu/MinimalMenu.java @@ -1,10 +1,10 @@ package minimalmenu; -import java.io.File; +import java.util.Arrays; import java.util.List; -import minimalmenu.screens.FolderScreen; -import net.minecraft.client.MinecraftClient; -import net.minecraft.util.Util; + +import net.minecraft.client.gui.widget.Widget; +import net.minecraft.text.TextContent; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -14,13 +14,12 @@ import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; +import net.minecraft.text.TranslatableTextContent; import net.minecraft.util.Language; public class MinimalMenu implements ClientModInitializer { public static Logger LOGGER = LogManager.getLogger(); - public static final String MOD_ID = "minimalmenu"; public static final String MOD_NAME = "MinimalMenu"; @Override @@ -37,17 +36,18 @@ public static void printButtonInfo(Screen screen) { log(Level.INFO, screen.getClass().getName()); Language language = Language.getInstance(); - List buttons = Screens.getButtons((Screen)(Object)screen); + List buttons = Screens.getButtons(screen); for (ClickableWidget button : buttons) { Text buttonMessage = button.getMessage(); + TextContent textContent = buttonMessage.getContent(); String buttonText = buttonMessage.getString(); log(Level.INFO,"-------------------------------------"); log(Level.INFO, "Button localized: " + buttonText); log(Level.INFO, "Button index: " + buttons.indexOf(button)); - if (buttonMessage instanceof TranslatableText) { - String buttonLangKey = ((TranslatableText) buttonMessage).getKey(); + if (textContent instanceof TranslatableTextContent) { + String buttonLangKey = ((TranslatableTextContent) textContent).getKey(); String buttonLangText = language.get(buttonLangKey); log(Level.INFO, "Button key: " + buttonLangKey); @@ -55,11 +55,11 @@ public static void printButtonInfo(Screen screen) { log(Level.INFO, "Button text: " + buttonLangText); } - Object[] textArgs = ((TranslatableText) buttonMessage).getArgs(); + Object[] textArgs = ((TranslatableTextContent) textContent).getArgs(); for (int i = 0; i < textArgs.length; i++) { Object arg = textArgs[i]; - if (arg instanceof TranslatableText) { - String argKey = ((TranslatableText) arg).getKey(); + if (arg instanceof TranslatableTextContent) { + String argKey = ((TranslatableTextContent) arg).getKey(); log(Level.INFO, ""); log(Level.INFO, "Text arg " + i + " key: " + argKey); log(Level.INFO, "Text arg " + i + " text: " + language.get(argKey)); @@ -70,34 +70,14 @@ public static void printButtonInfo(Screen screen) { log(Level.INFO,"-------------------------------------"); } - public static boolean buttonMatchesKey(ClickableWidget button, String key) { - Text buttonMessage = button.getMessage(); - if (buttonMessage instanceof TranslatableText) { - String buttonKey = ((TranslatableText) buttonMessage).getKey(); - if (buttonKey.equals(key)) { - return true; - } - Object[] textArgs = ((TranslatableText) buttonMessage).getArgs(); - for (Object arg : textArgs) { - if (arg instanceof TranslatableText) { - String argKey = ((TranslatableText) arg).getKey(); - if (argKey.equals(key)) { - return true; - } - } - } - } - return false; - } + public static boolean buttonMatchesKey(Widget widget, String... translationKeys) { + if (widget instanceof ClickableWidget button) { + Text text = button.getMessage(); + TextContent textContent = text.getContent(); - public static void processButtonFolderClick(MinecraftClient client) { - if (ConfigHandler.OPEN_FOLDER_SCREEN) { - FolderScreen folderScreen = new FolderScreen(client.currentScreen); - client.setScreenAndRender(folderScreen); - } else { - assert client != null; - File file = client.runDirectory.toPath().toFile(); - Util.getOperatingSystem().open(file); + return textContent instanceof TranslatableTextContent && Arrays.stream(translationKeys) + .anyMatch(s -> ((TranslatableTextContent) textContent).getKey().equals(s)); } + return false; } } diff --git a/src/main/java/minimalmenu/config/ConfigHandler.java b/src/main/java/minimalmenu/config/ConfigHandler.java index d6c5993..65d9bfc 100644 --- a/src/main/java/minimalmenu/config/ConfigHandler.java +++ b/src/main/java/minimalmenu/config/ConfigHandler.java @@ -15,8 +15,6 @@ public class ConfigHandler { public static final Path CONFIG_PATH = FabricLoader.getInstance().getConfigDir().resolve("minimalmenu.json"); - public static boolean OPEN_FOLDER_SCREEN; - public static boolean REMOVE_SPLASH; public static boolean REMOVE_EDITION; public static boolean REMOVE_SINGLEPLAYER; @@ -25,26 +23,13 @@ public class ConfigHandler { public static boolean REMOVE_LANGUAGE; public static boolean REMOVE_ACCESSIBILITY; public static boolean REMOVE_COPYRIGHT; - public static boolean ADD_FOLDER_TS; - public static boolean STOP_SPIN; - public static boolean DIRT_BACKGROUND; - public static int X_OFFSET_TITLE; - public static int Y_OFFSET_TITLE; public static boolean REMOVE_ONLINE; + public static boolean REMOVE_CREDITS; + public static boolean REMOVE_TELEMETRY; public static boolean REMOVE_FEEDBACK; public static boolean REMOVE_BUGS; - public static boolean REMOVE_LANSP; - public static boolean REMOVE_LANMP; - public static boolean ADD_FOLDER_PS; - public static int X_OFFSET_PAUSE; - public static int Y_OFFSET_PAUSE; - - public static boolean ADD_SAVES; - public static boolean ADD_RELOAD_SAVES; - - public static boolean DISABLE_POTION_OFFSET; public static boolean DEV_MODE; @@ -55,8 +40,6 @@ public static void write() { ) { jw.setIndent(" "); jw.beginObject() - .name("OPEN_FOLDER_SCREEN").value(OPEN_FOLDER_SCREEN) - .name("REMOVE_SPLASH").value(REMOVE_SPLASH) .name("REMOVE_EDITION").value(REMOVE_EDITION) .name("REMOVE_SINGLEPLAYER").value(REMOVE_SINGLEPLAYER) @@ -65,26 +48,13 @@ public static void write() { .name("REMOVE_LANGUAGE").value(REMOVE_LANGUAGE) .name("REMOVE_ACCESSIBILITY").value(REMOVE_ACCESSIBILITY) .name("REMOVE_COPYRIGHT").value(REMOVE_COPYRIGHT) - .name("ADD_FOLDER_TS").value(ADD_FOLDER_TS) - .name("STOP_SPIN").value(STOP_SPIN) - .name("DIRT_BACKGROUND").value(DIRT_BACKGROUND) - .name("X_OFFSET_TITLE").value(X_OFFSET_TITLE) - .name("Y_OFFSET_TITLE").value(Y_OFFSET_TITLE) .name("REMOVE_ONLINE").value(REMOVE_ONLINE) + .name("REMOVE_CREDITS").value(REMOVE_CREDITS) + .name("REMOVE_TELEMETRY").value(REMOVE_TELEMETRY) .name("REMOVE_FEEDBACK").value(REMOVE_FEEDBACK) .name("REMOVE_BUGS").value(REMOVE_BUGS) - .name("REMOVE_LANSP").value(REMOVE_LANSP) - .name("REMOVE_LANMP").value(REMOVE_LANMP) - .name("ADD_FOLDER").value(ADD_FOLDER_PS) - .name("X_OFFSET_PAUSE").value(X_OFFSET_PAUSE) - .name("Y_OFFSET_PAUSE").value(Y_OFFSET_PAUSE) - - .name("ADD_SAVES").value(ADD_SAVES) - .name("ADD_RELOAD_SAVES").value(ADD_RELOAD_SAVES) - - .name("DISABLE_POTION_OFFSET").value(DISABLE_POTION_OFFSET) .name("DEV_MODE").value(DEV_MODE) .endObject(); @@ -102,38 +72,23 @@ public static void read() { //Runs on init to get data from json file. } final JsonObject object = je.getAsJsonObject(); - OPEN_FOLDER_SCREEN = readBoolean(object, "OPEN_FOLDER_SCREEN", false); - - REMOVE_SPLASH = readBoolean(object, "REMOVE_SPLASH", false); - REMOVE_EDITION = readBoolean(object, "REMOVE_EDITION", false); - REMOVE_SINGLEPLAYER = readBoolean(object, "REMOVE_SINGLEPLAYER", false); - REMOVE_MULTIPLAYER = readBoolean(object, "REMOVE_MULTIPLAYER", false); - REMOVE_REALMS = readBoolean(object, "REMOVE_REALMS", false); - REMOVE_LANGUAGE = readBoolean(object, "REMOVE_LANGUAGE", false); - REMOVE_ACCESSIBILITY = readBoolean(object, "REMOVE_ACCESSIBILITY", false); - REMOVE_COPYRIGHT = readBoolean(object, "REMOVE_COPYRIGHT", false); - ADD_FOLDER_TS = readBoolean(object, "ADD_FOLDER_TS", false); - STOP_SPIN = readBoolean(object, "STOP_SPIN", false); - DIRT_BACKGROUND = readBoolean(object, "DIRT_BACKGROUND", false); - X_OFFSET_TITLE = readInt(object, "X_OFFSET_TITLE", 0); - Y_OFFSET_TITLE = readInt(object, "Y_OFFSET_TITLE", 0); - - REMOVE_ONLINE = readBoolean(object, "REMOVE_ONLINE", false); - - REMOVE_FEEDBACK = readBoolean(object, "REMOVE_FEEDBACK", false); - REMOVE_BUGS = readBoolean(object, "REMOVE_BUGS", false); - REMOVE_LANSP = readBoolean(object, "REMOVE_LANSP", false); - REMOVE_LANMP = readBoolean(object, "REMOVE_LANMP", false); - ADD_FOLDER_PS = readBoolean(object, "ADD_FOLDER", false); - X_OFFSET_PAUSE = readInt(object, "X_OFFSET_PAUSE", 0); - Y_OFFSET_PAUSE = readInt(object, "Y_OFFSET_PAUSE", 0); - - ADD_SAVES = readBoolean(object, "ADD_SAVES", false); - ADD_RELOAD_SAVES = readBoolean(object, "ADD_RELOAD_SAVES", false); - - DISABLE_POTION_OFFSET = readBoolean(object, "DISABLE_POTION_OFFSET", false); - - DEV_MODE = readBoolean(object, "DEV_MODE", false); + REMOVE_SPLASH = readBoolean(object, "REMOVE_SPLASH"); + REMOVE_EDITION = readBoolean(object, "REMOVE_EDITION"); + REMOVE_SINGLEPLAYER = readBoolean(object, "REMOVE_SINGLEPLAYER"); + REMOVE_MULTIPLAYER = readBoolean(object, "REMOVE_MULTIPLAYER"); + REMOVE_REALMS = readBoolean(object, "REMOVE_REALMS"); + REMOVE_LANGUAGE = readBoolean(object, "REMOVE_LANGUAGE"); + REMOVE_ACCESSIBILITY = readBoolean(object, "REMOVE_ACCESSIBILITY"); + REMOVE_COPYRIGHT = readBoolean(object, "REMOVE_COPYRIGHT"); + + REMOVE_ONLINE = readBoolean(object, "REMOVE_ONLINE"); + REMOVE_CREDITS = readBoolean(object, "REMOVE_CREDITS"); + REMOVE_TELEMETRY = readBoolean(object, "REMOVE_TELEMETRY"); + + REMOVE_FEEDBACK = readBoolean(object, "REMOVE_FEEDBACK"); + REMOVE_BUGS = readBoolean(object, "REMOVE_BUGS"); + + DEV_MODE = readBoolean(object, "DEV_MODE"); } catch (IOException | JsonSyntaxException e) { e.printStackTrace(); } @@ -143,8 +98,6 @@ public static void read() { //Runs on init to get data from json file. } private static void setDefaults() { - OPEN_FOLDER_SCREEN = false; - REMOVE_SPLASH = false; REMOVE_EDITION = false; REMOVE_SINGLEPLAYER = false; @@ -152,44 +105,24 @@ private static void setDefaults() { REMOVE_REALMS = false; REMOVE_LANGUAGE = false; REMOVE_COPYRIGHT = false; - ADD_FOLDER_TS = false; - STOP_SPIN = false; - DIRT_BACKGROUND = false; - X_OFFSET_TITLE = 0; - Y_OFFSET_TITLE = 0; REMOVE_ONLINE = false; + REMOVE_CREDITS = false; + REMOVE_TELEMETRY = false; + REMOVE_FEEDBACK = false; REMOVE_BUGS = false; - REMOVE_LANSP = false; - REMOVE_LANMP = false; - ADD_FOLDER_PS = false; - X_OFFSET_PAUSE = 0; - Y_OFFSET_PAUSE = 0; - - ADD_SAVES = false; - ADD_RELOAD_SAVES = false; DEV_MODE = false; } - private static boolean readBoolean(JsonObject json, String key, boolean fallback) { + private static boolean readBoolean(JsonObject json, String key) { final JsonElement el = json.get(key); - if (el == null || !el.isJsonPrimitive()) return fallback; + if (el == null || !el.isJsonPrimitive()) return false; try { return el.getAsBoolean(); } catch (ClassCastException e) { - return fallback; - } - } - - private static int readInt(JsonObject json, String key, int fallback) { - final JsonElement el = json.get(key); - if (el == null || !el.isJsonPrimitive()) return fallback; - try { - return el.getAsInt(); - } catch (ClassCastException e) { - return fallback; + return false; } } } diff --git a/src/main/java/minimalmenu/config/ConfigScreen.java b/src/main/java/minimalmenu/config/ConfigScreen.java index 1d81445..739bd6a 100644 --- a/src/main/java/minimalmenu/config/ConfigScreen.java +++ b/src/main/java/minimalmenu/config/ConfigScreen.java @@ -4,157 +4,97 @@ import me.shedaniel.clothconfig2.api.ConfigCategory; import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.text.TranslatableText; +import net.minecraft.text.Text; public class ConfigScreen { public static Screen getConfigScreen(Screen parentScreen) { ConfigBuilder builder = ConfigBuilder.create() .setParentScreen(parentScreen) - .setTitle(new TranslatableText("minimalmenu.config.title")); + .setTitle(Text.translatable("minimalmenu.config.title")); builder.setSavingRunnable(ConfigHandler::write); //Create categories - ConfigCategory titleScreen = builder.getOrCreateCategory(new TranslatableText("minimalmenu.config.category.title")); - ConfigCategory pauseScreen = builder.getOrCreateCategory(new TranslatableText("minimalmenu.config.category.pause")); - ConfigCategory singePlayerScreen = builder.getOrCreateCategory(new TranslatableText("minimalmenu.config.category.sp")); - ConfigCategory generalScreen = builder.getOrCreateCategory(new TranslatableText("minimalmenu.config.category.general")); - ConfigCategory optionsScreen = builder.getOrCreateCategory(new TranslatableText("minimalmenu.config.category.options")); - ConfigCategory otherOptions = builder.getOrCreateCategory(new TranslatableText("minimalmenu.config.category.other")); + ConfigCategory titleScreen = builder.getOrCreateCategory(Text.translatable("minimalmenu.config.category.title")); + ConfigCategory pauseScreen = builder.getOrCreateCategory(Text.translatable("minimalmenu.config.category.pause")); + ConfigCategory optionsScreen = builder.getOrCreateCategory(Text.translatable("minimalmenu.config.category.options")); + ConfigCategory otherOptions = builder.getOrCreateCategory(Text.translatable("minimalmenu.config.category.other")); ConfigEntryBuilder entryBuilder = builder.entryBuilder(); - //Build general screen options - generalScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.general.openFolderScreen"), ConfigHandler.OPEN_FOLDER_SCREEN) - .setDefaultValue(false) - .setSaveConsumer(newValue -> ConfigHandler.OPEN_FOLDER_SCREEN = newValue) - .setTooltip(new TranslatableText("minimalmenu.config.option.general.openFolderScreen.tooltip")) - .build()); - //Build title screen options - titleScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.title.splash"), ConfigHandler.REMOVE_SPLASH) + titleScreen.addEntry(entryBuilder.startBooleanToggle(Text.translatable("minimalmenu.config.option.title.splash"), ConfigHandler.REMOVE_SPLASH) .setDefaultValue(false) .setSaveConsumer(newValue -> ConfigHandler.REMOVE_SPLASH = newValue) .build()); - titleScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.title.edition"), ConfigHandler.REMOVE_EDITION) + titleScreen.addEntry(entryBuilder.startBooleanToggle(Text.translatable("minimalmenu.config.option.title.edition"), ConfigHandler.REMOVE_EDITION) .setDefaultValue(false) .setSaveConsumer(newValue -> ConfigHandler.REMOVE_EDITION = newValue) .build()); - titleScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.title.singleplayer"), ConfigHandler.REMOVE_SINGLEPLAYER) + titleScreen.addEntry(entryBuilder.startBooleanToggle(Text.translatable("minimalmenu.config.option.title.singleplayer"), ConfigHandler.REMOVE_SINGLEPLAYER) .setDefaultValue(false) .setSaveConsumer(newValue -> ConfigHandler.REMOVE_SINGLEPLAYER = newValue) .build()); - titleScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.title.multiplayer"), ConfigHandler.REMOVE_MULTIPLAYER) + titleScreen.addEntry(entryBuilder.startBooleanToggle(Text.translatable("minimalmenu.config.option.title.multiplayer"), ConfigHandler.REMOVE_MULTIPLAYER) .setDefaultValue(false) .setSaveConsumer(newValue -> ConfigHandler.REMOVE_MULTIPLAYER = newValue) .build()); - titleScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.title.realms"), ConfigHandler.REMOVE_REALMS) + titleScreen.addEntry(entryBuilder.startBooleanToggle(Text.translatable("minimalmenu.config.option.title.realms"), ConfigHandler.REMOVE_REALMS) .setDefaultValue(false) .setSaveConsumer(newValue -> ConfigHandler.REMOVE_REALMS = newValue) .build()); - titleScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.title.accessibility"), ConfigHandler.REMOVE_ACCESSIBILITY) + titleScreen.addEntry(entryBuilder.startBooleanToggle(Text.translatable("minimalmenu.config.option.title.accessibility"), ConfigHandler.REMOVE_ACCESSIBILITY) .setDefaultValue(false) .setSaveConsumer(newValue -> ConfigHandler.REMOVE_ACCESSIBILITY = newValue) .build()); - titleScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.title.language"), ConfigHandler.REMOVE_LANGUAGE) + titleScreen.addEntry(entryBuilder.startBooleanToggle(Text.translatable("minimalmenu.config.option.title.language"), ConfigHandler.REMOVE_LANGUAGE) .setDefaultValue(false) .setSaveConsumer(newValue -> ConfigHandler.REMOVE_LANGUAGE = newValue) .build()); - titleScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.title.copy"), ConfigHandler.REMOVE_COPYRIGHT) + titleScreen.addEntry(entryBuilder.startBooleanToggle(Text.translatable("minimalmenu.config.option.title.copy"), ConfigHandler.REMOVE_COPYRIGHT) .setDefaultValue(false) .setSaveConsumer(newValue -> ConfigHandler.REMOVE_COPYRIGHT = newValue) .build()); - titleScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.common.addFolder"), ConfigHandler.ADD_FOLDER_TS) - .setDefaultValue(false) - .setSaveConsumer(newValue -> ConfigHandler.ADD_FOLDER_TS = newValue) - .build()); - - titleScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.title.spin"), ConfigHandler.STOP_SPIN) - .setDefaultValue(false) - .setSaveConsumer(newValue -> ConfigHandler.STOP_SPIN = newValue) - .build()); - - titleScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.title.dirtBackground"), ConfigHandler.DIRT_BACKGROUND) - .setDefaultValue(false) - .setSaveConsumer(newValue -> ConfigHandler.DIRT_BACKGROUND = newValue) - .build()); - - titleScreen.addEntry(entryBuilder.startIntField(new TranslatableText("minimalmenu.config.option.title.xOffset"), ConfigHandler.X_OFFSET_TITLE) - .setDefaultValue(0) - .setSaveConsumer(newValue -> ConfigHandler.X_OFFSET_TITLE = newValue) - .build()); - - titleScreen.addEntry(entryBuilder.startIntField(new TranslatableText("minimalmenu.config.option.title.yOffset"), ConfigHandler.Y_OFFSET_TITLE) - .setDefaultValue(0) - .setSaveConsumer(newValue -> ConfigHandler.Y_OFFSET_TITLE = newValue) - .build()); - //Build options screen options - optionsScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.options.online"), ConfigHandler.REMOVE_ONLINE) + optionsScreen.addEntry(entryBuilder.startBooleanToggle(Text.translatable("minimalmenu.config.option.options.online"), ConfigHandler.REMOVE_ONLINE) .setDefaultValue(false) .setSaveConsumer(newValue -> ConfigHandler.REMOVE_ONLINE = newValue) .build()); + optionsScreen.addEntry(entryBuilder.startBooleanToggle(Text.translatable("minimalmenu.config.option.options.credits"), ConfigHandler.REMOVE_CREDITS) + .setDefaultValue(false) + .setSaveConsumer(newValue -> ConfigHandler.REMOVE_CREDITS = newValue) + .build()); + + optionsScreen.addEntry(entryBuilder.startBooleanToggle(Text.translatable("minimalmenu.config.option.options.telemetry"), ConfigHandler.REMOVE_TELEMETRY) + .setDefaultValue(false) + .setSaveConsumer(newValue -> ConfigHandler.REMOVE_TELEMETRY = newValue) + .build()); + //Build pause screen options - pauseScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.pause.feedback"), ConfigHandler.REMOVE_FEEDBACK) + pauseScreen.addEntry(entryBuilder.startBooleanToggle(Text.translatable("minimalmenu.config.option.pause.feedback"), ConfigHandler.REMOVE_FEEDBACK) .setDefaultValue(false) .setSaveConsumer(newValue -> ConfigHandler.REMOVE_FEEDBACK = newValue) .build()); - pauseScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.pause.bugs"), ConfigHandler.REMOVE_BUGS) + pauseScreen.addEntry(entryBuilder.startBooleanToggle(Text.translatable("minimalmenu.config.option.pause.bugs"), ConfigHandler.REMOVE_BUGS) .setDefaultValue(false) .setSaveConsumer(newValue -> ConfigHandler.REMOVE_BUGS = newValue) .build()); - pauseScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.pause.lanSingle"), ConfigHandler.REMOVE_LANSP) - .setDefaultValue(false) - .setSaveConsumer(newValue -> ConfigHandler.REMOVE_LANSP = newValue) - .build()); - - pauseScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.pause.lanMulti"), ConfigHandler.REMOVE_LANMP) - .setDefaultValue(false) - .setSaveConsumer(newValue -> ConfigHandler.REMOVE_LANMP = newValue) - .build()); - - pauseScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.common.addFolder"), ConfigHandler.ADD_FOLDER_PS) - .setDefaultValue(false) - .setSaveConsumer(newValue -> ConfigHandler.ADD_FOLDER_PS = newValue) - .build()); - - pauseScreen.addEntry(entryBuilder.startIntField(new TranslatableText("minimalmenu.config.option.pause.xOffset"), ConfigHandler.X_OFFSET_PAUSE) - .setDefaultValue(0) - .setSaveConsumer(newValue -> ConfigHandler.X_OFFSET_PAUSE = newValue) - .build()); - - pauseScreen.addEntry(entryBuilder.startIntField(new TranslatableText("minimalmenu.config.option.pause.yOffset"), ConfigHandler.Y_OFFSET_PAUSE) - .setDefaultValue(0) - .setSaveConsumer(newValue -> ConfigHandler.Y_OFFSET_PAUSE = newValue) - .build()); - - //Build singleplayer screen options - singePlayerScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.sp.addSavesFolder"), ConfigHandler.ADD_SAVES) - .setDefaultValue(false) - .setSaveConsumer(newValue -> ConfigHandler.ADD_SAVES = newValue) - .build()); - - singePlayerScreen.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.sp.reloadSaves"), ConfigHandler.ADD_RELOAD_SAVES) - .setDefaultValue(false) - .setSaveConsumer(newValue -> ConfigHandler.ADD_RELOAD_SAVES = newValue) - .build()); - //Build other options - otherOptions.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("minimalmenu.config.option.other.dev"), ConfigHandler.DEV_MODE) + otherOptions.addEntry(entryBuilder.startBooleanToggle(Text.translatable("minimalmenu.config.option.other.dev"), ConfigHandler.DEV_MODE) .setDefaultValue(false) - .setTooltip(new TranslatableText("minimalmenu.config.option.other.dev.tooltip")) + .setTooltip(Text.translatable("minimalmenu.config.option.other.dev.tooltip")) .setSaveConsumer(newValue -> ConfigHandler.DEV_MODE = newValue) .build()); diff --git a/src/main/java/minimalmenu/mixin/GameMenuScreenMixin.java b/src/main/java/minimalmenu/mixin/GameMenuScreenMixin.java index 90fce61..46ea5ef 100644 --- a/src/main/java/minimalmenu/mixin/GameMenuScreenMixin.java +++ b/src/main/java/minimalmenu/mixin/GameMenuScreenMixin.java @@ -2,28 +2,63 @@ import minimalmenu.MinimalMenu; import minimalmenu.config.ConfigHandler; +import net.fabricmc.fabric.api.client.screen.v1.Screens; import net.minecraft.client.gui.screen.GameMenuScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import java.util.List; + @Mixin(GameMenuScreen.class) public abstract class GameMenuScreenMixin extends Screen { protected GameMenuScreenMixin(Text title) { super(title); } + + @Inject(method = "init", at = @At("TAIL")) + private void init(CallbackInfo info) { + final List buttons = Screens.getButtons(this); + + final int buttonWidth = 204; + int spacing = 24; + int yOffset = 0; + + for (ClickableWidget widget : buttons) { + if (widget instanceof ButtonWidget button) { + if (ConfigHandler.REMOVE_FEEDBACK) { + if (MinimalMenu.buttonMatchesKey(button, "menu.sendFeedback")) { + button.visible = false; + } + if (!ConfigHandler.REMOVE_BUGS) { + if (MinimalMenu.buttonMatchesKey(button, "menu.reportBugs")) { + button.setWidth(buttonWidth); + button.setX(this.width / 2 - buttonWidth / 2); + } + } + } - @Inject(method = "initWidgets", at = @At("HEAD")) - private void initWidgets(CallbackInfo info) { - if (ConfigHandler.ADD_FOLDER_PS) { - this.addDrawableChild(new ButtonWidget(this.width / 2 + 104, this.height / 4 + 120 + -16, 20, 20, new TranslatableText("minimalmenu.common..minecraft"), (button) -> { - MinimalMenu.processButtonFolderClick(client); - })); + if (ConfigHandler.REMOVE_BUGS) { + if (MinimalMenu.buttonMatchesKey(button, "menu.reportBugs")) { + button.visible = false; + if (ConfigHandler.REMOVE_FEEDBACK) { + yOffset += spacing; + } + } + if (!ConfigHandler.REMOVE_FEEDBACK) { + if (MinimalMenu.buttonMatchesKey(button, "menu.sendFeedback")) { + button.setWidth(buttonWidth); + button.setX(this.width / 2 - buttonWidth / 2); + } + } + } + button.setY(button.getY() - yOffset); + } } } } diff --git a/src/main/java/minimalmenu/mixin/LogoDrawerMixin.java b/src/main/java/minimalmenu/mixin/LogoDrawerMixin.java new file mode 100644 index 0000000..f37c46e --- /dev/null +++ b/src/main/java/minimalmenu/mixin/LogoDrawerMixin.java @@ -0,0 +1,27 @@ +package minimalmenu.mixin; + +import minimalmenu.config.ConfigHandler; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.LogoDrawer; +import net.minecraft.util.Identifier; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(LogoDrawer.class) +public class LogoDrawerMixin { + @Shadow @Final @Mutable public static Identifier EDITION_TEXTURE; + + @Inject(method = "draw(Lnet/minecraft/client/gui/DrawContext;IFI)V", at = @At("HEAD")) + private void replaceEditionTexture(DrawContext context, int screenWidth, float alpha, int y, CallbackInfo ci) { + if (ConfigHandler.REMOVE_EDITION) { + EDITION_TEXTURE = Identifier.of("minimalmenu", "textures/gui/title/edition_empty.png"); + } else { + EDITION_TEXTURE = Identifier.ofVanilla("textures/gui/title/edition.png"); + } + } +} diff --git a/src/main/java/minimalmenu/mixin/ModMenuEventHandlerMixin.java b/src/main/java/minimalmenu/mixin/ModMenuEventHandlerMixin.java new file mode 100644 index 0000000..e2faae1 --- /dev/null +++ b/src/main/java/minimalmenu/mixin/ModMenuEventHandlerMixin.java @@ -0,0 +1,21 @@ +package minimalmenu.mixin; + +import com.terraformersmc.modmenu.event.ModMenuEventHandler; +import minimalmenu.config.ConfigHandler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; + +@Mixin(ModMenuEventHandler.class) +public class ModMenuEventHandlerMixin { + @ModifyArg(method = "afterTitleScreenInit", at = @At(value = "INVOKE", target = "Lcom/terraformersmc/modmenu/event/ModMenuEventHandler;buttonHasText(Lnet/minecraft/client/gui/widget/Widget;[Ljava/lang/String;)Z"), index = 1) + private static String[] moveModMenuButton(String[] translationKeys) { + if (ConfigHandler.REMOVE_REALMS) { + if (!ConfigHandler.REMOVE_MULTIPLAYER) { + return new String[]{"menu.multiplayer"}; + } + return new String[]{"menu.singleplayer"}; + } + return translationKeys; + } +} diff --git a/src/main/java/minimalmenu/mixin/OptionsScreenMixin.java b/src/main/java/minimalmenu/mixin/OptionsScreenMixin.java index 597e8ce..43ccaeb 100644 --- a/src/main/java/minimalmenu/mixin/OptionsScreenMixin.java +++ b/src/main/java/minimalmenu/mixin/OptionsScreenMixin.java @@ -1,31 +1,41 @@ -package minimalmenu.mixin; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import minimalmenu.MinimalMenu; -import minimalmenu.config.ConfigHandler; -import net.fabricmc.fabric.api.client.screen.v1.Screens; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.option.OptionsScreen; -import net.minecraft.client.gui.widget.ClickableWidget; - -@Mixin(OptionsScreen.class) -public abstract class OptionsScreenMixin extends ScreenMixin { - @Inject(method = "init", at = @At("TAIL")) - protected void init(CallbackInfo info) { - if (ConfigHandler.REMOVE_ONLINE) { - for (ClickableWidget button : Screens.getButtons((Screen)(Object)this)) { - if (!this.client.isInSingleplayer()) { - if (MinimalMenu.buttonMatchesKey(button, "options.online")) { - button.visible = false; - } - if (MinimalMenu.buttonMatchesKey(button, "options.fov")) { - button.setWidth(310); - } - } - } - } - } -} \ No newline at end of file +package minimalmenu.mixin; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import minimalmenu.MinimalMenu; +import minimalmenu.config.ConfigHandler; +import net.fabricmc.fabric.api.client.screen.v1.Screens; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.option.OptionsScreen; +import net.minecraft.client.gui.widget.ClickableWidget; +import net.minecraft.text.Text; + +import java.util.List; + +@Mixin(OptionsScreen.class) +public class OptionsScreenMixin extends Screen { + protected OptionsScreenMixin(Text title) { + super(title); + } + + @Inject(method = "init", at = @At("TAIL")) + private void init(CallbackInfo ci) { + final List buttons = Screens.getButtons(this); + + for (ClickableWidget widget : buttons) { + if (widget instanceof ClickableWidget button) { + if (ConfigHandler.REMOVE_ONLINE && MinimalMenu.buttonMatchesKey(button, "options.online")) { + button.visible = false; + } + if (ConfigHandler.REMOVE_CREDITS && MinimalMenu.buttonMatchesKey(button, "options.credits_and_attribution")) { + button.visible = false; + } + if (ConfigHandler.REMOVE_TELEMETRY && MinimalMenu.buttonMatchesKey(button, "options.telemetry")) { + button.visible = false; + } + } + } + } +} diff --git a/src/main/java/minimalmenu/mixin/RotatingCubeMapRendererMixin.java b/src/main/java/minimalmenu/mixin/RotatingCubeMapRendererMixin.java deleted file mode 100644 index d25dbe4..0000000 --- a/src/main/java/minimalmenu/mixin/RotatingCubeMapRendererMixin.java +++ /dev/null @@ -1,27 +0,0 @@ -package minimalmenu.mixin; - -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import minimalmenu.config.ConfigHandler; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.RotatingCubeMapRenderer; - -@Mixin(RotatingCubeMapRenderer.class) -public abstract class RotatingCubeMapRendererMixin { - @Shadow @Final private MinecraftClient client; - @Shadow private float time; - - @Inject(method = "render", at = @At("HEAD"), cancellable = true) - public void render(float delta, float alpha, CallbackInfo info) { - if (ConfigHandler.DIRT_BACKGROUND) { - this.client.currentScreen.renderBackgroundTexture(0); - info.cancel(); - } else if (ConfigHandler.STOP_SPIN) { - time -= delta; - } - } -} diff --git a/src/main/java/minimalmenu/mixin/ScreenMixin.java b/src/main/java/minimalmenu/mixin/ScreenMixin.java index 7d648bb..3027a4d 100644 --- a/src/main/java/minimalmenu/mixin/ScreenMixin.java +++ b/src/main/java/minimalmenu/mixin/ScreenMixin.java @@ -2,144 +2,21 @@ import minimalmenu.MinimalMenu; import minimalmenu.config.ConfigHandler; -import net.fabricmc.fabric.api.client.screen.v1.Screens; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.AbstractParentElement; import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.screen.GameMenuScreen; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.TitleScreen; -import net.minecraft.client.gui.widget.ClickableWidget; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import java.util.Collections; -import java.util.List; @Mixin(value = Screen.class, priority = 1100) public abstract class ScreenMixin extends AbstractParentElement implements Drawable { - @Shadow protected MinecraftClient client; - @Shadow public int width; - @Shadow public int height; - - @Inject(method = "init", at = @At("RETURN")) + @Inject(method = "init*", at = @At("RETURN")) private void init(MinecraftClient client, int width, int height, CallbackInfo info) { if (ConfigHandler.DEV_MODE) { MinimalMenu.printButtonInfo((Screen)(Object)this); } - - if ((Screen)(Object)this instanceof TitleScreen) { - afterTitleScreenInit(); - } else if ((Screen)(Object)this instanceof GameMenuScreen) { - afterGameMenuScreenInit(); - } - } - - private void afterTitleScreenInit() { - final int spacing = 24; - int yOffset = 0; - int posY = 0; - List widgetList = Screens.getButtons((Screen)(Object)this); - Collections.reverse(widgetList); - for (ClickableWidget button : widgetList) { - if (ConfigHandler.REMOVE_SINGLEPLAYER) { - if (MinimalMenu.buttonMatchesKey(button, "menu.singleplayer")) { - button.visible = false; - } - } - - if (ConfigHandler.REMOVE_MULTIPLAYER) { - if (MinimalMenu.buttonMatchesKey(button, "menu.multiplayer")) { - button.visible = false; - yOffset -= spacing; - } - } - - if (ConfigHandler.REMOVE_REALMS) { - if (MinimalMenu.buttonMatchesKey(button, "menu.online")) { - button.visible = false; - yOffset -= spacing; - } - } - - if (ConfigHandler.REMOVE_LANGUAGE) { - if (MinimalMenu.buttonMatchesKey(button, "narrator.button.language")) { - button.visible = false; - } - } - - if (ConfigHandler.REMOVE_ACCESSIBILITY) { - if (MinimalMenu.buttonMatchesKey(button, "narrator.button.accessibility")) { - button.visible = false; - posY = button.y - yOffset; - } - } - - if (MinimalMenu.buttonMatchesKey(button, "modmenu.title")) { - if (!ConfigHandler.REMOVE_ACCESSIBILITY) { - posY = button.y; - } - } - - if (MinimalMenu.buttonMatchesKey(button, "minimalmenu.common..minecraft")) { - button.y = posY; - } else { - button.y -= yOffset; - } - - button.x -= ConfigHandler.X_OFFSET_TITLE; - button.y -= ConfigHandler.Y_OFFSET_TITLE; - } - } - - private void afterGameMenuScreenInit() { - final int buttonWidth = 204; - final int spacing = 24; - int yOffset = 0; - boolean removeLan = this.client.isInSingleplayer() ? ConfigHandler.REMOVE_LANSP : ConfigHandler.REMOVE_LANMP; - for (ClickableWidget button : Screens.getButtons((Screen)(Object)this)) { - if (removeLan) { - if (MinimalMenu.buttonMatchesKey(button, "menu.shareToLan")) { - button.visible = false; - } - if (MinimalMenu.buttonMatchesKey(button, "menu.options")) { - button.setWidth(buttonWidth); - button.x = this.width / 2 - buttonWidth / 2; - } - } - - if (ConfigHandler.REMOVE_FEEDBACK) { - if (MinimalMenu.buttonMatchesKey(button, "menu.sendFeedback")) { - button.visible = false; - } - if (!ConfigHandler.REMOVE_BUGS) { - if (MinimalMenu.buttonMatchesKey(button, "menu.reportBugs")) { - button.setWidth(buttonWidth); - button.x = this.width / 2 - buttonWidth / 2; - } - } - } - - if (ConfigHandler.REMOVE_BUGS) { - if (MinimalMenu.buttonMatchesKey(button, "menu.reportBugs")) { - button.visible = false; - if (ConfigHandler.REMOVE_FEEDBACK) { - yOffset += spacing; - } - } - if (!ConfigHandler.REMOVE_FEEDBACK) { - if (MinimalMenu.buttonMatchesKey(button, "menu.sendFeedback")) { - button.setWidth(buttonWidth); - button.x = this.width / 2 - buttonWidth / 2; - } - } - } - - button.x -= ConfigHandler.X_OFFSET_PAUSE; - button.y -= ConfigHandler.Y_OFFSET_PAUSE; - button.y -= yOffset; - } } } diff --git a/src/main/java/minimalmenu/mixin/SelectWorldScreenMixin.java b/src/main/java/minimalmenu/mixin/SelectWorldScreenMixin.java deleted file mode 100644 index 3e8abd2..0000000 --- a/src/main/java/minimalmenu/mixin/SelectWorldScreenMixin.java +++ /dev/null @@ -1,56 +0,0 @@ -package minimalmenu.mixin; - -import java.io.File; -import java.util.List; - -import net.minecraft.text.TranslatableText; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import minimalmenu.config.ConfigHandler; -import net.fabricmc.fabric.api.client.screen.v1.Screens; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.world.SelectWorldScreen; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.gui.widget.ClickableWidget; -import net.minecraft.text.LiteralText; -import net.minecraft.util.Util; - -@Mixin(SelectWorldScreen.class) -public abstract class SelectWorldScreenMixin extends ScreenMixin { - @Shadow @Final protected Screen parent; - - @Inject(method = "init", at = @At("HEAD")) - public void init(CallbackInfo info) { - List buttons = Screens.getButtons((Screen)(Object)this); - - if (ConfigHandler.ADD_SAVES) { - buttons.add( - new ButtonWidget( - this.width / 2 - 232, //Create open saves folder button. - this.height - 28, - 72, 20, - new TranslatableText("minimalmenu.screen.singleplayer.saves"), - (button -> { - assert this.client != null; - File file = client.runDirectory.toPath().resolve("saves").toFile(); //Create saves file from current running directory. - Util.getOperatingSystem().open(file); - }))); - } - if (ConfigHandler.ADD_RELOAD_SAVES) { - buttons.add( - new ButtonWidget( - this.width / 2 - 232, //Create reload button. - this.height - 52, - 72, 20, - new TranslatableText("minimalmenu.screen.singleplayer.reload"), - button -> { - assert this.client != null; - this.client.setScreenAndRender(new SelectWorldScreen(parent)); //Refresh screen, by creating a new one. - })); - } - } -} diff --git a/src/main/java/minimalmenu/mixin/TitleScreenButtonMixin.java b/src/main/java/minimalmenu/mixin/TitleScreenButtonMixin.java deleted file mode 100644 index cf1199d..0000000 --- a/src/main/java/minimalmenu/mixin/TitleScreenButtonMixin.java +++ /dev/null @@ -1,32 +0,0 @@ -package minimalmenu.mixin; - -import minimalmenu.MinimalMenu; -import minimalmenu.config.ConfigHandler; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.TitleScreen; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(TitleScreen.class) -public abstract class TitleScreenButtonMixin extends Screen { - protected TitleScreenButtonMixin(Text title) { - super(title); - } - - @Inject(method = "init", at = @At("HEAD")) - protected void init(CallbackInfo info) { - if (ConfigHandler.ADD_FOLDER_TS) { - this.addDrawableChild(new ButtonWidget(this.width / 2 + 104, (this.height / 4 + 48) + 84 , 20, 20, new TranslatableText("minimalmenu.common..minecraft"), (button) -> { - MinimalMenu.processButtonFolderClick(client); - - })); - } - } - - -} diff --git a/src/main/java/minimalmenu/mixin/TitleScreenMixin.java b/src/main/java/minimalmenu/mixin/TitleScreenMixin.java index 4653bd0..2d620a7 100644 --- a/src/main/java/minimalmenu/mixin/TitleScreenMixin.java +++ b/src/main/java/minimalmenu/mixin/TitleScreenMixin.java @@ -1,8 +1,13 @@ package minimalmenu.mixin; +import minimalmenu.MinimalMenu; import minimalmenu.config.ConfigHandler; +import net.fabricmc.fabric.api.client.screen.v1.Screens; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.TitleScreen; -import net.minecraft.util.Identifier; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.ClickableWidget; +import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mutable; @@ -11,35 +16,57 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(TitleScreen.class) -public abstract class TitleScreenMixin extends ScreenMixin { - @Shadow private String splashText; - @Shadow private int copyrightTextX; - @Shadow @Final @Mutable private static Identifier EDITION_TITLE_TEXTURE; +import java.util.Collections; +import java.util.List; - @Inject(method = "init", at = @At("TAIL")) - protected void init(CallbackInfo info) { - if (ConfigHandler.REMOVE_EDITION) { - EDITION_TITLE_TEXTURE = new Identifier("minimalmenu", "textures/gui/title/edition_empty.png"); - } else { - EDITION_TITLE_TEXTURE = new Identifier("textures/gui/title/edition.png"); - } - - if (ConfigHandler.REMOVE_SPLASH) { - splashText = null; - } +@Mixin(TitleScreen.class) +public abstract class TitleScreenMixin extends Screen { + protected TitleScreenMixin(Text title) { + super(title); +} + @Shadow @Final @Mutable private static Text COPYRIGHT; + @Inject(method = "init", at = @At("HEAD")) + protected void initHead(CallbackInfo info) { if (ConfigHandler.REMOVE_COPYRIGHT) { - copyrightTextX = 1000000000; //Lol + COPYRIGHT = Text.of(""); } - } - - //Removes realms notifications from the screen. - @Inject(method = "init", at = @At("HEAD")) - protected void setRealmsNotificationsToFalse(CallbackInfo info) { if (ConfigHandler.REMOVE_REALMS) { assert this.client != null; - this.client.options.realmsNotifications = false; + this.client.options.getRealmsNotifications().setValue(false); + } + } + + @Inject(method = "init", at = @At("TAIL")) + protected void initTail(CallbackInfo info) { + final List buttons = Screens.getButtons(this); + Collections.reverse(buttons); + + int spacing = 24; + int yOffset = 0; + + for (ClickableWidget widget : buttons) { + if (widget instanceof ButtonWidget button) { + if (ConfigHandler.REMOVE_SINGLEPLAYER && MinimalMenu.buttonMatchesKey(button, "menu.singleplayer")) { + button.visible = false; + } + if (ConfigHandler.REMOVE_MULTIPLAYER && MinimalMenu.buttonMatchesKey(button, "menu.multiplayer")) { + button.visible = false; + yOffset -= spacing; + } + if (ConfigHandler.REMOVE_REALMS && MinimalMenu.buttonMatchesKey(button, "menu.online")) { + button.visible = false; + yOffset -= spacing; + } + if (ConfigHandler.REMOVE_LANGUAGE && MinimalMenu.buttonMatchesKey(button, "options.language")) { + button.visible = false; + } + if (ConfigHandler.REMOVE_ACCESSIBILITY && MinimalMenu.buttonMatchesKey(button, "options.accessibility")) { + button.visible = false; + } + + button.setY(button.getY() - yOffset); + } } } } diff --git a/src/main/java/minimalmenu/screens/FolderScreen.java b/src/main/java/minimalmenu/screens/FolderScreen.java deleted file mode 100644 index 9f5290c..0000000 --- a/src/main/java/minimalmenu/screens/FolderScreen.java +++ /dev/null @@ -1,53 +0,0 @@ -package minimalmenu.screens; - -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.ScreenTexts; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.LiteralText; -import net.minecraft.text.TranslatableText; -import net.minecraft.util.Util; -import java.io.File; - -public class FolderScreen extends Screen { - private final Screen parent; - - public FolderScreen(Screen parent) { - super(new TranslatableText("minimalmenu.screen.folders")); - this.parent = parent; - } - - public void init() { - assert client != null; - File file = client.runDirectory.toPath().toFile(); - String[] directories = file.list((dir, name) -> new File(dir, name).isDirectory()); - - assert directories != null; - int y = (directories.length * 24) / 2; - for (int i = 0; i <= directories.length; i++) { - if (i == 0) { - this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, (this.height / 2 + (i-1) * 24) - y, 200, 20, new LiteralText(file.getName()), button -> { - Util.getOperatingSystem().open(file); - })); - this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, (this.height / 2 + (directories.length+1) * 24) - y, 200, 20, ScreenTexts.DONE, button -> { - client.setScreen(parent); - })); - } - if (i < directories.length) { - int x = i; - ButtonWidget buttonWidget = new ButtonWidget(this.width / 2 - 100, (this.height / 2 + i * 24) - y, 200, 20, new LiteralText(directories[x]), (button -> { - File fileToOpen = new File(file.getAbsolutePath() + File.separator + directories[x]); - System.out.println(fileToOpen.getAbsolutePath()); - Util.getOperatingSystem().open(fileToOpen); - })); - this.addDrawableChild(buttonWidget); - } - } - } - - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - this.renderBackground(matrices); - drawCenteredText(matrices, this.textRenderer, this.title, this.width / 2, 15, 16777215); - super.render(matrices, mouseX, mouseY, delta); - } -} diff --git a/src/main/resources/assets/minimalmenu/lang/en_us.json b/src/main/resources/assets/minimalmenu/lang/en_us.json index 7c4f33b..de8224b 100644 --- a/src/main/resources/assets/minimalmenu/lang/en_us.json +++ b/src/main/resources/assets/minimalmenu/lang/en_us.json @@ -1,17 +1,10 @@ { - "minimalmenu.screen.folders": "Folders in .Minecraft", - "minimalmenu.screen.singleplayer.saves": "Saves", - "minimalmenu.screen.singleplayer.reload": "Reload", "minimalmenu.config.title": "Minimal Menu Config", - "minimalmenu.config.category.general": "General", "minimalmenu.config.category.title": "Title Screen", "minimalmenu.config.category.options": "Options Screen", "minimalmenu.config.category.pause": "Pause Screen", - "minimalmenu.config.category.sp": "Singleplayer Screen", "minimalmenu.config.category.ingame": "Ingame Screens", "minimalmenu.config.category.other": "Other Options", - "minimalmenu.config.option.general.openFolderScreen": "Open Folders Screen", - "minimalmenu.config.option.general.openFolderScreen.tooltip": "Needs Add .Minecraft button enabled. See Title Screen or Pause Screen", "minimalmenu.config.option.title.splash": "Remove Splash Text", "minimalmenu.config.option.title.edition": "Remove Java Edition", "minimalmenu.config.option.title.singleplayer": "Remove Singleplayer", @@ -20,21 +13,11 @@ "minimalmenu.config.option.title.accessibility": "Remove Accessibility", "minimalmenu.config.option.title.language": "Remove Language", "minimalmenu.config.option.title.copy": "Remove Copyright", - "minimalmenu.config.option.title.spin": "Pause Background Panorama", - "minimalmenu.config.option.title.dirtBackground": "Use Dirt Background", - "minimalmenu.config.option.title.xOffset": "X Offset", - "minimalmenu.config.option.title.yOffset": "Y Offset", "minimalmenu.config.option.options.online": "Remove Online…", + "minimalmenu.config.option.options.credits": "Remove Credits and Attribution", + "minimalmenu.config.option.options.telemetry": "Remove Telemetry", "minimalmenu.config.option.pause.feedback": "Remove Feedback", "minimalmenu.config.option.pause.bugs": "Remove Report Bugs", - "minimalmenu.config.option.pause.lanSingle": "Remove Open To Lan in Singleplayer", - "minimalmenu.config.option.pause.lanMulti": "Remove Open To Lan in Multiplayer", - "minimalmenu.config.option.pause.xOffset": "X Offset", - "minimalmenu.config.option.pause.yOffset": "Y Offset", - "minimalmenu.config.option.sp.addSavesFolder": "Add Saves Folder Button", - "minimalmenu.config.option.sp.reloadSaves": "Add Reload Saves Button", "minimalmenu.config.option.other.dev": "Developer Mode", - "minimalmenu.config.option.other.dev.tooltip": "Used in the development of this mod. Ignore.", - "minimalmenu.config.option.common.addFolder": "Add .Minecraft Button", - "minimalmenu.common..minecraft": "." + "minimalmenu.config.option.other.dev.tooltip": "Used in the development of this mod. Ignore." } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 35e73e6..239845b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -10,7 +10,8 @@ "contributors": [ "jackassmc", "umollu", - "huiki" + "huiki", + "yungando" ], "contact": { "homepage": "https://github.com/TomB-134/MinimalMenu", @@ -34,10 +35,11 @@ "minimalmenu.mixins.json" ], "depends": { - "fabricloader": ">=0.11.3", - "fabric": ">=0.35.0", - "modmenu": ">=2.0.1", - "java": ">=17", - "cloth-config2": ">=6.1.48" + "fabricloader": ">=0.16.13", + "minecraft": "~1.21.1", + "java": ">=21", + "fabric-api": "*", + "modmenu": ">=11.0.3", + "cloth-config2": ">=15.0.140" } -} +} \ No newline at end of file diff --git a/src/main/resources/minimalmenu.mixins.json b/src/main/resources/minimalmenu.mixins.json index 9c46d10..a121353 100644 --- a/src/main/resources/minimalmenu.mixins.json +++ b/src/main/resources/minimalmenu.mixins.json @@ -1,16 +1,15 @@ { "required": true, "package": "minimalmenu.mixin", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [], "client": [ - "RotatingCubeMapRendererMixin", "TitleScreenMixin", - "SelectWorldScreenMixin", "OptionsScreenMixin", "ScreenMixin", "GameMenuScreenMixin", - "TitleScreenButtonMixin" + "LogoDrawerMixin", + "ModMenuEventHandlerMixin" ], "server": [], "injectors": {