From b6709556c97ba3a00498a8b0d1a29cb309219b4a Mon Sep 17 00:00:00 2001 From: FoundationGames <43485105+FoundationGames@users.noreply.github.com> Date: Wed, 29 Mar 2023 23:32:51 -0700 Subject: [PATCH] Controller Expansion --- .github/workflows/build.yml | 31 ++ .gitignore | 40 ++ LICENSE.txt | 167 ++++++ README.md | 3 + build.gradle | 61 +++ gradle.properties | 12 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 61608 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 244 +++++++++ gradlew.bat | 92 ++++ settings.gradle | 10 + .../ControllerExpansion.java | 39 ++ .../controller/ControlifyCompat.java | 66 +++ .../controller/ControllerInfo.java | 36 ++ .../controller/ControllerNavigation.java | 12 + .../mixin/CraftingScreenMixin.java | 33 ++ .../mixin/InventoryScreenMixin.java | 37 ++ .../controlify/ScreenProcessorMixin.java | 24 + .../screen/ControllerCraftingScreen.java | 277 ++++++++++ .../screen/widget/CraftableGhostSlots.java | 22 + .../widget/ItemCategoryButtonWidget.java | 44 ++ .../screen/widget/RecipeCatalogWidget.java | 491 ++++++++++++++++++ .../controllerexpansion/util/CEUtil.java | 31 ++ .../util/SlotPositionRemapper.java | 68 +++ .../util/crafting/ItemCategory.java | 76 +++ .../assets/controllerexpansion/icon.png | Bin 0 -> 453 bytes .../controllerexpansion/lang/en_us.json | 9 + .../assets/controllerexpansion/sounds.json | 28 + .../controllerexpansion/sounds/ui/scroll.ogg | Bin 0 -> 7822 bytes .../textures/gui/container/crafting.png | Bin 0 -> 6703 bytes .../controllerexpansion.accesswidener | 8 + .../resources/controllerexpansion.mixins.json | 16 + src/main/resources/fabric.mod.json | 40 ++ .../assets/controllerexpansion/sounds.json | 18 + .../controllerexpansion/sounds/ui/back.ogg | Bin 0 -> 8404 bytes .../controllerexpansion/sounds/ui/deny.ogg | Bin 0 -> 8138 bytes .../controllerexpansion/sounds/ui/scroll.ogg | Bin 0 -> 5383 bytes .../controllerexpansion/sounds/ui/select.ogg | Bin 0 -> 6222 bytes .../assets/minecraft/sounds.json | 6 + .../legacy_ui_sounds/pack.mcmeta | 6 + 40 files changed, 2053 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 .gitignore create mode 100644 LICENSE.txt create mode 100644 README.md create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/io/github/foundationgames/controllerexpansion/ControllerExpansion.java create mode 100644 src/main/java/io/github/foundationgames/controllerexpansion/controller/ControlifyCompat.java create mode 100644 src/main/java/io/github/foundationgames/controllerexpansion/controller/ControllerInfo.java create mode 100644 src/main/java/io/github/foundationgames/controllerexpansion/controller/ControllerNavigation.java create mode 100644 src/main/java/io/github/foundationgames/controllerexpansion/mixin/CraftingScreenMixin.java create mode 100644 src/main/java/io/github/foundationgames/controllerexpansion/mixin/InventoryScreenMixin.java create mode 100644 src/main/java/io/github/foundationgames/controllerexpansion/mixin/compat/controlify/ScreenProcessorMixin.java create mode 100644 src/main/java/io/github/foundationgames/controllerexpansion/screen/ControllerCraftingScreen.java create mode 100644 src/main/java/io/github/foundationgames/controllerexpansion/screen/widget/CraftableGhostSlots.java create mode 100644 src/main/java/io/github/foundationgames/controllerexpansion/screen/widget/ItemCategoryButtonWidget.java create mode 100644 src/main/java/io/github/foundationgames/controllerexpansion/screen/widget/RecipeCatalogWidget.java create mode 100644 src/main/java/io/github/foundationgames/controllerexpansion/util/CEUtil.java create mode 100644 src/main/java/io/github/foundationgames/controllerexpansion/util/SlotPositionRemapper.java create mode 100644 src/main/java/io/github/foundationgames/controllerexpansion/util/crafting/ItemCategory.java create mode 100644 src/main/resources/assets/controllerexpansion/icon.png create mode 100644 src/main/resources/assets/controllerexpansion/lang/en_us.json create mode 100644 src/main/resources/assets/controllerexpansion/sounds.json create mode 100644 src/main/resources/assets/controllerexpansion/sounds/ui/scroll.ogg create mode 100644 src/main/resources/assets/controllerexpansion/textures/gui/container/crafting.png create mode 100644 src/main/resources/controllerexpansion.accesswidener create mode 100644 src/main/resources/controllerexpansion.mixins.json create mode 100644 src/main/resources/fabric.mod.json create mode 100644 src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds.json create mode 100644 src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds/ui/back.ogg create mode 100644 src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds/ui/deny.ogg create mode 100644 src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds/ui/scroll.ogg create mode 100644 src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds/ui/select.ogg create mode 100644 src/main/resources/resourcepacks/legacy_ui_sounds/assets/minecraft/sounds.json create mode 100644 src/main/resources/resourcepacks/legacy_ui_sounds/pack.mcmeta diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..13c489a --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,31 @@ +name: build +on: [pull_request, push] + +jobs: + build: + strategy: + matrix: + java: [17] + os: [ubuntu-22.04, windows-2022] + runs-on: ${{ matrix.os }} + steps: + - name: checkout repository + uses: actions/checkout@v3 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.java }} + distribution: 'microsoft' + - name: make gradle wrapper executable + if: ${{ runner.os != 'Windows' }} + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + if: ${{ runner.os == 'Linux' && matrix.java == '17' }} + uses: actions/upload-artifact@v3 + with: + name: Artifacts + path: build/libs/ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c476faf --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..098aa63 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,167 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + +Copyright 2023 FoundationGames, LGPLv3 \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..893c118 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# Controller Expansion + +Improve UIs for use with controller mods \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..d67bae6 --- /dev/null +++ b/build.gradle @@ -0,0 +1,61 @@ +plugins { + id 'fabric-loom' version '1.1-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 + +repositories { + maven { url = "https://api.modrinth.com/maven/" } +} + +dependencies { + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + modCompileOnly "maven.modrinth:controlify:1.0.0+1.19.4" +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 17 +} + +java { + withSourcesJar() +} + +jar { + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}"} + } +} + +loom { + accessWidenerPath = file("src/main/resources/controllerexpansion.accesswidener") +} + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + + repositories { + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..d5b1ed1 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,12 @@ +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +minecraft_version=1.19.4 +yarn_mappings=1.19.4+build.1 +loader_version=0.14.17 + +mod_version = 0.0.1 +maven_group = io.github.foundationgames +archives_base_name = controllerexpansion + +fabric_version=0.75.3+1.19.4 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..ccebba7710deaf9f98673a68957ea02138b60d0a GIT binary patch literal 61608 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..fc10b60 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..79a61d4 --- /dev/null +++ b/gradlew @@ -0,0 +1,244 @@ +#!/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. +# + +############################################################################## +# +# 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/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# 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##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# 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"' + +# 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 + which java >/dev/null 2>&1 || 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 + +# 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=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +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 + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +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..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@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. +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 execute + +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 + +: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 new file mode 100644 index 0000000..b02216b --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} diff --git a/src/main/java/io/github/foundationgames/controllerexpansion/ControllerExpansion.java b/src/main/java/io/github/foundationgames/controllerexpansion/ControllerExpansion.java new file mode 100644 index 0000000..497e69e --- /dev/null +++ b/src/main/java/io/github/foundationgames/controllerexpansion/ControllerExpansion.java @@ -0,0 +1,39 @@ +package io.github.foundationgames.controllerexpansion; + +import io.github.foundationgames.controllerexpansion.controller.ControlifyCompat; +import io.github.foundationgames.controllerexpansion.util.CEUtil; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.resource.ResourceManagerHelper; +import net.fabricmc.fabric.api.resource.ResourcePackActivationType; +import net.fabricmc.fabric.impl.resource.loader.ModResourcePackUtil; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.sound.SoundEvent; +import net.minecraft.util.Identifier; + +public class ControllerExpansion implements ClientModInitializer { + public static final String NAMESPACE = "controllerexpansion"; + public static final String MOD_ID = "controllerexpansion"; + + public static final SoundEvent UI_SELECT = soundEvent(CEUtil.id("ui.select")); + public static final SoundEvent UI_SCROLL = soundEvent(CEUtil.id("ui.scroll")); + public static final SoundEvent UI_BACK = soundEvent(CEUtil.id("ui.back")); + public static final SoundEvent UI_DENY = soundEvent(CEUtil.id("ui.deny")); + public static final SoundEvent UI_CRAFT = soundEvent(CEUtil.id("ui.craft")); + + @Override + public void onInitializeClient() { + if (FabricLoader.getInstance().isModLoaded("controlify")) { + ControlifyCompat.initialize(); + } + + FabricLoader.getInstance().getModContainer(MOD_ID).ifPresent(mod -> { + ResourceManagerHelper.registerBuiltinResourcePack(CEUtil.id("legacy_ui_sounds"), mod, ResourcePackActivationType.NORMAL); + }); + } + + public static SoundEvent soundEvent(Identifier id) { + return Registry.register(Registries.SOUND_EVENT, id, SoundEvent.of(id)); + } +} diff --git a/src/main/java/io/github/foundationgames/controllerexpansion/controller/ControlifyCompat.java b/src/main/java/io/github/foundationgames/controllerexpansion/controller/ControlifyCompat.java new file mode 100644 index 0000000..5326e3f --- /dev/null +++ b/src/main/java/io/github/foundationgames/controllerexpansion/controller/ControlifyCompat.java @@ -0,0 +1,66 @@ +package io.github.foundationgames.controllerexpansion.controller; + +import dev.isxander.controlify.Controlify; +import dev.isxander.controlify.InputMode; +import dev.isxander.controlify.api.ControlifyApi; +import dev.isxander.controlify.bindings.ControllerBindings; +import net.minecraft.client.gui.navigation.NavigationDirection; +import org.jetbrains.annotations.Nullable; + +public class ControlifyCompat { + public static void initialize() { + ControllerInfo.INSTANCE = new ControlifyNavigation(); + ControllerInfo.USING_CONTROLLER = () -> ControlifyApi.get().currentInputMode() == InputMode.CONTROLLER; + } + + public static class ControlifyNavigation implements ControllerNavigation { + private static ControllerBindings bindings() { + return ControlifyApi.get().currentController().bindings(); + } + + @Override + public @Nullable NavigationDirection getMenuNav() { + if (bindings().GUI_NAVI_UP.held()) { + return NavigationDirection.UP; + } else if (bindings().GUI_NAVI_DOWN.held()) { + return NavigationDirection.DOWN; + } else if (bindings().GUI_NAVI_LEFT.held()) { + return NavigationDirection.LEFT; + } else if (bindings().GUI_NAVI_RIGHT.held()) { + return NavigationDirection.RIGHT; + } + return null; + } + + @Override + public @Nullable NavigationDirection getTabNav() { + if (bindings().GUI_PREV_TAB.held()) { + return NavigationDirection.LEFT; + } else if (bindings().GUI_NEXT_TAB.held()) { + return NavigationDirection.RIGHT; + } + return null; + } + + @Override + public boolean getRequestingBlur() { + return bindings().GUI_BACK.held(); + } + + @Override + public boolean getRequestingPress() { + return bindings().GUI_PRESS.held(); + } + + @Override + public void setVirtualMouse(boolean enabled) { + // FIXME: Referencing non-API classes, extremely likely to break + var handler = Controlify.instance().virtualMouseHandler(); + if (enabled) { + handler.enableVirtualMouse(); + } else { + handler.disableVirtualMouse(); + } + } + } +} diff --git a/src/main/java/io/github/foundationgames/controllerexpansion/controller/ControllerInfo.java b/src/main/java/io/github/foundationgames/controllerexpansion/controller/ControllerInfo.java new file mode 100644 index 0000000..65cc2ef --- /dev/null +++ b/src/main/java/io/github/foundationgames/controllerexpansion/controller/ControllerInfo.java @@ -0,0 +1,36 @@ +package io.github.foundationgames.controllerexpansion.controller; + +import net.minecraft.client.gui.navigation.NavigationDirection; +import org.jetbrains.annotations.Nullable; + +import java.util.function.BooleanSupplier; + +public class ControllerInfo { + public static ControllerNavigation INSTANCE = new ControllerNavigation() { + @Override + public @Nullable NavigationDirection getMenuNav() { + return null; + } + + @Override + public @Nullable NavigationDirection getTabNav() { + return null; + } + + @Override + public boolean getRequestingBlur() { + return false; + } + + @Override + public boolean getRequestingPress() { + return false; + } + + @Override + public void setVirtualMouse(boolean enabled) { + } + }; + + public static BooleanSupplier USING_CONTROLLER = () -> false; +} diff --git a/src/main/java/io/github/foundationgames/controllerexpansion/controller/ControllerNavigation.java b/src/main/java/io/github/foundationgames/controllerexpansion/controller/ControllerNavigation.java new file mode 100644 index 0000000..bd4a3fb --- /dev/null +++ b/src/main/java/io/github/foundationgames/controllerexpansion/controller/ControllerNavigation.java @@ -0,0 +1,12 @@ +package io.github.foundationgames.controllerexpansion.controller; + +import net.minecraft.client.gui.navigation.NavigationDirection; +import org.jetbrains.annotations.Nullable; + +public interface ControllerNavigation { + @Nullable NavigationDirection getMenuNav(); + @Nullable NavigationDirection getTabNav(); + boolean getRequestingBlur(); + boolean getRequestingPress(); + void setVirtualMouse(boolean enabled); +} diff --git a/src/main/java/io/github/foundationgames/controllerexpansion/mixin/CraftingScreenMixin.java b/src/main/java/io/github/foundationgames/controllerexpansion/mixin/CraftingScreenMixin.java new file mode 100644 index 0000000..3a4b2f8 --- /dev/null +++ b/src/main/java/io/github/foundationgames/controllerexpansion/mixin/CraftingScreenMixin.java @@ -0,0 +1,33 @@ +package io.github.foundationgames.controllerexpansion.mixin; + +import io.github.foundationgames.controllerexpansion.screen.ControllerCraftingScreen; +import io.github.foundationgames.controllerexpansion.util.CEUtil; +import net.minecraft.client.gui.screen.ingame.CraftingScreen; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.CraftingScreenHandler; +import net.minecraft.text.Text; +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; + +@Mixin(CraftingScreen.class) +public abstract class CraftingScreenMixin extends HandledScreen { + @Shadow @Final private RecipeBookWidget recipeBook; + + public CraftingScreenMixin(CraftingScreenHandler handler, PlayerInventory inventory, Text title) { + super(handler, inventory, title); + } + + @Inject(method = "init", at = @At("HEAD"), cancellable = true) + private void controllerex$replaceCraftingScreen(CallbackInfo ci) { + if (CEUtil.useControllerScreen()) { + this.client.setScreen(new ControllerCraftingScreen.CraftingTable(this.handler, this.client.player.getInventory(), this.title, null)); + ci.cancel(); + } + } +} diff --git a/src/main/java/io/github/foundationgames/controllerexpansion/mixin/InventoryScreenMixin.java b/src/main/java/io/github/foundationgames/controllerexpansion/mixin/InventoryScreenMixin.java new file mode 100644 index 0000000..37a5157 --- /dev/null +++ b/src/main/java/io/github/foundationgames/controllerexpansion/mixin/InventoryScreenMixin.java @@ -0,0 +1,37 @@ +package io.github.foundationgames.controllerexpansion.mixin; + +import io.github.foundationgames.controllerexpansion.screen.ControllerCraftingScreen; +import io.github.foundationgames.controllerexpansion.util.CEUtil; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.gui.screen.ingame.InventoryScreen; +import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.PlayerScreenHandler; +import net.minecraft.text.Text; +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; + +@Mixin(InventoryScreen.class) +public abstract class InventoryScreenMixin extends HandledScreen { + @Shadow @Final private RecipeBookWidget recipeBook; + + public InventoryScreenMixin(PlayerScreenHandler handler, PlayerInventory inventory, Text title) { + super(handler, inventory, title); + } + + @Inject(method = "method_19891(Lnet/minecraft/client/gui/widget/ButtonWidget;)V", at = @At("HEAD"), cancellable = true) + private void controllerex$replaceInvRecipeBook(ButtonWidget button, CallbackInfo ci) { + if (CEUtil.useControllerScreen()) { + if (this.recipeBook.isOpen()) { + this.recipeBook.toggleOpen(); + } + this.client.setScreen(new ControllerCraftingScreen.InventoryCrafting(this.handler, this.client.player.getInventory(), this.title, this)); + ci.cancel(); + } + } +} diff --git a/src/main/java/io/github/foundationgames/controllerexpansion/mixin/compat/controlify/ScreenProcessorMixin.java b/src/main/java/io/github/foundationgames/controllerexpansion/mixin/compat/controlify/ScreenProcessorMixin.java new file mode 100644 index 0000000..af12a73 --- /dev/null +++ b/src/main/java/io/github/foundationgames/controllerexpansion/mixin/compat/controlify/ScreenProcessorMixin.java @@ -0,0 +1,24 @@ +package io.github.foundationgames.controllerexpansion.mixin.compat.controlify; + +import dev.isxander.controlify.controller.Controller; +import dev.isxander.controlify.screenop.ScreenProcessor; +import io.github.foundationgames.controllerexpansion.ControllerExpansion; +import io.github.foundationgames.controllerexpansion.util.CEUtil; +import net.minecraft.client.MinecraftClient; +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(ScreenProcessor.class) +public class ScreenProcessorMixin { + @Inject(method = "handleButtons", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;close()V", ordinal = 0)) + private void controllerex$playBackSound(Controller controller, CallbackInfo ci) { + CEUtil.playUI(MinecraftClient.getInstance().getSoundManager(), ControllerExpansion.UI_BACK, 1); + } + + @Inject(method = "handleComponentNavigation", at = @At(value = "INVOKE", target = "Ldev/isxander/controlify/mixins/feature/screenop/vanilla/ScreenAccessor;invokeChangeFocus(Lnet/minecraft/client/gui/navigation/GuiNavigationPath;)V", ordinal = 0)) + private void controllerex$playSelectSound(Controller controller, CallbackInfo ci) { + CEUtil.playSelect(MinecraftClient.getInstance().getSoundManager()); + } +} diff --git a/src/main/java/io/github/foundationgames/controllerexpansion/screen/ControllerCraftingScreen.java b/src/main/java/io/github/foundationgames/controllerexpansion/screen/ControllerCraftingScreen.java new file mode 100644 index 0000000..6b31a21 --- /dev/null +++ b/src/main/java/io/github/foundationgames/controllerexpansion/screen/ControllerCraftingScreen.java @@ -0,0 +1,277 @@ +package io.github.foundationgames.controllerexpansion.screen; + +import com.mojang.blaze3d.systems.RenderSystem; +import io.github.foundationgames.controllerexpansion.ControllerExpansion; +import io.github.foundationgames.controllerexpansion.controller.ControllerInfo; +import io.github.foundationgames.controllerexpansion.controller.ControllerNavigation; +import io.github.foundationgames.controllerexpansion.screen.widget.ItemCategoryButtonWidget; +import io.github.foundationgames.controllerexpansion.screen.widget.RecipeCatalogWidget; +import io.github.foundationgames.controllerexpansion.util.CEUtil; +import io.github.foundationgames.controllerexpansion.util.SlotPositionRemapper; +import io.github.foundationgames.controllerexpansion.util.crafting.ItemCategory; +import net.minecraft.client.gui.navigation.GuiNavigation; +import net.minecraft.client.gui.navigation.GuiNavigationPath; +import net.minecraft.client.gui.navigation.NavigationDirection; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.CraftingInventory; +import net.minecraft.inventory.CraftingResultInventory; +import net.minecraft.inventory.Inventory; +import net.minecraft.screen.AbstractRecipeScreenHandler; +import net.minecraft.screen.CraftingScreenHandler; +import net.minecraft.screen.PlayerScreenHandler; +import net.minecraft.screen.slot.Slot; +import net.minecraft.sound.SoundEvents; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import org.jetbrains.annotations.Nullable; + +public abstract class ControllerCraftingScreen> extends HandledScreen { + public static final Identifier TEXTURE = CEUtil.id("textures/gui/container/crafting.png"); + protected final int craftingAreaWidth; + + protected final ControllerNavigation controller = ControllerInfo.INSTANCE; + protected int controllerMenuNavTimer = 0; + protected NavigationDirection controllerTabNav = null; + protected NavigationDirection controllerMenuNav = null; + protected boolean controllerRequestingCraft = true; + + protected final @Nullable Screen parent; + protected RecipeCatalogWidget recipeCatalog; + private SlotPositionRemapper slotPositions; + + public ControllerCraftingScreen(T handler, PlayerInventory inventory, Text title, @Nullable Screen parent, int craftingAreaWidth) { + super(handler, inventory, title); + this.parent = parent; + + this.craftingAreaWidth = craftingAreaWidth; + + this.backgroundWidth = 13 + craftingAreaWidth + 10 + 162 + 7; + this.backgroundHeight = 159; + } + + @Override + protected void init() { + super.init(); + + this.clearChildren(); + + if (slotPositions == null && this.handler.slots.size() > 0) { + var slots = new Slot[this.handler.slots.size()]; + this.handler.slots.toArray(slots); + this.slotPositions = new SlotPositionRemapper(slots); + + while (this.slotPositions.next()) { + this.remapSlotPosition(this.slotPositions); + } + } + + boolean needsRecipeCatalog = this.recipeCatalog == null; + if (needsRecipeCatalog) { + this.recipeCatalog = new RecipeCatalogWidget(this.client); + } + this.recipeCatalog.init(this.x + 8, this.y + 8, this.backgroundWidth - 14, this.handler); + if (needsRecipeCatalog) { + this.recipeCatalog.open(ItemCategory.CONSTRUCTION, true); + } + + this.addSelectableChild(this.recipeCatalog); + + int buttonX = this.x + (this.backgroundWidth - ItemCategory.CATEGORIES.size() * 33) / 2; + for (var category : ItemCategory.CATEGORIES) { + this.addDrawableChild(new ItemCategoryButtonWidget(buttonX, this.y - 24, category, this.recipeCatalog)); + buttonX += 33; + } + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + this.renderBackground(matrices); + super.render(matrices, mouseX, mouseY, delta); + this.recipeCatalog.render(matrices, mouseX, mouseY, delta); + this.recipeCatalog.getGhostSlots().draw(matrices, this.client, this.x, this.y, true, delta); + + this.drawMouseoverTooltip(matrices, mouseX, mouseY); + } + + @Override + protected void drawBackground(MatrixStack matrices, float delta, int mouseX, int mouseY) { + RenderSystem.setShaderTexture(0, TEXTURE); + drawTexture(matrices, (this.width - this.backgroundWidth) / 2, (this.height - this.backgroundHeight) / 2, + 0, 0, + this.backgroundWidth / 2, this.backgroundHeight); + drawTexture(matrices, this.width / 2, (this.height - this.backgroundHeight) / 2, + 256 - (this.backgroundWidth / 2), 0, + this.backgroundWidth / 2, this.backgroundHeight); + + this.drawInventory(matrices, + ((this.width + this.backgroundWidth) / 2) - 170, ((this.height + this.backgroundHeight) / 2) - 84); + + this.drawCraftingBackground(matrices, delta); + } + + @Override + protected void drawForeground(MatrixStack matrices, int mouseX, int mouseY) { + this.textRenderer.draw(matrices, this.title, (float)this.titleX, (float)this.titleY, 4210752); + } + + protected void drawInventory(MatrixStack matrices, int x, int y) { + RenderSystem.setShaderTexture(0, TEXTURE); + + for (int i = 0; i < 3; i++) { + drawTexture(matrices, x + (54 * i), y, 108, 180, 54, 76); + } + } + + protected abstract void drawCraftingBackground(MatrixStack matrices, float delta); + + protected void remapSlotPosition(SlotPositionRemapper slotInfo) { + } + + private void controllerTick() { + if (this.recipeCatalog.isFocused() && this.controller.getRequestingBlur()) { + this.recipeCatalog.setFocused(false); + } + + var sounds = this.client.getSoundManager(); + if (!this.controllerRequestingCraft && this.controller.getRequestingPress()) { + if (this.recipeCatalog.craft()) { + CEUtil.playUI(sounds, SoundEvents.UI_BUTTON_CLICK.value(), 1); + CEUtil.playUI(sounds, ControllerExpansion.UI_CRAFT, 1); + } else { + CEUtil.playUI(sounds, ControllerExpansion.UI_DENY, 1); + } + } + this.controllerRequestingCraft = this.controller.getRequestingPress(); + + var tabNav = this.controller.getTabNav(); + if (this.controllerTabNav != tabNav && tabNav != null) { + this.recipeCatalog.changeCategory(switch (tabNav) { + case LEFT -> -1; + case RIGHT -> 1; + default -> 0; + }); + CEUtil.playSelect(sounds); + } + this.controllerTabNav = tabNav; + + var menuNav = this.controller.getMenuNav(); + if (menuNav == null || this.controllerMenuNav != menuNav) { + this.controllerMenuNavTimer = 0; + } else { + if (this.controllerMenuNavTimer == 0 || this.controllerMenuNavTimer > 5) { + if (this.recipeCatalog.navigate(this.controller.getMenuNav())) { + CEUtil.playUI(sounds, ControllerExpansion.UI_SCROLL, 1); + } + } + + this.controllerMenuNavTimer++; + } + this.controllerMenuNav = menuNav; + + this.controller.setVirtualMouse(!this.recipeCatalog.isFocused()); + } + + @Override + protected void handledScreenTick() { + super.handledScreenTick(); + + this.controllerTick(); + this.recipeCatalog.tick(); + } + + @Override + public void close() { + if (this.slotPositions != null) { + this.slotPositions.rewind(); + } + + if (this.parent != null) { + this.client.setScreen(this.parent); + } else { + this.client.player.closeHandledScreen(); + this.client.setScreen(null); + } + } + + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + if (this.recipeCatalog != null && this.recipeCatalog.keyPressed(keyCode, scanCode, modifiers)) { + return true; + } + + return super.keyPressed(keyCode, scanCode, modifiers); + } + + @Nullable + @Override + public GuiNavigationPath getNavigationPath(GuiNavigation navigation) { + return null; + } + + public static class InventoryCrafting extends ControllerCraftingScreen { + public InventoryCrafting(PlayerScreenHandler handler, PlayerInventory inventory, Text title, Screen parent) { + super(handler, inventory, title, parent, 90); + + this.titleX = 14; + this.titleY = 81; + } + + @Override + protected void drawCraftingBackground(MatrixStack matrices, float delta) { + RenderSystem.setShaderTexture(0, TEXTURE); + drawTexture(matrices, + ((this.width - this.backgroundWidth) / 2) + 13, + ((this.height - this.backgroundHeight) / 2) + 95, + 0, 166, 90, 36); + } + + @Override + protected void remapSlotPosition(SlotPositionRemapper slotInfo) { + Inventory inv = slotInfo.slotInv(); + + if (inv instanceof PlayerInventory && slotInfo.slotId() > 8 && slotInfo.slotId() < 45) { + slotInfo.move((this.backgroundWidth - 170) - 7, 76 - 84); + } else if (inv instanceof CraftingInventory) { + slotInfo.move(-84, 78); + } else if (inv instanceof CraftingResultInventory) { + slotInfo.move(-72, 77); + } else { + slotInfo.set(-99999, -99999); + } + } + } + + public static class CraftingTable extends ControllerCraftingScreen { + public CraftingTable(CraftingScreenHandler handler, PlayerInventory inventory, Text title, Screen parent) { + super(handler, inventory, title, parent, 108); + + this.titleX = 14; + this.titleY = 74; + } + + @Override + protected void drawCraftingBackground(MatrixStack matrices, float delta) { + RenderSystem.setShaderTexture(0, TEXTURE); + drawTexture(matrices, + ((this.width - this.backgroundWidth) / 2) + 13, + ((this.height - this.backgroundHeight) / 2) + 87, + 0, 202, 108, 54); + } + + @Override + protected void remapSlotPosition(SlotPositionRemapper slotInfo) { + Inventory inv = slotInfo.slotInv(); + + if (inv instanceof PlayerInventory) { + slotInfo.move((this.backgroundWidth - 170) - 7, 76 - 84); + } else if (inv instanceof CraftingInventory) { + slotInfo.move(-16, 71); + } else if (inv instanceof CraftingResultInventory) { + slotInfo.move(-24, 71); + } + } + } +} diff --git a/src/main/java/io/github/foundationgames/controllerexpansion/screen/widget/CraftableGhostSlots.java b/src/main/java/io/github/foundationgames/controllerexpansion/screen/widget/CraftableGhostSlots.java new file mode 100644 index 0000000..c865881 --- /dev/null +++ b/src/main/java/io/github/foundationgames/controllerexpansion/screen/widget/CraftableGhostSlots.java @@ -0,0 +1,22 @@ +package io.github.foundationgames.controllerexpansion.screen.widget; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.recipebook.RecipeBookGhostSlots; +import net.minecraft.client.util.math.MatrixStack; + +public class CraftableGhostSlots extends RecipeBookGhostSlots { + @Override + public void draw(MatrixStack matrices, MinecraftClient client, int x, int y, boolean notInventory, float tickDelta) { + for(int i = 0; i < this.getSlotCount(); ++i) { + var slot = this.getSlot(i); + int slotX = slot.getX() + x; + int slotY = slot.getY() + y; + + var stack = slot.getCurrentItemStack(); + client.getItemRenderer().renderInGui(matrices, stack, slotX, slotY); + if (i == 0) { + client.getItemRenderer().renderGuiItemOverlay(matrices, client.textRenderer, stack, slotX, slotY); + } + } + } +} diff --git a/src/main/java/io/github/foundationgames/controllerexpansion/screen/widget/ItemCategoryButtonWidget.java b/src/main/java/io/github/foundationgames/controllerexpansion/screen/widget/ItemCategoryButtonWidget.java new file mode 100644 index 0000000..b1fe533 --- /dev/null +++ b/src/main/java/io/github/foundationgames/controllerexpansion/screen/widget/ItemCategoryButtonWidget.java @@ -0,0 +1,44 @@ +package io.github.foundationgames.controllerexpansion.screen.widget; + +import com.mojang.blaze3d.systems.RenderSystem; +import io.github.foundationgames.controllerexpansion.screen.ControllerCraftingScreen; +import io.github.foundationgames.controllerexpansion.util.crafting.ItemCategory; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; +import net.minecraft.client.gui.widget.ClickableWidget; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; + +public class ItemCategoryButtonWidget extends ClickableWidget { + private static final Identifier TEXTURE = ControllerCraftingScreen.TEXTURE; + + private final ItemCategory itemCategory; + private final RecipeCatalogWidget recipeCatalog; + + public ItemCategoryButtonWidget(int x, int y, ItemCategory itemCategory, RecipeCatalogWidget recipeCatalog) { + super(x, y, 32, 27, Text.empty()); + this.itemCategory = itemCategory; + this.recipeCatalog = recipeCatalog; + } + + @Override + public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) { + RenderSystem.setShaderTexture(0, TEXTURE); + + boolean selected = this.itemCategory.equals(this.recipeCatalog.getCurrentCategory()); + drawTexture(matrices, this.getX(), this.getY(), selected ? 194 : 162, 159, this.width, this.height); + + this.itemCategory.drawIcon(matrices, MinecraftClient.getInstance(), this.getX() + 8, this.getY() + 6); + } + + @Override + public void onClick(double mouseX, double mouseY) { + this.recipeCatalog.open(this.itemCategory, true); + } + + @Override + protected void appendClickableNarrations(NarrationMessageBuilder builder) { + // TODO + } +} diff --git a/src/main/java/io/github/foundationgames/controllerexpansion/screen/widget/RecipeCatalogWidget.java b/src/main/java/io/github/foundationgames/controllerexpansion/screen/widget/RecipeCatalogWidget.java new file mode 100644 index 0000000..0072134 --- /dev/null +++ b/src/main/java/io/github/foundationgames/controllerexpansion/screen/widget/RecipeCatalogWidget.java @@ -0,0 +1,491 @@ +package io.github.foundationgames.controllerexpansion.screen.widget; + +import com.google.common.collect.Lists; +import com.mojang.blaze3d.systems.RenderSystem; +import io.github.foundationgames.controllerexpansion.screen.ControllerCraftingScreen; +import io.github.foundationgames.controllerexpansion.util.crafting.ItemCategory; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.*; +import net.minecraft.client.gui.navigation.NavigationDirection; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; +import net.minecraft.client.gui.screen.recipebook.RecipeBookGhostSlots; +import net.minecraft.client.gui.screen.recipebook.RecipeDisplayListener; +import net.minecraft.client.gui.screen.recipebook.RecipeResultCollection; +import net.minecraft.client.recipebook.ClientRecipeBook; +import net.minecraft.client.recipebook.RecipeBookGroup; +import net.minecraft.client.sound.PositionedSoundInstance; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeGridAligner; +import net.minecraft.recipe.RecipeMatcher; +import net.minecraft.screen.AbstractRecipeScreenHandler; +import net.minecraft.screen.slot.Slot; +import net.minecraft.screen.slot.SlotActionType; +import net.minecraft.sound.SoundEvents; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.MathHelper; +import org.jetbrains.annotations.Nullable; +import org.lwjgl.glfw.GLFW; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; + +public class RecipeCatalogWidget extends DrawableHelper implements RecipeGridAligner, Drawable, Element, Selectable, RecipeDisplayListener { + private static final Identifier TEXTURE = ControllerCraftingScreen.TEXTURE; + + private final RecipeMatcher recipeMatcher = new RecipeMatcher(); + private final ClientRecipeBook recipes; + + private final MinecraftClient client; + private final RecipeBookGhostSlots uncraftableGhostSlots = new RecipeBookGhostSlots(); + private final RecipeBookGhostSlots craftableGhostSlots = new CraftableGhostSlots(); + private int x, y, width, maxRowSize; + private AbstractRecipeScreenHandler screenHandler; + + private RecipeBookGhostSlots activeGhostSlots = craftableGhostSlots; + private boolean focused; + private ItemCategory currentCategory; + private Text categoryTitle; + private List results = List.of(); + private int startOffset; + private int selected; + private float recipeTooltipTime; + private boolean takeCraftResult = false; + + public RecipeCatalogWidget(MinecraftClient client) { + this.client = client; + this.recipes = client.player.getRecipeBook(); + } + + public void init(int x, int y, int width, AbstractRecipeScreenHandler screenHandler) { + this.x = x; + this.y = y; + this.width = width; + this.maxRowSize = (width - 28) / 23; + this.screenHandler = screenHandler; + } + + public void open(ItemCategory category, boolean resetSelect) { + Recipe lastRecipe = null; + if (this.getSelected() != null) { + lastRecipe = this.getSelected().getSelectedRecipe(); + } + + this.currentCategory = category; + this.categoryTitle = category.createTitle(); + this.recipeMatcher.clear(); + this.screenHandler.populateRecipeFinder(this.recipeMatcher); + this.client.player.getInventory().populateRecipeFinder(this.recipeMatcher); + + var results = Lists.newArrayList(this.recipes.getResultsForGroup(RecipeBookGroup.CRAFTING_SEARCH)); + results.forEach(res -> res.computeCraftables(this.recipeMatcher, this.screenHandler.getCraftingWidth(), this.screenHandler.getCraftingHeight(), this.recipes)); + results.removeIf(res -> + !res.isInitialized() || + !res.hasFittingRecipes() || + res.getAllRecipes().stream() + .noneMatch(rec -> + rec.fits(this.screenHandler.getCraftingWidth(), this.screenHandler.getCraftingHeight()) && + category.filter().test(rec.getOutput(res.getRegistryManager())) + ) + ); + + var craftables = Lists.newArrayList(results); + var uncraftables = Lists.newArrayList(results); + + craftables.removeIf(res -> !res.hasCraftableRecipes()); + uncraftables.removeIf(RecipeResultCollection::hasCraftableRecipes); + + craftables.addAll(uncraftables); + + this.results = craftables.stream().map(coll -> new CatalogRecipeResult(this.client, coll)).collect(Collectors.toList()); + + if (resetSelect || lastRecipe == null) { + this.selected = 0; + this.startOffset = 0; + } else { + int selectDiff = this.selected - this.startOffset; + int toSelect = 0; + for (; toSelect < this.results.size(); toSelect++) { + var result = this.results.get(toSelect); + if (result.trySetRecipe(lastRecipe)) { + break; + } + } + + toSelect = MathHelper.clamp(toSelect, 0, this.results.size() - 1); + this.setSelectionPosition(toSelect, this.results.size() < this.maxRowSize ? this.startOffset : toSelect - selectDiff); + } + + this.setFocused(true); + } + + public void refresh(boolean resetSelect) { + this.open(this.currentCategory, resetSelect); + } + + public @Nullable CatalogRecipeResult getSelected() { + if (this.isFocused() && this.results.size() > 0) { + return this.results.get(this.selected); + } + + return null; + } + + public ItemCategory getCurrentCategory() { + return this.currentCategory; + } + + public void setSelectionPosition(int selected, int offset) { + if (this.results.size() > 0) { + this.selected = MathHelper.clamp(selected, 0, this.results.size() - 1); + + int maxOffset = this.selected; + int minOffset = Math.max(Math.min(this.results.size() - (this.maxRowSize - 1), this.selected - (this.maxRowSize - 1)), 0); + this.startOffset = MathHelper.clamp(offset, minOffset, maxOffset); + } else { + this.selected = 0; + this.startOffset = 0; + } + } + + public void setSelected(int selected) { + this.setSelectionPosition(selected, this.startOffset); + } + + public boolean changeSelected(int by) { + int prev = this.selected; + this.setSelected(this.selected + by); + return this.selected != prev; + } + + public void populateRecipe(CatalogRecipeResult result, List slots) { + var recipe = result.getSelectedRecipe(); + + this.activeGhostSlots = result.isCraftable() ? this.craftableGhostSlots : this.uncraftableGhostSlots; + + var output = recipe.getOutput(this.client.world.getRegistryManager()); + this.activeGhostSlots.setRecipe(recipe); + this.activeGhostSlots.addSlot(Ingredient.ofStacks(output), slots.get(0).x, slots.get(0).y); + this.alignRecipeToGrid(this.screenHandler.getCraftingWidth(), this.screenHandler.getCraftingHeight(), + this.screenHandler.getCraftingResultSlotIndex(), recipe, recipe.getIngredients().iterator(), 0); + } + + public void refreshRecipe() { + if (this.getSelected() != null) { + this.resetGhostSlots(); + this.populateRecipe(this.getSelected(), this.screenHandler.slots); + this.recipeTooltipTime = 35; + } + } + + public RecipeBookGhostSlots getGhostSlots() { + return this.activeGhostSlots; + } + + public void tick() { + var resultSlot = this.screenHandler.slots.get(0); + if (this.takeCraftResult && resultSlot.hasStack()) { + this.client.interactionManager.clickSlot(this.screenHandler.syncId, resultSlot.id, 0, SlotActionType.QUICK_MOVE, this.client.player); + this.takeCraftResult = false; + + this.refresh(false); + } + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + if (this.categoryTitle != null) { + int titleX = this.x + (this.width / 2); + titleX -= this.client.textRenderer.getWidth(this.categoryTitle) / 2; + this.client.textRenderer.draw(matrices, this.categoryTitle, titleX, this.y + 6, 0xFFFFFF); + } + + if (this.results.size() > 0) { + int x = this.x + (this.width - this.maxRowSize * 23) / 2; + int count = Math.min(this.maxRowSize, this.results.size() - this.startOffset); + int index; + + for (int i = 0; i < count; i++) { + index = i + this.startOffset; + this.results.get(index).render(matrices, x + i * 23, this.y + 19, delta, + this.isFocused() && this.selected == index); + } + for (int i = 0; i < count; i++) { + index = i + this.startOffset; + this.results.get(index).renderForeground(matrices, x + i * 23, this.y + 19, + this.isFocused() && this.selected == index); + } + } + + if (this.recipeTooltipTime > 0) { + this.recipeTooltipTime -= delta; + } + + RenderSystem.setShaderTexture(0, TEXTURE); + boolean recipesLeft = this.startOffset > 0; + boolean recipesRight = (this.startOffset + this.maxRowSize) < this.results.size(); + int sideSpace = (this.width - (23 * this.maxRowSize)) / 2; + drawTexture(matrices, (this.x + sideSpace) - 10, this.y + 25, 162, recipesLeft ? 199 : 188, 7, 11); + drawTexture(matrices, (this.x + sideSpace + 23 * this.maxRowSize) + 3, this.y + 25, 169, recipesRight ? 199 : 188, 7, 11); + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (mouseX >= this.x && mouseX <= this.x + this.width && mouseY >= this.y && mouseY <= this.y + 61) { + if (!this.isFocused()) { + this.setFocused(true); + } + + int catalogX = this.x + (this.width - this.maxRowSize * 23) / 2; + int positionBasedIndex = this.startOffset + (int) Math.floor((mouseX - catalogX) / 23); + int maxIndex = MathHelper.clamp(this.startOffset + this.maxRowSize, 0, this.results.size()); + int minIndex = Math.max(this.startOffset - 1, 0); + this.setSelected(MathHelper.clamp(positionBasedIndex, minIndex, maxIndex)); + + this.refreshRecipe(); + } else { + this.setFocused(false); + } + + return Element.super.mouseClicked(mouseX, mouseY, button); + } + + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + if (scanCode == 0) { + return false; + } + + if (Screen.hasShiftDown()) { + switch (keyCode) { + case GLFW.GLFW_KEY_LEFT -> this.changeCategory(-1); + case GLFW.GLFW_KEY_RIGHT -> this.changeCategory(1); + default -> { + return false; + } + } + return true; + } else if (this.getSelected() != null) { + switch (keyCode) { + case GLFW.GLFW_KEY_UP -> this.navigate(NavigationDirection.UP); + case GLFW.GLFW_KEY_DOWN -> this.navigate(NavigationDirection.DOWN); + case GLFW.GLFW_KEY_LEFT -> this.navigate(NavigationDirection.LEFT); + case GLFW.GLFW_KEY_RIGHT -> this.navigate(NavigationDirection.RIGHT); + case GLFW.GLFW_KEY_ENTER -> { + this.craft(); + this.client.getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F)); + } + default -> { + return false; + } + } + return true; + } + + return false; + } + + public void changeCategory(int by) { + int idx = ItemCategory.CATEGORIES.indexOf(this.currentCategory); + idx = MathHelper.floorMod(idx + by, ItemCategory.CATEGORIES.size()); + this.open(ItemCategory.CATEGORIES.get(idx), true); + } + + public boolean navigate(NavigationDirection nav) { + if (this.getSelected() != null) { + boolean changed = switch (nav) { + case UP -> this.getSelected().changeRecipe(1); + case DOWN -> this.getSelected().changeRecipe(-1); + case LEFT -> this.changeSelected(-1); + case RIGHT -> this.changeSelected(1); + }; + + this.refreshRecipe(); + return changed; + } + + return false; + } + + public boolean craft() { + var result = this.getSelected(); + if (result != null && result.isCraftable()) { + this.client.interactionManager.clickRecipe(this.client.player.currentScreenHandler.syncId, + this.getSelected().getSelectedRecipe(), false); + this.takeCraftResult = true; + return true; + } + + return false; + } + + @Override + public SelectionType getType() { + return this.isFocused() ? SelectionType.FOCUSED : SelectionType.NONE; + } + + @Override + public void appendNarrations(NarrationMessageBuilder builder) { + // TODO + } + + @Override + public void setFocused(boolean focused) { + this.focused = focused; + + if (this.getSelected() != null) { + this.refreshRecipe(); + } else { + this.resetGhostSlots(); + } + } + + @Override + public boolean isFocused() { + return this.focused; + } + + @Override + public void onRecipesDisplayed(List> recipes) { + for (var recipe : recipes) { + this.client.player.onRecipeDisplayed(recipe); + } + } + + @Override + public void acceptAlignedInput(Iterator inputs, int slotId, int amount, int gridX, int gridY) { + Ingredient ingredient = inputs.next(); + + if (!ingredient.isEmpty()) { + var slot = this.screenHandler.slots.get(slotId); + this.activeGhostSlots.addSlot(ingredient, slot.x, slot.y); + } + } + + public void resetGhostSlots() { + this.uncraftableGhostSlots.reset(); + this.craftableGhostSlots.reset(); + } + + public static class CatalogRecipeResult { + public final RecipeResultCollection results; + private final MinecraftClient client; + private final List> craftableRecipes; + private final List> allRecipes; + private int selectedRecipe; + private float time; + + public CatalogRecipeResult(MinecraftClient client, RecipeResultCollection recipes) { + this.results = recipes; + this.client = client; + + this.craftableRecipes = this.results.getRecipes(true); + this.allRecipes = Lists.newArrayList(this.results.getAllRecipes()); + this.allRecipes.removeIf(re -> !client.player.getRecipeBook().contains(re)); + + if (this.craftableRecipes.size() > 0) { + this.selectedRecipe = this.allRecipes.indexOf(this.craftableRecipes.get(0)); + } + } + + private int estimateIndexOf(Recipe other) { + if (this.allRecipes.contains(other)) { + return this.allRecipes.indexOf(other); + } + + var drm = this.results.getRegistryManager(); + return this.allRecipes.stream() + .filter(recipe -> + recipe.getGroup().equals(other.getGroup()) && recipe.getOutput(drm).isItemEqual(other.getOutput(drm))) + .findFirst().map(this.allRecipes::indexOf).orElse(-1); + } + + public boolean isCraftable() { + return this.craftableRecipes.contains(this.getSelectedRecipe()); + } + + public Recipe getSelectedRecipe() { + return this.allRecipes.get(selectedRecipe); + } + + public Recipe getOffsetRecipe(int by) { + return this.allRecipes.get(MathHelper.floorMod(this.selectedRecipe + by, this.allRecipes.size())); + } + + public boolean changeRecipe(int by) { + int prev = this.selectedRecipe; + this.setRecipe(this.selectedRecipe + by); + return prev != this.selectedRecipe; + } + + public void setRecipe(int recipe) { + this.selectedRecipe = MathHelper.floorMod(recipe, this.allRecipes.size()); + } + + public boolean trySetRecipe(Recipe recipe) { + int idx = this.estimateIndexOf(recipe); + if (idx >= 0) { + this.setRecipe(idx); + return true; + } + return false; + } + + public void render(MatrixStack matrices, int x, int y, float delta, boolean selected) { + RenderSystem.setShaderTexture(0, TEXTURE); + + boolean craftable = this.isCraftable(); + drawTexture(matrices, x, y, 162, craftable ? 233 : 210, 23, 23); + + this.renderRecipeIcon(matrices, this.getSelectedRecipe(), x + 3, y + 3); + + if (selected && this.allRecipes.size() > 1) { + this.drawOffsetRecipe(matrices, this.getOffsetRecipe(1), x + 1, y - 19); + this.drawOffsetRecipe(matrices, this.getOffsetRecipe(-1), x + 1, y + 21); + } + + this.time += delta; + } + + public void renderForeground(MatrixStack matrices, int x, int y, boolean selected) { + if (selected) { + RenderSystem.setShaderTexture(0, TEXTURE); + if (this.allRecipes.size() > 1) { + drawTexture(matrices, x - 2, y - 24, 185, 186, 26, 70); + } else { + drawTexture(matrices, x - 2, y - 2, 211, 230, 26, 26); + } + } + } + + protected void drawOffsetRecipe(MatrixStack matrices, Recipe recipe, int x, int y) { + boolean craftable = this.craftableRecipes.contains(recipe); + RenderSystem.setShaderTexture(0, TEXTURE); + + drawTexture(matrices, x, y, 211, craftable ? 210 : 190, 20, 20); + this.renderRecipeIcon(matrices, recipe, x + 2, y + 2); + } + + protected void renderRecipeIcon(MatrixStack matrices, Recipe recipe, int x, int y) { + var output = recipe.getOutput(this.results.getRegistryManager()); + + if (this.allRecipes.stream().anyMatch(re -> re != recipe && re.getOutput(this.results.getRegistryManager()).isItemEqual(output))) { + var ingredients = recipe.getIngredients(); + var stacks = ingredients.get((int)((this.time / 60) % ingredients.size())).getMatchingStacks(); + var ingredient = stacks[(int)((this.time / 20) % stacks.length)]; + + matrices.push(); + matrices.scale(0.5f, 0.5f, 0.5f); + client.getItemRenderer().renderInGui(matrices, ingredient, (x * 2) - 1, (y * 2)); + matrices.pop(); + } + + client.getItemRenderer().renderInGui(matrices, output, x, y); + } + } +} diff --git a/src/main/java/io/github/foundationgames/controllerexpansion/util/CEUtil.java b/src/main/java/io/github/foundationgames/controllerexpansion/util/CEUtil.java new file mode 100644 index 0000000..0c4fb47 --- /dev/null +++ b/src/main/java/io/github/foundationgames/controllerexpansion/util/CEUtil.java @@ -0,0 +1,31 @@ +package io.github.foundationgames.controllerexpansion.util; + +import io.github.foundationgames.controllerexpansion.ControllerExpansion; +import net.minecraft.client.sound.PositionedSoundInstance; +import net.minecraft.client.sound.SoundManager; +import net.minecraft.sound.SoundEvent; +import net.minecraft.sound.SoundEvents; +import net.minecraft.util.Identifier; + +import java.util.Random; + +public enum CEUtil {; + private static final Random random = new Random(); + + public static Identifier id(String path) { + return new Identifier(ControllerExpansion.NAMESPACE, path); + } + + public static boolean useControllerScreen() { + // TODO: Config + return true; + } + + public static void playUI(SoundManager soundManager, SoundEvent sound, float pitch) { + soundManager.play(PositionedSoundInstance.master(sound, pitch)); + } + + public static void playSelect(SoundManager soundManager) { + soundManager.play(PositionedSoundInstance.master(ControllerExpansion.UI_SELECT, 0.975f + (random.nextFloat() * 0.05f))); + } +} diff --git a/src/main/java/io/github/foundationgames/controllerexpansion/util/SlotPositionRemapper.java b/src/main/java/io/github/foundationgames/controllerexpansion/util/SlotPositionRemapper.java new file mode 100644 index 0000000..ec19cdd --- /dev/null +++ b/src/main/java/io/github/foundationgames/controllerexpansion/util/SlotPositionRemapper.java @@ -0,0 +1,68 @@ +package io.github.foundationgames.controllerexpansion.util; + +import net.minecraft.inventory.Inventory; +import net.minecraft.screen.slot.Slot; + +public class SlotPositionRemapper { + private final Pos[] oldPositions; + private final Slot[] slots; + private int remapIndex = -1; + + public SlotPositionRemapper(Slot[] slots) { + this.slots = slots; + this.oldPositions = new Pos[slots.length]; + } + + private void trySaveOldPos() { + if (this.oldPositions[remapIndex] == null) { + this.oldPositions[remapIndex] = new Pos(this.slots[remapIndex].x, this.slots[remapIndex].y); + } + } + + public int index() { + return remapIndex; + } + + public Inventory slotInv() { + return this.slots[remapIndex].inventory; + } + + public int slotId() { + return this.slots[remapIndex].id; + } + + public void move(int x, int y) { + this.trySaveOldPos(); + + this.slots[remapIndex].x += x; + this.slots[remapIndex].y += y; + } + + public void set(int x, int y) { + this.trySaveOldPos(); + + this.slots[remapIndex].x = x; + this.slots[remapIndex].y = y; + } + + public boolean next() { + if (this.remapIndex >= this.slots.length - 1) { + return false; + } + + this.remapIndex++; + return true; + } + + public void rewind() { + for (int i = 0; i < oldPositions.length; i++) { + var pos = oldPositions[i]; + if (pos != null) { + this.slots[i].x = pos.x; + this.slots[i].y = pos.y; + } + } + } + + private record Pos(int x, int y) {} +} diff --git a/src/main/java/io/github/foundationgames/controllerexpansion/util/crafting/ItemCategory.java b/src/main/java/io/github/foundationgames/controllerexpansion/util/crafting/ItemCategory.java new file mode 100644 index 0000000..c56bfb8 --- /dev/null +++ b/src/main/java/io/github/foundationgames/controllerexpansion/util/crafting/ItemCategory.java @@ -0,0 +1,76 @@ +package io.github.foundationgames.controllerexpansion.util.crafting; + +import net.minecraft.block.Blocks; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.item.*; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.text.Text; + +import java.util.List; +import java.util.function.Predicate; + +public record ItemCategory(Predicate filter, String name, ItemStack... icons) { + public static final ItemCategory ALL = new ItemCategory(item -> true, "all", stack(Items.FILLED_MAP), stack(Items.COMPASS)); + public static final ItemCategory CONSTRUCTION = new ItemCategory(item -> + inAnyOf(item, ItemGroups.BUILDING_BLOCKS, ItemGroups.COLORED_BLOCKS, ItemGroups.FUNCTIONAL), + "construction", stack(Blocks.BRICKS), stack(Blocks.OAK_DOOR)); + public static final ItemCategory NATURE_DECOR = new ItemCategory(item -> + inAnyOf(item, ItemGroups.NATURAL, ItemGroups.FUNCTIONAL), + "nature_decor", stack(Blocks.OAK_LEAVES), stack(Items.LANTERN), stack(Items.OAK_HANGING_SIGN)); + public static final ItemCategory UTILITIES_COMBAT = new ItemCategory(item -> + inAnyOf(item, ItemGroups.TOOLS, ItemGroups.COMBAT), + "utilities_combat", stack(Items.MINECART), stack(Items.LEATHER_CHESTPLATE), stack(Items.DIAMOND_SWORD)); + public static final ItemCategory RESOURCES = new ItemCategory(item -> inAnyOf(item, ItemGroups.INGREDIENTS), + "resources", stack(Items.LEATHER), stack(Items.PAPER)); + public static final ItemCategory REDSTONE = new ItemCategory(item -> inAnyOf(item, ItemGroups.REDSTONE), + "redstone", stack(Items.POWERED_RAIL), stack(Items.COMPARATOR)); + public static final ItemCategory FOOD_DRINK = new ItemCategory(item -> inAnyOf(item, ItemGroups.FOOD_AND_DRINK), + "food_drink", stack(Items.CAKE), stack(Items.APPLE), stack(Items.BREAD)); + + public static final List CATEGORIES = + List.of(CONSTRUCTION, NATURE_DECOR, UTILITIES_COMBAT, RESOURCES, REDSTONE, FOOD_DRINK, ALL); + + public void drawIcon(MatrixStack matrices, MinecraftClient client, int x, int y) { + matrices.push(); + switch (this.icons.length) { + default -> client.getItemRenderer().renderInGui(matrices, this.icons[0], x, y); + case 2 -> { + client.getItemRenderer().renderInGui(matrices, this.icons[0], x - 3, y - 2); + matrices.translate(0, 0, 16); + client.getItemRenderer().renderInGui(matrices, this.icons[1], x + 3, y + 1); + } + case 3 -> { + client.getItemRenderer().renderInGui(matrices, this.icons[0], x - 3, y - 2); + matrices.translate(0, 0, 16); + client.getItemRenderer().renderInGui(matrices, this.icons[1], x + 3, y); + matrices.translate(0, 0, 16); + client.getItemRenderer().renderInGui(matrices, this.icons[2], x, y + 1); + } + } + matrices.pop(); + } + + public Text createTitle() { + return Text.translatable("catalog.category." + this.name()); + } + + private static ItemStack stack(ItemConvertible item) { + return new ItemStack(item); + } + + private static boolean inAnyOf(ItemStack stack, ItemGroup ... groups) { + for (var group : groups) { + if (group.getDisplayStacks().size() <= 0) { + var world = MinecraftClient.getInstance().world; + group.updateEntries(new ItemGroup.DisplayContext(world.getEnabledFeatures(), false, world.getRegistryManager())); + } + + if (group.getDisplayStacks().stream().anyMatch(stack::isItemEqual)) { + return true; + } + } + + return false; + } +} diff --git a/src/main/resources/assets/controllerexpansion/icon.png b/src/main/resources/assets/controllerexpansion/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..047b91f2347de5cf95f23284476fddbe21ba23fe GIT binary patch literal 453 zcmV;$0XqJPP)QAFYGys`80vegN0XDFh0OXKz&i8?Le#x7{1X)R+00000NkvXXu0mjf73i~T literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/controllerexpansion/lang/en_us.json b/src/main/resources/assets/controllerexpansion/lang/en_us.json new file mode 100644 index 0000000..ef14728 --- /dev/null +++ b/src/main/resources/assets/controllerexpansion/lang/en_us.json @@ -0,0 +1,9 @@ +{ + "catalog.category.construction": "Construction", + "catalog.category.nature_decor": "Nature & Decoration", + "catalog.category.utilities_combat": "Utilities & Combat", + "catalog.category.resources": "Resources", + "catalog.category.redstone": "Redstone", + "catalog.category.food_drink": "Food & Drink", + "catalog.category.all": "All Recipes" +} \ No newline at end of file diff --git a/src/main/resources/assets/controllerexpansion/sounds.json b/src/main/resources/assets/controllerexpansion/sounds.json new file mode 100644 index 0000000..46dbcfd --- /dev/null +++ b/src/main/resources/assets/controllerexpansion/sounds.json @@ -0,0 +1,28 @@ +{ + "ui.select": { + "sounds": [] + }, + "ui.scroll": { + "sounds": [ + { + "name": "controllerexpansion:ui/scroll", + "volume": 0.5 + } + ] + }, + "ui.back": { + "sounds": [] + }, + "ui.deny": { + "sounds": [ + { + "name": "controllerexpansion:ui/scroll", + "volume": 1, + "pitch": 0.5 + } + ] + }, + "ui.craft": { + "sounds": ["random/pop"] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/controllerexpansion/sounds/ui/scroll.ogg b/src/main/resources/assets/controllerexpansion/sounds/ui/scroll.ogg new file mode 100644 index 0000000000000000000000000000000000000000..7144144680da0a735ce3062d5762fce839fa3b8e GIT binary patch literal 7822 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/controllerexpansion/textures/gui/container/crafting.png b/src/main/resources/assets/controllerexpansion/textures/gui/container/crafting.png new file mode 100644 index 0000000000000000000000000000000000000000..7e927f6f88a404f30638253eb03e0040a5280833 GIT binary patch literal 6703 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 Z4l{V$Nvlmo=ywOe*UR7Yto!<{{{kN)<~;xa literal 0 HcmV?d00001 diff --git a/src/main/resources/controllerexpansion.accesswidener b/src/main/resources/controllerexpansion.accesswidener new file mode 100644 index 0000000..c60f4b4 --- /dev/null +++ b/src/main/resources/controllerexpansion.accesswidener @@ -0,0 +1,8 @@ +accessWidener v2 named + +mutable field net/minecraft/screen/slot/Slot x I +mutable field net/minecraft/screen/slot/Slot y I +accessible field net/minecraft/screen/slot/CraftingResultSlot input Lnet/minecraft/inventory/CraftingInventory; +accessible field net/minecraft/screen/slot/CraftingResultSlot player Lnet/minecraft/entity/player/PlayerEntity; + +extendable method net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget renderIcons (Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/item/ItemRenderer;)V \ No newline at end of file diff --git a/src/main/resources/controllerexpansion.mixins.json b/src/main/resources/controllerexpansion.mixins.json new file mode 100644 index 0000000..ec2f380 --- /dev/null +++ b/src/main/resources/controllerexpansion.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "io.github.foundationgames.controllerexpansion.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + ], + "client": [ + "compat.controlify.ScreenProcessorMixin", + "CraftingScreenMixin", + "InventoryScreenMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..e7ff857 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,40 @@ +{ + "schemaVersion": 1, + "id": "controllerexpansion", + "version": "${version}", + + "name": "Controller Expansion", + "description": "Improve in-game UIs and features for use with controller support mods", + "authors": [ + "FoundationGames" + ], + "contact": { + "homepage": "", + "sources": "" + }, + + "license": "LGPLv3", + "icon": "assets/controllerexpansion/icon.png", + + "environment": "*", + "entrypoints": { + "client": [ + "io.github.foundationgames.controllerexpansion.ControllerExpansion" + ] + }, + "mixins": [ + "controllerexpansion.mixins.json" + ], + + "accessWidener": "controllerexpansion.accesswidener", + + "depends": { + "fabricloader": ">=0.14", + "fabric-api": "*", + "minecraft": "~1.19.4", + "java": ">=17" + }, + "suggests": { + "another-mod": "*" + } +} diff --git a/src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds.json b/src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds.json new file mode 100644 index 0000000..bdb5d32 --- /dev/null +++ b/src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds.json @@ -0,0 +1,18 @@ +{ + "ui.select": { + "replace": true, + "sounds": ["controllerexpansion:ui/select"] + }, + "ui.scroll": { + "replace": true, + "sounds": ["controllerexpansion:ui/scroll"] + }, + "ui.back": { + "replace": true, + "sounds": ["controllerexpansion:ui/back"] + }, + "ui.deny": { + "replace": true, + "sounds": ["controllerexpansion:ui/deny"] + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds/ui/back.ogg b/src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds/ui/back.ogg new file mode 100644 index 0000000000000000000000000000000000000000..6fdef64c889e581cbb626b1f2640430724405324 GIT binary patch literal 8404 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds/ui/deny.ogg b/src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds/ui/deny.ogg new file mode 100644 index 0000000000000000000000000000000000000000..ec150d5fd5a57d44742d57d9c979282302bf379c GIT binary patch literal 8138 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds/ui/scroll.ogg b/src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds/ui/scroll.ogg new file mode 100644 index 0000000000000000000000000000000000000000..31025cb6e0acee73a0703c6bdc19ce9d975e2b2a GIT binary patch literal 5383 zcmeG=c~p~E_AfvnEMkBFi2_YnOoD+L2$mpBLlg*MlK@Jhh%6BTY9%39dg?SFC{Umf z0%AZ4fuM;%g$jzDR$SN>Sw-ti-Er$U)V<4$zxO5R_;Y%ub576vH}AZ>^WMGp-TS?} zynA1w($Zpp0a$1+()1JbyI=1|IiYes5GRWy2*_Yf+X6|Jp7=N_3fcL(Av;lUW#68B z$a>Aow_2s4o)rU9#EW*Mdq#=Vh+9R;>vRH$p+v70UMp6-w}L^W@Pw(-6w&rHV$k*+ zk@$n{+l1S*sfZX9TF-;ZUcC+lFc3lyC-%$6E8+ma0cKwr4PIsh>TQQ0E~c)Vp`rj7n(7~Ov97Q#f?l+r0+qZNlElIrs?UY%Tl(t z9&OFsK1OxJEaIb~0sxCcD#Y=SA-RaO2M>q64&ouw!FsWo`=Q2sGp`}y?r^VrEme_z z_YO6e``xD;9cP<+9G&Eb(`VMDbbM``@Udi!d8dA1Fx8!d2)~7GOi0DDF$nu2YHO_+ zveF-m2xRb>Afyr(+KC(ObT~iZ8uf@4ZR0cH9TXEA5eJ(zVSSEpHb**}vx{F_xZ(IN z{_(;MmkJY}7bfBNEc6$HGyAgmhp_O@<8PU6G_yiwv^GH(^#==p{jdqNZC!<+$?k zd8VcEcB2MYH+8BwwvODZsjbslaO)W1CbT7WWPg9-{&A&bEYw1&*3WXS>rC1;lMqI@ zQ*SvyNP={tNu`PAay;D2A6L#D>czoXv7(OL-5aatx8N3=*Eb@kkM6J< zMpG9p;<5gW0TWQ6*+KSi8UTR43X3q^Jrd3HnBn=%@I2yT1O9!)Kf*8?8urIKIf+k{76O08}P)eV75Q_mb$?tE!A}iVl74?QJ79)Zc8}a)k{g1={ zH1L}mfG&=*gg-lW6KT1D%ohdr-ek#%q4Nw`3V+`J!zJN1*W&H`7b{JsUPT8?u#XrY zI{7bdHLYMQZZNs9TlBg@1jJm3Xn@2V1aaroE5C*xG9PZ!YC2JnVc{Z3v z?Qj@1C{N+DOuW@kcSq`Cnt8eH3f8=YiC-}0?di&R5d zw6Li)l|onq6+1KF)T-f5Zma2q$MD>g5|zjRrWdGoG@|yE>0FxS+VmkVAi9FS>%KL& zb5)cQSU+h;vS_1^*F@tYV&W3^-HflfQ>>yWTeT-Vp`Z)86a|aBbmeO>BLW9+VR#!S z*emCX5e`~yhdHF2Vnjg7S+pu$*{adPOv2I;&PWsNix8L=W)}m5C@x{PS|}62eJ46- zhOzoJp;4>7f1+dgD1ZgjQqQqU&Zr- zFiTi)WJ8h`1&@8VUIOcn1CRs-SbA-jY>ixD9jjBfE$F+3n5%&d)g3Bt&21pVx-~=I zqK7E`FDz(3w_!oY;sj_7L{V;|h>bK_tr=WRK}8iJ^{!U?;B*h7|5<6$6-45R{8*tOi(gRY-R640w%pi$NtZRim_n-u7SZpz zD&$27)kn6v0Mwl3F47)T0Mq zx0M8~mI+}g-rQ~ogGb4vaeE=Gvmc*X7DTDrfM7G*eWuMkZI za^48sfgqqbH}$lB2L-8wxtiAqwL-zu?ZxOyWcUj%}((DCCe%y?}s%ApZpf6a?Amcfbi!f>$H7$V4}4kQrR+M?FFf1wo)5gb0Gm z1%5g~3ZA=u39ny60%bX(6A<*M=uHvmx@P1L)%veFPUp> zxfE(b>W&W+5(7s;3WH2is4f)3dNsE=ed-Kdf!d|ZCghfPdj6dhN^ZrE7>XUmf^c=q#84#0` z_Raj|i+>{*-&1YSbiXfpXZ;U(`5S+#DO)441K>;sxu$|Lw?gUz;--_2YS*Q- z2##4>Ywuz+Z4H%^@y#(+imD6&w(`jE7V9m4X34K^`{|SEHm%)PKM{**J*7)+&pto> zkM}b^;xGTmtn$`k&?pu+%%pdJI?Vlwa;93w6kN4@XA6BNOv(UM*n+eRbDKV>ul9Vf zj80o*=Vl%_Wi0(ZyAbX9!fTsZ^X%?})`hLN6&t$oZd;yl22N!sFpN#7wJyQ#N?!U7 zXI87vCNo2MOZ>Y2N?~558tdm+;MLW5tI2lmMx-G+Z{P4UY|RmNwR<1F_eS6SwRk?= zZs!Kgm9K zS%7Ws`Op9HRrlV^vX60*{imMbrpk)&WrB!cLttT*xH$esjAc#!19He&$3xdO(Ju$5 z^AC#dH~3Xc4!zezmFN&Q<}!xwWqCw~rDrTNSC)TiHH zVUp2hs9$i2Aw#FgpFi>Kx2Jvi{+U^^`nMX49I#5pA_o z)suEc8_~!cSJ-d%n5q8`pjeAGZ|<}=sSq7WzVaU78&!L%cfe07r|&w%zx?Ukm1mDq z)}OrTa&C57(?On2^xpgM`tcW^yHo4cX4oedU!b2wZDd@ZdP&%X9(lNHd_dB1@@2xR z&;HT|58UVQ#k(1w-MiBKwbbfy-{9Y~);>LXauLt-od?&YxYdu296mQn+DHC&YV@)C U*8I=2iyuEe9A)`+aFoIS0iVR*o&W#< literal 0 HcmV?d00001 diff --git a/src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds/ui/select.ogg b/src/main/resources/resourcepacks/legacy_ui_sounds/assets/controllerexpansion/sounds/ui/select.ogg new file mode 100644 index 0000000000000000000000000000000000000000..a0e8791de03a817bfc8e01761523b8f92fe8ac84 GIT binary patch literal 6222 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/resourcepacks/legacy_ui_sounds/assets/minecraft/sounds.json b/src/main/resources/resourcepacks/legacy_ui_sounds/assets/minecraft/sounds.json new file mode 100644 index 0000000..feff6af --- /dev/null +++ b/src/main/resources/resourcepacks/legacy_ui_sounds/assets/minecraft/sounds.json @@ -0,0 +1,6 @@ +{ + "ui.button.click": { + "replace": true, + "sounds": ["random/wood_click"] + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/legacy_ui_sounds/pack.mcmeta b/src/main/resources/resourcepacks/legacy_ui_sounds/pack.mcmeta new file mode 100644 index 0000000..b81fccf --- /dev/null +++ b/src/main/resources/resourcepacks/legacy_ui_sounds/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 9, + "description": "UI sounds from the Legacy Console editions of Minecraft" + } +} \ No newline at end of file