From 456913cea0f0e6a76bf5949fed06f236dbf4cdee Mon Sep 17 00:00:00 2001 From: trunksbomb Date: Tue, 24 Mar 2026 17:41:26 -0400 Subject: [PATCH] initial commit --- .gitattributes | 5 + .github/workflows/build.yml | 30 ++ .gitignore | 41 ++ README.md | 25 ++ TEMPLATE_LICENSE.txt | 24 ++ build.gradle | 192 +++++++++ gradle.properties | 39 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 +++++++++++ gradlew.bat | 94 ++++ settings.gradle | 9 + .../trade/client/TradeClientState.java | 45 ++ .../trunksbomb/trade/client/TradeScreen.java | 311 ++++++++++++++ .../trade/command/TradeCommand.java | 160 +++++++ .../trunksbomb/trade/mod/TradeClientMod.java | 18 + .../com/trunksbomb/trade/mod/TradeMod.java | 46 ++ .../network/DebugTradeControlPayload.java | 31 ++ .../trade/network/TradeActionPayload.java | 32 ++ .../trade/network/TradeClosePayload.java | 31 ++ .../trade/network/TradeNetworking.java | 77 ++++ .../trade/network/TradeStatePayload.java | 28 ++ .../trade/trade/DebugControlAction.java | 11 + .../trade/trade/DebugTradeSession.java | 405 ++++++++++++++++++ .../trunksbomb/trade/trade/TradeAction.java | 9 + .../trunksbomb/trade/trade/TradeEntry.java | 5 + .../trunksbomb/trade/trade/TradeManager.java | 309 +++++++++++++ .../trunksbomb/trade/trade/TradeSession.java | 281 ++++++++++++ .../trunksbomb/trade/trade/TradeStage.java | 6 + .../com/trunksbomb/trade/trade/TradeView.java | 86 ++++ .../resources/assets/trade/lang/en_us.json | 5 + .../assets/trade/textures/gui/trade.png | Bin 0 -> 1552 bytes .../templates/META-INF/neoforge.mods.toml | 95 ++++ 33 files changed, 2708 insertions(+) create mode 100644 .gitattributes create mode 100644 .github/workflows/build.yml create mode 100644 .gitignore create mode 100644 README.md create mode 100644 TEMPLATE_LICENSE.txt 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/com/trunksbomb/trade/client/TradeClientState.java create mode 100644 src/main/java/com/trunksbomb/trade/client/TradeScreen.java create mode 100644 src/main/java/com/trunksbomb/trade/command/TradeCommand.java create mode 100644 src/main/java/com/trunksbomb/trade/mod/TradeClientMod.java create mode 100644 src/main/java/com/trunksbomb/trade/mod/TradeMod.java create mode 100644 src/main/java/com/trunksbomb/trade/network/DebugTradeControlPayload.java create mode 100644 src/main/java/com/trunksbomb/trade/network/TradeActionPayload.java create mode 100644 src/main/java/com/trunksbomb/trade/network/TradeClosePayload.java create mode 100644 src/main/java/com/trunksbomb/trade/network/TradeNetworking.java create mode 100644 src/main/java/com/trunksbomb/trade/network/TradeStatePayload.java create mode 100644 src/main/java/com/trunksbomb/trade/trade/DebugControlAction.java create mode 100644 src/main/java/com/trunksbomb/trade/trade/DebugTradeSession.java create mode 100644 src/main/java/com/trunksbomb/trade/trade/TradeAction.java create mode 100644 src/main/java/com/trunksbomb/trade/trade/TradeEntry.java create mode 100644 src/main/java/com/trunksbomb/trade/trade/TradeManager.java create mode 100644 src/main/java/com/trunksbomb/trade/trade/TradeSession.java create mode 100644 src/main/java/com/trunksbomb/trade/trade/TradeStage.java create mode 100644 src/main/java/com/trunksbomb/trade/trade/TradeView.java create mode 100644 src/main/resources/assets/trade/lang/en_us.json create mode 100644 src/main/resources/assets/trade/textures/gui/trade.png create mode 100644 src/main/templates/META-INF/neoforge.mods.toml diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..b7bbcc4 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +# Disable autocrlf on generated files, they always generate with LF +# Add any extra files or paths here to make git stop saying they +# are changed when only line endings change. +src/generated/**/.cache/* text eol=lf +src/generated/**/*.json text eol=lf diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..b93c3c6 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,30 @@ +name: Build + +on: [push, pull_request] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + fetch-tags: true + + - name: Setup JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + # This is needed to be able to run ./gradlew below + # You can run `git update-index --chmod +x gradlew` then remove this step. + - name: Make Gradle wrapper executable + run: chmod +x ./gradlew + + - name: Build with Gradle + run: ./gradlew build \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d18e332 --- /dev/null +++ b/.gitignore @@ -0,0 +1,41 @@ +### Gradle ### +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/**/build/ + +### IntelliJ IDEA ### +.idea/ +*.iws +*.iml +*.ipr +out/ +!**/src/**/out/ + +.run/ + +### Eclipse ### +.apt_generated +.classpath +.eclipse/ +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/**/bin/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store + +### Minecraft Modding ### +run/ +!**/src/**/run/ +**/src/generated/**/.cache/ +repo/ +!**/src/**/repo/ +/.gradle-user-home/ diff --git a/README.md b/README.md new file mode 100644 index 0000000..b421122 --- /dev/null +++ b/README.md @@ -0,0 +1,25 @@ + +Installation information +======= + +This template repository can be directly cloned to get you started with a new +mod. Simply create a new repository cloned from this one, by following the +instructions provided by [GitHub](https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template). + +Once you have your clone, simply open the repository in the IDE of your choice. The usual recommendation for an IDE is either IntelliJ IDEA or Eclipse. + +If at any point you are missing libraries in your IDE, or you've run into problems you can +run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything +{this does not affect your code} and then start the process again. + +Mapping Names: +============ +By default, the MDK is configured to use the official mapping names from Mojang for methods and fields +in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this +license. For the latest license text, refer to the mapping file itself, or the reference copy here: +https://github.com/NeoForged/NeoForm/blob/main/Mojang.md + +Additional Resources: +========== +Community Documentation: https://docs.neoforged.net/ +NeoForged Discord: https://discord.neoforged.net/ diff --git a/TEMPLATE_LICENSE.txt b/TEMPLATE_LICENSE.txt new file mode 100644 index 0000000..b64bc64 --- /dev/null +++ b/TEMPLATE_LICENSE.txt @@ -0,0 +1,24 @@ +MIT License + +Copyright (c) 2023 NeoForged project + +This license applies to the template files as supplied by github.com/NeoForged/MDK + + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..e4b0e34 --- /dev/null +++ b/build.gradle @@ -0,0 +1,192 @@ +plugins { + id 'java-library' + id 'maven-publish' + id 'net.neoforged.moddev' version '2.0.140' + id 'idea' +} + +tasks.named('wrapper', Wrapper).configure { + // Define wrapper values here so as to not have to always do so when updating gradlew.properties. + // Switching this to Wrapper.DistributionType.ALL will download the full gradle sources that comes with + // documentation attached on cursor hover of gradle classes and methods. However, this comes with increased + // file size for Gradle. If you do switch this to ALL, run the Gradle wrapper task twice afterwards. + // (Verify by checking gradle/wrapper/gradle-wrapper.properties to see if distributionUrl now points to `-all`) + distributionType = Wrapper.DistributionType.BIN +} + +version = mod_version +group = mod_group_id + +sourceSets.main.resources { + // Include resources generated by data generators. + srcDir('src/generated/resources') + + // Exclude common development only resources from finalized outputs + exclude("**/*.bbmodel") // BlockBench project files + exclude("src/generated/**/.cache") // datagen cache files +} + +repositories { + // Add here additional repositories if required by some of the dependencies below. +} + +base { + archivesName = mod_id +} + +// Mojang ships Java 21 to end users in 1.21.1, so mods should target Java 21. +java.toolchain.languageVersion = JavaLanguageVersion.of(21) + +neoForge { + // Specify the version of NeoForge to use. + version = project.neo_version + + parchment { + mappingsVersion = project.parchment_mappings_version + minecraftVersion = project.parchment_minecraft_version + } + + // This line is optional. Access Transformers are automatically detected + // accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg') + + // Default run configurations. + // These can be tweaked, removed, or duplicated as needed. + runs { + client { + client() + + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + server { + server() + programArgument '--nogui' + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + // This run config launches GameTestServer and runs all registered gametests, then exits. + // By default, the server will crash when no gametests are provided. + // The gametest system is also enabled by default for other run configs under the /test command. + gameTestServer { + type = "gameTestServer" + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + data { + data() + + // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it + // gameDirectory = project.file('run-data') + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + } + + // applies to all the run configs above + configureEach { + // Recommended logging data for a userdev environment + // The markers can be added/remove as needed separated by commas. + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + systemProperty 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + logLevel = org.slf4j.event.Level.DEBUG + } + } + + mods { + // define mod <-> source bindings + // these are used to tell the game which sources are for which mod + // multi mod projects should define one per mod + "${mod_id}" { + sourceSet(sourceSets.main) + } + } +} + +// Sets up a dependency configuration called 'localRuntime'. +// This configuration should be used instead of 'runtimeOnly' to declare +// a dependency that will be present for runtime testing but that is +// "optional", meaning it will not be pulled by dependents of this mod. +configurations { + runtimeClasspath.extendsFrom localRuntime +} + +dependencies { + // Example optional mod dependency with JEI + // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime + // compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}" + // compileOnly "mezz.jei:jei-${mc_version}-neoforge-api:${jei_version}" + // We add the full version to localRuntime, not runtimeOnly, so that we do not publish a dependency on it + // localRuntime "mezz.jei:jei-${mc_version}-neoforge:${jei_version}" + + // Example mod dependency using a mod jar from ./libs with a flat dir repository + // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar + // The group id is ignored when searching -- in this case, it is "blank" + // implementation "blank:coolmod-${mc_version}:${coolmod_version}" + + // Example mod dependency using a file as dependency + // implementation files("libs/coolmod-${mc_version}-${coolmod_version}.jar") + + // Example project dependency using a sister or child project: + // implementation project(":myproject") + + // For more info: + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html +} + +// This block of code expands all declared replace properties in the specified resource targets. +// A missing property will result in an error. Properties are expanded using ${} Groovy notation. +var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) { + var replaceProperties = [ + minecraft_version : minecraft_version, + minecraft_version_range: minecraft_version_range, + neo_version : neo_version, + loader_version_range : loader_version_range, + mod_id : mod_id, + mod_name : mod_name, + mod_license : mod_license, + mod_version : mod_version, + ] + inputs.properties replaceProperties + expand replaceProperties + from "src/main/templates" + into "build/generated/sources/modMetadata" +} +// Include the output of "generateModMetadata" as an input directory for the build +// this works with both building through Gradle and the IDE. +sourceSets.main.resources.srcDir generateModMetadata +// To avoid having to run "generateModMetadata" manually, make it run on every project reload +neoForge.ideSyncTask generateModMetadata + +// Example configuration to allow publishing using the maven-publish plugin +publishing { + publications { + register('mavenJava', MavenPublication) { + from components.java + } + } + repositories { + maven { + url "file://${project.projectDir}/repo" + } + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} + +// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior. +idea { + module { + downloadSources = true + downloadJavadoc = true + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..5c1229f --- /dev/null +++ b/gradle.properties @@ -0,0 +1,39 @@ +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +org.gradle.jvmargs=-Xmx1G +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true + +#read more on this at https://github.com/neoforged/ModDevGradle?tab=readme-ov-file#better-minecraft-parameter-names--javadoc-parchment +# you can also find the latest versions at: https://parchmentmc.org/docs/getting-started +parchment_minecraft_version=1.21.1 +parchment_mappings_version=2024.11.17 +# Environment Properties +# You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge +# The Minecraft version must agree with the Neo version to get a valid artifact +minecraft_version=1.21.1 +# The Minecraft version range can use any release version of Minecraft as bounds. +# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly +# as they do not follow standard versioning conventions. +minecraft_version_range=[1.21.1] +# The Neo version must agree with the Minecraft version to get a valid artifact +neo_version=21.1.220 +# The loader version range can only use the major version of FML as bounds +loader_version_range=[1,) + +## Mod Properties + +# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} +# Must match the String constant located in the main mod class annotated with @Mod. +mod_id=trade +# The human-readable display name for the mod. +mod_name=Trading Screen +# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. +mod_license=All Rights Reserved +# The mod version. See https://semver.org/ +mod_version=1.0.0 +# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. +# This should match the base package used for the mod sources. +# See https://maven.apache.org/guides/mini/guide-naming-conventions.html +mod_group_id=com.trunksbomb.trade diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846 GIT binary patch literal 43764 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +: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..7a488e3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,9 @@ +pluginManagement { + repositories { + gradlePluginPortal() + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' +} diff --git a/src/main/java/com/trunksbomb/trade/client/TradeClientState.java b/src/main/java/com/trunksbomb/trade/client/TradeClientState.java new file mode 100644 index 0000000..a8cd677 --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/client/TradeClientState.java @@ -0,0 +1,45 @@ +package com.trunksbomb.trade.mod.client; + +import com.trunksbomb.trade.mod.trade.TradeView; +import java.util.UUID; +import net.minecraft.client.Minecraft; +import net.minecraft.network.chat.Component; + +public final class TradeClientState { + private static Minecraft minecraft; + + private TradeClientState() {} + + public static void init(Minecraft minecraftInstance) { + minecraft = minecraftInstance; + } + + public static Minecraft minecraft() { + return minecraft; + } + + public static void showOrUpdate(Minecraft minecraftInstance, TradeView view) { + minecraft = minecraftInstance; + if (minecraft.screen instanceof TradeScreen screen && screen.sessionId().equals(view.sessionId())) { + screen.updateView(view); + return; + } + + if (minecraft.player == null) { + return; + } + + minecraft.setScreen(new TradeScreen(new TradeScreen.TradeMenu(0, minecraft.player.getInventory(), view), minecraft.player.getInventory(), Component.literal("Trade"))); + } + + public static void closeTrade(Minecraft minecraftInstance, UUID sessionId, Component reason) { + minecraft = minecraftInstance; + if (minecraft.screen instanceof TradeScreen screen && screen.sessionId().equals(sessionId)) { + minecraft.setScreen(null); + } + + if (minecraft.player != null) { + minecraft.player.displayClientMessage(reason, false); + } + } +} diff --git a/src/main/java/com/trunksbomb/trade/client/TradeScreen.java b/src/main/java/com/trunksbomb/trade/client/TradeScreen.java new file mode 100644 index 0000000..b29704e --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/client/TradeScreen.java @@ -0,0 +1,311 @@ +package com.trunksbomb.trade.mod.client; + +import com.trunksbomb.trade.mod.network.TradeActionPayload; +import com.trunksbomb.trade.mod.network.DebugTradeControlPayload; +import com.trunksbomb.trade.mod.trade.DebugControlAction; +import com.trunksbomb.trade.mod.trade.TradeAction; +import com.trunksbomb.trade.mod.trade.TradeStage; +import com.trunksbomb.trade.mod.trade.TradeView; +import java.util.UUID; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.Container; +import net.minecraft.world.SimpleContainer; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.ClickType; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.inventory.Slot; +import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.network.PacketDistributor; + +public class TradeScreen extends AbstractContainerScreen { + private static final ResourceLocation TEXTURE = ResourceLocation.fromNamespaceAndPath("trade", "textures/gui/trade.png"); + private static final int LEFT_OFFER_START_X = 8; + private static final int RIGHT_OFFER_START_X = 170; + private static final int OFFER_START_Y = 18; + private static final int INVENTORY_START_X = 62; + private static final int INVENTORY_START_Y = 139; + private static final int CENTER_COLUMN_X = 115; + private static final int STATUS_LABEL_Y = 54; + private static final int ACCEPT_BUTTON_Y = 74; + private static final int CANCEL_BUTTON_Y = 98; + private static final int ACTION_BUTTON_WIDTH = 48; + private static final int ACTION_BUTTON_HEIGHT = 20; + private static final int DEBUG_PANEL_OFFSET_X = 96; + private static final int DEBUG_BUTTON_WIDTH = 86; + private static final int DEBUG_BUTTON_HEIGHT = 20; + private static final int DEBUG_BUTTON_GAP = 4; + private static final int CONFIRM_PANEL_X = 89; + private static final int CONFIRM_PANEL_Y = 77; + private static final int CONFIRM_PANEL_WIDTH = 106; + private static final int CONFIRM_PANEL_HEIGHT = 64; + + public TradeScreen(TradeMenu menu, Inventory inventory, Component title) { + super(menu, inventory, title); + this.imageWidth = 284; + this.imageHeight = 221; + this.inventoryLabelX = INVENTORY_START_X; + this.inventoryLabelY = INVENTORY_START_Y - 11; + } + + public UUID sessionId() { + return menu.view().sessionId(); + } + + public void updateView(TradeView view) { + menu.updateView(view); + } + + @Override + protected void init() { + super.init(); + titleLabelX = LEFT_OFFER_START_X; + titleLabelY = 6; + + addRenderableWidget(Button.builder(Component.literal("Accept"), button -> sendAction(TradeAction.ACCEPT, -1, false)) + .bounds(leftPos + CENTER_COLUMN_X + 3, topPos + ACCEPT_BUTTON_Y, ACTION_BUTTON_WIDTH, ACTION_BUTTON_HEIGHT) + .build()); + addRenderableWidget(Button.builder(Component.literal("Cancel"), button -> sendAction(TradeAction.DECLINE, -1, false)) + .bounds(leftPos + CENTER_COLUMN_X + 3, topPos + CANCEL_BUTTON_Y, ACTION_BUTTON_WIDTH, ACTION_BUTTON_HEIGHT) + .build()); + + if (menu.view().debugMode()) { + int debugX = leftPos - DEBUG_PANEL_OFFSET_X; + int debugY = topPos + 8; + addRenderableWidget(Button.builder(Component.literal("Debug Accept"), button -> sendDebug(DebugControlAction.ACCEPT)) + .bounds(debugX, debugY, DEBUG_BUTTON_WIDTH, DEBUG_BUTTON_HEIGHT) + .build()); + addRenderableWidget(Button.builder(Component.literal("Debug Cancel"), button -> sendDebug(DebugControlAction.CANCEL)) + .bounds(debugX, debugY + (DEBUG_BUTTON_HEIGHT + DEBUG_BUTTON_GAP), DEBUG_BUTTON_WIDTH, DEBUG_BUTTON_HEIGHT) + .build()); + addRenderableWidget(Button.builder(Component.literal("Add Random"), button -> sendDebug(DebugControlAction.APPEND_RANDOM)) + .bounds(debugX, debugY + 2 * (DEBUG_BUTTON_HEIGHT + DEBUG_BUTTON_GAP), DEBUG_BUTTON_WIDTH, DEBUG_BUTTON_HEIGHT) + .build()); + addRenderableWidget(Button.builder(Component.literal("Remove Item"), button -> sendDebug(DebugControlAction.REMOVE_LAST)) + .bounds(debugX, debugY + 3 * (DEBUG_BUTTON_HEIGHT + DEBUG_BUTTON_GAP), DEBUG_BUTTON_WIDTH, DEBUG_BUTTON_HEIGHT) + .build()); + } + } + + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + if (minecraft != null && minecraft.options.keyInventory.matches(keyCode, scanCode)) { + onClose(); + return true; + } + return super.keyPressed(keyCode, scanCode, modifiers); + } + + @Override + public void onClose() { + sendAction(TradeAction.CLOSE, -1, false); + if (minecraft != null) { + minecraft.setScreen(null); + } + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (menu.view().stage() == TradeStage.CONFIRMING) { + return super.mouseClicked(mouseX, mouseY, button); + } + + if (hoveredSlot instanceof SelfOfferSlot selfOfferSlot) { + sendAction(TradeAction.REMOVE_ITEM, selfOfferSlot.offerIndex(), button == 1); + return true; + } + + if (hoveredSlot instanceof OtherOfferSlot) { + return true; + } + + if (hoveredSlot != null && hoveredSlot.container == menu.playerInventory()) { + sendAction(TradeAction.ADD_ITEM, hoveredSlot.getSlotIndex(), button == 1); + return true; + } + + return super.mouseClicked(mouseX, mouseY, button); + } + + @Override + protected void renderBg(GuiGraphics guiGraphics, float partialTick, int mouseX, int mouseY) { + guiGraphics.blit(TEXTURE, leftPos, topPos, 0, 0, imageWidth, imageHeight, imageWidth, imageHeight); + if (menu.view().stage() == TradeStage.CONFIRMING) { + renderConfirmationOverlay(guiGraphics); + } + } + + @Override + protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { + guiGraphics.drawString(font, menu.view().selfName(), titleLabelX, titleLabelY, 0x404040, false); + guiGraphics.drawString(font, menu.view().otherName(), RIGHT_OFFER_START_X, 6, 0x404040, false); + guiGraphics.drawString(font, playerInventoryTitle, inventoryLabelX, inventoryLabelY, 0x404040, false); + if (menu.view().otherAccepted()) { + drawScaledCenteredColumnText(guiGraphics, "Other player", STATUS_LABEL_Y, 0x2E7D32, 0.7F); + drawScaledCenteredColumnText(guiGraphics, "has accepted", STATUS_LABEL_Y + 7, 0x2E7D32, 0.7F); + } + if (menu.view().stage() == TradeStage.CONFIRMING) { + drawCenteredColumnText(guiGraphics, "FINAL", 16, 0x7A4F00); + drawCenteredColumnText(guiGraphics, "CONFIRM", 28, 0x7A4F00); + } + } + + @Override + public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { + super.render(guiGraphics, mouseX, mouseY, partialTick); + renderTooltip(guiGraphics, mouseX, mouseY); + } + + private void sendAction(TradeAction action, int slot, boolean secondary) { + if (minecraft == null || minecraft.getConnection() == null) { + return; + } + PacketDistributor.sendToServer(new TradeActionPayload(menu.view().sessionId(), action, slot, secondary)); + } + + private void sendDebug(DebugControlAction action) { + if (minecraft == null || minecraft.getConnection() == null) { + return; + } + PacketDistributor.sendToServer(new DebugTradeControlPayload(menu.view().sessionId(), action, "")); + } + + private void renderConfirmationOverlay(GuiGraphics guiGraphics) { + int panelLeft = leftPos + CONFIRM_PANEL_X; + int panelTop = topPos + CONFIRM_PANEL_Y; + guiGraphics.fill(leftPos, topPos, leftPos + imageWidth, topPos + imageHeight, 0x22000000); + guiGraphics.fill(panelLeft, panelTop, panelLeft + CONFIRM_PANEL_WIDTH, panelTop + CONFIRM_PANEL_HEIGHT, 0xDDF7D48C); + guiGraphics.fill(panelLeft + 1, panelTop + 1, panelLeft + CONFIRM_PANEL_WIDTH - 1, panelTop + CONFIRM_PANEL_HEIGHT - 1, 0xAAFFF4D6); + guiGraphics.drawString(font, Component.literal("Confirm Trade"), panelLeft + 11, panelTop + 9, 0x5B3A00, false); + guiGraphics.drawString(font, Component.literal("Review items"), panelLeft + 18, panelTop + 24, 0x5B3A00, false); + guiGraphics.drawString(font, Component.literal("No more changes"), panelLeft + 9, panelTop + 36, 0x5B3A00, false); + } + + private void drawCenteredColumnText(GuiGraphics guiGraphics, String text, int y, int color) { + int textX = CENTER_COLUMN_X + (ACTION_BUTTON_WIDTH / 2) - (font.width(text) / 2); + guiGraphics.drawString(font, text, textX, y, color, false); + } + + private void drawScaledCenteredColumnText(GuiGraphics guiGraphics, String text, int y, int color, float scale) { + var pose = guiGraphics.pose(); + pose.pushPose(); + pose.scale(scale, scale, 1.0F); + float scaledCenterX = CENTER_COLUMN_X + 3 + (ACTION_BUTTON_WIDTH / 2.0F); + float drawX = (scaledCenterX - (font.width(text) * scale / 2.0F)) / scale; + float drawY = y / scale; + guiGraphics.drawString(font, text, (int) drawX, (int) drawY, color, false); + pose.popPose(); + } + + public static class TradeMenu extends AbstractContainerMenu { + private static final int OFFER_COLUMNS = 6; + private static final int OFFER_ROWS = 6; + private TradeView view; + private final Inventory playerInventory; + private final SimpleContainer selfOffer = new SimpleContainer(TradeView.OFFER_SLOT_COUNT); + private final SimpleContainer otherOffer = new SimpleContainer(TradeView.OFFER_SLOT_COUNT); + + public TradeMenu(int containerId, Inventory inventory, TradeView view) { + super(MenuType.GENERIC_9x6, containerId); + this.playerInventory = inventory; + this.view = view; + syncOfferContainers(); + + for (int row = 0; row < OFFER_ROWS; row++) { + for (int col = 0; col < OFFER_COLUMNS; col++) { + int slot = col + row * OFFER_COLUMNS; + addSlot(new SelfOfferSlot(selfOffer, slot, LEFT_OFFER_START_X + col * 18, OFFER_START_Y + row * 18)); + } + } + + for (int row = 0; row < OFFER_ROWS; row++) { + for (int col = 0; col < OFFER_COLUMNS; col++) { + int slot = col + row * OFFER_COLUMNS; + addSlot(new OtherOfferSlot(otherOffer, slot, RIGHT_OFFER_START_X + col * 18, OFFER_START_Y + row * 18)); + } + } + + for (int row = 0; row < 3; row++) { + for (int col = 0; col < 9; col++) { + int slot = col + row * 9 + 9; + addSlot(new Slot(inventory, slot, INVENTORY_START_X + col * 18, INVENTORY_START_Y + row * 18)); + } + } + + for (int col = 0; col < 9; col++) { + addSlot(new Slot(inventory, col, INVENTORY_START_X + col * 18, INVENTORY_START_Y + 58)); + } + } + + public TradeView view() { + return view; + } + + public Inventory playerInventory() { + return playerInventory; + } + + public void updateView(TradeView view) { + this.view = view; + syncOfferContainers(); + } + + private void syncOfferContainers() { + for (int i = 0; i < TradeView.OFFER_SLOT_COUNT; i++) { + selfOffer.setItem(i, view.selfOffer().get(i).copy()); + otherOffer.setItem(i, view.otherOffer().get(i).copy()); + } + } + + @Override + public void clicked(int slotId, int button, ClickType clickType, Player player) { + // All interaction is routed through custom trade packets instead of vanilla container clicks. + } + + @Override + public ItemStack quickMoveStack(Player player, int index) { + return ItemStack.EMPTY; + } + + @Override + public boolean stillValid(Player player) { + return true; + } + } + + private static class SelfOfferSlot extends Slot { + public SelfOfferSlot(Container container, int slot, int x, int y) { + super(container, slot, x, y); + } + + public int offerIndex() { + return getSlotIndex(); + } + + @Override + public boolean mayPlace(ItemStack stack) { + return false; + } + } + + private static class OtherOfferSlot extends Slot { + public OtherOfferSlot(Container container, int slot, int x, int y) { + super(container, slot, x, y); + } + + @Override + public boolean mayPickup(Player player) { + return false; + } + + @Override + public boolean mayPlace(ItemStack stack) { + return false; + } + } +} diff --git a/src/main/java/com/trunksbomb/trade/command/TradeCommand.java b/src/main/java/com/trunksbomb/trade/command/TradeCommand.java new file mode 100644 index 0000000..f115b3e --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/command/TradeCommand.java @@ -0,0 +1,160 @@ +package com.trunksbomb.trade.mod.command; + +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.suggestion.SuggestionsBuilder; +import com.trunksbomb.trade.mod.trade.DebugTradeSession; +import com.trunksbomb.trade.mod.trade.TradeManager; +import java.util.concurrent.CompletableFuture; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; + +public final class TradeCommand { + private TradeCommand() {} + + public static void register(CommandDispatcher dispatcher) { + dispatcher.register(Commands.literal("trade") + .then(Commands.literal("debug") + .then(Commands.literal("init").executes(context -> initDebug(context.getSource()))) + .then(Commands.literal("offer") + .then(Commands.argument("spec", StringArgumentType.greedyString()) + .executes(context -> setDebugOffer( + context.getSource(), + StringArgumentType.getString(context, "spec"))))) + .then(Commands.literal("remove") + .then(Commands.argument("spec", StringArgumentType.greedyString()) + .executes(context -> removeDebugOffer( + context.getSource(), + StringArgumentType.getString(context, "spec"))))) + .then(Commands.literal("accept").executes(context -> acceptDebug(context.getSource()))) + .then(Commands.literal("cancel").executes(context -> cancelDebug(context.getSource()))) + .then(Commands.literal("close").executes(context -> closeDebug(context.getSource())))) + .then(Commands.argument("player", StringArgumentType.word()) + .suggests((context, builder) -> suggestPlayers(context.getSource(), builder)) + .executes(context -> startTrade(context.getSource(), StringArgumentType.getString(context, "player"))))); + } + + private static CompletableFuture suggestPlayers(CommandSourceStack source, SuggestionsBuilder builder) { + for (ServerPlayer player : source.getServer().getPlayerList().getPlayers()) { + if (!player.getGameProfile().getName().equalsIgnoreCase(source.getTextName())) { + builder.suggest(player.getGameProfile().getName()); + } + } + return builder.buildFuture(); + } + + private static int startTrade(CommandSourceStack source, String targetName) { + if (!(source.getEntity() instanceof ServerPlayer player)) { + source.sendFailure(Component.literal("Only players can start trades.")); + return 0; + } + + ServerPlayer target = source.getServer().getPlayerList().getPlayerByName(targetName); + if (target == null) { + source.sendFailure(Component.literal("That player is not online.")); + return 0; + } + + if (target == player) { + source.sendFailure(Component.literal("You cannot trade with yourself.")); + return 0; + } + + if (!TradeManager.get(source.getServer()).startTrade(player, target)) { + source.sendFailure(Component.literal("Trade could not be started. One of you is already trading.")); + return 0; + } + + source.sendSuccess(() -> Component.literal("Trade opened with " + target.getGameProfile().getName() + "."), false); + return 1; + } + + private static int initDebug(CommandSourceStack source) { + if (!(source.getEntity() instanceof ServerPlayer player)) { + source.sendFailure(Component.literal("Only players can start debug trades.")); + return 0; + } + + if (!TradeManager.get(source.getServer()).initDebugTrade(player)) { + source.sendFailure(Component.literal("You are already in a trade.")); + return 0; + } + + source.sendSuccess(() -> Component.literal("Debug trade initialized."), false); + return 1; + } + + private static int setDebugOffer(CommandSourceStack source, String spec) { + if (!(source.getEntity() instanceof ServerPlayer player)) { + source.sendFailure(Component.literal("Only players can control debug trades.")); + return 0; + } + + try { + if (!TradeManager.get(source.getServer()).setDebugOffer(player, DebugTradeSession.parseOfferSpec(spec))) { + source.sendFailure(Component.literal("Start a debug trade first with /trade debug init.")); + return 0; + } + } catch (IllegalArgumentException exception) { + source.sendFailure(Component.literal(exception.getMessage())); + return 0; + } + + source.sendSuccess(() -> Component.literal("Debug offer updated."), false); + return 1; + } + + private static int acceptDebug(CommandSourceStack source) { + return runDebugAction(source, TradeManager.get(source.getServer())::acceptDebug, "Debug trader accepted."); + } + + private static int removeDebugOffer(CommandSourceStack source, String spec) { + if (!(source.getEntity() instanceof ServerPlayer player)) { + source.sendFailure(Component.literal("Only players can control debug trades.")); + return 0; + } + + try { + int result = TradeManager.get(source.getServer()).removeDebugOffer(player, spec); + if (result < 0) { + source.sendFailure(Component.literal("Start a debug trade first with /trade debug init.")); + return 0; + } + if (result == 0) { + source.sendFailure(Component.literal("That debug offer slot is already empty.")); + return 0; + } + } catch (IllegalArgumentException exception) { + source.sendFailure(Component.literal(exception.getMessage())); + return 0; + } + + source.sendSuccess(() -> Component.literal("Debug offer updated."), false); + return 1; + } + + private static int cancelDebug(CommandSourceStack source) { + return runDebugAction(source, TradeManager.get(source.getServer())::cancelDebug, "Debug trader cancelled."); + } + + private static int closeDebug(CommandSourceStack source) { + return runDebugAction(source, TradeManager.get(source.getServer())::closeDebug, "Debug trade closed."); + } + + private static int runDebugAction(CommandSourceStack source, java.util.function.Predicate action, String successMessage) { + if (!(source.getEntity() instanceof ServerPlayer player)) { + source.sendFailure(Component.literal("Only players can control debug trades.")); + return 0; + } + + if (!action.test(player)) { + source.sendFailure(Component.literal("Start a debug trade first with /trade debug init.")); + return 0; + } + + source.sendSuccess(() -> Component.literal(successMessage), false); + return 1; + } +} diff --git a/src/main/java/com/trunksbomb/trade/mod/TradeClientMod.java b/src/main/java/com/trunksbomb/trade/mod/TradeClientMod.java new file mode 100644 index 0000000..999fc38 --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/mod/TradeClientMod.java @@ -0,0 +1,18 @@ +package com.trunksbomb.trade.mod; + +import com.trunksbomb.trade.mod.client.TradeClientState; +import net.minecraft.client.Minecraft; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.fml.common.Mod; +import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; + +@Mod(value = TradeMod.MODID, dist = Dist.CLIENT) +@EventBusSubscriber(modid = TradeMod.MODID, value = Dist.CLIENT) +public class TradeClientMod { + @SubscribeEvent + static void onClientSetup(FMLClientSetupEvent event) { + event.enqueueWork(() -> TradeClientState.init(Minecraft.getInstance())); + } +} diff --git a/src/main/java/com/trunksbomb/trade/mod/TradeMod.java b/src/main/java/com/trunksbomb/trade/mod/TradeMod.java new file mode 100644 index 0000000..434f10d --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/mod/TradeMod.java @@ -0,0 +1,46 @@ +package com.trunksbomb.trade.mod; + +import com.mojang.logging.LogUtils; +import com.trunksbomb.trade.mod.command.TradeCommand; +import com.trunksbomb.trade.mod.network.TradeNetworking; +import com.trunksbomb.trade.mod.trade.TradeManager; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.common.Mod; +import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; +import net.neoforged.neoforge.common.NeoForge; +import net.neoforged.neoforge.event.RegisterCommandsEvent; +import net.neoforged.neoforge.event.entity.player.PlayerEvent; +import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; +import org.slf4j.Logger; + +@Mod(TradeMod.MODID) +public class TradeMod { + public static final String MODID = "trade"; + public static final Logger LOGGER = LogUtils.getLogger(); + + public TradeMod(IEventBus modEventBus) { + modEventBus.addListener(this::commonSetup); + modEventBus.addListener(this::registerPayloads); + NeoForge.EVENT_BUS.addListener(this::registerCommands); + NeoForge.EVENT_BUS.addListener(this::onPlayerLogout); + } + + private void commonSetup(FMLCommonSetupEvent event) { + LOGGER.info("Initializing trading screen"); + } + + private void registerPayloads(RegisterPayloadHandlersEvent event) { + TradeNetworking.register(event.registrar("1")); + } + + public void registerCommands(RegisterCommandsEvent event) { + LOGGER.info("Registering /trade command"); + TradeCommand.register(event.getDispatcher()); + } + + public void onPlayerLogout(PlayerEvent.PlayerLoggedOutEvent event) { + if (event.getEntity() instanceof net.minecraft.server.level.ServerPlayer player) { + TradeManager.get(player.server).handleDisconnect(player); + } + } +} diff --git a/src/main/java/com/trunksbomb/trade/network/DebugTradeControlPayload.java b/src/main/java/com/trunksbomb/trade/network/DebugTradeControlPayload.java new file mode 100644 index 0000000..16e3dea --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/network/DebugTradeControlPayload.java @@ -0,0 +1,31 @@ +package com.trunksbomb.trade.mod.network; + +import com.trunksbomb.trade.mod.TradeMod; +import com.trunksbomb.trade.mod.trade.DebugControlAction; +import java.util.UUID; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.ResourceLocation; + +public record DebugTradeControlPayload(UUID sessionId, DebugControlAction action, String spec) implements CustomPacketPayload { + public static final Type TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(TradeMod.MODID, "debug_trade_control")); + public static final StreamCodec STREAM_CODEC = new StreamCodec<>() { + @Override + public void encode(RegistryFriendlyByteBuf buf, DebugTradeControlPayload value) { + buf.writeUUID(value.sessionId()); + buf.writeEnum(value.action()); + buf.writeUtf(value.spec(), 256); + } + + @Override + public DebugTradeControlPayload decode(RegistryFriendlyByteBuf buf) { + return new DebugTradeControlPayload(buf.readUUID(), buf.readEnum(DebugControlAction.class), buf.readUtf(256)); + } + }; + + @Override + public Type type() { + return TYPE; + } +} diff --git a/src/main/java/com/trunksbomb/trade/network/TradeActionPayload.java b/src/main/java/com/trunksbomb/trade/network/TradeActionPayload.java new file mode 100644 index 0000000..0b3c974 --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/network/TradeActionPayload.java @@ -0,0 +1,32 @@ +package com.trunksbomb.trade.mod.network; + +import com.trunksbomb.trade.mod.TradeMod; +import com.trunksbomb.trade.mod.trade.TradeAction; +import java.util.UUID; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.ResourceLocation; + +public record TradeActionPayload(UUID sessionId, TradeAction action, int slot, boolean secondary) implements CustomPacketPayload { + public static final Type TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(TradeMod.MODID, "trade_action")); + public static final StreamCodec STREAM_CODEC = new StreamCodec<>() { + @Override + public void encode(RegistryFriendlyByteBuf buf, TradeActionPayload value) { + buf.writeUUID(value.sessionId); + buf.writeEnum(value.action); + buf.writeVarInt(value.slot); + buf.writeBoolean(value.secondary); + } + + @Override + public TradeActionPayload decode(RegistryFriendlyByteBuf buf) { + return new TradeActionPayload(buf.readUUID(), buf.readEnum(TradeAction.class), buf.readVarInt(), buf.readBoolean()); + } + }; + + @Override + public Type type() { + return TYPE; + } +} diff --git a/src/main/java/com/trunksbomb/trade/network/TradeClosePayload.java b/src/main/java/com/trunksbomb/trade/network/TradeClosePayload.java new file mode 100644 index 0000000..b9ca54a --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/network/TradeClosePayload.java @@ -0,0 +1,31 @@ +package com.trunksbomb.trade.mod.network; + +import com.trunksbomb.trade.mod.TradeMod; +import java.util.UUID; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.ComponentSerialization; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.ResourceLocation; + +public record TradeClosePayload(UUID sessionId, Component reason) implements CustomPacketPayload { + public static final Type TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(TradeMod.MODID, "trade_close")); + public static final StreamCodec STREAM_CODEC = new StreamCodec<>() { + @Override + public void encode(RegistryFriendlyByteBuf buf, TradeClosePayload value) { + buf.writeUUID(value.sessionId); + ComponentSerialization.STREAM_CODEC.encode(buf, value.reason); + } + + @Override + public TradeClosePayload decode(RegistryFriendlyByteBuf buf) { + return new TradeClosePayload(buf.readUUID(), ComponentSerialization.STREAM_CODEC.decode(buf)); + } + }; + + @Override + public Type type() { + return TYPE; + } +} diff --git a/src/main/java/com/trunksbomb/trade/network/TradeNetworking.java b/src/main/java/com/trunksbomb/trade/network/TradeNetworking.java new file mode 100644 index 0000000..61e21be --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/network/TradeNetworking.java @@ -0,0 +1,77 @@ +package com.trunksbomb.trade.mod.network; + +import com.trunksbomb.trade.mod.client.TradeScreen; +import com.trunksbomb.trade.mod.trade.TradeManager; +import net.minecraft.client.Minecraft; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.neoforged.neoforge.network.handling.DirectionalPayloadHandler; +import net.neoforged.neoforge.network.handling.IPayloadContext; +import net.neoforged.neoforge.network.registration.PayloadRegistrar; + +public final class TradeNetworking { + private TradeNetworking() {} + + public static void register(PayloadRegistrar registrar) { + registrar.playBidirectional( + TradeStatePayload.TYPE, + TradeStatePayload.STREAM_CODEC, + new DirectionalPayloadHandler<>(TradeNetworking::handleTradeStateClient, TradeNetworking::ignoreTradeStateServer)); + registrar.playBidirectional( + TradeClosePayload.TYPE, + TradeClosePayload.STREAM_CODEC, + new DirectionalPayloadHandler<>(TradeNetworking::handleTradeCloseClient, TradeNetworking::ignoreTradeCloseServer)); + registrar.playToServer( + TradeActionPayload.TYPE, + TradeActionPayload.STREAM_CODEC, + TradeNetworking::handleTradeActionServer); + registrar.playToServer( + DebugTradeControlPayload.TYPE, + DebugTradeControlPayload.STREAM_CODEC, + TradeNetworking::handleDebugTradeControlServer); + } + + private static void handleTradeStateClient(TradeStatePayload payload, IPayloadContext context) { + Minecraft minecraft = Minecraft.getInstance(); + if (minecraft.player == null) { + return; + } + + if (minecraft.screen instanceof TradeScreen screen && screen.sessionId().equals(payload.view().sessionId())) { + screen.updateView(payload.view()); + return; + } + + minecraft.setScreen(new TradeScreen( + new TradeScreen.TradeMenu(0, minecraft.player.getInventory(), payload.view()), + minecraft.player.getInventory(), + Component.literal("Trade"))); + } + + private static void handleTradeCloseClient(TradeClosePayload payload, IPayloadContext context) { + Minecraft minecraft = Minecraft.getInstance(); + if (minecraft.screen instanceof TradeScreen screen && screen.sessionId().equals(payload.sessionId())) { + minecraft.setScreen(null); + } + + if (minecraft.player != null) { + minecraft.player.displayClientMessage(payload.reason(), false); + } + } + + private static void handleTradeActionServer(TradeActionPayload payload, IPayloadContext context) { + if (context.player() instanceof ServerPlayer player) { + TradeManager.get(player.server).handleAction(player, payload.sessionId(), payload.action(), payload.slot(), payload.secondary()); + } + } + + private static void handleDebugTradeControlServer(DebugTradeControlPayload payload, IPayloadContext context) { + if (context.player() instanceof ServerPlayer player) { + TradeManager.get(player.server).handleDebugControl(player, payload.sessionId(), payload.action(), payload.spec()); + } + } + + private static void ignoreTradeStateServer(TradeStatePayload payload, IPayloadContext context) {} + + private static void ignoreTradeCloseServer(TradeClosePayload payload, IPayloadContext context) {} +} diff --git a/src/main/java/com/trunksbomb/trade/network/TradeStatePayload.java b/src/main/java/com/trunksbomb/trade/network/TradeStatePayload.java new file mode 100644 index 0000000..2b88930 --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/network/TradeStatePayload.java @@ -0,0 +1,28 @@ +package com.trunksbomb.trade.mod.network; + +import com.trunksbomb.trade.mod.TradeMod; +import com.trunksbomb.trade.mod.trade.TradeView; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.ResourceLocation; + +public record TradeStatePayload(TradeView view) implements CustomPacketPayload { + public static final Type TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(TradeMod.MODID, "trade_state")); + public static final StreamCodec STREAM_CODEC = new StreamCodec<>() { + @Override + public void encode(RegistryFriendlyByteBuf buf, TradeStatePayload value) { + TradeView.STREAM_CODEC.encode(buf, value.view); + } + + @Override + public TradeStatePayload decode(RegistryFriendlyByteBuf buf) { + return new TradeStatePayload(TradeView.STREAM_CODEC.decode(buf)); + } + }; + + @Override + public Type type() { + return TYPE; + } +} diff --git a/src/main/java/com/trunksbomb/trade/trade/DebugControlAction.java b/src/main/java/com/trunksbomb/trade/trade/DebugControlAction.java new file mode 100644 index 0000000..8bd2e86 --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/trade/DebugControlAction.java @@ -0,0 +1,11 @@ +package com.trunksbomb.trade.mod.trade; + +public enum DebugControlAction { + SET_OFFER, + APPEND_RANDOM, + REMOVE_OFFER, + REMOVE_LAST, + ACCEPT, + CANCEL, + CLOSE +} diff --git a/src/main/java/com/trunksbomb/trade/trade/DebugTradeSession.java b/src/main/java/com/trunksbomb/trade/trade/DebugTradeSession.java new file mode 100644 index 0000000..e7ffe39 --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/trade/DebugTradeSession.java @@ -0,0 +1,405 @@ +package com.trunksbomb.trade.mod.trade; + +import com.trunksbomb.trade.mod.network.TradeClosePayload; +import com.trunksbomb.trade.mod.network.TradeStatePayload; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.network.PacketDistributor; + +public class DebugTradeSession { + private static final int INVENTORY_SLOT_COUNT = TradeView.INVENTORY_SLOT_COUNT; + private static final int OFFER_SLOT_COUNT = TradeView.OFFER_SLOT_COUNT; + private static final String DEBUG_NAME = "Debug Trader"; + private static final net.minecraft.util.RandomSource RANDOM = net.minecraft.util.RandomSource.create(); + + private final UUID id = UUID.randomUUID(); + private final ServerPlayer player; + private final List selfOffer = blankOffer(); + private final List otherOffer = blankStacks(); + private boolean selfAccepted; + private boolean otherAccepted; + private TradeStage stage = TradeStage.OFFERING; + + public DebugTradeSession(ServerPlayer player) { + this.player = player; + } + + public UUID id() { + return id; + } + + public ServerPlayer player() { + return player; + } + + public void sync() { + PacketDistributor.sendToPlayer(player, new TradeStatePayload(view())); + } + + public void close(Component reason) { + PacketDistributor.sendToPlayer(player, new TradeClosePayload(id, reason)); + } + + public boolean addFromInventory(int inventorySlot, boolean singleItem) { + if (stage != TradeStage.OFFERING || inventorySlot < 0 || inventorySlot >= INVENTORY_SLOT_COUNT) { + return false; + } + + Inventory inventory = player.getInventory(); + ItemStack sourceStack = inventory.getItem(inventorySlot); + if (sourceStack.isEmpty()) { + return false; + } + + ItemStack moving = sourceStack.copyWithCount(singleItem ? 1 : sourceStack.getCount()); + if (!insertStack(selfOffer, moving)) { + return false; + } + + sourceStack.shrink(singleItem ? 1 : sourceStack.getCount()); + if (sourceStack.isEmpty()) { + inventory.setItem(inventorySlot, ItemStack.EMPTY); + } + inventory.setChanged(); + clearAccepts(); + return true; + } + + public boolean removeFromOffer(int offerSlot, boolean singleItem) { + if (stage != TradeStage.OFFERING || offerSlot < 0 || offerSlot >= OFFER_SLOT_COUNT) { + return false; + } + + ItemStack offered = selfOffer.get(offerSlot); + if (offered.isEmpty()) { + return false; + } + + List workingInventory = inventorySnapshot(); + ItemStack returned = offered.copyWithCount(singleItem ? 1 : offered.getCount()); + if (!insertStack(workingInventory, returned)) { + return false; + } + + Inventory inventory = player.getInventory(); + for (int i = 0; i < workingInventory.size(); i++) { + inventory.setItem(i, workingInventory.get(i)); + } + inventory.setChanged(); + + if (singleItem && offered.getCount() > 1) { + ItemStack updated = offered.copy(); + updated.shrink(1); + selfOffer.set(offerSlot, updated); + } else { + selfOffer.set(offerSlot, ItemStack.EMPTY); + } + + clearAccepts(); + return true; + } + + public void acceptSelf() { + selfAccepted = true; + } + + public void acceptOther() { + otherAccepted = true; + } + + public void setOtherOffer(List offer) { + for (int i = 0; i < OFFER_SLOT_COUNT; i++) { + otherOffer.set(i, i < offer.size() ? offer.get(i).copy() : ItemStack.EMPTY); + } + clearAccepts(); + } + + public boolean appendOtherOffer(List offer) { + boolean changed = false; + for (ItemStack stack : offer) { + if (stack.isEmpty()) { + continue; + } + if (!insertStack(otherOffer, stack.copy())) { + break; + } + changed = true; + } + + if (changed) { + clearAccepts(); + } + return changed; + } + + public boolean removeOtherOffer(String spec) { + if ("all".equalsIgnoreCase(spec)) { + for (int i = 0; i < OFFER_SLOT_COUNT; i++) { + otherOffer.set(i, ItemStack.EMPTY); + } + clearAccepts(); + return true; + } + + int split = spec.indexOf(':'); + if (split <= 0 || split >= spec.length() - 1) { + throw new IllegalArgumentException("Use all or slot:count"); + } + + int slot = parsePositiveInt(spec.substring(0, split), "slot") - 1; + int count = parsePositiveInt(spec.substring(split + 1), "count"); + if (slot < 0 || slot >= OFFER_SLOT_COUNT) { + throw new IllegalArgumentException("Slot must be between 1 and " + OFFER_SLOT_COUNT + "."); + } + + ItemStack stack = otherOffer.get(slot); + if (stack.isEmpty()) { + return false; + } + + if (count >= stack.getCount()) { + otherOffer.set(slot, ItemStack.EMPTY); + } else { + ItemStack updated = stack.copy(); + updated.shrink(count); + otherOffer.set(slot, updated); + } + + clearAccepts(); + return true; + } + + public boolean removeLastOtherOffer() { + for (int i = OFFER_SLOT_COUNT - 1; i >= 0; i--) { + if (otherOffer.get(i).isEmpty()) { + continue; + } + otherOffer.set(i, ItemStack.EMPTY); + clearAccepts(); + return true; + } + return false; + } + + public void advanceToConfirmation() { + if (stage == TradeStage.OFFERING && selfAccepted && otherAccepted) { + stage = TradeStage.CONFIRMING; + selfAccepted = false; + otherAccepted = false; + } + } + + public boolean bothAccepted() { + return selfAccepted && otherAccepted; + } + + public boolean isConfirmationStage() { + return stage == TradeStage.CONFIRMING; + } + + public boolean completeTrade() { + List result = inventorySnapshot(); + for (ItemStack stack : otherOffer) { + if (!stack.isEmpty() && !insertStack(result, stack.copy())) { + return false; + } + } + + Inventory inventory = player.getInventory(); + for (int i = 0; i < result.size(); i++) { + inventory.setItem(i, result.get(i)); + } + inventory.setChanged(); + return true; + } + + public TradeView view() { + return new TradeView( + id, + player.getGameProfile().getName(), + DEBUG_NAME, + true, + stage, + selfAccepted, + otherAccepted, + inventorySnapshot(), + emptyReservedSnapshot(), + selfOfferSnapshot(), + otherOfferSnapshot()); + } + + public static List parseOfferSpec(String spec) { + if (spec.startsWith("random:")) { + return parseRandomOffer(spec); + } + + int split = spec.lastIndexOf(':'); + if (split <= 0 || split >= spec.length() - 1) { + throw new IllegalArgumentException("Use item:count or random:count or random:numStacks:stackCount"); + } + + ResourceLocation itemId = ResourceLocation.tryParse(spec.substring(0, split)); + if (itemId == null) { + throw new IllegalArgumentException("Invalid item id."); + } + + Item item = BuiltInRegistries.ITEM.get(itemId); + if (item == null || item == net.minecraft.world.item.Items.AIR) { + throw new IllegalArgumentException("Unknown item: " + itemId); + } + + int count = parsePositiveInt(spec.substring(split + 1), "count"); + return List.of(new ItemStack(item, count)); + } + + private static List parseRandomOffer(String spec) { + String[] parts = spec.split(":"); + List items = BuiltInRegistries.ITEM.stream() + .filter(item -> item != net.minecraft.world.item.Items.AIR) + .toList(); + + if (parts.length == 2) { + int count = parsePositiveInt(parts[1], "count"); + return List.of(new ItemStack(randomItem(items), count)); + } + + if (parts.length == 3) { + int numStacks = parsePositiveInt(parts[1], "numStacks"); + int stackCount = parsePositiveInt(parts[2], "stackCount"); + List result = new ArrayList<>(); + for (int i = 0; i < Math.min(numStacks, OFFER_SLOT_COUNT); i++) { + result.add(new ItemStack(randomItem(items), stackCount)); + } + return result; + } + + throw new IllegalArgumentException("Use random:count or random:numStacks:stackCount"); + } + + private static Item randomItem(List items) { + return items.get(RANDOM.nextInt(items.size())); + } + + public static List randomSingleStackOffer() { + List items = BuiltInRegistries.ITEM.stream() + .filter(item -> item != net.minecraft.world.item.Items.AIR) + .toList(); + Item item = randomItem(items); + int maxCount = Math.max(1, Math.min(item.getDefaultMaxStackSize(), 64)); + int count = 1 + RANDOM.nextInt(maxCount); + return List.of(new ItemStack(item, count)); + } + + private static int parsePositiveInt(String value, String label) { + try { + int parsed = Integer.parseInt(value); + if (parsed <= 0) { + throw new IllegalArgumentException(label + " must be positive."); + } + return parsed; + } catch (NumberFormatException exception) { + throw new IllegalArgumentException("Invalid " + label + ": " + value); + } + } + + private static boolean insertStack(List working, ItemStack incoming) { + if (incoming.isEmpty()) { + return true; + } + + for (int i = 0; i < working.size(); i++) { + ItemStack existing = working.get(i); + if (existing.isEmpty() || !ItemStack.isSameItemSameComponents(existing, incoming)) { + continue; + } + + int space = existing.getMaxStackSize() - existing.getCount(); + if (space <= 0) { + continue; + } + + int moved = Math.min(space, incoming.getCount()); + ItemStack updated = existing.copy(); + updated.grow(moved); + working.set(i, updated); + incoming.shrink(moved); + if (incoming.isEmpty()) { + return true; + } + } + + for (int i = 0; i < working.size(); i++) { + if (!working.get(i).isEmpty()) { + continue; + } + working.set(i, incoming.copy()); + incoming.setCount(0); + return true; + } + + return false; + } + + private static List emptyReservedSnapshot() { + List result = new ArrayList<>(INVENTORY_SLOT_COUNT); + for (int i = 0; i < INVENTORY_SLOT_COUNT; i++) { + result.add(0); + } + return result; + } + + private void clearAccepts() { + selfAccepted = false; + otherAccepted = false; + } + + private List inventorySnapshot() { + List result = new ArrayList<>(INVENTORY_SLOT_COUNT); + Inventory inventory = player.getInventory(); + for (int i = 0; i < INVENTORY_SLOT_COUNT; i++) { + result.add(inventory.getItem(i).copy()); + } + return result; + } + + private List selfOfferSnapshot() { + List result = new ArrayList<>(OFFER_SLOT_COUNT); + for (ItemStack stack : selfOffer) { + result.add(stack.copy()); + } + return result; + } + + private List otherOfferSnapshot() { + List result = new ArrayList<>(OFFER_SLOT_COUNT); + for (ItemStack stack : otherOffer) { + result.add(stack.copy()); + } + return result; + } + + private static List blankOffer() { + List result = new ArrayList<>(OFFER_SLOT_COUNT); + for (int i = 0; i < OFFER_SLOT_COUNT; i++) { + result.add(ItemStack.EMPTY); + } + return result; + } + + private static List blankStacks() { + List result = new ArrayList<>(OFFER_SLOT_COUNT); + for (int i = 0; i < OFFER_SLOT_COUNT; i++) { + result.add(ItemStack.EMPTY); + } + return result; + } + +} diff --git a/src/main/java/com/trunksbomb/trade/trade/TradeAction.java b/src/main/java/com/trunksbomb/trade/trade/TradeAction.java new file mode 100644 index 0000000..56faf72 --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/trade/TradeAction.java @@ -0,0 +1,9 @@ +package com.trunksbomb.trade.mod.trade; + +public enum TradeAction { + ADD_ITEM, + REMOVE_ITEM, + ACCEPT, + DECLINE, + CLOSE +} diff --git a/src/main/java/com/trunksbomb/trade/trade/TradeEntry.java b/src/main/java/com/trunksbomb/trade/trade/TradeEntry.java new file mode 100644 index 0000000..881ebe6 --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/trade/TradeEntry.java @@ -0,0 +1,5 @@ +package com.trunksbomb.trade.mod.trade; + +import net.minecraft.world.item.ItemStack; + +public record TradeEntry(int sourceSlot, ItemStack stack) {} diff --git a/src/main/java/com/trunksbomb/trade/trade/TradeManager.java b/src/main/java/com/trunksbomb/trade/trade/TradeManager.java new file mode 100644 index 0000000..309684b --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/trade/TradeManager.java @@ -0,0 +1,309 @@ +package com.trunksbomb.trade.mod.trade; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.WeakHashMap; +import net.minecraft.network.chat.Component; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.item.ItemStack; + +public class TradeManager { + private static final Map INSTANCES = new WeakHashMap<>(); + + private final Map sessionsById = new HashMap<>(); + private final Map sessionByPlayer = new HashMap<>(); + private final Map debugSessionsById = new HashMap<>(); + private final Map debugSessionByPlayer = new HashMap<>(); + + public static TradeManager get(MinecraftServer server) { + return INSTANCES.computeIfAbsent(server, ignored -> new TradeManager()); + } + + public boolean startTrade(ServerPlayer first, ServerPlayer second) { + if (isTrading(first) || isTrading(second)) { + return false; + } + + TradeSession session = new TradeSession(first, second); + sessionsById.put(session.id(), session); + sessionByPlayer.put(first.getUUID(), session.id()); + sessionByPlayer.put(second.getUUID(), session.id()); + session.syncToPlayers(); + first.sendSystemMessage(Component.literal("Trade opened with " + second.getGameProfile().getName() + ".")); + second.sendSystemMessage(Component.literal("Trade opened with " + first.getGameProfile().getName() + ".")); + return true; + } + + public void handleAction(ServerPlayer player, UUID sessionId, TradeAction action, int slot, boolean secondary) { + TradeSession session = sessionsById.get(sessionId); + if (session != null && session.involves(player)) { + handleRealAction(player, session, action, slot, secondary); + return; + } + + DebugTradeSession debugSession = debugSessionsById.get(sessionId); + if (debugSession != null && debugSession.player() == player) { + handleDebugAction(debugSession, action, slot, secondary); + return; + } + } + + private void handleRealAction(ServerPlayer player, TradeSession session, TradeAction action, int slot, boolean secondary) { + boolean changed = switch (action) { + case ADD_ITEM -> session.addFromInventory(player, slot, secondary); + case REMOVE_ITEM -> session.removeFromOffer(player, slot, secondary); + case ACCEPT -> { + session.accept(player); + yield true; + } + case DECLINE, CLOSE -> { + cancel(session, Component.literal(player.getGameProfile().getName() + " cancelled the trade.")); + yield false; + } + }; + + if (!changed) { + return; + } + + if (!session.isConfirmationStage()) { + session.advanceToConfirmation(); + session.syncToPlayers(); + return; + } + + if (!session.bothAccepted()) { + session.syncToPlayers(); + return; + } + + if (session.completeTrade()) { + finish(session, Component.literal("Trade completed.")); + } else { + cancel(session, Component.literal("Trade cancelled because one player could not fit all traded items.")); + } + } + + private void handleDebugAction(DebugTradeSession session, TradeAction action, int slot, boolean secondary) { + boolean changed = switch (action) { + case ADD_ITEM -> session.addFromInventory(slot, secondary); + case REMOVE_ITEM -> session.removeFromOffer(slot, secondary); + case ACCEPT -> { + session.acceptSelf(); + yield true; + } + case DECLINE, CLOSE -> { + closeDebug(session, Component.literal("You closed the debug trade.")); + yield false; + } + }; + + if (!changed) { + return; + } + + if (!session.isConfirmationStage()) { + session.advanceToConfirmation(); + session.sync(); + return; + } + + if (!session.bothAccepted()) { + session.sync(); + return; + } + + if (session.completeTrade()) { + finishDebug(session, Component.literal("Debug trade completed.")); + } else { + closeDebug(session, Component.literal("Debug trade cancelled because the items would not fit.")); + } + } + + public void handleDisconnect(ServerPlayer player) { + TradeSession session = getSession(player); + if (session != null) { + cancel(session, Component.literal(player.getGameProfile().getName() + " left the game.")); + return; + } + + DebugTradeSession debugSession = getDebugSession(player); + if (debugSession != null) { + closeDebug(debugSession, Component.literal("Debug trade closed because you left the game.")); + } + } + + public boolean isTrading(ServerPlayer player) { + return sessionByPlayer.containsKey(player.getUUID()) || debugSessionByPlayer.containsKey(player.getUUID()); + } + + public boolean initDebugTrade(ServerPlayer player) { + if (isTrading(player)) { + return false; + } + + DebugTradeSession session = new DebugTradeSession(player); + debugSessionsById.put(session.id(), session); + debugSessionByPlayer.put(player.getUUID(), session.id()); + session.sync(); + player.sendSystemMessage(Component.literal("Debug trade opened.")); + return true; + } + + public boolean setDebugOffer(ServerPlayer player, List offer) { + DebugTradeSession session = getDebugSession(player); + if (session == null) { + return false; + } + + session.setOtherOffer(offer); + session.sync(); + return true; + } + + public int removeDebugOffer(ServerPlayer player, String spec) { + DebugTradeSession session = getDebugSession(player); + if (session == null) { + return -1; + } + + boolean changed = session.removeOtherOffer(spec); + if (changed) { + session.sync(); + return 1; + } + + return 0; + } + + public boolean acceptDebug(ServerPlayer player) { + DebugTradeSession session = getDebugSession(player); + if (session == null) { + return false; + } + + session.acceptOther(); + if (!session.isConfirmationStage()) { + session.advanceToConfirmation(); + session.sync(); + return true; + } + + if (session.bothAccepted()) { + if (session.completeTrade()) { + finishDebug(session, Component.literal("Debug trade completed.")); + } else { + closeDebug(session, Component.literal("Debug trade cancelled because the items would not fit.")); + } + } else { + session.sync(); + } + return true; + } + + public boolean cancelDebug(ServerPlayer player) { + DebugTradeSession session = getDebugSession(player); + if (session == null) { + return false; + } + + closeDebug(session, Component.literal("Debug trader cancelled the trade.")); + return true; + } + + public boolean closeDebug(ServerPlayer player) { + DebugTradeSession session = getDebugSession(player); + if (session == null) { + return false; + } + + closeDebug(session, Component.literal("Debug trade closed.")); + return true; + } + + public void handleDebugControl(ServerPlayer player, UUID sessionId, DebugControlAction action, String spec) { + DebugTradeSession session = debugSessionsById.get(sessionId); + if (session == null || session.player() != player) { + return; + } + + try { + switch (action) { + case SET_OFFER -> { + session.setOtherOffer(DebugTradeSession.parseOfferSpec(spec)); + session.sync(); + } + case APPEND_RANDOM -> { + if (session.appendOtherOffer(DebugTradeSession.randomSingleStackOffer())) { + session.sync(); + } + } + case REMOVE_OFFER -> { + if (session.removeOtherOffer(spec)) { + session.sync(); + } + } + case REMOVE_LAST -> { + if (session.removeLastOtherOffer()) { + session.sync(); + } + } + case ACCEPT -> acceptDebug(player); + case CANCEL -> cancelDebug(player); + case CLOSE -> closeDebug(player); + } + } catch (IllegalArgumentException ignored) { + player.sendSystemMessage(Component.literal(ignored.getMessage())); + } + } + + private TradeSession getSession(ServerPlayer player) { + UUID sessionId = sessionByPlayer.get(player.getUUID()); + return sessionId == null ? null : sessionsById.get(sessionId); + } + + private DebugTradeSession getDebugSession(ServerPlayer player) { + UUID sessionId = debugSessionByPlayer.get(player.getUUID()); + return sessionId == null ? null : debugSessionsById.get(sessionId); + } + + private void finish(TradeSession session, Component reason) { + session.firstPlayer().sendSystemMessage(reason); + session.secondPlayer().sendSystemMessage(reason); + session.close(reason); + removeSession(session); + } + + private void cancel(TradeSession session, Component reason) { + session.firstPlayer().sendSystemMessage(reason); + session.secondPlayer().sendSystemMessage(reason); + session.close(reason); + removeSession(session); + } + + private void removeSession(TradeSession session) { + sessionsById.remove(session.id()); + sessionByPlayer.remove(session.firstPlayer().getUUID()); + sessionByPlayer.remove(session.secondPlayer().getUUID()); + } + + private void finishDebug(DebugTradeSession session, Component reason) { + session.player().sendSystemMessage(reason); + session.close(reason); + removeDebugSession(session); + } + + private void closeDebug(DebugTradeSession session, Component reason) { + session.player().sendSystemMessage(reason); + session.close(reason); + removeDebugSession(session); + } + + private void removeDebugSession(DebugTradeSession session) { + debugSessionsById.remove(session.id()); + debugSessionByPlayer.remove(session.player().getUUID()); + } +} diff --git a/src/main/java/com/trunksbomb/trade/trade/TradeSession.java b/src/main/java/com/trunksbomb/trade/trade/TradeSession.java new file mode 100644 index 0000000..7976a53 --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/trade/TradeSession.java @@ -0,0 +1,281 @@ +package com.trunksbomb.trade.mod.trade; + +import com.trunksbomb.trade.mod.network.TradeClosePayload; +import com.trunksbomb.trade.mod.network.TradeStatePayload; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.network.PacketDistributor; + +public class TradeSession { + private static final int INVENTORY_SLOT_COUNT = TradeView.INVENTORY_SLOT_COUNT; + private static final int OFFER_SLOT_COUNT = TradeView.OFFER_SLOT_COUNT; + + private final UUID id = UUID.randomUUID(); + private final ServerPlayer first; + private final ServerPlayer second; + private final List firstOffer = blankOffer(); + private final List secondOffer = blankOffer(); + private boolean firstAccepted; + private boolean secondAccepted; + private TradeStage stage = TradeStage.OFFERING; + + public TradeSession(ServerPlayer first, ServerPlayer second) { + this.first = first; + this.second = second; + } + + public UUID id() { + return id; + } + + public ServerPlayer firstPlayer() { + return first; + } + + public ServerPlayer secondPlayer() { + return second; + } + + public boolean involves(ServerPlayer player) { + return player == first || player == second; + } + + public ServerPlayer other(ServerPlayer player) { + return player == first ? second : first; + } + + public void syncToPlayers() { + sendState(first); + sendState(second); + } + + public void close(Component reason) { + PacketDistributor.sendToPlayer(first, new TradeClosePayload(id, reason)); + PacketDistributor.sendToPlayer(second, new TradeClosePayload(id, reason)); + } + + public boolean addFromInventory(ServerPlayer player, int inventorySlot, boolean singleItem) { + if (stage != TradeStage.OFFERING || inventorySlot < 0 || inventorySlot >= INVENTORY_SLOT_COUNT) { + return false; + } + + List offer = offerFor(player); + Inventory inventory = player.getInventory(); + ItemStack sourceStack = inventory.getItem(inventorySlot); + if (sourceStack.isEmpty()) { + return false; + } + + ItemStack moving = sourceStack.copyWithCount(singleItem ? 1 : sourceStack.getCount()); + if (!insertStack(offer, moving)) { + return false; + } + + sourceStack.shrink(singleItem ? 1 : sourceStack.getCount()); + if (sourceStack.isEmpty()) { + inventory.setItem(inventorySlot, ItemStack.EMPTY); + } + inventory.setChanged(); + clearAccepts(); + return true; + } + + public boolean removeFromOffer(ServerPlayer player, int offerSlot, boolean singleItem) { + if (stage != TradeStage.OFFERING || offerSlot < 0 || offerSlot >= OFFER_SLOT_COUNT) { + return false; + } + + List offer = offerFor(player); + ItemStack offered = offer.get(offerSlot); + if (offered.isEmpty()) { + return false; + } + + Inventory inventory = player.getInventory(); + List workingInventory = inventorySnapshot(player); + ItemStack returned = offered.copyWithCount(singleItem ? 1 : offered.getCount()); + if (!insertStack(workingInventory, returned)) { + return false; + } + + applyInventory(player, workingInventory); + if (singleItem && offered.getCount() > 1) { + ItemStack updated = offered.copy(); + updated.shrink(1); + offer.set(offerSlot, updated); + } else { + offer.set(offerSlot, ItemStack.EMPTY); + } + clearAccepts(); + return true; + } + + public void accept(ServerPlayer player) { + if (player == first) { + firstAccepted = true; + } else { + secondAccepted = true; + } + } + + public void advanceToConfirmation() { + if (stage == TradeStage.OFFERING && firstAccepted && secondAccepted) { + stage = TradeStage.CONFIRMING; + firstAccepted = false; + secondAccepted = false; + } + } + + public boolean bothAccepted() { + return firstAccepted && secondAccepted; + } + + public boolean isConfirmationStage() { + return stage == TradeStage.CONFIRMING; + } + + public boolean completeTrade() { + List firstResult = simulateResult(first, secondOffer); + List secondResult = simulateResult(second, firstOffer); + if (firstResult == null || secondResult == null) { + return false; + } + + applyInventory(first, firstResult); + applyInventory(second, secondResult); + clearOffer(firstOffer); + clearOffer(secondOffer); + return true; + } + + public TradeView viewFor(ServerPlayer player) { + boolean isFirst = player == first; + ServerPlayer other = isFirst ? second : first; + return new TradeView( + id, + player.getGameProfile().getName(), + other.getGameProfile().getName(), + false, + stage, + isFirst ? firstAccepted : secondAccepted, + isFirst ? secondAccepted : firstAccepted, + inventorySnapshot(player), + emptyReservedSnapshot(), + offerSnapshot(isFirst ? firstOffer : secondOffer), + offerSnapshot(isFirst ? secondOffer : firstOffer)); + } + + public void sendState(ServerPlayer player) { + PacketDistributor.sendToPlayer(player, new TradeStatePayload(viewFor(player))); + } + + private List simulateResult(ServerPlayer player, List incoming) { + List working = inventorySnapshot(player); + for (ItemStack stack : incoming) { + if (!stack.isEmpty() && !insertStack(working, stack.copy())) { + return null; + } + } + + return working; + } + + private static boolean insertStack(List working, ItemStack incoming) { + if (incoming.isEmpty()) { + return true; + } + + for (int i = 0; i < working.size(); i++) { + ItemStack existing = working.get(i); + if (existing.isEmpty() || !ItemStack.isSameItemSameComponents(existing, incoming)) { + continue; + } + + int space = existing.getMaxStackSize() - existing.getCount(); + if (space <= 0) { + continue; + } + + int moved = Math.min(space, incoming.getCount()); + ItemStack updated = existing.copy(); + updated.grow(moved); + working.set(i, updated); + incoming.shrink(moved); + if (incoming.isEmpty()) { + return true; + } + } + + for (int i = 0; i < working.size(); i++) { + if (!working.get(i).isEmpty()) { + continue; + } + working.set(i, incoming.copy()); + incoming.setCount(0); + return true; + } + + return false; + } + + private static void clearOffer(List offer) { + for (int i = 0; i < offer.size(); i++) { + offer.set(i, ItemStack.EMPTY); + } + } + + private static void applyInventory(ServerPlayer player, List result) { + Inventory inventory = player.getInventory(); + for (int i = 0; i < result.size(); i++) { + inventory.setItem(i, result.get(i)); + } + inventory.setChanged(); + } + + private static List blankOffer() { + List result = new ArrayList<>(OFFER_SLOT_COUNT); + for (int i = 0; i < OFFER_SLOT_COUNT; i++) { + result.add(ItemStack.EMPTY); + } + return result; + } + + private void clearAccepts() { + firstAccepted = false; + secondAccepted = false; + } + + private static List emptyReservedSnapshot() { + List result = new ArrayList<>(INVENTORY_SLOT_COUNT); + for (int i = 0; i < INVENTORY_SLOT_COUNT; i++) { + result.add(0); + } + return result; + } + + private List offerFor(ServerPlayer player) { + return player == first ? firstOffer : secondOffer; + } + + private static List inventorySnapshot(ServerPlayer player) { + List result = new ArrayList<>(INVENTORY_SLOT_COUNT); + Inventory inventory = player.getInventory(); + for (int i = 0; i < INVENTORY_SLOT_COUNT; i++) { + result.add(inventory.getItem(i).copy()); + } + return result; + } + + private static List offerSnapshot(List offer) { + List result = new ArrayList<>(OFFER_SLOT_COUNT); + for (ItemStack stack : offer) { + result.add(stack.copy()); + } + return result; + } +} diff --git a/src/main/java/com/trunksbomb/trade/trade/TradeStage.java b/src/main/java/com/trunksbomb/trade/trade/TradeStage.java new file mode 100644 index 0000000..0db0b13 --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/trade/TradeStage.java @@ -0,0 +1,6 @@ +package com.trunksbomb.trade.mod.trade; + +public enum TradeStage { + OFFERING, + CONFIRMING +} diff --git a/src/main/java/com/trunksbomb/trade/trade/TradeView.java b/src/main/java/com/trunksbomb/trade/trade/TradeView.java new file mode 100644 index 0000000..2c65314 --- /dev/null +++ b/src/main/java/com/trunksbomb/trade/trade/TradeView.java @@ -0,0 +1,86 @@ +package com.trunksbomb.trade.mod.trade; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.world.item.ItemStack; + +public record TradeView( + UUID sessionId, + String selfName, + String otherName, + boolean debugMode, + TradeStage stage, + boolean selfAccepted, + boolean otherAccepted, + List inventory, + List reservedCounts, + List selfOffer, + List otherOffer) { + + public static final int INVENTORY_SLOT_COUNT = 36; + public static final int OFFER_SLOT_COUNT = 36; + + public static final StreamCodec STREAM_CODEC = new StreamCodec<>() { + @Override + public void encode(RegistryFriendlyByteBuf buf, TradeView value) { + buf.writeUUID(value.sessionId); + buf.writeUtf(value.selfName); + buf.writeUtf(value.otherName); + buf.writeBoolean(value.debugMode); + buf.writeEnum(value.stage); + buf.writeBoolean(value.selfAccepted); + buf.writeBoolean(value.otherAccepted); + writeStacks(buf, value.inventory, INVENTORY_SLOT_COUNT); + writeInts(buf, value.reservedCounts, INVENTORY_SLOT_COUNT); + writeStacks(buf, value.selfOffer, OFFER_SLOT_COUNT); + writeStacks(buf, value.otherOffer, OFFER_SLOT_COUNT); + } + + @Override + public TradeView decode(RegistryFriendlyByteBuf buf) { + return new TradeView( + buf.readUUID(), + buf.readUtf(), + buf.readUtf(), + buf.readBoolean(), + buf.readEnum(TradeStage.class), + buf.readBoolean(), + buf.readBoolean(), + readStacks(buf, INVENTORY_SLOT_COUNT), + readInts(buf, INVENTORY_SLOT_COUNT), + readStacks(buf, OFFER_SLOT_COUNT), + readStacks(buf, OFFER_SLOT_COUNT)); + } + }; + + private static void writeStacks(RegistryFriendlyByteBuf buf, List stacks, int expectedSize) { + for (int i = 0; i < expectedSize; i++) { + ItemStack.OPTIONAL_STREAM_CODEC.encode(buf, stacks.get(i)); + } + } + + private static List readStacks(RegistryFriendlyByteBuf buf, int expectedSize) { + List stacks = new ArrayList<>(expectedSize); + for (int i = 0; i < expectedSize; i++) { + stacks.add(ItemStack.OPTIONAL_STREAM_CODEC.decode(buf)); + } + return stacks; + } + + private static void writeInts(RegistryFriendlyByteBuf buf, List values, int expectedSize) { + for (int i = 0; i < expectedSize; i++) { + buf.writeVarInt(values.get(i)); + } + } + + private static List readInts(RegistryFriendlyByteBuf buf, int expectedSize) { + List values = new ArrayList<>(expectedSize); + for (int i = 0; i < expectedSize; i++) { + values.add(buf.readVarInt()); + } + return values; + } +} diff --git a/src/main/resources/assets/trade/lang/en_us.json b/src/main/resources/assets/trade/lang/en_us.json new file mode 100644 index 0000000..aed2f1b --- /dev/null +++ b/src/main/resources/assets/trade/lang/en_us.json @@ -0,0 +1,5 @@ +{ + "trade.trade.title": "Trading Screen", + "trade.trade.offer": "Offer screen", + "trade.trade.confirm": "Confirmation screen" +} diff --git a/src/main/resources/assets/trade/textures/gui/trade.png b/src/main/resources/assets/trade/textures/gui/trade.png new file mode 100644 index 0000000000000000000000000000000000000000..3724f585d74216c8034ee3d4f9a2086555c630fe GIT binary patch literal 1552 zcmeAS@N?(olHy`uVBq!ia0y~yV3Yx}?{Y8$$+(xcJkvZqwHP>n999M?Mpgz!Aj=DgrJ-z~7Z@}cnZe>rK(-+x6N4a-jsoJ$ zb{4RB4v-B3-^v&nUI2XxqtR_;U;s)^U}se&Heg%;F&AVf>jH>b(|~LcU;>)V z1XdYjX#r$Gbr~8MfMiXztfW*F-tYheu*1{EF{C2y?cBudJ02n|sqfwX|5tA>bunS_IX5EE11!{`Q;m%YEWXTOGgT_`+TFLM!qg?yKH= z|La-*H?Na}A3k|yz2oz}xmNRU&$sw$@a_9)kJ+DPAN^TX9sc3JN3C@6>f>|f#yCzt zQQq@e@ArBuFSpD zA9_Lc>&E9{{g&1{oAf63ub)bEs9>?i`iNxy;dRPD1I^|Y%T9d%Mw5`MxgeclexR+ur>@wRVOb%i7ZTZ%gWXg&_%C z+3&_8i?8YC=j!GxZkn&E{g}sGv0V8GXNyInfV#jV7N3<&f z?w;6M`0D8Go3Syh_TFK~B<+roV!)ot-O`Z~%j5RUy?ZqD!{(IKIS-R-%<)=_aLa_& z!eg_ygB&o=5SnMZA6+^9Z}ac}Ty@jd^ceqH{yC2*uK>;De%!PDZ@Dt}W1Hk7oXUO@ zg@5+dc{^sGoo-q`_1G%Y`I~-jdba*j#Flr?W%1X4he~ya-T(Ebj+r;ExuW?0wI87J N$