From cc9fedd63b84ec916d071be934fcece55385041b Mon Sep 17 00:00:00 2001 From: skippyall <121978267+skippyall@users.noreply.github.com> Date: Wed, 29 Apr 2026 00:51:31 +0200 Subject: [PATCH] Converted --- LICENSE | 2 +- TODO.txt | 35 +++ build.gradle | 18 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 48966 bytes gradle/wrapper/gradle-wrapper.properties | 8 +- gradlew | 248 ++++++++++++++++++ gradlew.bat | 93 +++++++ publish | 2 + .../minions/client/MinionsClient.java | 2 +- .../minions/MinionMixinConfigPlugin.java | 4 +- .../io/github/skippyall/minions/Minions.java | 10 +- .../skippyall/minions/MinionsConfig.java | 13 +- .../minions/block/input/AnalogInputBlock.java | 4 +- .../InstructionBoundBlockEntity.java | 13 +- .../miniontrigger/MinionTriggerBlock.java | 12 +- .../MinionTriggerBlockEntity.java | 8 - .../MinionTriggerMinionListener.java | 2 +- .../minions/clipboard/ClipboardItem.java | 4 +- .../minions/command/DocsSubcommand.java | 2 +- .../minions/command/MinionsCommand.java | 3 +- .../minions/command/TestSubcommand.java | 78 ++++++ .../skippyall/minions/docs/DocsEntry.java | 1 - .../skippyall/minions/docs/DocsManager.java | 1 - .../minions/docs/ReferenceEntry.java | 2 +- .../skippyall/minions/gui/GuiDisplay.java | 3 +- .../minions/gui/MinionBoundSimpleGui.java | 37 --- .../skippyall/minions/gui/MinionLookGui.java | 2 +- .../skippyall/minions/gui/MinionsGui.java | 31 ++- .../skippyall/minions/gui/PaginatedList.java | 68 +++-- .../minions/gui/input/ChoiceInput.java | 32 +++ .../skippyall/minions/gui/input/Result.java | 68 ++++- .../minions/gui/input/TextInput.java | 32 +++ .../minions/gui/instruction/ArgumentGui.java | 171 ++++++++---- .../instruction/ConfigureInstructionGui.java | 92 ++++--- .../minions/gui/instruction/ConverterGui.java | 154 +++++++---- .../gui/instruction/ConverterListGui.java | 109 ++++++++ .../InstructionBoundSimpleGui.java | 30 --- .../gui/instruction/InstructionGui.java | 172 ++++++------ .../gui/instruction/InstructionListGui.java | 69 +++++ .../minions/gui/minion/GuiContext.java | 43 +++ .../minions/gui/minion/GuiContextImpl.java | 120 +++++++++ .../minions/gui/minion/MinionGui.java | 16 +- .../gui/minion/MinionInventoryGui.java | 3 +- .../minions/gui/minion/SimpleMinionsGui.java | 27 ++ .../minions/listener/ListenerManager.java | 35 +-- .../listener/SerializableListenerManager.java | 47 +--- .../skippyall/minions/minion/MinionData.java | 6 +- .../minions/minion/MinionListener.java | 2 +- .../minions/minion/MinionRuntime.java | 6 +- .../fakeplayer/EntityPlayerActionPack.java | 10 +- .../fakeplayer/FakeClientConnection.java | 2 +- .../minion/fakeplayer/MinionFakePlayer.java | 15 +- .../minions/minion/fakeplayer/Tracer.java | 5 +- .../program/instruction/ActionExecution.java | 4 +- .../instruction/MineBlockExecution.java | 4 +- .../inventory/SwapItemExecution.java | 12 +- .../instruction/move/TurnExecution.java | 8 +- .../instruction/move/TurnVectorExecution.java | 10 +- .../instruction/move/WalkExecution.java | 6 +- .../program/supplier/AnalogInputSupplier.java | 40 +-- .../minions/module/MinionModule.java | 2 +- .../minions/program/InstructionRuntime.java | 8 +- .../program/consumer/ValueConsumer.java | 2 +- .../program/conversion/CastConverter.java | 17 +- .../minions/program/conversion/Casts.java | 26 +- .../program/conversion/ConverterList.java | 81 ++++++ .../program/conversion/EqualityConverter.java | 30 ++- .../program/conversion/ValueConverter.java | 3 +- .../conversion/ValueConverterType.java | 4 +- .../instruction/ConfiguredInstruction.java | 56 ++-- .../ConfiguredInstructionListener.java | 2 +- .../instruction/InstructionExecution.java | 7 +- .../program/instruction/InstructionType.java | 6 +- .../program/supplier/FixedValueSupplier.java | 2 +- .../supplier/FixedValueSupplierType.java | 8 +- .../minions/program/supplier/Parameter.java | 3 +- .../program/supplier/ParameterValueList.java | 21 ++ .../program/supplier/ValueSupplier.java | 2 +- .../program/supplier/ValueSupplierList.java | 131 ++++----- .../program/supplier/ValueSupplierType.java | 4 +- .../program/value/RestrictionRule.java | 12 - .../program/value/SimpleValueType.java | 9 +- .../program/value/TypeRestriction.java | 6 - .../minions/program/value/TypedValue.java | 7 + .../minions/program/value/ValueType.java | 6 +- .../minions/registration/ClipboardTypes.java | 2 +- .../minions/registration/Instructions.java | 6 +- .../minions/registration/MinionBlocks.java | 1 - .../registration/MinionComponentTypes.java | 2 +- .../minions/registration/MinionItems.java | 2 +- .../registration/MinionRegistries.java | 20 +- .../minions/registration/SkinProviders.java | 2 +- .../registration/SpecialAbilities.java | 2 +- .../minions/registration/ValueConverters.java | 4 +- .../minions/registration/ValueSuppliers.java | 4 +- .../minions/registration/ValueTypes.java | 25 +- src/main/resources/TODO.txt | 35 --- .../{data => assets}/minions/lang/en_us.json | 54 ++-- .../attack.json | 0 .../mine_block.json | 0 .../gui_display/instruction/swap_item.json | 4 + .../turn.json | 0 .../turn_vector.json | 0 .../use.json | 0 .../walk.json | 0 .../walk_continuous.json | 0 .../gui_display/value_converter/cast.json | 11 + .../gui_display/value_converter/equality.json | 4 + .../value_supplier/analog_input.json | 4 + .../fixed.json | 0 .../gui_display/value_type/boolean.json | 4 + 112 files changed, 1928 insertions(+), 771 deletions(-) create mode 100644 TODO.txt create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 publish create mode 100644 src/main/java/io/github/skippyall/minions/command/TestSubcommand.java delete mode 100644 src/main/java/io/github/skippyall/minions/gui/MinionBoundSimpleGui.java create mode 100644 src/main/java/io/github/skippyall/minions/gui/instruction/ConverterListGui.java delete mode 100644 src/main/java/io/github/skippyall/minions/gui/instruction/InstructionBoundSimpleGui.java create mode 100644 src/main/java/io/github/skippyall/minions/gui/instruction/InstructionListGui.java create mode 100644 src/main/java/io/github/skippyall/minions/gui/minion/GuiContext.java create mode 100644 src/main/java/io/github/skippyall/minions/gui/minion/GuiContextImpl.java create mode 100644 src/main/java/io/github/skippyall/minions/gui/minion/SimpleMinionsGui.java create mode 100644 src/main/java/io/github/skippyall/minions/program/conversion/ConverterList.java create mode 100644 src/main/java/io/github/skippyall/minions/program/supplier/ParameterValueList.java delete mode 100644 src/main/java/io/github/skippyall/minions/program/value/RestrictionRule.java delete mode 100644 src/main/java/io/github/skippyall/minions/program/value/TypeRestriction.java create mode 100644 src/main/java/io/github/skippyall/minions/program/value/TypedValue.java delete mode 100644 src/main/resources/TODO.txt rename src/main/resources/{data => assets}/minions/lang/en_us.json (65%) rename src/main/resources/data/minions/minions/gui_display/{instruction_type => instruction}/attack.json (100%) rename src/main/resources/data/minions/minions/gui_display/{instruction_type => instruction}/mine_block.json (100%) create mode 100644 src/main/resources/data/minions/minions/gui_display/instruction/swap_item.json rename src/main/resources/data/minions/minions/gui_display/{instruction_type => instruction}/turn.json (100%) rename src/main/resources/data/minions/minions/gui_display/{instruction_type => instruction}/turn_vector.json (100%) rename src/main/resources/data/minions/minions/gui_display/{instruction_type => instruction}/use.json (100%) rename src/main/resources/data/minions/minions/gui_display/{instruction_type => instruction}/walk.json (100%) rename src/main/resources/data/minions/minions/gui_display/{instruction_type => instruction}/walk_continuous.json (100%) create mode 100644 src/main/resources/data/minions/minions/gui_display/value_converter/cast.json create mode 100644 src/main/resources/data/minions/minions/gui_display/value_converter/equality.json create mode 100644 src/main/resources/data/minions/minions/gui_display/value_supplier/analog_input.json rename src/main/resources/data/minions/minions/gui_display/{value_supplier_type => value_supplier}/fixed.json (100%) create mode 100644 src/main/resources/data/minions/minions/gui_display/value_type/boolean.json diff --git a/LICENSE b/LICENSE index c986429..e0bddef 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2024 +Copyright (c) 2024 skippyall Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 0000000..f81f296 --- /dev/null +++ b/TODO.txt @@ -0,0 +1,35 @@ +- Module: + - Bewegungsmodul ✓ + - Angriffsmodul ✓ + - Abbaumodul ✓ + - Platziermodul / Verwendungsmodul ✓ + - Werfmodul + - Inventarmanagementmodul (Noch nicht wirklich) + - Inventaropenmodul (Nä) + +- Detektoren: + - Blockdetektor + - Entitydetektor + - Dimensiondetektor + - Positiondetektor + - Inventardetektor + +- Programmieren: Nö + - Variablen Nö + - (Listen) Nö + - Warten Nö + - Wiederholen Nö + - Wiederhole bis/während Nö + - Wiederhole x mal/(für jedes Element) Nö + - Bedingung Nö + +- VariableTypen: + - Integer ✓ + - String ✓ + - Position (Nö) + - Block (weisned) + - BlockType + - (NBT) Nö + - (World) Nö + - (Chunk) Nö + - Inventory (weisned) diff --git a/build.gradle b/build.gradle index d64efcb..db268b5 100644 --- a/build.gradle +++ b/build.gradle @@ -108,6 +108,11 @@ jar { from("LICENSE") { rename { "${it}_${project.archives_base_name}"} } + + from("src/main/resoures/assets/minions/lang") { + include("*") + into("data/minions/lang/") + } } // configure the maven publication @@ -124,15 +129,10 @@ publishing { // Notice: This block does NOT have the same function as the block in the top level. // The repositories here will be used for publishing your artifact, not for // retrieving dependencies. - if(project.hasProperty("foxgalaxy_user_name") && project.hasProperty("foxgalaxy_password")) { - maven { - url = "https://maven.foxgalaxy.de/private" - - credentials { - username = project.property("foxgalaxy_user_name") - password = project.property("foxgalaxy_password") - } - } + maven { + name = "foxgalaxy" + url = "https://maven.foxgalaxy.de/private" + credentials(PasswordCredentials) } } } diff --git a/gradle.properties b/gradle.properties index c2d996d..99abc21 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.21.7+build.2 # Mod Properties - mod_version = 1.0.0-SNAPSHOT-1 + mod_version = 1.0.0-TEST-1 maven_group = io.github.skippyall archives_base_name = Minions diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d997cfc60f4cff0e7451d19d49a82fa986695d07 GIT binary patch literal 48966 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

`Lem|V$A>eR0uN8Y&sdjtu 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

1bvi{DS7E@q1{$_8->K{_OWv2 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3c0465a..c61a118 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1 +1,7 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..739907d --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# 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" ) + + 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" \ + -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..c4bdd3a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@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 + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -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/publish b/publish new file mode 100644 index 0000000..1041747 --- /dev/null +++ b/publish @@ -0,0 +1,2 @@ +#!/bin/bash +bash gradlew publish -PfoxgalaxyPassword=$(read -s -p "Enter Password: ") \ No newline at end of file diff --git a/src/client/java/io/github/skippyall/minions/client/MinionsClient.java b/src/client/java/io/github/skippyall/minions/client/MinionsClient.java index 85f64fa..c99fdde 100644 --- a/src/client/java/io/github/skippyall/minions/client/MinionsClient.java +++ b/src/client/java/io/github/skippyall/minions/client/MinionsClient.java @@ -1,8 +1,8 @@ package io.github.skippyall.minions.client; import eu.pb4.polymer.networking.api.client.PolymerClientNetworking; -import io.github.skippyall.minions.registration.MinionBlocks; import io.github.skippyall.minions.polymer.VersionSync; +import io.github.skippyall.minions.registration.MinionBlocks; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap; import net.minecraft.client.render.BlockRenderLayer; diff --git a/src/main/java/io/github/skippyall/minions/MinionMixinConfigPlugin.java b/src/main/java/io/github/skippyall/minions/MinionMixinConfigPlugin.java index bba6579..7528226 100644 --- a/src/main/java/io/github/skippyall/minions/MinionMixinConfigPlugin.java +++ b/src/main/java/io/github/skippyall/minions/MinionMixinConfigPlugin.java @@ -21,10 +21,10 @@ public class MinionMixinConfigPlugin implements IMixinConfigPlugin { @Override public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { - if(mixinClassName.startsWith("io.github.skippyall.mixins.compat.universal_graves.")) { + if(mixinClassName.startsWith("io.github.skippyall.minions.mixins.compat.universal_graves.")) { return MinionsConfig.get().compat.enableGravesCompat && FabricLoader.getInstance().isModLoaded("universal-graves"); } - if(mixinClassName.startsWith("io.github.skippyall.mixins.antimobcap.")) { + if(mixinClassName.startsWith("io.github.skippyall.minions.mixins.antimobcap.")) { return MinionsConfig.get().minion.enableMobCapHacks; } return true; diff --git a/src/main/java/io/github/skippyall/minions/Minions.java b/src/main/java/io/github/skippyall/minions/Minions.java index 1898537..8aaba56 100644 --- a/src/main/java/io/github/skippyall/minions/Minions.java +++ b/src/main/java/io/github/skippyall/minions/Minions.java @@ -3,10 +3,10 @@ package io.github.skippyall.minions; import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils; import io.github.skippyall.minions.command.MinionsCommand; import io.github.skippyall.minions.docs.DocsManager; -import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.MinionPersistentState; -import io.github.skippyall.minions.registration.MinionRegistration; +import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.polymer.VersionSync; +import io.github.skippyall.minions.registration.MinionRegistration; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; @@ -38,12 +38,6 @@ public class Minions implements ModInitializer { CommandRegistrationCallback.EVENT.register(MinionsCommand::register); - /*ServerBlockEntityEvents.BLOCK_ENTITY_LOAD.register((blockEntity, world) -> { - if(blockEntity instanceof MinionTriggerBlockEntity) { - world.updateComparators(blockEntity.getPos(), MinionBlocks.MINION_TRIGGER_BLOCK); - } - });*/ - PolymerResourcePackUtils.addModAssets(Minions.MOD_ID); ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(new DocsManager()); diff --git a/src/main/java/io/github/skippyall/minions/MinionsConfig.java b/src/main/java/io/github/skippyall/minions/MinionsConfig.java index a4140d2..fb05f23 100644 --- a/src/main/java/io/github/skippyall/minions/MinionsConfig.java +++ b/src/main/java/io/github/skippyall/minions/MinionsConfig.java @@ -8,7 +8,6 @@ import com.electronwill.nightconfig.core.serde.ObjectDeserializer; import com.electronwill.nightconfig.core.serde.ObjectSerializer; import com.electronwill.nightconfig.core.serde.SerdeException; import com.electronwill.nightconfig.core.serde.annotations.SerdeComment; -import com.electronwill.nightconfig.core.serde.annotations.SerdeSkipDeserializingIf; import com.electronwill.nightconfig.toml.TomlFormat; import com.electronwill.nightconfig.toml.TomlParser; import net.fabricmc.loader.api.FabricLoader; @@ -17,31 +16,24 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import static com.electronwill.nightconfig.core.serde.annotations.SerdeSkipDeserializingIf.SkipDeIf.IS_MISSING; - public class MinionsConfig { private static MinionsConfig INSTANCE; - @SerdeSkipDeserializingIf(IS_MISSING) public Minion minion = new Minion(); public static class Minion { @SerdeComment("The prefix for all minion names") - @SerdeSkipDeserializingIf(IS_MISSING) public String minionPrefix = "+"; @SerdeComment("Makes minions not raise the mob cap if they can't spawn mobs.") @SerdeComment("Might cause incompatibilities.") - @SerdeSkipDeserializingIf(IS_MISSING) public boolean enableMobCapHacks = true; } - @SerdeSkipDeserializingIf(IS_MISSING) public Compat compat = new Compat(); public static class Compat { @SerdeComment("Enables compat with Universal Graves, which allows everyone to pick up graves from minions") - @SerdeSkipDeserializingIf(IS_MISSING) public boolean enableGravesCompat = true; } @@ -66,12 +58,15 @@ public class MinionsConfig { public static void loadConfig() { try { + CommentedConfig defaultConfig = ObjectSerializer.standard().serializeFields(new MinionsConfig(), TomlFormat::newConfig); + CommentedConfig config = new TomlParser().parse(getPath(), (file, configFormat) -> { - CommentedConfig defaultConfig = ObjectSerializer.standard().serializeFields(new MinionsConfig(), TomlFormat::newConfig); configFormat.createWriter().write(defaultConfig, file, WritingMode.REPLACE); return true; }); + //Always use default values when entries are missing + config.addAll(defaultConfig); INSTANCE = ObjectDeserializer.standard().deserializeFields(config, MinionsConfig::new); } catch (SerdeException | ParsingException | WritingException e) { Minions.LOGGER.error("Error while reading config", e); diff --git a/src/main/java/io/github/skippyall/minions/block/input/AnalogInputBlock.java b/src/main/java/io/github/skippyall/minions/block/input/AnalogInputBlock.java index 9a7d591..0a7b247 100644 --- a/src/main/java/io/github/skippyall/minions/block/input/AnalogInputBlock.java +++ b/src/main/java/io/github/skippyall/minions/block/input/AnalogInputBlock.java @@ -16,7 +16,9 @@ public class AnalogInputBlock extends Block { @Override protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) { - player.getInventory().offer(ClipboardItem.createBlockPosReference(world, pos), true); + if(!world.isClient) { + player.getInventory().offer(ClipboardItem.createBlockPosReference(world, pos), true); + } return ActionResult.SUCCESS; } } diff --git a/src/main/java/io/github/skippyall/minions/block/instruction_bound/InstructionBoundBlockEntity.java b/src/main/java/io/github/skippyall/minions/block/instruction_bound/InstructionBoundBlockEntity.java index b04bf38..39f0c49 100644 --- a/src/main/java/io/github/skippyall/minions/block/instruction_bound/InstructionBoundBlockEntity.java +++ b/src/main/java/io/github/skippyall/minions/block/instruction_bound/InstructionBoundBlockEntity.java @@ -7,6 +7,7 @@ import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import java.util.Optional; @@ -25,13 +26,17 @@ public abstract class InstructionBoundBlockEntity getListenerClass(); public void removeListener() { - L listener = getListener(); - listener.remove(world.getServer()); + if(world instanceof ServerWorld serverWorld) { + L listener = getListener(); + listener.remove(serverWorld.getServer()); + } } public void addListener() { - L listener = createListener(); - listener.add(world.getServer()); + if(world instanceof ServerWorld serverWorld) { + L listener = createListener(); + listener.add(serverWorld.getServer()); + } } public void setInstruction(UUID minionUuid, String instructionName) { diff --git a/src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerBlock.java b/src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerBlock.java index 601eb24..e4188c9 100644 --- a/src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerBlock.java +++ b/src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerBlock.java @@ -8,11 +8,10 @@ import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils; import eu.pb4.polymer.virtualentity.api.BlockWithElementHolder; import eu.pb4.polymer.virtualentity.api.ElementHolder; import eu.pb4.polymer.virtualentity.api.elements.ItemDisplayElement; -import io.github.skippyall.minions.block.instruction_bound.InstructionBoundBlock; -import io.github.skippyall.minions.block.instruction_bound.InstructionBoundBlockEntity; -import io.github.skippyall.minions.registration.MinionBlocks; import io.github.skippyall.minions.Minions; +import io.github.skippyall.minions.block.instruction_bound.InstructionBoundBlock; import io.github.skippyall.minions.polymer.VersionSync; +import io.github.skippyall.minions.registration.MinionBlocks; import net.minecraft.block.AbstractRedstoneGateBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -21,6 +20,7 @@ import net.minecraft.block.SideShapeType; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.component.DataComponentTypes; +import net.minecraft.item.ItemDisplayContext; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.server.network.ServerPlayNetworkHandler; @@ -120,7 +120,7 @@ public class MinionTriggerBlock extends InstructionBoundBlock implements Polymer ElementHolder holder = new ElementHolder() { @Override public boolean startWatching(ServerPlayNetworkHandler player) { - if(PolymerResourcePackUtils.hasMainPack(player)) { + if(PolymerResourcePackUtils.hasMainPack(player) && !VersionSync.isOnClient(player)) { return super.startWatching(player); } else { return false; @@ -130,7 +130,9 @@ public class MinionTriggerBlock extends InstructionBoundBlock implements Polymer ItemStack stack = new ItemStack(Items.BARRIER); stack.set(DataComponentTypes.ITEM_MODEL, Identifier.of(Minions.MOD_ID, "minion_trigger_no_plate_" + (initialBlockState.get(MinionTriggerBlock.POWERED) ? "active" : "inactive"))); - holder.addElement(new ItemDisplayElement(stack)); + ItemDisplayElement element = new ItemDisplayElement(stack); + element.setItemDisplayContext(ItemDisplayContext.NONE); + holder.addElement(element); return holder; } } diff --git a/src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerBlockEntity.java b/src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerBlockEntity.java index 74ddb45..32ed91e 100644 --- a/src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerBlockEntity.java +++ b/src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerBlockEntity.java @@ -1,21 +1,13 @@ package io.github.skippyall.minions.block.miniontrigger; import io.github.skippyall.minions.block.instruction_bound.InstructionBoundBlockEntity; -import io.github.skippyall.minions.listener.BlockEntityMinionListener; import io.github.skippyall.minions.registration.MinionBlocks; -import io.github.skippyall.minions.minion.MinionRuntime; -import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; -import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.storage.ReadView; import net.minecraft.storage.WriteView; import net.minecraft.util.Uuids; import net.minecraft.util.math.BlockPos; -import java.util.Optional; -import java.util.UUID; - public class MinionTriggerBlockEntity extends InstructionBoundBlockEntity { public MinionTriggerBlockEntity(BlockPos pos, BlockState state) { super(MinionBlocks.MINION_TRIGGER_BE_TYPE, pos, state); diff --git a/src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerMinionListener.java b/src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerMinionListener.java index 2657093..41373f7 100644 --- a/src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerMinionListener.java +++ b/src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerMinionListener.java @@ -5,10 +5,10 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import io.github.skippyall.minions.Minions; import io.github.skippyall.minions.listener.BlockEntityMinionInstructionListener; import io.github.skippyall.minions.minion.MinionRuntime; -import io.github.skippyall.minions.registration.MinionBlocks; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; import io.github.skippyall.minions.program.instruction.ConfiguredInstructionListener; +import io.github.skippyall.minions.registration.MinionBlocks; import net.minecraft.registry.RegistryKey; import net.minecraft.server.MinecraftServer; import net.minecraft.util.Identifier; diff --git a/src/main/java/io/github/skippyall/minions/clipboard/ClipboardItem.java b/src/main/java/io/github/skippyall/minions/clipboard/ClipboardItem.java index 3b11dd7..29e0e23 100644 --- a/src/main/java/io/github/skippyall/minions/clipboard/ClipboardItem.java +++ b/src/main/java/io/github/skippyall/minions/clipboard/ClipboardItem.java @@ -1,9 +1,9 @@ package io.github.skippyall.minions.clipboard; import eu.pb4.polymer.core.api.item.PolymerItem; +import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.registration.MinionComponentTypes; import io.github.skippyall.minions.registration.MinionItems; -import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import net.minecraft.component.DataComponentTypes; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -22,7 +22,7 @@ public class ClipboardItem extends Item implements PolymerItem { @Override public Item getPolymerItem(ItemStack itemStack, PacketContext context) { - return Items.PAPER; + return /*VersionSync.isOnClient(context) ? this : */Items.PAPER; } @Override diff --git a/src/main/java/io/github/skippyall/minions/command/DocsSubcommand.java b/src/main/java/io/github/skippyall/minions/command/DocsSubcommand.java index 84956ee..07e7362 100644 --- a/src/main/java/io/github/skippyall/minions/command/DocsSubcommand.java +++ b/src/main/java/io/github/skippyall/minions/command/DocsSubcommand.java @@ -12,8 +12,8 @@ import net.minecraft.util.Identifier; import java.util.concurrent.CompletableFuture; -import static net.minecraft.server.command.CommandManager.literal; import static net.minecraft.server.command.CommandManager.argument; +import static net.minecraft.server.command.CommandManager.literal; public class DocsSubcommand { public static final LiteralArgumentBuilder DOCS = literal("docs") diff --git a/src/main/java/io/github/skippyall/minions/command/MinionsCommand.java b/src/main/java/io/github/skippyall/minions/command/MinionsCommand.java index b10e095..2823d68 100644 --- a/src/main/java/io/github/skippyall/minions/command/MinionsCommand.java +++ b/src/main/java/io/github/skippyall/minions/command/MinionsCommand.java @@ -14,7 +14,8 @@ public class MinionsCommand { LiteralArgumentBuilder builder = literal("minions") .then(SpawnSubcommand.SPAWN) .then(ListSubcommand.LIST) - .then(DocsSubcommand.DOCS); + .then(DocsSubcommand.DOCS) + .then(TestSubcommand.TEST); if(MinionsConfig.get().minion.enableMobCapHacks) { builder.then(MobCapDebugSubcommand.MOB_CAP_DEBUG); diff --git a/src/main/java/io/github/skippyall/minions/command/TestSubcommand.java b/src/main/java/io/github/skippyall/minions/command/TestSubcommand.java new file mode 100644 index 0000000..089b69a --- /dev/null +++ b/src/main/java/io/github/skippyall/minions/command/TestSubcommand.java @@ -0,0 +1,78 @@ +package io.github.skippyall.minions.command; + +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import com.mojang.brigadier.context.CommandContext; +import io.github.skippyall.minions.Minions; +import net.minecraft.block.Blocks; +import net.minecraft.command.argument.BlockPosArgumentType; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.text.Text; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.World; + +import java.util.Collection; +import java.util.HashSet; + +import static net.minecraft.server.command.CommandManager.argument; +import static net.minecraft.server.command.CommandManager.literal; + +public class TestSubcommand { + public static LiteralArgumentBuilder TEST = literal("test") + .then(argument("pos", BlockPosArgumentType.blockPos()) + .executes(TestSubcommand::execute) + ); + + + private static int execute(CommandContext context) { + try { + BlockPos pos = BlockPosArgumentType.getBlockPos(context, "pos"); + Collection result = findInputs(context.getSource().getWorld(), pos); + for (BlockPos resultPos : result) { + context.getSource().sendFeedback(() -> Text.literal(resultPos.toShortString()), false); + } + } catch (Throwable e) { + Minions.LOGGER.error("Error", e); + } + return 0; + } + + private static Collection findInputs(World world, BlockPos pos) { + //positions that are already processed + Collection visitedPositions = new HashSet<>(); + //positions we are currently looking at + Collection currentPositions = new HashSet<>(); + //new positions are added here + Collection newPositions = new HashSet<>(); + //resulting machines + Collection machines = new HashSet<>(); + + currentPositions.add(pos); + + while(!currentPositions.isEmpty()) { + for(BlockPos currentPosition : currentPositions) { + for(Direction dir : Direction.values()) { + //check each neighbor of the current positions + BlockPos newPos = currentPosition.offset(dir); + //Do not check blocks that were already checked + if(!visitedPositions.contains(newPos)) { + if (world.getBlockState(newPos).getBlock() == Blocks.REDSTONE_BLOCK) { + //Add pipes to positions for the next iteration + newPositions.add(newPos); + } else if (world.getBlockState(newPos).getBlock() == Blocks.IRON_BLOCK) { + //Add machines to output set + machines.add(newPos); + } + //Add checked blocks here so that they are not checked again + visitedPositions.add(newPos); + } + } + } + //Check the new positions in the next iteration + currentPositions = newPositions; + newPositions = new HashSet<>(); + } + + return machines; + } +} diff --git a/src/main/java/io/github/skippyall/minions/docs/DocsEntry.java b/src/main/java/io/github/skippyall/minions/docs/DocsEntry.java index 9633186..31a4a75 100644 --- a/src/main/java/io/github/skippyall/minions/docs/DocsEntry.java +++ b/src/main/java/io/github/skippyall/minions/docs/DocsEntry.java @@ -6,7 +6,6 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import io.github.skippyall.minions.registration.MinionRegistries; import net.minecraft.dialog.body.DialogBody; import net.minecraft.registry.DynamicRegistryManager; -import net.minecraft.server.network.ServerPlayerEntity; import java.util.List; import java.util.function.Function; diff --git a/src/main/java/io/github/skippyall/minions/docs/DocsManager.java b/src/main/java/io/github/skippyall/minions/docs/DocsManager.java index 38698c0..ea7de95 100644 --- a/src/main/java/io/github/skippyall/minions/docs/DocsManager.java +++ b/src/main/java/io/github/skippyall/minions/docs/DocsManager.java @@ -8,7 +8,6 @@ import net.minecraft.dialog.AfterAction; import net.minecraft.dialog.DialogActionButtonData; import net.minecraft.dialog.DialogButtonData; import net.minecraft.dialog.DialogCommonData; -import net.minecraft.dialog.action.DynamicRunCommandDialogAction; import net.minecraft.dialog.action.SimpleDialogAction; import net.minecraft.dialog.type.MultiActionDialog; import net.minecraft.registry.entry.RegistryEntry; diff --git a/src/main/java/io/github/skippyall/minions/docs/ReferenceEntry.java b/src/main/java/io/github/skippyall/minions/docs/ReferenceEntry.java index 43b5687..2addd61 100644 --- a/src/main/java/io/github/skippyall/minions/docs/ReferenceEntry.java +++ b/src/main/java/io/github/skippyall/minions/docs/ReferenceEntry.java @@ -50,7 +50,7 @@ public record ReferenceEntry(Metadata metadata, RegistryKey object, Text shor bodyElements.add(new ItemDialogBody(display.createItemStack(), Optional.empty(), false, false, 16, 16)); } bodyElements.add(new PlainMessageDialogBody(Text.translatable(object.getValue().toTranslationKey(object.getRegistry().getPath())), 200)); - bodyElements.add(new PlainMessageDialogBody(longDescription.copy().append("\n".repeat(100)), 200)); + bodyElements.add(new PlainMessageDialogBody(longDescription, 200)); return bodyElements; } diff --git a/src/main/java/io/github/skippyall/minions/gui/GuiDisplay.java b/src/main/java/io/github/skippyall/minions/gui/GuiDisplay.java index 3a8ae6a..9328196 100644 --- a/src/main/java/io/github/skippyall/minions/gui/GuiDisplay.java +++ b/src/main/java/io/github/skippyall/minions/gui/GuiDisplay.java @@ -15,6 +15,7 @@ import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.text.Text; +import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; import net.minecraft.util.Uuids; @@ -46,7 +47,7 @@ public interface GuiDisplay { static ItemStack getDisplayStackWithName(Registry registry, T element, DynamicRegistryManager manager) { ItemStack stack = getDisplayStack(registry, element, manager); - stack.set(DataComponentTypes.ITEM_NAME, Text.translatable(TranslationUtil.getTranslationKey(element, registry))); + stack.set(DataComponentTypes.CUSTOM_NAME, Text.translatable(TranslationUtil.getTranslationKey(element, registry)).styled(style -> style.withItalic(false).withColor(Formatting.WHITE))); return stack; } diff --git a/src/main/java/io/github/skippyall/minions/gui/MinionBoundSimpleGui.java b/src/main/java/io/github/skippyall/minions/gui/MinionBoundSimpleGui.java deleted file mode 100644 index 7ea084b..0000000 --- a/src/main/java/io/github/skippyall/minions/gui/MinionBoundSimpleGui.java +++ /dev/null @@ -1,37 +0,0 @@ -package io.github.skippyall.minions.gui; - -import eu.pb4.sgui.api.gui.SimpleGui; -import io.github.skippyall.minions.minion.MinionListener; -import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.server.network.ServerPlayerEntity; - -public class MinionBoundSimpleGui extends SimpleGui implements MinionListener { - protected final MinionFakePlayer minion; - - public MinionBoundSimpleGui(ScreenHandlerType type, ServerPlayerEntity player, MinionFakePlayer minion) { - super(type, player, false); - this.minion = minion; - minion.addMinionListener(this); - } - - public MinionFakePlayer getMinion() { - return minion; - } - - @Override - public void onMinionRemove(MinionFakePlayer minion) { - close(); - } - - @Override - public void onClose() { - minion.removeMinionListener(this); - } - - @Override - public boolean equals(Object o) { - if (!(o instanceof MinionBoundSimpleGui that)) return false; - return minion == that.minion && player == that.player; - } -} diff --git a/src/main/java/io/github/skippyall/minions/gui/MinionLookGui.java b/src/main/java/io/github/skippyall/minions/gui/MinionLookGui.java index c4f5938..b16f338 100644 --- a/src/main/java/io/github/skippyall/minions/gui/MinionLookGui.java +++ b/src/main/java/io/github/skippyall/minions/gui/MinionLookGui.java @@ -2,12 +2,12 @@ package io.github.skippyall.minions.gui; import eu.pb4.sgui.api.elements.GuiElementBuilder; import eu.pb4.sgui.api.gui.SimpleGui; -import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.gui.input.TextInput; import io.github.skippyall.minions.minion.MinionData; import io.github.skippyall.minions.minion.MinionItem; import io.github.skippyall.minions.minion.MinionProfileUtils; import io.github.skippyall.minions.minion.skin.SkinProvider; +import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.registration.SkinProviders; import net.minecraft.component.DataComponentTypes; import net.minecraft.component.type.ProfileComponent; diff --git a/src/main/java/io/github/skippyall/minions/gui/MinionsGui.java b/src/main/java/io/github/skippyall/minions/gui/MinionsGui.java index ebec233..08ecbf0 100644 --- a/src/main/java/io/github/skippyall/minions/gui/MinionsGui.java +++ b/src/main/java/io/github/skippyall/minions/gui/MinionsGui.java @@ -6,23 +6,25 @@ import org.jetbrains.annotations.Nullable; public abstract class MinionsGui { protected final @Nullable MinionsGui parent; protected final ServerPlayerEntity viewer; - private @Nullable MinionsGui child = null; + protected @Nullable MinionsGui child = null; private boolean open = true; public MinionsGui(MinionsGui parent) { this.viewer = parent.viewer; this.parent = parent; parent.child = this; - open(); } public MinionsGui(ServerPlayerEntity viewer) { this.viewer = viewer; this.parent = null; - open(); } - protected void open() {} + public ServerPlayerEntity getViewer() { + return viewer; + } + + protected abstract void open(); protected void reopen() { open(); @@ -38,17 +40,26 @@ public abstract class MinionsGui { public void close() { if(open) { - if(child != null) { - child.close(); - } if(parent != null) { parent.child = null; parent.reopen(); } - onClose(); - open = false; + closeNoOpen(parent == null); } } - protected void onClose() {} + private void closeNoOpen(boolean closeBacking) { + if(child != null) { + child.closeNoOpen(closeBacking); + } + if(parent != null) { + parent.child = null; + } + if(closeBacking) { + closeBacking(); + } + open = false; + } + + protected abstract void closeBacking(); } diff --git a/src/main/java/io/github/skippyall/minions/gui/PaginatedList.java b/src/main/java/io/github/skippyall/minions/gui/PaginatedList.java index 2dde6ef..3fd3af3 100644 --- a/src/main/java/io/github/skippyall/minions/gui/PaginatedList.java +++ b/src/main/java/io/github/skippyall/minions/gui/PaginatedList.java @@ -1,55 +1,79 @@ package io.github.skippyall.minions.gui; import eu.pb4.sgui.api.elements.GuiElementBuilder; -import eu.pb4.sgui.api.gui.SlotGuiInterface; -import io.github.skippyall.minions.gui.minion.MinionGui; +import eu.pb4.sgui.api.gui.SimpleGui; import net.minecraft.item.Items; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.text.Text; import net.minecraft.util.collection.IndexedIterable; import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Function; +import java.util.function.BiFunction; -public class PaginatedList { - public static void createList(SlotGuiInterface gui, int size, Function display, Runnable onBack) { - AtomicInteger page = new AtomicInteger(0); - addItems(page, gui, size, display); +public class PaginatedList extends MinionsGui { + private int page = 0; + private SimpleGui gui; + private final Text title; + private final int size; + private final BiFunction display; - gui.setSlot(27, MinionGui.backButton(onBack)); + public PaginatedList(MinionsGui parent, Text title, int size, BiFunction display) { + super(parent); + this.title = title; + this.size = size; + this.display = display; + open(); } - public static void createList(SlotGuiInterface gui, List list, Function display, Runnable onBack) { - createList(gui, list.size(), i -> display.apply(list.get(i)), onBack); + @Override + protected void open() { + gui = new SimpleGui(ScreenHandlerType.GENERIC_9X4, viewer, false) { + @Override + public void onClose() { + onBackingClosed(); + } + }; + gui.setTitle(title); + addItems(); + gui.open(); } - public static void createList(SlotGuiInterface gui, IndexedIterable list, Function display, Runnable onBack) { - createList(gui, list.size(), i -> display.apply(list.get(i)), onBack); + @Override + protected void closeBacking() { + gui.close(); } - private static void addItems(AtomicInteger page, SlotGuiInterface gui, int size, Function display) { - for(int i = 27 * page.get(); i < Math.min(27 * (page.get() + 1), size); i++) { - gui.addSlot(display.apply(i)); + public static void createList(MinionsGui parent, Text title, List list, BiFunction display) { + new PaginatedList(parent, title, list.size(), (i, gui) -> display.apply(list.get(i), gui)); + } + + public static void createList(MinionsGui parent, Text title, IndexedIterable list, BiFunction display) { + new PaginatedList(parent, title, list.size(), (i, gui) -> display.apply(list.get(i), gui)); + } + + private void addItems() { + for(int i = 27 * page; i < Math.min(27 * (page + 1), size); i++) { + gui.addSlot(display.apply(i, this)); } - if(page.get() > 0) { + if(page > 0) { gui.setSlot(30, new GuiElementBuilder(Items.SPECTRAL_ARROW) .setItemName(Text.translatable("book.page_button.previous")) .setCallback(() -> { - page.decrementAndGet(); - addItems(page, gui, size, display); + page--; + addItems(); }) ); } else { gui.clearSlot(30); } - if(27 * (page.get() + 1) < size) { + if(27 * (page + 1) < size) { gui.setSlot(32, new GuiElementBuilder(Items.ARROW) .setItemName(Text.translatable("book.page_button.next")) .setCallback(() -> { - page.incrementAndGet(); - addItems(page, gui, size, display); + page++; + addItems(); }) ); } else { diff --git a/src/main/java/io/github/skippyall/minions/gui/input/ChoiceInput.java b/src/main/java/io/github/skippyall/minions/gui/input/ChoiceInput.java index 0e6ba7d..2c9df98 100644 --- a/src/main/java/io/github/skippyall/minions/gui/input/ChoiceInput.java +++ b/src/main/java/io/github/skippyall/minions/gui/input/ChoiceInput.java @@ -4,6 +4,8 @@ import eu.pb4.sgui.api.elements.GuiElementBuilder; import eu.pb4.sgui.api.gui.SimpleGui; import io.github.skippyall.minions.gui.Displayable; import io.github.skippyall.minions.gui.GuiDisplay; +import io.github.skippyall.minions.gui.MinionsGui; +import io.github.skippyall.minions.gui.minion.SimpleMinionsGui; import net.minecraft.item.Items; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.server.network.ServerPlayerEntity; @@ -72,6 +74,36 @@ public class ChoiceInput { return future; } + public static CompletableFuture confirm(MinionsGui parent, Text title) { + CompletableFuture future = new CompletableFuture<>(); + + new SimpleMinionsGui(parent, (onClose, me) -> { + SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, parent.getViewer(), false) { + @Override + public void onClose() { + future.cancel(false); + onClose.run(); + } + }; + + gui.setTitle(title); + + gui.setSlot(3, new GuiElementBuilder(Items.REDSTONE_BLOCK) + .setName(Text.translatable("minions.gui.abort")) + .setCallback(() -> future.cancel(false)) + ); + + gui.setSlot(5, new GuiElementBuilder(Items.EMERALD_BLOCK) + .setName(Text.translatable("minions.gui.confirm")) + .setCallback(() -> future.complete(null)) + ); + + gui.open(); + return gui; + }); + return future; + } + public static BiFunction> inputBoolean(Text title) { return createDialogOpener(ScreenHandlerType.GENERIC_3X3, title, value -> { if(value) { diff --git a/src/main/java/io/github/skippyall/minions/gui/input/Result.java b/src/main/java/io/github/skippyall/minions/gui/input/Result.java index 8dd4e9b..f0ffdec 100644 --- a/src/main/java/io/github/skippyall/minions/gui/input/Result.java +++ b/src/main/java/io/github/skippyall/minions/gui/input/Result.java @@ -1,10 +1,12 @@ package io.github.skippyall.minions.gui.input; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.Optional; import java.util.function.Consumer; import java.util.function.Function; +import java.util.function.Supplier; public interface Result { static Result wrap(UnsafeOperation toWrap) { @@ -23,6 +25,22 @@ public interface Result { } } + static Result ofNullable(@Nullable T value, E error) { + if(value != null) { + return new Success<>(value); + } else { + return new Error<>(error); + } + } + + static Result ofNullable(@Nullable T value, Supplier error) { + if(value != null) { + return new Success<>(value); + } else { + return new Error<>(error.get()); + } + } + boolean isSuccess(); T getOrDefault(T defaultValue); @@ -33,10 +51,18 @@ public interface Result { @NotNull Optional getOptional(); + @NotNull Optional getOptionalError(); + void ifSuccess(@NotNull Consumer handler); void ifError(@NotNull Consumer> handler); + Result map(Function mapper); + + Result flatMap(Function> mapper); + + Result mapError(Function mapper); + record Success(T result) implements Result { @Override public boolean isSuccess() { @@ -48,6 +74,11 @@ public interface Result { return result; } + @Override + public @NotNull Optional getOptionalError() { + return Optional.empty(); + } + @Override public T getOrThrow() { return result; @@ -60,7 +91,7 @@ public interface Result { @Override public @NotNull Optional getOptional() { - return Optional.of(result); + return Optional.ofNullable(result); } @Override @@ -72,6 +103,21 @@ public interface Result { public void ifError(@NotNull Consumer> handler) { } + + @Override + public Result map(Function mapper) { + return new Success<>(mapper.apply(result)); + } + + @Override + public Result flatMap(Function> mapper) { + return mapper.apply(result); + } + + @Override + public Result mapError(Function mapper) { + return new Success<>(result); + } } record Error(E message) implements Result { @@ -101,6 +147,11 @@ public interface Result { return Optional.empty(); } + @Override + public @NotNull Optional getOptionalError() { + return Optional.ofNullable(message); + } + @Override public void ifSuccess(@NotNull Consumer handler) { @@ -110,6 +161,21 @@ public interface Result { public void ifError(@NotNull Consumer> handler) { handler.accept(this); } + + @Override + public Result map(Function mapper) { + return new Error<>(message); + } + + @Override + public Result flatMap(Function> mapper) { + return new Error<>(message); + } + + @Override + public Result mapError(Function mapper) { + return new Error<>(mapper.apply(message)); + } } interface UnsafeOperation { diff --git a/src/main/java/io/github/skippyall/minions/gui/input/TextInput.java b/src/main/java/io/github/skippyall/minions/gui/input/TextInput.java index 9add272..bde1964 100644 --- a/src/main/java/io/github/skippyall/minions/gui/input/TextInput.java +++ b/src/main/java/io/github/skippyall/minions/gui/input/TextInput.java @@ -2,6 +2,8 @@ package io.github.skippyall.minions.gui.input; import eu.pb4.sgui.api.elements.GuiElementBuilder; import eu.pb4.sgui.api.gui.AnvilInputGui; +import io.github.skippyall.minions.gui.MinionsGui; +import io.github.skippyall.minions.gui.minion.SimpleMinionsGui; import net.minecraft.item.Items; import net.minecraft.screen.AnvilScreenHandler; import net.minecraft.server.network.ServerPlayerEntity; @@ -37,24 +39,54 @@ public class TextInput extends AnvilInputGui { return input(player, title, defaultValue, (String string) -> CompletableFuture.completedFuture(parser.apply(string))); } + public static CompletableFuture inputSync(MinionsGui gui, Text title, String defaultValue, Function> parser) { + return input(gui, title, defaultValue, (String string) -> CompletableFuture.completedFuture(parser.apply(string))); + } + public static CompletableFuture input(ServerPlayerEntity player, Text title, String defaultValue, Function>> parser) { CompletableFuture future = new CompletableFuture<>(); new TextInput<>(player, title, defaultValue, parser, future).open(); return future; } + public static CompletableFuture input(MinionsGui gui, Text title, String defaultValue, Function>> parser) { + CompletableFuture future = new CompletableFuture<>(); + new SimpleMinionsGui(gui, (onClose, me) -> { + TextInput input = new TextInput<>(gui.getViewer(), title, defaultValue, parser, future); + future.handle((v, e) -> { + onClose.run(); + return null; + }); + input.open(); + return input; + }); + return future; + } + public static CompletableFuture inputString(ServerPlayerEntity player, Text title, String defaultValue) { return inputSync(player, title, defaultValue, Result.Success::new); } + public static CompletableFuture inputString(MinionsGui gui, Text title, String defaultValue) { + return inputSync(gui, title, defaultValue, Result.Success::new); + } + public static CompletableFuture inputLong(ServerPlayerEntity player, Text title, String defaultValue) { return inputSync(player, title, defaultValue, string -> Result.wrapCustomError(() -> Long.valueOf(string), Text.translatable("minions.command.input.int.fail"))); } + public static CompletableFuture inputLong(MinionsGui gui, Text title, String defaultValue) { + return inputSync(gui, title, defaultValue, string -> Result.wrapCustomError(() -> Long.valueOf(string), Text.translatable("minions.command.input.int.fail"))); + } + public static CompletableFuture inputDouble(ServerPlayerEntity player, Text title, String defaultValue) { return inputSync(player, title, defaultValue, string -> Result.wrapCustomError(() -> Double.valueOf(string), Text.translatable("minions.command.input.float.fail"))); } + public static CompletableFuture inputDouble(MinionsGui gui, Text title, String defaultValue) { + return inputSync(gui, title, defaultValue, string -> Result.wrapCustomError(() -> Double.valueOf(string), Text.translatable("minions.command.input.float.fail"))); + } + @Override public void onInput(String input) { updateConfirmButton(input); diff --git a/src/main/java/io/github/skippyall/minions/gui/instruction/ArgumentGui.java b/src/main/java/io/github/skippyall/minions/gui/instruction/ArgumentGui.java index 7a03fb5..8e91d55 100644 --- a/src/main/java/io/github/skippyall/minions/gui/instruction/ArgumentGui.java +++ b/src/main/java/io/github/skippyall/minions/gui/instruction/ArgumentGui.java @@ -3,79 +3,160 @@ package io.github.skippyall.minions.gui.instruction; import eu.pb4.sgui.api.elements.GuiElementBuilder; import eu.pb4.sgui.api.gui.SimpleGui; import io.github.skippyall.minions.gui.GuiDisplay; +import io.github.skippyall.minions.gui.MinionsGui; +import io.github.skippyall.minions.gui.PaginatedList; +import io.github.skippyall.minions.gui.minion.GuiContext; import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; import io.github.skippyall.minions.program.supplier.Parameter; import io.github.skippyall.minions.program.supplier.ValueSupplier; +import io.github.skippyall.minions.program.supplier.ValueSupplierList; import io.github.skippyall.minions.program.supplier.ValueSupplierType; import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.util.TranslationUtil; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; -import java.util.concurrent.CompletableFuture; +public class ArgumentGui extends MinionsGui { + private final GuiContext.ValueSupplier context; + private final MinionFakePlayer minion; + private final ConfiguredInstruction instruction; + private final Parameter parameter; -public class ArgumentGui { - public static > void configureArgumentMenu(String instructionName, ConfiguredInstruction instruction, Parameter parameter, MinionFakePlayer minion, ServerPlayerEntity player) { - if (!InstructionGui.checkInstructionExists(instructionName, instruction, minion, player)) { - return; + private SimpleGui gui; + + private @Nullable ValueSupplierType argumentType; + private @Nullable ValueSupplierList.ValueSupplierEntry entry; + + public ArgumentGui(MinionsGui parent, GuiContext.ValueSupplier context) { + super(parent); + minion = context.getMinion(); + instruction = context.getInstruction(); + this.parameter = context.getParameter(); + this.context = context; + + this.entry = instruction.getArguments().getEntry(parameter); + if(entry != null) { + this.argumentType = entry.getSupplier().getType(); } - - @Nullable ValueSupplier argument = instruction.getArguments().getArgument(parameter); - - if(argument == null) { - configureTypeAndValue(instructionName, instruction, parameter, minion, player); - return; - } - - configureArgumentHelper(instructionName, instruction, parameter, argument, minion, player); + open(); } - private static void configureArgumentHelper(String instructionName, ConfiguredInstruction instruction, Parameter parameter, ValueSupplier argument, MinionFakePlayer minion, ServerPlayerEntity player) { - SimpleGui gui = new InstructionBoundSimpleGui(ScreenHandlerType.GENERIC_3X3, player, minion, instruction); + public String getInstructionName() { + return context.getName(); + } - ItemStack displayStack = GuiDisplay.getDisplayStack(MinionRegistries.VALUE_SUPPLIER_TYPES, argument.getType(), player.getRegistryManager()); + public @Nullable ValueSupplier getArgument() { + if(entry != null) { + return entry.getSupplier(); + } + return null; + } + + @Override + protected void open() { + gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, viewer, false) { + @Override + public void onClose() { + onBackingClosed(); + } + }; + gui.setTitle(Text.translatable( + "minions.gui.instruction.argument.title", + parameter.name(), + Text.translatable(TranslationUtil.getTranslationKey(parameter.type(), MinionRegistries.VALUE_TYPES)) + )); + + updateTypeConfiguration(); + updateArgumentConfiguration(); + updateConverterConfiguration(); + gui.open(); + } + + private void updateTypeConfiguration() { + ItemStack displayStack; + if(argumentType != null) { + displayStack = GuiDisplay.getDisplayStack(MinionRegistries.VALUE_SUPPLIER_TYPES, argumentType, viewer.getRegistryManager()); + } else { + displayStack = new ItemStack(Items.BARRIER); + } gui.setSlot(3, new GuiElementBuilder(displayStack) - .setName(Text.translatable("minions.gui.instruction.argument.configure.type", Text.translatable(TranslationUtil.getTranslationKey(argument.getType(), MinionRegistries.VALUE_SUPPLIER_TYPES, "minions.gui.instruction.argument.configure.type.unset")))) - .setCallback(() -> configureTypeAndValue(instructionName, instruction, parameter, minion, player)) + .setName(Text.translatable("minions.gui.instruction.argument.configure.type")) + .addLoreLine(Text.translatable(TranslationUtil.getTranslationKey( + argumentType, + MinionRegistries.VALUE_SUPPLIER_TYPES, + "minions.gui.not_set" + ))) + .setCallback(this::selectArgumentType) ); - gui.setSlot(5, new GuiElementBuilder(Items.STRUCTURE_VOID) - .setName(Text.literal("Configure")) - .setCallback(() -> argument.getType().openConfiguration(player, argument.getValueType(), argument) - .thenAccept(newArgument -> { - instruction.getArguments().setArgument(parameter, newArgument); - configureArgumentMenu(instructionName, instruction, parameter, minion, player); - }) - ) - ); - gui.open(); } - public static CompletableFuture> selectArgumentType(ServerPlayerEntity player, MinionFakePlayer minion, ConfiguredInstruction instruction) { - CompletableFuture> future = new CompletableFuture<>(); - SimpleGui gui = new InstructionBoundSimpleGui(ScreenHandlerType.GENERIC_9X3, player, minion, instruction); - for (ValueSupplierType type : MinionRegistries.VALUE_SUPPLIER_TYPES) { - gui.addSlot(new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_SUPPLIER_TYPES, type, player.getRegistryManager())) - .setCallback(() -> future.complete(type)) + private void updateArgumentConfiguration() { + if(argumentType != null) { + gui.setSlot(4, new GuiElementBuilder(Items.STRUCTURE_VOID) + .setName(Text.translatable("minions.gui.instruction.argument.configure.data")) + .addLoreLine(getArgument() != null ? getArgument().getDisplayText() : Text.translatable("minions.gui.not_set")) + .setCallback(() -> argumentType.openConfiguration(this, parameter.type(), getArgument()) + .thenAccept(newArgument -> { + setArgument(newArgument); + if(child != null) { + child.close(); + } + }) + ) ); } - gui.open(); - return future; } - public static void configureTypeAndValue(String name, ConfiguredInstruction instruction, Parameter parameter, MinionFakePlayer minion, ServerPlayerEntity player) { - selectArgumentType(player, minion, instruction) - .thenApply(type -> type.openConfiguration(player, parameter.type(), null) - .thenAccept(v -> { - instruction.getArguments().setArgument(parameter, v); - configureArgumentMenu(name, instruction, parameter, minion, player); + private void updateConverterConfiguration() { + if(entry != null) { + gui.setSlot(5, new GuiElementBuilder(Items.CRAFTER) + .setName(Text.translatable("minions.gui.instruction.converters")) + .setCallback(this::configureConvertersMenu) + ); + } + } + + @Override + protected void closeBacking() { + gui.close(); + } + + public void setArgumentType(ValueSupplierType type) { + this.argumentType = type; + if(entry != null && getArgument().getType() != argumentType) { + instruction.getArguments().removeEntry(parameter); + entry = null; + } + updateTypeConfiguration(); + } + + public void setArgument(ValueSupplier argument) { + if(entry != null) { + entry.setSupplier(argument); + } else { + entry = instruction.getArguments().createEntry(parameter, argument); + } + } + + public void selectArgumentType() { + PaginatedList.createList(this, Text.translatable("minions.gui.instruction.argument.configure.type.title"), MinionRegistries.VALUE_SUPPLIER_TYPES, (type, me) -> + new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_SUPPLIER_TYPES, type, viewer.getRegistryManager())) + .setCallback(() -> { + setArgumentType(type); + me.close(); }) - ); + ); + } + + public void configureConvertersMenu() { + if(entry != null) { + new ConverterListGui(this, entry.getConverters(), entry.getSupplier().getValueType(), entry.getParameter().type()); + } } } diff --git a/src/main/java/io/github/skippyall/minions/gui/instruction/ConfigureInstructionGui.java b/src/main/java/io/github/skippyall/minions/gui/instruction/ConfigureInstructionGui.java index 5d1d78a..4d502b9 100644 --- a/src/main/java/io/github/skippyall/minions/gui/instruction/ConfigureInstructionGui.java +++ b/src/main/java/io/github/skippyall/minions/gui/instruction/ConfigureInstructionGui.java @@ -1,78 +1,100 @@ package io.github.skippyall.minions.gui.instruction; import eu.pb4.sgui.api.elements.GuiElementBuilder; +import eu.pb4.sgui.api.gui.SimpleGui; +import io.github.skippyall.minions.clipboard.ClipboardItem; +import io.github.skippyall.minions.gui.MinionsGui; import io.github.skippyall.minions.gui.input.ChoiceInput; +import io.github.skippyall.minions.gui.minion.GuiContext; +import io.github.skippyall.minions.minion.MinionListener; import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; +import io.github.skippyall.minions.program.instruction.ConfiguredInstructionListener; import io.github.skippyall.minions.program.supplier.Parameter; -import io.github.skippyall.minions.clipboard.ClipboardItem; import net.minecraft.item.Items; import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.text.Text; -public class ConfigureInstructionGui extends InstructionBoundSimpleGui { +public class ConfigureInstructionGui extends MinionsGui implements ConfiguredInstructionListener, MinionListener { private String name; + private final ConfiguredInstruction instruction; + private final MinionFakePlayer minion; - private ConfigureInstructionGui(ScreenHandlerType type, ServerPlayerEntity player, MinionFakePlayer minion, ConfiguredInstruction configuredInstruction, String name) { - super(type, player, minion, configuredInstruction); - this.name = name; - init(); - } - - public static void configureInstructionMenu(String name, ConfiguredInstruction instruction, MinionFakePlayer minion, ServerPlayerEntity player) { - if(!InstructionGui.checkInstructionExists(name, instruction, minion, player)) { - return; - } - - ConfigureInstructionGui gui = new ConfigureInstructionGui(ScreenHandlerType.GENERIC_9X3, player, minion, instruction, name); - - gui.open(); - } + private final GuiContext.Instruction context; - private void init() { - setTitle(Text.literal(name)); + private SimpleGui gui; + + public ConfigureInstructionGui(MinionsGui parent, GuiContext.Instruction context) { + super(parent); + this.name = context.getName(); + this.instruction = context.getInstruction(); + this.minion = context.getMinion(); + this.context = context; + minion.addMinionListener(this); + instruction.addListener(this); + open(); + } - setSlot(7, new GuiElementBuilder(Items.ANVIL) + @Override + protected void open() { + gui = new SimpleGui(ScreenHandlerType.GENERIC_9X3, viewer, false) { + @Override + public void onClose() { + onBackingClosed(); + } + }; + + gui.setTitle(Text.literal(name)); + + gui.setSlot(7, new GuiElementBuilder(Items.ANVIL) .setName(Text.translatable("minions.gui.instruction.configure.rename")) - .setCallback(() -> InstructionGui.inputInstructionName(minion, player, name).thenAccept(newName -> { + .setCallback(() -> InstructionGui.inputInstructionName(this, context, name).thenAccept(newName -> { minion.getInstructionManager().setInstructionName(name, newName); - configureInstructionMenu(newName, instruction, minion, player); + reopen(); })) ); - setSlot(8, new GuiElementBuilder(Items.LAVA_BUCKET) + gui.setSlot(8, new GuiElementBuilder(Items.LAVA_BUCKET) .setName(Text.translatable("minions.gui.instruction.configure.delete")) - .setCallback(() -> ChoiceInput.confirm(player, Text.translatable("minions.gui.instruction.configure.delete.confirm", name)) + .setCallback(() -> ChoiceInput.confirm(this, Text.translatable("minions.gui.instruction.configure.delete.confirm", name)) .thenAccept(v -> { minion.getInstructionManager().removeInstruction(name); - InstructionGui.instructionList(minion, player); + close(); })) ); updateSuppliers(); - setSlot(13, InstructionGui.createInstructionElement(instruction.getInstruction(), player.getRegistryManager())); + gui.setSlot(13, InstructionGui.createInstructionElement(instruction.getInstruction(), viewer.getRegistryManager())); - setSlot(25, new GuiElementBuilder(Items.FEATHER) + gui.setSlot(25, new GuiElementBuilder(Items.FEATHER) .setName(Text.translatable("minions.gui.instruction.configure.copy")) .addLoreLine(Text.translatable("minions.gui.instruction.configure.copy.description")) .setCallback(() -> { - player.getInventory().offer(ClipboardItem.createInstructionReference(minion, name), true); - player.playSoundToPlayer(SoundEvents.BLOCK_NOTE_BLOCK_CHIME.value(), SoundCategory.BLOCKS, 1, 1); + viewer.getInventory().offer(ClipboardItem.createInstructionReference(minion, name), true); + viewer.playSoundToPlayer(SoundEvents.BLOCK_NOTE_BLOCK_CHIME.value(), SoundCategory.BLOCKS, 1, 1); }) ); updateRunSlot(); + gui.open(); + } + + @Override + protected void closeBacking() { + gui.close(); + minion.removeMinionListener(this); + instruction.removeListener(this); } @Override public void onInstructionRename(MinionFakePlayer minion, ConfiguredInstruction instruction, String oldName, String newName) { - this.setTitle(Text.literal(newName)); + gui.setTitle(Text.literal(newName)); name = newName; + context.setName(newName); } @Override @@ -92,12 +114,12 @@ public class ConfigureInstructionGui extends InstructionBoundSimpleGui { private void updateRunSlot() { if(!instruction.isRunning()) { - setSlot(26, new GuiElementBuilder(Items.ARROW) + gui.setSlot(26, new GuiElementBuilder(Items.ARROW) .setName(Text.translatable("minions.gui.instruction.run")) .setCallback(() -> instruction.run(minion.getInstructionManager())) ); } else { - setSlot(26, new GuiElementBuilder(Items.BARRIER) + gui.setSlot(26, new GuiElementBuilder(Items.BARRIER) .setName(Text.translatable("minions.gui.instruction.stop")) .setCallback(() -> instruction.stop(minion.getInstructionManager())) ); @@ -107,8 +129,8 @@ public class ConfigureInstructionGui extends InstructionBoundSimpleGui { private void updateSuppliers() { int slot = 12; for(Parameter parameter : instruction.getInstruction().getParameters().reversed()) { - setSlot(slot, InstructionGui.createParameterElement(parameter, instruction.getArguments().getArgument(parameter), player.getRegistryManager()) - .setCallback(() -> ArgumentGui.configureArgumentMenu(name, instruction, parameter, minion, player)) + gui.setSlot(slot, InstructionGui.createParameterElement(parameter, instruction.getArguments().getArgument(parameter), viewer.getRegistryManager()) + .setCallback(() -> new ArgumentGui(this, GuiContext.ValueSupplier.create(context, parameter))) ); slot--; } diff --git a/src/main/java/io/github/skippyall/minions/gui/instruction/ConverterGui.java b/src/main/java/io/github/skippyall/minions/gui/instruction/ConverterGui.java index d90e63b..8cfccac 100644 --- a/src/main/java/io/github/skippyall/minions/gui/instruction/ConverterGui.java +++ b/src/main/java/io/github/skippyall/minions/gui/instruction/ConverterGui.java @@ -1,71 +1,131 @@ package io.github.skippyall.minions.gui.instruction; import eu.pb4.sgui.api.elements.GuiElementBuilder; +import eu.pb4.sgui.api.gui.SimpleGui; import io.github.skippyall.minions.gui.GuiDisplay; +import io.github.skippyall.minions.gui.MinionsGui; import io.github.skippyall.minions.gui.PaginatedList; -import io.github.skippyall.minions.minion.MinionRuntime; -import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; +import io.github.skippyall.minions.program.conversion.ConverterList; import io.github.skippyall.minions.program.conversion.ValueConverter; import io.github.skippyall.minions.program.conversion.ValueConverterType; -import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; -import io.github.skippyall.minions.program.supplier.Parameter; -import io.github.skippyall.minions.program.supplier.ValueSupplierList; import io.github.skippyall.minions.program.value.ValueType; import io.github.skippyall.minions.registration.MinionRegistries; import net.minecraft.item.Items; import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; -public class ConverterGui { - public static void configureConvertersMenu(ServerPlayerEntity player, MinionFakePlayer minion, ConfiguredInstruction instruction, Parameter parameter, Runnable back) { - InstructionBoundSimpleGui gui = new InstructionBoundSimpleGui(ScreenHandlerType.GENERIC_9X4, player, minion, instruction); +public class ConverterGui extends MinionsGui { + private @Nullable ValueConverterType valueConverterType; + private @Nullable ValueConverter converter; + private ConverterList list; + private ValueType from, to; + + private SimpleGui gui; + private boolean isNew; + private int index; + + public ConverterGui(MinionsGui parent, @Nullable ValueConverter converter, ValueType from, ValueType to, ConverterList list, boolean isNew, int index) { + super(parent); + open(); + this.converter = converter; + if(converter != null) { + this.valueConverterType = converter.getType(); + } + this.from = from; + this.to = to; + this.list = list; + this.isNew = isNew; + this.index = index; + } + + @Override + protected void open() { + gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, viewer, false) { + @Override + public void onClose() { + onBackingClosed(); + } + }; + + gui.setTitle(Text.translatable("minions.gui.instruction.converter.title")); + + updateTypeDisplay(); + updateConverterDisplay(); - ValueSupplierList.ValueSupplierEntry entry = instruction.getArguments().getEntry(parameter); - PaginatedList.createList( - gui, - entry.getConverters(), - converter -> createConverterElement(converter, player.getRegistryManager()) - .setCallback(() -> configureConverter(player, minion, instruction, parameter, entry, converter)), - back - ); gui.open(); } + @Override + protected void reopen() { + gui.open(); + } + + private void updateTypeDisplay() { + gui.setSlot(3, new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, valueConverterType, viewer.getRegistryManager())) + .setCallback(this::configureType) + ); + } + + private void updateConverterDisplay() { + gui.setSlot(5, new GuiElementBuilder(Items.STRUCTURE_VOID) + .setName(Text.translatable("minions.gui.instruction.converter.title")) + .addLoreLine(converter == null ? Text.translatable("minions.gui.not_set") : converter.getDisplayText()) + .setCallback(this::configureData) + ); + } + + @Override + protected void closeBacking() { + gui.close(); + } + + private void setType(ValueConverterType valueConverterType) { + this.valueConverterType = valueConverterType; + updateTypeDisplay(); + } + + public void setConverter(ValueConverter converter) { + this.converter = converter; + if(isNew) { + list.getConverters().add(index, converter); + isNew = false; + } else { + list.getConverters().set(index, converter); + } + updateConverterDisplay(); + } + + private void configureType() { + PaginatedList.createList( + this, + Text.translatable("minions.gui.instruction.converter.type.title"), + MinionRegistries.VALUE_CONVERTER_TYPES, + (type, me) -> new GuiElementBuilder( + GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, type, viewer.getRegistryManager()) + ).setCallback(() -> { + setType(type); + me.close(); + }) + ); + } + + private void configureData() { + if(valueConverterType != null) { + valueConverterType.configure(this, from, to, converter) + .thenAccept(newConverter -> { + setConverter(newConverter); + if(child != null) { + child.close(); + } + }); + } + } + public static GuiElementBuilder createConverterElement(ValueConverter converter, DynamicRegistryManager manager) { GuiElementBuilder builder = new GuiElementBuilder(GuiDisplay.getDisplayStack(MinionRegistries.VALUE_CONVERTER_TYPES, converter.getType(), manager)); builder.addLoreLine(converter.getDisplayText()); return builder; } - - public static void configureConverter(ServerPlayerEntity player, MinionFakePlayer minion, ConfiguredInstruction instruction, Parameter parameter, ValueSupplierList.ValueSupplierEntry entry, @Nullable ValueConverter converter) { - InstructionBoundSimpleGui gui = new InstructionBoundSimpleGui(ScreenHandlerType.GENERIC_3X3, player, minion, instruction); - gui.setSlot(3, new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, converter.getType(), player.getRegistryManager())) - .setCallback(() -> { - InstructionBoundSimpleGui chooseTypeGui = new InstructionBoundSimpleGui(ScreenHandlerType.GENERIC_9X4, player, minion, instruction); - PaginatedList.createList( - chooseTypeGui, - MinionRegistries.VALUE_CONVERTER_TYPES, - type -> new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, type, player.getRegistryManager())) - .setCallback(() -> { - entry.set - }), - () -> configureConverter(player, minion, instruction, parameter, entry, converter) - ); - })); - - gui.setSlot(5, new GuiElementBuilder(Items.STRUCTURE_VOID)); - - gui.open(); - } - - public static void selectConverterMenu(ValueType from, ValueType to, ServerPlayerEntity player, MinionFakePlayer minion, ConfiguredInstruction instruction) { - InstructionBoundSimpleGui gui = new InstructionBoundSimpleGui(ScreenHandlerType.GENERIC_9X3, player, minion, instruction); - for(ValueConverterType valueConverterType : MinionRegistries.VALUE_CONVERTER_TYPES) { - gui.addSlot(new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, valueConverterType, player.getRegistryManager())) - .setCallback(() -> valueConverterType.configure(player, from, to, null).thenAccept(c -> ))); - } - gui.open(); - } } diff --git a/src/main/java/io/github/skippyall/minions/gui/instruction/ConverterListGui.java b/src/main/java/io/github/skippyall/minions/gui/instruction/ConverterListGui.java new file mode 100644 index 0000000..9be8480 --- /dev/null +++ b/src/main/java/io/github/skippyall/minions/gui/instruction/ConverterListGui.java @@ -0,0 +1,109 @@ +package io.github.skippyall.minions.gui.instruction; + +import eu.pb4.sgui.api.elements.GuiElementBuilder; +import eu.pb4.sgui.api.gui.SimpleGui; +import io.github.skippyall.minions.gui.GuiDisplay; +import io.github.skippyall.minions.gui.MinionsGui; +import io.github.skippyall.minions.program.conversion.ConverterList; +import io.github.skippyall.minions.program.conversion.ValueConverter; +import io.github.skippyall.minions.program.value.ValueType; +import io.github.skippyall.minions.registration.MinionRegistries; +import io.github.skippyall.minions.util.TranslationUtil; +import net.minecraft.item.Items; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.text.Text; + +public class ConverterListGui extends MinionsGui { + private ConverterList converters; + + private SimpleGui gui; + private int page = 0; + + private ValueType inputType; + private ValueType outputType; + + public ConverterListGui(MinionsGui parent, ConverterList converters, ValueType inputType, ValueType outputType) { + super(parent); + this.converters = converters; + this.inputType = inputType; + this.outputType = outputType; + open(); + } + + @Override + protected void open() { + gui = new SimpleGui(ScreenHandlerType.GENERIC_9X3, viewer, false) { + @Override + public void onClose() { + onBackingClosed(); + } + }; + + gui.setTitle(Text.translatable("minions.gui.instruction.converters")); + + updateConverters(); + + gui.setSlot(21, new GuiElementBuilder(Items.SPECTRAL_ARROW) + .setCallback(() -> { + if(page > 0) { + page--; + updateConverters(); + } + }) + ); + + gui.setSlot(23, new GuiElementBuilder(Items.ARROW) + .setCallback(() -> { + if(page * 4 + 4 < converters.getConverters().size()) { + page++; + updateConverters(); + } + }) + ); + + gui.open(); + } + + public void updateConverters() { + int lastConverter = Math.min(5, converters.getConverters().size() + 2 - page * 4); + for(int i = 0; i < lastConverter; i++) { + //Each page has 5 converters, but the last is displayed on the next page as well + int converterIndex = page * 4 + i; + //without input element + int actualConverterIndex = converterIndex - 1; + int slot = 9 + 2 * i; + if(converterIndex == 0) { + gui.setSlot(slot, new GuiElementBuilder(Items.DROPPER)); + } else if(converterIndex == converters.getConverters().size() + 1) { + gui.setSlot(slot, new GuiElementBuilder(Items.HOPPER)); + } else { + ValueConverter converter = converters.getConverters().get(actualConverterIndex); + ValueType fromType = actualConverterIndex >= 1 ? converters.getConverters().get(actualConverterIndex - 1).getTo() : inputType; + ValueType toType = actualConverterIndex < converters.getConverters().size() - 1 ? converters.getConverters().get(actualConverterIndex + 1).getFrom() : outputType; + + gui.setSlot(slot, new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, converter.getType(), viewer.getRegistryManager())) + .addLoreLine(converter.getDisplayText()) + .setCallback(() -> new ConverterGui(this, converter, fromType, toType, converters, false, actualConverterIndex)) + ); + } + if(i != 4 && actualConverterIndex != converters.getConverters().size()) { + ValueType fromType = actualConverterIndex >= 0 ? converters.getConverters().get(actualConverterIndex).getTo() : inputType; + ValueType toType = actualConverterIndex < converters.getConverters().size() - 1 ? converters.getConverters().get(actualConverterIndex + 1).getFrom() : outputType; + + gui.setSlot(slot + 1, new GuiElementBuilder(Items.MAGENTA_GLAZED_TERRACOTTA) + .setName(Text.translatable( + "minions.gui.instruction.converters.cast", + Text.translatable(TranslationUtil.getTranslationKey(fromType, MinionRegistries.VALUE_TYPES)), + Text.translatable(TranslationUtil.getTranslationKey(toType, MinionRegistries.VALUE_TYPES)) + )) + .setCallback(() -> new ConverterGui(this, null, fromType, toType, converters, true, actualConverterIndex + 1)) + ); + } + } + } + + @Override + protected void closeBacking() { + gui.close(); + } +} diff --git a/src/main/java/io/github/skippyall/minions/gui/instruction/InstructionBoundSimpleGui.java b/src/main/java/io/github/skippyall/minions/gui/instruction/InstructionBoundSimpleGui.java deleted file mode 100644 index 40fe37a..0000000 --- a/src/main/java/io/github/skippyall/minions/gui/instruction/InstructionBoundSimpleGui.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.github.skippyall.minions.gui.instruction; - -import io.github.skippyall.minions.gui.MinionBoundSimpleGui; -import io.github.skippyall.minions.minion.MinionRuntime; -import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; -import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; -import io.github.skippyall.minions.program.instruction.ConfiguredInstructionListener; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.server.network.ServerPlayerEntity; - -public class InstructionBoundSimpleGui extends MinionBoundSimpleGui implements ConfiguredInstructionListener { - protected final ConfiguredInstruction instruction; - - public InstructionBoundSimpleGui(ScreenHandlerType type, ServerPlayerEntity player, MinionFakePlayer minion, ConfiguredInstruction instruction) { - super(type, player, minion); - this.instruction = instruction; - instruction.addListener(this); - } - - @Override - public void onInstructionRemove(ConfiguredInstruction instruction) { - close(); - } - - @Override - public void onClose() { - super.onClose(); - instruction.removeListener(this); - } -} diff --git a/src/main/java/io/github/skippyall/minions/gui/instruction/InstructionGui.java b/src/main/java/io/github/skippyall/minions/gui/instruction/InstructionGui.java index 37426a7..18066d1 100644 --- a/src/main/java/io/github/skippyall/minions/gui/instruction/InstructionGui.java +++ b/src/main/java/io/github/skippyall/minions/gui/instruction/InstructionGui.java @@ -3,18 +3,20 @@ package io.github.skippyall.minions.gui.instruction; import eu.pb4.sgui.api.elements.GuiElementBuilder; import eu.pb4.sgui.api.gui.SimpleGui; import io.github.skippyall.minions.gui.GuiDisplay; -import io.github.skippyall.minions.gui.MinionBoundSimpleGui; -import io.github.skippyall.minions.registration.MinionComponentTypes; -import io.github.skippyall.minions.registration.MinionRegistries; +import io.github.skippyall.minions.gui.MinionsGui; import io.github.skippyall.minions.gui.input.Result; import io.github.skippyall.minions.gui.input.TextInput; +import io.github.skippyall.minions.gui.minion.GuiContext; +import io.github.skippyall.minions.gui.minion.SimpleMinionsGui; import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.module.MinionModule; -import io.github.skippyall.minions.program.supplier.ValueSupplier; import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; import io.github.skippyall.minions.program.instruction.InstructionType; import io.github.skippyall.minions.program.supplier.Parameter; +import io.github.skippyall.minions.program.supplier.ValueSupplier; +import io.github.skippyall.minions.registration.MinionComponentTypes; +import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.util.TranslationUtil; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -28,63 +30,50 @@ import java.util.NoSuchElementException; import java.util.concurrent.CompletableFuture; public class InstructionGui { - public static void openInstructionMainMenu(MinionFakePlayer minion, ServerPlayerEntity player) { - SimpleGui gui = new MinionBoundSimpleGui(ScreenHandlerType.GENERIC_3X3, player, minion); - gui.setTitle(Text.translatable("minions.gui.instruction.title")); + public static MinionsGui openInstructionMainMenu(MinionsGui parent, GuiContext.Minion context) { + return new SimpleMinionsGui(parent, (onClose, me) -> { + ServerPlayerEntity player = parent.getViewer(); - gui.setSlot(3, new GuiElementBuilder() - .setItem(Items.BOOK) - .setName(Text.translatable("minions.gui.instruction.list")) - .setCallback(() -> instructionList(minion, player)) - ); - gui.setSlot(5, new GuiElementBuilder() - .setItem(Items.WRITABLE_BOOK) - .setName(Text.translatable("minions.gui.instruction.create")) - .setCallback(() -> createNewInstruction(minion, player)) - ); + SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, player, false) { + @Override + public void onClose() { + onClose.run(); + } + }; + gui.setTitle(Text.translatable("minions.gui.instruction.title")); - gui.open(); - } - - public static void instructionList(MinionFakePlayer minion, ServerPlayerEntity player) { - SimpleGui gui = new MinionBoundSimpleGui(ScreenHandlerType.GENERIC_9X3, player, minion) { - @Override - public void onInstructionsUpdate(MinionFakePlayer minion) { - resetInstructionList(this, minion, player); - } - }; - gui.setTitle(Text.translatable("minions.gui.instruction.title")); - resetInstructionList(gui, minion, player); - - gui.open(); - } - - private static void resetInstructionList(SimpleGui gui, MinionFakePlayer minion, ServerPlayerEntity player) { - int i = 0; - for (String instructionName : minion.getInstructionManager().getInstructionNames()) { - ConfiguredInstruction instruction = minion.getInstructionManager().getInstruction(instructionName); - gui.setSlot(i, new GuiElementBuilder(GuiDisplay.getGuiDisplayFor(MinionRegistries.INSTRUCTION_TYPES, instruction.getInstruction(), player.getRegistryManager()).createItemStack()) - .setName(Text.literal(instructionName)) - .setCallback(() -> ConfigureInstructionGui.configureInstructionMenu(instructionName, instruction, minion, player)) + gui.setSlot(3, new GuiElementBuilder() + .setItem(Items.BOOK) + .setName(Text.translatable("minions.gui.instruction.list")) + .setCallback(() -> new InstructionListGui(me, context)) ); - i++; - } + gui.setSlot(5, new GuiElementBuilder() + .setItem(Items.WRITABLE_BOOK) + .setName(Text.translatable("minions.gui.instruction.create")) + .setCallback(() -> createNewInstruction(me, context)) + ); + + gui.open(); + return gui; + }); } - public static void createNewInstruction(MinionFakePlayer minion, ServerPlayerEntity player) { - selectInstructionModuleMenu(minion, player).thenAccept(instructionType -> - inputInstructionName(minion, player, "Instruction").thenAccept(name -> { + public static void createNewInstruction(MinionsGui parent, GuiContext.Minion context) { + MinionFakePlayer minion = context.getMinion(); + ServerPlayerEntity viewer = parent.getViewer(); + selectInstructionModuleMenu(parent, context).thenAccept(instructionType -> + inputInstructionName(parent, context, "Instruction").thenAccept(name -> { if (!minion.isRemoved() && !minion.isDisconnected()) { ConfiguredInstruction configuredInstruction = minion.getInstructionManager().createInstruction(name, instructionType); - ConfigureInstructionGui.configureInstructionMenu(name, configuredInstruction, minion, player); + new ConfigureInstructionGui(parent, GuiContext.Instruction.create(context, configuredInstruction, name)); } }) ); } - public static CompletableFuture inputInstructionName(MinionFakePlayer minion, ServerPlayerEntity player, String defaultValue) { - return TextInput.inputSync(player, Text.translatable("minions.gui.instruction.enter_name"), defaultValue, name -> { - if (minion.getInstructionManager().hasInstruction(name)) { + public static CompletableFuture inputInstructionName(MinionsGui parent, GuiContext.Minion context, String defaultValue) { + return TextInput.inputSync(parent, Text.translatable("minions.gui.instruction.enter_name"), defaultValue, name -> { + if (context.getMinion().getInstructionManager().hasInstruction(name)) { return new Result.Error<>(Text.translatable("minions.gui.instruction.name_already_used")); } return new Result.Success<>(name); @@ -100,62 +89,71 @@ public class InstructionGui { return stillExists; } - public static CompletableFuture> selectInstructionModuleMenu(MinionFakePlayer minion, ServerPlayerEntity player) { + public static CompletableFuture> selectInstructionModuleMenu(MinionsGui parent, GuiContext.Minion context) { + MinionFakePlayer minion = context.getMinion(); + ServerPlayerEntity viewer = parent.getViewer(); + if (minion.getModuleInventory().getModules().isEmpty()) { - player.sendMessage(Text.translatable("minions.gui.instruction.no_modules")); + viewer.sendMessage(Text.translatable("minions.gui.instruction.no_modules")); return CompletableFuture.failedFuture(new NoSuchElementException("No modules")); } CompletableFuture> future = new CompletableFuture<>(); - SimpleGui gui = new MinionBoundSimpleGui(ScreenHandlerType.GENERIC_9X3, player, minion) { - @Override - public void onClose() { - if (!future.isDone()) { - future.cancel(false); + new SimpleMinionsGui(parent, (closeHandler, me) -> { + SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_9X3, viewer, false) { + @Override + public void onClose() { + if (!future.isDone()) { + future.cancel(false); + } + closeHandler.run(); } - super.onClose(); - } - }; - gui.setTitle(Text.translatable("minions.gui.instruction.select_instruction")); + }; + gui.setTitle(Text.translatable("minions.gui.instruction.select_instruction")); - for (int i = 0; i < minion.getModuleInventory().size(); i++) { - ItemStack moduleItem = minion.getModuleInventory().getStack(i); - MinionModule module = moduleItem.get(MinionComponentTypes.MODULE); - if (module != null && !module.instructions().isEmpty()) { - gui.addSlot(new GuiElementBuilder(moduleItem) - .setCallback(() -> selectInstructionMenu(module, minion, player) - .thenApply(future::complete) - ) - ); + for (int i = 0; i < minion.getModuleInventory().size(); i++) { + ItemStack moduleItem = minion.getModuleInventory().getStack(i); + MinionModule module = moduleItem.get(MinionComponentTypes.MODULE); + if (module != null && !module.instructions().isEmpty()) { + gui.addSlot(new GuiElementBuilder(moduleItem) + .setCallback(() -> selectInstructionMenu(parent, context, module) + .thenApply(future::complete) + ) + ); + } } - } - gui.open(); + gui.open(); + return gui; + }); return future; } - public static CompletableFuture> selectInstructionMenu(MinionModule module, MinionFakePlayer minion, ServerPlayerEntity player) { + public static CompletableFuture> selectInstructionMenu(MinionsGui parent, GuiContext.Minion context, MinionModule module) { CompletableFuture> future = new CompletableFuture<>(); - SimpleGui gui = new MinionBoundSimpleGui(ScreenHandlerType.GENERIC_9X3, player, minion) { - @Override - public void onClose() { - if (!future.isDone()) { - future.cancel(false); + new SimpleMinionsGui(parent, (closeHandler, me) -> { + SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_9X3, parent.getViewer(), false) { + @Override + public void onClose() { + if (!future.isDone()) { + future.cancel(false); + } + closeHandler.run(); } - super.onClose(); + }; + gui.setTitle(Text.translatable("minions.gui.instruction.select_instruction")); + + for (InstructionType instructionType : module.instructions()) { + gui.addSlot(createInstructionElement(instructionType, parent.getViewer().getRegistryManager()) + .setCallback(() -> future.complete(instructionType)) + ); } - }; - gui.setTitle(Text.translatable("minions.gui.instruction.select_instruction")); - for (InstructionType instructionType : module.instructions()) { - gui.addSlot(createInstructionElement(instructionType, player.getRegistryManager()) - .setCallback(() -> future.complete(instructionType)) - ); - } - - gui.open(); + gui.open(); + return gui; + }); return future; } diff --git a/src/main/java/io/github/skippyall/minions/gui/instruction/InstructionListGui.java b/src/main/java/io/github/skippyall/minions/gui/instruction/InstructionListGui.java new file mode 100644 index 0000000..f967780 --- /dev/null +++ b/src/main/java/io/github/skippyall/minions/gui/instruction/InstructionListGui.java @@ -0,0 +1,69 @@ +package io.github.skippyall.minions.gui.instruction; + +import eu.pb4.sgui.api.elements.GuiElementBuilder; +import eu.pb4.sgui.api.gui.SimpleGui; +import io.github.skippyall.minions.gui.GuiDisplay; +import io.github.skippyall.minions.gui.MinionsGui; +import io.github.skippyall.minions.gui.minion.GuiContext; +import io.github.skippyall.minions.minion.MinionListener; +import io.github.skippyall.minions.minion.MinionRuntime; +import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; +import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; +import io.github.skippyall.minions.registration.MinionRegistries; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.text.Text; + +public class InstructionListGui extends MinionsGui implements MinionListener { + private final GuiContext.Minion context; + private final MinionFakePlayer minion; + private SimpleGui gui; + + public InstructionListGui(MinionsGui parent, GuiContext.Minion context) { + super(parent); + this.context = context; + this.minion = context.getMinion(); + open(); + } + + @Override + public void onInstructionsUpdate(MinionFakePlayer minion) { + resetInstructionList(); + } + + @Override + protected void open() { + minion.addMinionListener(this); + gui = new SimpleGui(ScreenHandlerType.GENERIC_9X3, viewer, false) { + @Override + public void onClose() { + onBackingClosed(); + } + }; + gui.setTitle(Text.translatable("minions.gui.instruction.title")); + resetInstructionList(); + gui.open(); + } + + @Override + protected void reopen() { + gui.open(); + } + + @Override + protected void closeBacking() { + minion.removeMinionListener(this); + gui.close(); + } + + private void resetInstructionList() { + int i = 0; + for (String instructionName : minion.getInstructionManager().getInstructionNames()) { + ConfiguredInstruction instruction = minion.getInstructionManager().getInstruction(instructionName); + gui.setSlot(i, new GuiElementBuilder(GuiDisplay.getGuiDisplayFor(MinionRegistries.INSTRUCTION_TYPES, instruction.getInstruction(), viewer.getRegistryManager()).createItemStack()) + .setName(Text.literal(instructionName)) + .setCallback(() -> new ConfigureInstructionGui(this, GuiContext.Instruction.create(context, instruction, instructionName))) + ); + i++; + } + } +} diff --git a/src/main/java/io/github/skippyall/minions/gui/minion/GuiContext.java b/src/main/java/io/github/skippyall/minions/gui/minion/GuiContext.java new file mode 100644 index 0000000..a9e0334 --- /dev/null +++ b/src/main/java/io/github/skippyall/minions/gui/minion/GuiContext.java @@ -0,0 +1,43 @@ +package io.github.skippyall.minions.gui.minion; + +import io.github.skippyall.minions.minion.MinionRuntime; +import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; +import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; +import io.github.skippyall.minions.program.supplier.Parameter; +import net.minecraft.server.network.ServerPlayerEntity; + +public interface GuiContext { + ServerPlayerEntity getViewer(); + + static GuiContext create(ServerPlayerEntity viewer) { + return new GuiContextImpl(viewer); + } + + interface Minion extends GuiContext { + MinionFakePlayer getMinion(); + + static GuiContext.Minion create(GuiContext context, MinionFakePlayer minion) { + return new GuiContextImpl.MinionImpl(context, minion); + } + } + + interface Instruction extends Minion { + ConfiguredInstruction getInstruction(); + + String getName(); + + void setName(String name); + + static GuiContext.Instruction create(GuiContext.Minion context, ConfiguredInstruction instruction, String name) { + return new GuiContextImpl.InstructionImpl(context, instruction, name); + } + } + + interface ValueSupplier extends Instruction { + Parameter getParameter(); + + static GuiContext.ValueSupplier create(GuiContext.Instruction context, Parameter parameter) { + return new GuiContextImpl.ValueSupplierImpl(context, parameter); + } + } +} diff --git a/src/main/java/io/github/skippyall/minions/gui/minion/GuiContextImpl.java b/src/main/java/io/github/skippyall/minions/gui/minion/GuiContextImpl.java new file mode 100644 index 0000000..20b4feb --- /dev/null +++ b/src/main/java/io/github/skippyall/minions/gui/minion/GuiContextImpl.java @@ -0,0 +1,120 @@ +package io.github.skippyall.minions.gui.minion; + +import io.github.skippyall.minions.minion.MinionRuntime; +import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; +import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; +import io.github.skippyall.minions.program.supplier.Parameter; +import net.minecraft.server.network.ServerPlayerEntity; + +//If only this mod was kotlin +public class GuiContextImpl implements GuiContext { + private final ServerPlayerEntity viewer; + + public GuiContextImpl(ServerPlayerEntity viewer) { + this.viewer = viewer; + } + + @Override + public ServerPlayerEntity getViewer() { + return viewer; + } + + public static class MinionImpl extends DelegatingGuiContextImpl implements GuiContext.Minion { + private final MinionFakePlayer minion; + + public MinionImpl(GuiContext context, MinionFakePlayer minion) { + super(context); + this.minion = minion; + } + + @Override + public MinionFakePlayer getMinion() { + return minion; + } + } + + public static class InstructionImpl extends DelegatingMinionImpl implements GuiContext.Instruction { + private final ConfiguredInstruction instruction; + private String name; + + public InstructionImpl(GuiContext.Minion context, ConfiguredInstruction instruction, String name) { + super(context); + this.instruction = instruction; + this.name = name; + } + + @Override + public ConfiguredInstruction getInstruction() { + return instruction; + } + + @Override + public String getName() { + return name; + } + + @Override + public void setName(String name) { + this.name = name; + } + } + + public static class ValueSupplierImpl extends DelegatingInstructionImpl implements GuiContext.ValueSupplier { + private final Parameter parameter; + + public ValueSupplierImpl(GuiContext.Instruction context, Parameter parameter) { + super(context); + this.parameter = parameter; + } + + @Override + public Parameter getParameter() { + return parameter; + } + } + + public static class DelegatingGuiContextImpl implements GuiContext { + protected final C context; + + public DelegatingGuiContextImpl(C context) { + this.context = context; + } + + @Override + public ServerPlayerEntity getViewer() { + return context.getViewer(); + } + } + + public static class DelegatingMinionImpl extends DelegatingGuiContextImpl implements GuiContext.Minion { + public DelegatingMinionImpl(C context) { + super(context); + } + + @Override + public MinionFakePlayer getMinion() { + return context.getMinion(); + } + } + + public static class DelegatingInstructionImpl extends DelegatingMinionImpl implements GuiContext.Instruction { + public DelegatingInstructionImpl(C context) { + super(context); + } + + @Override + public ConfiguredInstruction getInstruction() { + return context.getInstruction(); + } + + @Override + public String getName() { + return context.getName(); + } + + @Override + public void setName(String name) { + context.setName(name); + } + } +} diff --git a/src/main/java/io/github/skippyall/minions/gui/minion/MinionGui.java b/src/main/java/io/github/skippyall/minions/gui/minion/MinionGui.java index ba0f210..fb3c2eb 100644 --- a/src/main/java/io/github/skippyall/minions/gui/minion/MinionGui.java +++ b/src/main/java/io/github/skippyall/minions/gui/minion/MinionGui.java @@ -7,13 +7,8 @@ import io.github.skippyall.minions.gui.instruction.InstructionGui; import io.github.skippyall.minions.minion.MinionListener; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.module.ModuleInventory; -import net.minecraft.entity.EquipmentSlot; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.screen.slot.ArmorSlot; -import net.minecraft.screen.slot.Slot; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; @@ -25,6 +20,7 @@ public class MinionGui extends MinionsGui implements MinionListener { super(viewer); this.minion = minion; minion.addMinionListener(this); + open(); } public MinionFakePlayer getMinion() { @@ -46,7 +42,7 @@ public class MinionGui extends MinionsGui implements MinionListener { .setItem(Items.COMMAND_BLOCK) .setName(Text.translatable("minions.gui.main.instructions")) .setCallback(() -> { - InstructionGui.openInstructionMainMenu(minion, viewer); + InstructionGui.openInstructionMainMenu(this, GuiContext.Minion.create(GuiContext.create(viewer), minion)); }) ); gui.setSlot(3, new GuiElementBuilder() @@ -75,7 +71,7 @@ public class MinionGui extends MinionsGui implements MinionListener { } @Override - protected void onClose() { + protected void closeBacking() { gui.close(); minion.removeMinionListener(this); } @@ -84,10 +80,4 @@ public class MinionGui extends MinionsGui implements MinionListener { public void onMinionRemove(MinionFakePlayer minion) { close(); } - - public static GuiElementBuilder backButton(Runnable onBack) { - return new GuiElementBuilder(Items.COMPASS) - .setItemName(Text.translatable("gui.back")) - .setCallback(onBack); - } } diff --git a/src/main/java/io/github/skippyall/minions/gui/minion/MinionInventoryGui.java b/src/main/java/io/github/skippyall/minions/gui/minion/MinionInventoryGui.java index 4efc147..439e708 100644 --- a/src/main/java/io/github/skippyall/minions/gui/minion/MinionInventoryGui.java +++ b/src/main/java/io/github/skippyall/minions/gui/minion/MinionInventoryGui.java @@ -22,6 +22,7 @@ public class MinionInventoryGui extends MinionsGui { super(parent); this.parent = parent; this.minion = parent.getMinion(); + open(); } @Override @@ -61,7 +62,7 @@ public class MinionInventoryGui extends MinionsGui { } @Override - protected void onClose() { + protected void closeBacking() { gui.close(); } } diff --git a/src/main/java/io/github/skippyall/minions/gui/minion/SimpleMinionsGui.java b/src/main/java/io/github/skippyall/minions/gui/minion/SimpleMinionsGui.java new file mode 100644 index 0000000..b0f1c9f --- /dev/null +++ b/src/main/java/io/github/skippyall/minions/gui/minion/SimpleMinionsGui.java @@ -0,0 +1,27 @@ +package io.github.skippyall.minions.gui.minion; + +import eu.pb4.sgui.api.gui.GuiInterface; +import io.github.skippyall.minions.gui.MinionsGui; + +import java.util.function.BiFunction; + +public class SimpleMinionsGui extends MinionsGui { + private GuiInterface gui; + private final BiFunction guiFactory; + + public SimpleMinionsGui(MinionsGui parent, BiFunction guiFactory) { + super(parent); + this.guiFactory = guiFactory; + open(); + } + + @Override + protected void open() { + gui = guiFactory.apply(this::onBackingClosed, this); + } + + @Override + protected void closeBacking() { + gui.close(); + } +} diff --git a/src/main/java/io/github/skippyall/minions/listener/ListenerManager.java b/src/main/java/io/github/skippyall/minions/listener/ListenerManager.java index 6d33f3d..6e5ae6f 100644 --- a/src/main/java/io/github/skippyall/minions/listener/ListenerManager.java +++ b/src/main/java/io/github/skippyall/minions/listener/ListenerManager.java @@ -3,17 +3,17 @@ package io.github.skippyall.minions.listener; import org.jetbrains.annotations.NotNull; import java.util.Iterator; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; +import java.util.Set; +import java.util.concurrent.CopyOnWriteArraySet; public class ListenerManager implements Iterable { - protected final List listeners; + protected final Set listeners; public ListenerManager() { - this(new CopyOnWriteArrayList<>()); + this(new CopyOnWriteArraySet<>()); } - protected ListenerManager(List listeners) { + protected ListenerManager(Set listeners) { this.listeners = listeners; } @@ -23,34 +23,11 @@ public class ListenerManager implements Iterable { public void removeListener(T listener) { listeners.remove(listener); - onRemove(listener); } - protected void onRemove(T listener) {} - @Override public @NotNull Iterator iterator() { - return new Iterator<>() { - final Iterator backing = listeners.iterator(); - T last; - - @Override - public boolean hasNext() { - return backing.hasNext(); - } - - @Override - public T next() { - last = backing.next(); - return last; - } - - @Override - public void remove() { - backing.remove(); - onRemove(last); - } - }; + return listeners.iterator(); } @Override diff --git a/src/main/java/io/github/skippyall/minions/listener/SerializableListenerManager.java b/src/main/java/io/github/skippyall/minions/listener/SerializableListenerManager.java index 48d6aaa..fa4cc9a 100644 --- a/src/main/java/io/github/skippyall/minions/listener/SerializableListenerManager.java +++ b/src/main/java/io/github/skippyall/minions/listener/SerializableListenerManager.java @@ -2,25 +2,21 @@ package io.github.skippyall.minions.listener; import com.mojang.serialization.Codec; import net.minecraft.registry.Registry; -import net.minecraft.storage.ReadView; -import net.minecraft.storage.WriteView; import net.minecraft.util.Identifier; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import java.util.concurrent.CopyOnWriteArrayList; +import java.util.Set; +import java.util.concurrent.CopyOnWriteArraySet; public class SerializableListenerManager extends ListenerManager { - private final Registry> registry; - - public SerializableListenerManager(Registry> registry) { - this.registry = registry; + public SerializableListenerManager() { + super(); } - public SerializableListenerManager(Registry> registry, List listeners) { + protected SerializableListenerManager(Set listeners) { super(listeners); - this.registry = registry; } public static Codec> getCodec(Registry> registry) { @@ -28,7 +24,7 @@ public class SerializableListenerManager listener.getCodecId().map(registry::get).orElse(Codec.unit(null)), codec -> codec.fieldOf("data") ).listOf().xmap( - list -> new SerializableListenerManager<>(registry, new CopyOnWriteArrayList<>(list)), + list -> new SerializableListenerManager<>(new CopyOnWriteArraySet<>(list)), manager -> { List serializableListeners = new ArrayList<>(); for(T listener : manager.listeners) { @@ -41,37 +37,6 @@ public class SerializableListenerManager codec = registry.get(listener.getCodecId().get()); - listenerView.put("id", Identifier.CODEC, listener.getCodecId().get()); - //noinspection unchecked - listenerView.put("data", (Codec) codec, listener); - } - } - } - - public void load(ReadView view) { - ReadView.ListReadView listView = view.getListReadView("listeners"); - for (ReadView listenerView : listView) { - Optional id = listenerView.read("id", Identifier.CODEC); - if(id.isEmpty()) { - continue; - } - - Codec codec = registry.get(id.get()); - - Optional listener = listenerView.read("data", codec); - - if(listener.isPresent()) { - listeners.add(listener.get()); - } - } - } - public interface SerializableListener { default Optional getCodecId() { return Optional.empty(); diff --git a/src/main/java/io/github/skippyall/minions/minion/MinionData.java b/src/main/java/io/github/skippyall/minions/minion/MinionData.java index 9f513fc..6f15fb1 100644 --- a/src/main/java/io/github/skippyall/minions/minion/MinionData.java +++ b/src/main/java/io/github/skippyall/minions/minion/MinionData.java @@ -3,8 +3,8 @@ package io.github.skippyall.minions.minion; import com.mojang.authlib.properties.PropertyMap; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.listener.SerializableListenerManager; +import io.github.skippyall.minions.registration.MinionRegistries; import net.minecraft.server.MinecraftServer; import net.minecraft.util.Uuids; import net.minecraft.util.dynamic.Codecs; @@ -27,7 +27,7 @@ public record MinionData( Codecs.GAME_PROFILE_PROPERTY_MAP.optionalFieldOf("skin").forGetter(MinionData::skin), Codec.BOOL.optionalFieldOf("isSpawned", false).forGetter(MinionData::isSpawned), SerializableListenerManager.getCodec(MinionRegistries.MINION_LISTENER_CODECS).optionalFieldOf("listeners").xmap( - optional -> optional.orElseGet(() -> new SerializableListenerManager<>(MinionRegistries.MINION_LISTENER_CODECS)), + optional -> optional.orElseGet(SerializableListenerManager::new), Optional::of ).forGetter(MinionData::listeners), MinionConfig.CODEC.optionalFieldOf("config", new MinionConfig()).forGetter(MinionData::config) @@ -40,7 +40,7 @@ public record MinionData( MinionProfileUtils.newDefaultMinionName(server), Optional.empty(), false, - new SerializableListenerManager<>(MinionRegistries.MINION_LISTENER_CODECS), + new SerializableListenerManager<>(), new MinionConfig() ); } diff --git a/src/main/java/io/github/skippyall/minions/minion/MinionListener.java b/src/main/java/io/github/skippyall/minions/minion/MinionListener.java index b643e5f..0c14d3e 100644 --- a/src/main/java/io/github/skippyall/minions/minion/MinionListener.java +++ b/src/main/java/io/github/skippyall/minions/minion/MinionListener.java @@ -1,8 +1,8 @@ package io.github.skippyall.minions.minion; +import io.github.skippyall.minions.listener.SerializableListenerManager; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; -import io.github.skippyall.minions.listener.SerializableListenerManager; import org.jetbrains.annotations.Nullable; public interface MinionListener extends SerializableListenerManager.SerializableListener { diff --git a/src/main/java/io/github/skippyall/minions/minion/MinionRuntime.java b/src/main/java/io/github/skippyall/minions/minion/MinionRuntime.java index 70ed434..4d7cb80 100644 --- a/src/main/java/io/github/skippyall/minions/minion/MinionRuntime.java +++ b/src/main/java/io/github/skippyall/minions/minion/MinionRuntime.java @@ -1,13 +1,13 @@ package io.github.skippyall.minions.minion; -import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.Minions; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.program.InstructionRuntime; -import io.github.skippyall.minions.program.supplier.ValueSupplierType; +import io.github.skippyall.minions.program.consumer.ValueConsumerType; import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; import io.github.skippyall.minions.program.instruction.InstructionType; -import io.github.skippyall.minions.program.consumer.ValueConsumerType; +import io.github.skippyall.minions.program.supplier.ValueSupplierType; +import io.github.skippyall.minions.registration.MinionRegistries; import net.minecraft.registry.Registry; import net.minecraft.storage.ReadView; import net.minecraft.storage.WriteView; diff --git a/src/main/java/io/github/skippyall/minions/minion/fakeplayer/EntityPlayerActionPack.java b/src/main/java/io/github/skippyall/minions/minion/fakeplayer/EntityPlayerActionPack.java index 3ed7e83..53a39ff 100644 --- a/src/main/java/io/github/skippyall/minions/minion/fakeplayer/EntityPlayerActionPack.java +++ b/src/main/java/io/github/skippyall/minions/minion/fakeplayer/EntityPlayerActionPack.java @@ -2,11 +2,6 @@ package io.github.skippyall.minions.minion.fakeplayer; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import io.github.skippyall.minions.mixins.EntityAccessor; import net.minecraft.block.BlockState; import net.minecraft.command.argument.EntityAnchorArgumentType; @@ -32,6 +27,11 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec2f; import net.minecraft.util.math.Vec3d; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class EntityPlayerActionPack { private final MinionFakePlayer player; diff --git a/src/main/java/io/github/skippyall/minions/minion/fakeplayer/FakeClientConnection.java b/src/main/java/io/github/skippyall/minions/minion/fakeplayer/FakeClientConnection.java index e45fce8..ddeedc1 100644 --- a/src/main/java/io/github/skippyall/minions/minion/fakeplayer/FakeClientConnection.java +++ b/src/main/java/io/github/skippyall/minions/minion/fakeplayer/FakeClientConnection.java @@ -4,8 +4,8 @@ package io.github.skippyall.minions.minion.fakeplayer; import io.netty.channel.embedded.EmbeddedChannel; import net.minecraft.network.ClientConnection; import net.minecraft.network.NetworkSide; -import net.minecraft.network.state.NetworkState; import net.minecraft.network.listener.PacketListener; +import net.minecraft.network.state.NetworkState; public class FakeClientConnection extends ClientConnection { public FakeClientConnection(NetworkSide p) diff --git a/src/main/java/io/github/skippyall/minions/minion/fakeplayer/MinionFakePlayer.java b/src/main/java/io/github/skippyall/minions/minion/fakeplayer/MinionFakePlayer.java index 46f7154..adaa912 100644 --- a/src/main/java/io/github/skippyall/minions/minion/fakeplayer/MinionFakePlayer.java +++ b/src/main/java/io/github/skippyall/minions/minion/fakeplayer/MinionFakePlayer.java @@ -3,18 +3,18 @@ package io.github.skippyall.minions.minion.fakeplayer; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.PropertyMap; -import io.github.skippyall.minions.registration.MinionConfigOptions; -import io.github.skippyall.minions.registration.MinionItems; -import io.github.skippyall.minions.minion.MinionListener; -import io.github.skippyall.minions.minion.MinionData; import io.github.skippyall.minions.gui.minion.MinionGui; -import io.github.skippyall.minions.minion.MinionRuntime; +import io.github.skippyall.minions.listener.SerializableListenerManager; +import io.github.skippyall.minions.minion.MinionData; import io.github.skippyall.minions.minion.MinionItem; +import io.github.skippyall.minions.minion.MinionListener; import io.github.skippyall.minions.minion.MinionPersistentState; import io.github.skippyall.minions.minion.MinionProfileUtils; +import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.module.ModuleInventory; +import io.github.skippyall.minions.registration.MinionConfigOptions; +import io.github.skippyall.minions.registration.MinionItems; import io.github.skippyall.minions.registration.SpecialAbilities; -import io.github.skippyall.minions.listener.SerializableListenerManager; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EquipmentSlot; @@ -91,6 +91,7 @@ public class MinionFakePlayer extends ServerPlayerEntity { instance.setHealth(20.0F); instance.unsetRemoved(); instance.getAttributeInstance(EntityAttributes.STEP_HEIGHT).setBaseValue(0.6F); + instance.getAttributeInstance(EntityAttributes.WAYPOINT_TRANSMIT_RANGE).setBaseValue(0); instance.interactionManager.changeGameMode(GameMode.SURVIVAL); server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), level.getRegistryKey()); server.getPlayerManager().sendToDimension(EntityPositionSyncS2CPacket.create(instance), level.getRegistryKey()); @@ -281,7 +282,7 @@ public class MinionFakePlayer extends ServerPlayerEntity { @Override public void drop(ServerWorld world, DamageSource damageSource) { super.drop(world, damageSource); - ItemEntity entity = dropStack(world, toItemStack(getServer())); + ItemEntity entity = dropItem(toItemStack(world.getServer()), true, false); if (entity != null) { entity.setNeverDespawn(); } diff --git a/src/main/java/io/github/skippyall/minions/minion/fakeplayer/Tracer.java b/src/main/java/io/github/skippyall/minions/minion/fakeplayer/Tracer.java index 51e9d08..1e29f14 100644 --- a/src/main/java/io/github/skippyall/minions/minion/fakeplayer/Tracer.java +++ b/src/main/java/io/github/skippyall/minions/minion/fakeplayer/Tracer.java @@ -1,8 +1,6 @@ //code from https://github.com/gnembon/fabric-carpet package io.github.skippyall.minions.minion.fakeplayer; -import java.util.Optional; -import java.util.function.Predicate; import net.minecraft.entity.Entity; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.EntityHitResult; @@ -12,6 +10,9 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.RaycastContext; import net.minecraft.world.World; +import java.util.Optional; +import java.util.function.Predicate; + public class Tracer { public static HitResult rayTrace(Entity source, float partialTicks, double reach, boolean fluids) diff --git a/src/main/java/io/github/skippyall/minions/minion/program/instruction/ActionExecution.java b/src/main/java/io/github/skippyall/minions/minion/program/instruction/ActionExecution.java index 4e764ff..369a378 100644 --- a/src/main/java/io/github/skippyall/minions/minion/program/instruction/ActionExecution.java +++ b/src/main/java/io/github/skippyall/minions/minion/program/instruction/ActionExecution.java @@ -4,7 +4,7 @@ import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack; import io.github.skippyall.minions.program.consumer.ValueConsumerList; import io.github.skippyall.minions.program.instruction.execution.ContinuousInstructionExecution; -import io.github.skippyall.minions.program.supplier.ValueSupplierList; +import io.github.skippyall.minions.program.supplier.ParameterValueList; import net.minecraft.storage.ReadView; import net.minecraft.storage.WriteView; @@ -39,7 +39,7 @@ public class ActionExecution implements ContinuousInstructionExecution parameters, MinionRuntime minion) {} + public void readArguments(ParameterValueList parameters, MinionRuntime minion) {} @Override public void save(WriteView view, MinionRuntime minion) {} diff --git a/src/main/java/io/github/skippyall/minions/minion/program/instruction/MineBlockExecution.java b/src/main/java/io/github/skippyall/minions/minion/program/instruction/MineBlockExecution.java index ad6a86d..7eebece 100644 --- a/src/main/java/io/github/skippyall/minions/minion/program/instruction/MineBlockExecution.java +++ b/src/main/java/io/github/skippyall/minions/minion/program/instruction/MineBlockExecution.java @@ -6,7 +6,7 @@ import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.program.consumer.ValueConsumerList; import io.github.skippyall.minions.program.instruction.InstructionExecution; -import io.github.skippyall.minions.program.supplier.ValueSupplierList; +import io.github.skippyall.minions.program.supplier.ParameterValueList; import net.minecraft.block.BlockState; import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; import net.minecraft.storage.ReadView; @@ -121,7 +121,7 @@ public class MineBlockExecution implements InstructionExecution { } @Override - public void readArguments(ValueSupplierList arguments, MinionRuntime runtime) { + public void readArguments(ParameterValueList arguments, MinionRuntime runtime) { } diff --git a/src/main/java/io/github/skippyall/minions/minion/program/instruction/inventory/SwapItemExecution.java b/src/main/java/io/github/skippyall/minions/minion/program/instruction/inventory/SwapItemExecution.java index 58d2980..3985487 100644 --- a/src/main/java/io/github/skippyall/minions/minion/program/instruction/inventory/SwapItemExecution.java +++ b/src/main/java/io/github/skippyall/minions/minion/program/instruction/inventory/SwapItemExecution.java @@ -5,7 +5,7 @@ import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.program.consumer.ValueConsumerList; import io.github.skippyall.minions.program.instruction.InstructionExecution; import io.github.skippyall.minions.program.supplier.Parameter; -import io.github.skippyall.minions.program.supplier.ValueSupplierList; +import io.github.skippyall.minions.program.supplier.ParameterValueList; import io.github.skippyall.minions.registration.ValueTypes; import net.minecraft.item.ItemStack; import net.minecraft.screen.ScreenHandler; @@ -114,11 +114,11 @@ public class SwapItemExecution implements InstructionExecution { } @Override - public void readArguments(ValueSupplierList arguments, MinionRuntime runtime) { - fromSlot = Math.clamp(arguments.getValue(FROM_SLOT, runtime), 0, Integer.MAX_VALUE); - fromScreen = arguments.getValue(FROM_SCREEN, runtime); - toSlot = Math.clamp(arguments.getValue(TO_SLOT, runtime), 0, Integer.MAX_VALUE); - toScreen = arguments.getValue(TO_SCREEN, runtime); + public void readArguments(ParameterValueList arguments, MinionRuntime runtime) { + fromSlot = Math.clamp(arguments.getValue(FROM_SLOT), 0, Integer.MAX_VALUE); + fromScreen = arguments.getValue(FROM_SCREEN); + toSlot = Math.clamp(arguments.getValue(TO_SLOT), 0, Integer.MAX_VALUE); + toScreen = arguments.getValue(TO_SCREEN); } @Override diff --git a/src/main/java/io/github/skippyall/minions/minion/program/instruction/move/TurnExecution.java b/src/main/java/io/github/skippyall/minions/minion/program/instruction/move/TurnExecution.java index ec9b077..2cea952 100644 --- a/src/main/java/io/github/skippyall/minions/minion/program/instruction/move/TurnExecution.java +++ b/src/main/java/io/github/skippyall/minions/minion/program/instruction/move/TurnExecution.java @@ -1,8 +1,8 @@ package io.github.skippyall.minions.minion.program.instruction.move; import io.github.skippyall.minions.minion.MinionRuntime; -import io.github.skippyall.minions.program.supplier.ValueSupplierList; import io.github.skippyall.minions.program.supplier.Parameter; +import io.github.skippyall.minions.program.supplier.ParameterValueList; import io.github.skippyall.minions.registration.ValueTypes; public class TurnExecution extends AbstractTurnExecution { @@ -10,9 +10,9 @@ public class TurnExecution extends AbstractTurnExecution { public static final Parameter DIRECTION = new Parameter<>("direction", ValueTypes.TURN_DIRECTION); @Override - public void readArguments(ValueSupplierList arguments, MinionRuntime minion) { - float maxAngle = arguments.getValue(ANGLE, minion).floatValue(); - TurnDirection direction = arguments.getValue(DIRECTION, minion); + public void readArguments(ParameterValueList arguments, MinionRuntime minion) { + float maxAngle = arguments.getValue(ANGLE).floatValue(); + TurnDirection direction = arguments.getValue(DIRECTION); float turnYaw = maxAngle * direction.xFactor; float turnPitch = maxAngle * direction.yFactor; diff --git a/src/main/java/io/github/skippyall/minions/minion/program/instruction/move/TurnVectorExecution.java b/src/main/java/io/github/skippyall/minions/minion/program/instruction/move/TurnVectorExecution.java index c445ac3..ab53a0a 100644 --- a/src/main/java/io/github/skippyall/minions/minion/program/instruction/move/TurnVectorExecution.java +++ b/src/main/java/io/github/skippyall/minions/minion/program/instruction/move/TurnVectorExecution.java @@ -2,7 +2,7 @@ package io.github.skippyall.minions.minion.program.instruction.move; import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.program.supplier.Parameter; -import io.github.skippyall.minions.program.supplier.ValueSupplierList; +import io.github.skippyall.minions.program.supplier.ParameterValueList; import io.github.skippyall.minions.registration.ValueTypes; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec2f; @@ -14,10 +14,10 @@ public class TurnVectorExecution extends AbstractTurnExecution { public static final Parameter Z = new Parameter<>("z", ValueTypes.DOUBLE); @Override - public void readArguments(ValueSupplierList arguments, MinionRuntime runtime) { - double x = arguments.getValue(X, runtime); - double y = arguments.getValue(Y, runtime); - double z = arguments.getValue(Z, runtime); + public void readArguments(ParameterValueList arguments, MinionRuntime runtime) { + double x = arguments.getValue(X); + double y = arguments.getValue(Y); + double z = arguments.getValue(Z); Vec3d vector = new Vec3d(x, y, z); Vec2f rotation = vectorToRotation(vector); diff --git a/src/main/java/io/github/skippyall/minions/minion/program/instruction/move/WalkExecution.java b/src/main/java/io/github/skippyall/minions/minion/program/instruction/move/WalkExecution.java index ba90653..0926285 100644 --- a/src/main/java/io/github/skippyall/minions/minion/program/instruction/move/WalkExecution.java +++ b/src/main/java/io/github/skippyall/minions/minion/program/instruction/move/WalkExecution.java @@ -3,7 +3,7 @@ package io.github.skippyall.minions.minion.program.instruction.move; import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.program.instruction.InstructionExecution; import io.github.skippyall.minions.program.supplier.Parameter; -import io.github.skippyall.minions.program.supplier.ValueSupplierList; +import io.github.skippyall.minions.program.supplier.ParameterValueList; import io.github.skippyall.minions.registration.ValueTypes; import net.minecraft.entity.MovementType; import net.minecraft.storage.ReadView; @@ -29,8 +29,8 @@ public class WalkExecution implements InstructionExecution { } @Override - public void readArguments(ValueSupplierList parameters, MinionRuntime minion) { - totalBlocksToMove = parameters.getValue(blocksToMoveParam, minion).floatValue(); + public void readArguments(ParameterValueList parameters, MinionRuntime minion) { + totalBlocksToMove = parameters.getValue(blocksToMoveParam).floatValue(); blocksMoved = 0; } diff --git a/src/main/java/io/github/skippyall/minions/minion/program/supplier/AnalogInputSupplier.java b/src/main/java/io/github/skippyall/minions/minion/program/supplier/AnalogInputSupplier.java index 038606e..ac96f16 100644 --- a/src/main/java/io/github/skippyall/minions/minion/program/supplier/AnalogInputSupplier.java +++ b/src/main/java/io/github/skippyall/minions/minion/program/supplier/AnalogInputSupplier.java @@ -5,6 +5,8 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import eu.pb4.sgui.api.elements.GuiElementBuilder; import eu.pb4.sgui.api.gui.SimpleGui; import io.github.skippyall.minions.clipboard.BlockPosClipboard; +import io.github.skippyall.minions.gui.MinionsGui; +import io.github.skippyall.minions.gui.minion.SimpleMinionsGui; import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.program.supplier.ValueSupplier; import io.github.skippyall.minions.program.supplier.ValueSupplierType; @@ -17,7 +19,6 @@ import io.github.skippyall.minions.registration.ValueTypes; import net.minecraft.item.ItemStack; import net.minecraft.registry.RegistryKey; import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -62,7 +63,7 @@ public class AnalogInputSupplier implements ValueSupplier { @Override public Text getDisplayText() { - return Text.translatable("value_supplier_type.minions.analog_input.display", analogInputPos.toString(), analogInputWorld.getValue().toString()); + return Text.translatable("value_supplier.minions.analog_input.display", analogInputPos.toShortString(), analogInputWorld.getValue().toString()); } public static class AnalogInputSupplierType extends ValueSupplierType { @@ -75,22 +76,29 @@ public class AnalogInputSupplier implements ValueSupplier { } @Override - public CompletableFuture> openConfiguration(ServerPlayerEntity player, ValueType valueType, @Nullable ValueSupplier previous) { + public CompletableFuture> openConfiguration(MinionsGui parent, ValueType valueType, @Nullable ValueSupplier previous) { CompletableFuture> future = new CompletableFuture<>(); + new SimpleMinionsGui(parent, (onClose, me) -> { + SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, parent.getViewer(), false) { + @Override + public void onClose() { + onClose.run(); + } + }; + gui.setTitle(Text.translatable("value_supplier.minions.analog_input")); - SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, player, false); - gui.setTitle(Text.translatable("value_supplier_type.minions.analog_input")); - - gui.setSlot(4, new GuiElementBuilder(MinionItems.REFERENCE_ITEM) - .setCallback(() -> { - ItemStack cursor = player.currentScreenHandler.getCursorStack(); - if(cursor.isOf(MinionItems.REFERENCE_ITEM) && cursor.get(MinionComponentTypes.REFERENCE) instanceof BlockPosClipboard pos) { - future.complete(new AnalogInputSupplier(pos.world(), pos.pos())); - } - }) - .setItemName(Text.translatable("value_supplier_type.minions.analog_input.config.click_with_reference")) - ); - gui.open(); + gui.setSlot(4, new GuiElementBuilder(MinionItems.REFERENCE_ITEM) + .setCallback(() -> { + ItemStack cursor = parent.getViewer().currentScreenHandler.getCursorStack(); + if (cursor.isOf(MinionItems.REFERENCE_ITEM) && cursor.get(MinionComponentTypes.REFERENCE) instanceof BlockPosClipboard pos) { + future.complete(new AnalogInputSupplier(pos.world(), pos.pos())); + } + }) + .setItemName(Text.translatable("value_supplier.minions.analog_input.config.click_with_reference")) + ); + gui.open(); + return gui; + }); return future; } } diff --git a/src/main/java/io/github/skippyall/minions/module/MinionModule.java b/src/main/java/io/github/skippyall/minions/module/MinionModule.java index 15f1d6d..e7e32f9 100644 --- a/src/main/java/io/github/skippyall/minions/module/MinionModule.java +++ b/src/main/java/io/github/skippyall/minions/module/MinionModule.java @@ -2,9 +2,9 @@ package io.github.skippyall.minions.module; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.program.instruction.InstructionType; +import io.github.skippyall.minions.registration.MinionRegistries; import java.util.List; diff --git a/src/main/java/io/github/skippyall/minions/program/InstructionRuntime.java b/src/main/java/io/github/skippyall/minions/program/InstructionRuntime.java index 6765707..f1667de 100644 --- a/src/main/java/io/github/skippyall/minions/program/InstructionRuntime.java +++ b/src/main/java/io/github/skippyall/minions/program/InstructionRuntime.java @@ -1,13 +1,13 @@ package io.github.skippyall.minions.program; import com.mojang.serialization.Codec; -import io.github.skippyall.minions.program.supplier.ValueSupplier; -import io.github.skippyall.minions.program.supplier.ValueSupplierList; -import io.github.skippyall.minions.program.supplier.ValueSupplierType; -import io.github.skippyall.minions.program.instruction.InstructionType; import io.github.skippyall.minions.program.consumer.ValueConsumer; import io.github.skippyall.minions.program.consumer.ValueConsumerList; import io.github.skippyall.minions.program.consumer.ValueConsumerType; +import io.github.skippyall.minions.program.instruction.InstructionType; +import io.github.skippyall.minions.program.supplier.ValueSupplier; +import io.github.skippyall.minions.program.supplier.ValueSupplierList; +import io.github.skippyall.minions.program.supplier.ValueSupplierType; import net.minecraft.registry.Registry; public interface InstructionRuntime> { diff --git a/src/main/java/io/github/skippyall/minions/program/consumer/ValueConsumer.java b/src/main/java/io/github/skippyall/minions/program/consumer/ValueConsumer.java index 09da40b..8723e32 100644 --- a/src/main/java/io/github/skippyall/minions/program/consumer/ValueConsumer.java +++ b/src/main/java/io/github/skippyall/minions/program/consumer/ValueConsumer.java @@ -1,9 +1,9 @@ package io.github.skippyall.minions.program.consumer; import com.mojang.serialization.Codec; -import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.program.InstructionRuntime; import io.github.skippyall.minions.program.value.ValueType; +import io.github.skippyall.minions.registration.MinionRegistries; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/io/github/skippyall/minions/program/conversion/CastConverter.java b/src/main/java/io/github/skippyall/minions/program/conversion/CastConverter.java index 722570b..9238fa7 100644 --- a/src/main/java/io/github/skippyall/minions/program/conversion/CastConverter.java +++ b/src/main/java/io/github/skippyall/minions/program/conversion/CastConverter.java @@ -2,10 +2,14 @@ package io.github.skippyall.minions.program.conversion; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; +import io.github.skippyall.minions.gui.MinionsGui; +import io.github.skippyall.minions.gui.input.Result; +import io.github.skippyall.minions.program.value.TypedValue; import io.github.skippyall.minions.program.value.ValueType; import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.registration.ValueConverters; -import net.minecraft.server.network.ServerPlayerEntity; +import io.github.skippyall.minions.util.TranslationUtil; +import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; import java.util.concurrent.CompletableFuture; @@ -26,8 +30,8 @@ public class CastConverter implements ValueConverter { } @Override - public T convert(F fromValue) { - return Casts.getCast(from, to).cast(fromValue); + public Result convert(F fromValue) { + return Casts.castOrError(new TypedValue<>(fromValue, from), to); } @Override @@ -45,6 +49,11 @@ public class CastConverter implements ValueConverter { return ValueConverters.CAST_CONVERTER; } + @Override + public Text getDisplayText() { + return Text.translatable("value_converter.minions.cast.display", Text.translatable(TranslationUtil.getTranslationKey(from, MinionRegistries.VALUE_TYPES)), Text.translatable(TranslationUtil.getTranslationKey(to, MinionRegistries.VALUE_TYPES))); + } + public static class Type implements ValueConverterType> { @Override public MapCodec> getCodec() { @@ -57,7 +66,7 @@ public class CastConverter implements ValueConverter { } @Override - public CompletableFuture> configure(ServerPlayerEntity player, ValueType from, ValueType to, @Nullable CastConverter old) { + public CompletableFuture> configure(MinionsGui parent, ValueType from, ValueType to, @Nullable ValueConverter old) { return CompletableFuture.completedFuture(new CastConverter<>(from, to)); } } diff --git a/src/main/java/io/github/skippyall/minions/program/conversion/Casts.java b/src/main/java/io/github/skippyall/minions/program/conversion/Casts.java index 0fdf426..61c9601 100644 --- a/src/main/java/io/github/skippyall/minions/program/conversion/Casts.java +++ b/src/main/java/io/github/skippyall/minions/program/conversion/Casts.java @@ -1,7 +1,12 @@ package io.github.skippyall.minions.program.conversion; +import io.github.skippyall.minions.gui.input.Result; +import io.github.skippyall.minions.program.value.TypedValue; import io.github.skippyall.minions.program.value.ValueType; +import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.registration.ValueTypes; +import io.github.skippyall.minions.util.TranslationUtil; +import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; public class Casts { @@ -12,11 +17,11 @@ public class Casts { } if(from == ValueTypes.LONG && to == ValueTypes.DOUBLE) { //noinspection unchecked - return (Cast) new Cast<>(ValueTypes.LONG, ValueTypes.DOUBLE, (v) -> (double)v); + return (Cast) new Cast<>(ValueTypes.LONG, ValueTypes.DOUBLE, Long::doubleValue); } if(from == ValueTypes.DOUBLE && to == ValueTypes.LONG) { //noinspection unchecked - return (Cast) new Cast.CastCrafter<>(ValueTypes.DOUBLE, ValueTypes.LONG, (v) -> (long)(double)v).lossy().craftCast(); + return (Cast) new Cast.CastCrafter<>(ValueTypes.DOUBLE, ValueTypes.LONG, Double::longValue).lossy().craftCast(); } if((from == ValueTypes.DOUBLE || from == ValueTypes.LONG) && to == ValueTypes.STRING) { //noinspection unchecked @@ -26,6 +31,23 @@ public class Casts { return null; } + public static @Nullable T cast(TypedValue from, ValueType to) { + @Nullable Cast cast = getCast(from.type(), to); + if(cast != null) { + return cast.cast(from.value()); + } else { + return null; + } + } + + public static Result castOrError(TypedValue from, ValueType to) { + return Result.ofNullable(Casts.cast(from, to), () -> Text.translatable( + "value_converter.minions.cast.cast_failed", + from.type().getDisplayText(from.value()), + Text.translatable(TranslationUtil.getTranslationKey(to, MinionRegistries.VALUE_TYPES)) + )); + } + public static boolean canCastSafely(ValueType from, ValueType to) { if(from == to) { return true; diff --git a/src/main/java/io/github/skippyall/minions/program/conversion/ConverterList.java b/src/main/java/io/github/skippyall/minions/program/conversion/ConverterList.java new file mode 100644 index 0000000..79e0872 --- /dev/null +++ b/src/main/java/io/github/skippyall/minions/program/conversion/ConverterList.java @@ -0,0 +1,81 @@ +package io.github.skippyall.minions.program.conversion; + +import com.mojang.serialization.Codec; +import io.github.skippyall.minions.gui.input.Result; +import io.github.skippyall.minions.program.value.TypedValue; +import io.github.skippyall.minions.program.value.ValueType; +import net.minecraft.text.Text; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; +import java.util.ListIterator; +import java.util.Objects; + +public class ConverterList { + public static final Codec CODEC = ValueConverter.CODEC.listOf().xmap(ConverterList::new, l -> l.converters); + + private final List> converters; + + public ConverterList() { + this.converters = new ArrayList<>(); + } + + private ConverterList(List> converters) { + this.converters = new ArrayList<>(converters); + } + + public static ConverterList of(List> converters) { + return new ConverterList(new ArrayList<>(converters)); + } + + public List> getConverters() { + return converters; + } + + public ValueType getInputType() { + return converters.getFirst().getFrom(); + } + + public ValueType getOutputType() { + return converters.getLast().getTo(); + } + + public Result, Text> convert(TypedValue input) { + if(converters.isEmpty()) { + return new Result.Success<>(input); + } else { + ListIterator> iterator = converters.listIterator(); + return convert(input, iterator.next(), iterator); + } + } + + private Result, Text> convert(TypedValue from, ValueConverter converter, ListIterator> iterator) { + Result inter = Casts.castOrError(from, converter.getFrom()); + if(inter instanceof Result.Error error) { + return new Result.Error<>(Text.translatable("minions.converter.list.passing_error", iterator.previousIndex(), error.message())); + } + Result to = converter.convert(inter.getOrThrow()); + + if(iterator.hasNext() && to instanceof Result.Success success) { + return convert(new TypedValue<>(success.result(), converter.getTo()), iterator.next(), iterator); + } else { + return to.map(v -> new TypedValue<>(v, converter.getTo())); + } + } + + public Result<@Nullable Void, Text> check() { + return new Result.Success<>(null); + } + + @Override + public boolean equals(Object o) { + if (!(o instanceof ConverterList that)) return false; + return Objects.equals(converters, that.converters); + } + + @Override + public int hashCode() { + return Objects.hashCode(converters); + } +} diff --git a/src/main/java/io/github/skippyall/minions/program/conversion/EqualityConverter.java b/src/main/java/io/github/skippyall/minions/program/conversion/EqualityConverter.java index 619ab00..7404583 100644 --- a/src/main/java/io/github/skippyall/minions/program/conversion/EqualityConverter.java +++ b/src/main/java/io/github/skippyall/minions/program/conversion/EqualityConverter.java @@ -1,16 +1,20 @@ package io.github.skippyall.minions.program.conversion; import com.mojang.serialization.MapCodec; +import io.github.skippyall.minions.gui.MinionsGui; +import io.github.skippyall.minions.gui.input.Result; import io.github.skippyall.minions.program.value.ValueType; import io.github.skippyall.minions.registration.MinionRegistries; +import io.github.skippyall.minions.registration.ValueConverters; import io.github.skippyall.minions.registration.ValueTypes; -import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; import java.util.concurrent.CompletableFuture; public class EqualityConverter implements ValueConverter { public static final MapCodec> CODEC = MinionRegistries.VALUE_TYPES.getCodec().dispatchMap( + "value_type", EqualityConverter::getFrom, EqualityConverter::getCodec ); @@ -24,8 +28,8 @@ public class EqualityConverter implements ValueConverter { } @Override - public Boolean convert(F from) { - return compareValue.equals(from); + public Result convert(F from) { + return new Result.Success<>(compareValue.equals(from)); } @Override @@ -40,7 +44,12 @@ public class EqualityConverter implements ValueConverter { @Override public ValueConverterType getType() { - return null; + return ValueConverters.EQUALITY_CONVERTER; + } + + @Override + public Text getDisplayText() { + return Text.translatable("value_converter.minions.equality.display", fromType.getDisplayText(compareValue)); } private static MapCodec> getCodec(ValueType fromType) { @@ -60,14 +69,13 @@ public class EqualityConverter implements ValueConverter { } @Override - public CompletableFuture> configure(ServerPlayerEntity player, ValueType from, ValueType to, @Nullable EqualityConverter old) { - if(to == ValueTypes.BOOLEAN) { - //noinspection unchecked - return from.openValueDialog(player, old != null && old.fromType == from ? (F) old.compareValue : null) - .thenApply(compareValue -> new EqualityConverter<>(from, compareValue)); - } else { - return CompletableFuture.failedFuture(new IllegalArgumentException("EqualityConverter does not support converting to " + to)); + public CompletableFuture> configure(MinionsGui parent, ValueType from, ValueType to, @Nullable ValueConverter old) { + F oldValue = null; + if(old instanceof EqualityConverter eq && eq.fromType == from) { + oldValue = from.checkedCast(eq.compareValue); } + return from.openValueDialog(parent, oldValue) + .thenApply(compareValue -> new EqualityConverter<>(from, compareValue)); } } } diff --git a/src/main/java/io/github/skippyall/minions/program/conversion/ValueConverter.java b/src/main/java/io/github/skippyall/minions/program/conversion/ValueConverter.java index cf72e77..a83f12b 100644 --- a/src/main/java/io/github/skippyall/minions/program/conversion/ValueConverter.java +++ b/src/main/java/io/github/skippyall/minions/program/conversion/ValueConverter.java @@ -1,6 +1,7 @@ package io.github.skippyall.minions.program.conversion; import com.mojang.serialization.Codec; +import io.github.skippyall.minions.gui.input.Result; import io.github.skippyall.minions.program.value.ValueType; import io.github.skippyall.minions.registration.MinionRegistries; import net.minecraft.text.Text; @@ -8,7 +9,7 @@ import net.minecraft.text.Text; public interface ValueConverter { Codec> CODEC = MinionRegistries.VALUE_CONVERTER_TYPES.getCodec().dispatch(ValueConverter::getType, ValueConverterType::getCodec); - T convert(F from); + Result convert(F from); ValueType getFrom(); diff --git a/src/main/java/io/github/skippyall/minions/program/conversion/ValueConverterType.java b/src/main/java/io/github/skippyall/minions/program/conversion/ValueConverterType.java index e5ac035..af541a3 100644 --- a/src/main/java/io/github/skippyall/minions/program/conversion/ValueConverterType.java +++ b/src/main/java/io/github/skippyall/minions/program/conversion/ValueConverterType.java @@ -1,8 +1,8 @@ package io.github.skippyall.minions.program.conversion; import com.mojang.serialization.MapCodec; +import io.github.skippyall.minions.gui.MinionsGui; import io.github.skippyall.minions.program.value.ValueType; -import net.minecraft.server.network.ServerPlayerEntity; import org.jetbrains.annotations.Nullable; import java.util.concurrent.CompletableFuture; @@ -12,5 +12,5 @@ public interface ValueConverterType> { boolean isSupportedConversion(ValueType from, ValueType to); - CompletableFuture configure(ServerPlayerEntity player, ValueType from, ValueType to, @Nullable C old); + CompletableFuture configure(MinionsGui parent, ValueType from, ValueType to, @Nullable ValueConverter old); } diff --git a/src/main/java/io/github/skippyall/minions/program/instruction/ConfiguredInstruction.java b/src/main/java/io/github/skippyall/minions/program/instruction/ConfiguredInstruction.java index 999d4ef..0304894 100644 --- a/src/main/java/io/github/skippyall/minions/program/instruction/ConfiguredInstruction.java +++ b/src/main/java/io/github/skippyall/minions/program/instruction/ConfiguredInstruction.java @@ -1,12 +1,13 @@ package io.github.skippyall.minions.program.instruction; -import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.Minions; -import io.github.skippyall.minions.program.InstructionRuntime; -import io.github.skippyall.minions.program.supplier.Parameter; -import io.github.skippyall.minions.program.supplier.ValueSupplierList; -import io.github.skippyall.minions.program.consumer.ValueConsumerList; import io.github.skippyall.minions.listener.SerializableListenerManager; +import io.github.skippyall.minions.program.InstructionRuntime; +import io.github.skippyall.minions.program.consumer.ValueConsumerList; +import io.github.skippyall.minions.program.supplier.Parameter; +import io.github.skippyall.minions.program.supplier.ParameterValueList; +import io.github.skippyall.minions.program.supplier.ValueSupplierList; +import io.github.skippyall.minions.registration.MinionRegistries; import net.minecraft.storage.ReadView; import net.minecraft.storage.WriteView; import org.jetbrains.annotations.Nullable; @@ -22,15 +23,27 @@ public class ConfiguredInstruction> { private @Nullable InstructionExecution execution; private boolean paused = false; - private SerializableListenerManager listeners = new SerializableListenerManager<>(MinionRegistries.INSTRUCTION_LISTENER_CODECS); + private SerializableListenerManager listeners = new SerializableListenerManager<>(); - private ConfiguredInstruction(InstructionType instruction, ValueSupplierList arguments, ValueConsumerList valueConsumers, @Nullable InstructionExecution execution, SerializableListenerManager listeners, boolean paused) { + private ConfiguredInstruction( + InstructionType instruction, + ValueSupplierList arguments, + ValueConsumerList valueConsumers, + @Nullable InstructionExecution execution, + SerializableListenerManager listeners, + boolean paused + ) { this(instruction, arguments, valueConsumers, execution); this.listeners = listeners; this.paused = paused; } - private ConfiguredInstruction(InstructionType instruction, ValueSupplierList arguments, ValueConsumerList valueConsumers, @Nullable InstructionExecution execution) { + private ConfiguredInstruction( + InstructionType instruction, + ValueSupplierList arguments, + ValueConsumerList valueConsumers, + @Nullable InstructionExecution execution + ) { this.instruction = instruction; this.arguments = arguments; this.valueConsumers = valueConsumers; @@ -52,7 +65,7 @@ public class ConfiguredInstruction> { } public boolean canRun() { - return instruction != null && arguments != null && arguments.checkRun(instruction).isSuccess(); + return instruction != null && arguments != null && arguments.checkRun(instruction) == null; } public boolean isRunning() { @@ -65,8 +78,9 @@ public class ConfiguredInstruction> { public void run(R minion) { if(canRun() && !isRunning()) { + ParameterValueList resolvedArguments = arguments.resolve(minion); try { - execution = instruction.createExecution(arguments, minion); + execution = instruction.createExecution(resolvedArguments, minion); execution.start(minion); } catch (Exception e) { Minions.LOGGER.error("An error occurred while executing configured Instruction", e); @@ -132,17 +146,17 @@ public class ConfiguredInstruction> { listeners.removeListener(listener); } - public void save(WriteView view, R minion) { - view.put("instruction", minion.getInstructionTypeRegistry().getCodec(), instruction); - view.put("arguments", minion.getArgumentListCodec(), arguments); - view.put("valueConsumers", minion.getValueConsumerListCodec(), valueConsumers); + public void save(WriteView view, R runtime) { + view.put("instruction", runtime.getInstructionTypeRegistry().getCodec(), instruction); + view.put("arguments", runtime.getArgumentListCodec(), arguments); + view.put("valueConsumers", runtime.getValueConsumerListCodec(), valueConsumers); view.putBoolean("running", isRunning()); view.putBoolean("paused", paused); - if(execution != null) { - execution.save(view.get("execution"), minion); - } + view.put("listeners", SerializableListenerManager.getCodec(MinionRegistries.INSTRUCTION_LISTENER_CODECS), listeners); - listeners.save(view); + if(execution != null) { + execution.save(view.get("execution"), runtime); + } } public static > ConfiguredInstruction load(ReadView view, R minion) { @@ -154,8 +168,10 @@ public class ConfiguredInstruction> { boolean running = view.getBoolean("running", false); boolean paused = view.getBoolean("paused", false); - SerializableListenerManager listeners = new SerializableListenerManager<>(MinionRegistries.INSTRUCTION_LISTENER_CODECS); - listeners.load(view); + SerializableListenerManager listeners = view.read( + "listeners", + SerializableListenerManager.getCodec(MinionRegistries.INSTRUCTION_LISTENER_CODECS) + ).orElseGet(SerializableListenerManager::new); if(running) { ReadView executionView = view.getReadView("execution"); diff --git a/src/main/java/io/github/skippyall/minions/program/instruction/ConfiguredInstructionListener.java b/src/main/java/io/github/skippyall/minions/program/instruction/ConfiguredInstructionListener.java index f791af3..5892752 100644 --- a/src/main/java/io/github/skippyall/minions/program/instruction/ConfiguredInstructionListener.java +++ b/src/main/java/io/github/skippyall/minions/program/instruction/ConfiguredInstructionListener.java @@ -1,7 +1,7 @@ package io.github.skippyall.minions.program.instruction; -import io.github.skippyall.minions.program.supplier.Parameter; import io.github.skippyall.minions.listener.SerializableListenerManager; +import io.github.skippyall.minions.program.supplier.Parameter; public interface ConfiguredInstructionListener extends SerializableListenerManager.SerializableListener { default void onRun(ConfiguredInstruction instruction) {} diff --git a/src/main/java/io/github/skippyall/minions/program/instruction/InstructionExecution.java b/src/main/java/io/github/skippyall/minions/program/instruction/InstructionExecution.java index c3ee90e..76e0487 100644 --- a/src/main/java/io/github/skippyall/minions/program/instruction/InstructionExecution.java +++ b/src/main/java/io/github/skippyall/minions/program/instruction/InstructionExecution.java @@ -1,8 +1,9 @@ package io.github.skippyall.minions.program.instruction; import io.github.skippyall.minions.program.InstructionRuntime; -import io.github.skippyall.minions.program.supplier.ValueSupplierList; import io.github.skippyall.minions.program.consumer.ValueConsumerList; +import io.github.skippyall.minions.program.supplier.ParameterValueList; +import io.github.skippyall.minions.program.supplier.ValueSupplierList; import net.minecraft.storage.ReadView; import net.minecraft.storage.WriteView; @@ -48,7 +49,7 @@ public interface InstructionExecution> { * @param arguments The arguments to initialize the execution * @param runtime The runtime should be used to resolve the arguments */ - void readArguments(ValueSupplierList arguments, R runtime); + void readArguments(ParameterValueList arguments, R runtime); /** * Saves the execution, e.g. when the server is closed. @@ -62,7 +63,7 @@ public interface InstructionExecution> { interface Stateless> extends InstructionExecution { @Override - default void readArguments(ValueSupplierList arguments, R runtime) {} + default void readArguments(ParameterValueList arguments, R runtime) {} @Override default void save(WriteView view, R runtime) {} diff --git a/src/main/java/io/github/skippyall/minions/program/instruction/InstructionType.java b/src/main/java/io/github/skippyall/minions/program/instruction/InstructionType.java index 1852f20..2053608 100644 --- a/src/main/java/io/github/skippyall/minions/program/instruction/InstructionType.java +++ b/src/main/java/io/github/skippyall/minions/program/instruction/InstructionType.java @@ -2,7 +2,7 @@ package io.github.skippyall.minions.program.instruction; import io.github.skippyall.minions.program.InstructionRuntime; import io.github.skippyall.minions.program.supplier.Parameter; -import io.github.skippyall.minions.program.supplier.ValueSupplierList; +import io.github.skippyall.minions.program.supplier.ParameterValueList; import net.minecraft.storage.ReadView; import java.util.Collection; @@ -33,9 +33,9 @@ public class InstructionType> { return returnParameters; } - public InstructionExecution createExecution(ValueSupplierList parameters, R minion) { + public InstructionExecution createExecution(ParameterValueList arguments, R minion) { InstructionExecution execution = executionFactory.get(); - execution.readArguments(parameters, minion); + execution.readArguments(arguments, minion); return execution; } diff --git a/src/main/java/io/github/skippyall/minions/program/supplier/FixedValueSupplier.java b/src/main/java/io/github/skippyall/minions/program/supplier/FixedValueSupplier.java index f827c6d..d8a534a 100644 --- a/src/main/java/io/github/skippyall/minions/program/supplier/FixedValueSupplier.java +++ b/src/main/java/io/github/skippyall/minions/program/supplier/FixedValueSupplier.java @@ -39,6 +39,6 @@ public class FixedValueSupplier> implements V @Override public Text getDisplayText() { - return Text.translatable("value_supplier_type.minions.fixed.display", valueType.getDisplayText(value)); + return valueType.getDisplayText(value); } } diff --git a/src/main/java/io/github/skippyall/minions/program/supplier/FixedValueSupplierType.java b/src/main/java/io/github/skippyall/minions/program/supplier/FixedValueSupplierType.java index 8908367..343d433 100644 --- a/src/main/java/io/github/skippyall/minions/program/supplier/FixedValueSupplierType.java +++ b/src/main/java/io/github/skippyall/minions/program/supplier/FixedValueSupplierType.java @@ -1,9 +1,9 @@ package io.github.skippyall.minions.program.supplier; import com.mojang.serialization.Codec; +import io.github.skippyall.minions.gui.MinionsGui; import io.github.skippyall.minions.program.InstructionRuntime; import io.github.skippyall.minions.program.value.ValueType; -import net.minecraft.server.network.ServerPlayerEntity; import org.jetbrains.annotations.Nullable; import java.util.concurrent.CompletableFuture; @@ -15,10 +15,10 @@ public class FixedValueSupplierType> extends Val } @Override - public CompletableFuture> openConfiguration(ServerPlayerEntity player, ValueType valueType, @Nullable ValueSupplier previousValueSupplier) { + public CompletableFuture> openConfiguration(MinionsGui parent, ValueType valueType, @Nullable ValueSupplier previousValueSupplier) { return valueType.openValueDialog( - player, - previousValueSupplier instanceof FixedValueSupplier val ? val.getValue() : valueType.defaultValue() + parent, + previousValueSupplier instanceof FixedValueSupplier val && val.getValueType() == valueType ? valueType.checkedCast(val.getValue()) : valueType.defaultValue() ).thenApply(value -> new FixedValueSupplier<>(this, valueType, value)); } } diff --git a/src/main/java/io/github/skippyall/minions/program/supplier/Parameter.java b/src/main/java/io/github/skippyall/minions/program/supplier/Parameter.java index f2d111b..db42204 100644 --- a/src/main/java/io/github/skippyall/minions/program/supplier/Parameter.java +++ b/src/main/java/io/github/skippyall/minions/program/supplier/Parameter.java @@ -3,9 +3,8 @@ package io.github.skippyall.minions.program.supplier; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import io.github.skippyall.minions.program.value.SimpleValueType; -import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.program.value.ValueType; +import io.github.skippyall.minions.registration.MinionRegistries; import org.jetbrains.annotations.Nullable; public record Parameter(String name, ValueType type) { diff --git a/src/main/java/io/github/skippyall/minions/program/supplier/ParameterValueList.java b/src/main/java/io/github/skippyall/minions/program/supplier/ParameterValueList.java new file mode 100644 index 0000000..ad89ba2 --- /dev/null +++ b/src/main/java/io/github/skippyall/minions/program/supplier/ParameterValueList.java @@ -0,0 +1,21 @@ +package io.github.skippyall.minions.program.supplier; + +import java.util.HashMap; +import java.util.Map; + +public class ParameterValueList { + private final Map, Object> values; + + public ParameterValueList() { + values = new HashMap<>(); + } + + public T getValue(Parameter parameter) { + //noinspection unchecked + return (T) values.get(parameter); + } + + public void setValue(Parameter parameter, T value) { + values.put(parameter, value); + } +} diff --git a/src/main/java/io/github/skippyall/minions/program/supplier/ValueSupplier.java b/src/main/java/io/github/skippyall/minions/program/supplier/ValueSupplier.java index 1e56ee9..e62d4bd 100644 --- a/src/main/java/io/github/skippyall/minions/program/supplier/ValueSupplier.java +++ b/src/main/java/io/github/skippyall/minions/program/supplier/ValueSupplier.java @@ -2,9 +2,9 @@ package io.github.skippyall.minions.program.supplier; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; -import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.program.InstructionRuntime; import io.github.skippyall.minions.program.value.ValueType; +import io.github.skippyall.minions.registration.MinionRegistries; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/io/github/skippyall/minions/program/supplier/ValueSupplierList.java b/src/main/java/io/github/skippyall/minions/program/supplier/ValueSupplierList.java index a74e479..4c4a2aa 100644 --- a/src/main/java/io/github/skippyall/minions/program/supplier/ValueSupplierList.java +++ b/src/main/java/io/github/skippyall/minions/program/supplier/ValueSupplierList.java @@ -5,43 +5,40 @@ import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; import io.github.skippyall.minions.gui.input.Result; import io.github.skippyall.minions.program.InstructionRuntime; -import io.github.skippyall.minions.program.conversion.Cast; import io.github.skippyall.minions.program.conversion.Casts; -import io.github.skippyall.minions.program.conversion.ValueConverter; +import io.github.skippyall.minions.program.conversion.ConverterList; import io.github.skippyall.minions.program.instruction.InstructionType; -import io.github.skippyall.minions.program.value.ValueType; +import io.github.skippyall.minions.program.value.TypedValue; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.function.Consumer; public class ValueSupplierList> { - private final Map, ValueSupplierEntry> arguments = new HashMap<>(); + private final Map, ValueSupplierEntry> arguments = new HashMap<>(); private final List>> changeListeners = new ArrayList<>(); public ValueSupplierList() { } - private ValueSupplierList(List> arguments) { - for(ValueSupplierEntry argument : arguments) { + private ValueSupplierList(List> arguments) { + for(ValueSupplierEntry argument : arguments) { this.arguments.put(argument.parameter, argument); } } - private List> toCodecList() { + private List> toCodecList() { return List.copyOf(arguments.values()); } public T getValue(Parameter parameter, R runtime) { - ValueSupplierEntry entry = getEntry(parameter); + ValueSupplierEntry entry = getEntry(parameter); return parameter.type().checkedCast(entry.getValue(runtime)); } @@ -53,47 +50,55 @@ public class ValueSupplierList> { } } - public

ValueSupplierEntry getEntry(Parameter

parameter) { + public

ValueSupplierEntry getEntry(Parameter

parameter) { //noinspection unchecked - return (ValueSupplierEntry) arguments.get(parameter); + return (ValueSupplierEntry) arguments.get(parameter); } - public void setArgument(Parameter parameter, ValueSupplier valueSupplier) { - arguments.put(parameter, new ValueSupplierEntry<>(parameter, valueSupplier, List.of())); - onChange(parameter); + public

ValueSupplierEntry createEntry(Parameter

parameter, ValueSupplier supplier) { + ValueSupplierEntry entry = new ValueSupplierEntry<>(parameter, supplier, new ConverterList()); + arguments.put(parameter, entry); + return entry; } - public void setArgument(Parameter parameter, ValueSupplier valueSupplier, List> converter) { - arguments.put(parameter, new ValueSupplierEntry<>(parameter, valueSupplier, converter)); - onChange(parameter); + public void removeEntry(Parameter parameter) { + arguments.remove(parameter); + } + + public ParameterValueList resolve(R runtime) { + ParameterValueList list = new ParameterValueList(); + for(ValueSupplierEntry argument : arguments.values()) { + argument.addToList(list, runtime); + } + return list; } public boolean hasArgumentFor(Parameter parameter) { return arguments.containsKey(parameter); } - public Result<@Nullable Void, Text> checkHasArguments(Collection> checkParameters) { + public @Nullable Text checkHasArguments(Collection> checkParameters) { for(Parameter parameter : checkParameters) { if(!hasArgumentFor(parameter)) { - return new Result.Error<>(Text.translatable("minions.gui.instruction.check.argument_not_set", parameter.name())); + return Text.translatable("minions.gui.instruction.check.argument_not_set", parameter.name()); } } - return new Result.Success<>(null); + return null; } - public Result<@Nullable Void, Text> checkRun(InstructionType instructionType) { - Result<@Nullable Void, Text> checkResult = checkHasArguments(instructionType.getParameters()); - if(!checkResult.isSuccess()) { + public @Nullable Text checkRun(InstructionType instructionType) { + @Nullable Text checkResult = checkHasArguments(instructionType.getParameters()); + if(checkResult != null) { return checkResult; } - for(ValueSupplierEntry entry : arguments.values()) { + for(ValueSupplierEntry entry : arguments.values()) { checkResult = entry.check(); - if(!checkResult.isSuccess()) { + if(checkResult != null) { return checkResult; } } - return new Result.Success<>(null); + return null; } private void onChange(Parameter parameter) { @@ -117,18 +122,18 @@ public class ValueSupplierList> { .xmap(ValueSupplierList::new, ValueSupplierList::toCodecList); } - public static class ValueSupplierEntry> { + public static class ValueSupplierEntry> { private Parameter

parameter; - private ValueSupplier supplier; - private List> converters; + private ValueSupplier supplier; + private ConverterList converters; - public ValueSupplierEntry(Parameter

parameter, ValueSupplier supplier, Collection> converters) { + public ValueSupplierEntry(Parameter

parameter, ValueSupplier supplier, ConverterList converters) { this.parameter = parameter; this.supplier = supplier; - this.converters = new LinkedList<>(converters); + this.converters = converters; } - public List> getConverters() { + public ConverterList getConverters() { return converters; } @@ -136,7 +141,7 @@ public class ValueSupplierList> { return parameter; } - public ValueSupplier getSupplier() { + public ValueSupplier getSupplier() { return supplier; } @@ -144,64 +149,36 @@ public class ValueSupplierList> { this.parameter = parameter; } - public void setSupplier(ValueSupplier supplier) { + public void setSupplier(ValueSupplier supplier) { this.supplier = supplier; } - public void setConverters(List> converters) { - this.converters = converters; + private void addToList(ParameterValueList list, R runtime) { + list.setValue(parameter, getValue(runtime)); } public @Nullable P getValue(R runtime) { - S value = supplier.resolve(runtime); - Iterator> iterator = converters.iterator(); - Object convertedValue = convert(supplier.getValueType(), value, iterator.next(), iterator); - - return finalCast(convertedValue); + return getValue(supplier, runtime); } - private @Nullable P finalCast(Object value) { - //noinspection unchecked - ValueType lastConvertedType = (ValueType) converters.getLast().getTo(); - F convertedValue = lastConvertedType.checkedCast(value); - if(convertedValue == null) { - return null; - } + //Ich liebe generische Typen (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) + private @Nullable P getValue(ValueSupplier supplier, R runtime) { + S value = supplier.resolve(runtime); + Result, Text> convertedResult = converters.convert(new TypedValue<>(value, supplier.getValueType())); - Cast cast = Casts.getCast(lastConvertedType, parameter.type()); - if(cast != null) { - return cast.cast(convertedValue); - } + return convertedResult.flatMap(convertedValue -> Casts.castOrError(convertedValue, parameter.type())).getOrDefault(null); + } + + public @Nullable Text check() { + //TODO check it return null; } - private @Nullable Object convert(ValueType fromType, F from, ValueConverter converter, Iterator> iterator) { - Cast cast = Casts.getCast(fromType, converter.getFrom()); - if(cast == null) { - return null; - } - I inter = cast.cast(from); - if(inter == null) { - return null; - } - T to = converter.convert(inter); - - if(iterator.hasNext() && to != null) { - return convert(converter.getTo(), to, iterator.next(), iterator); - } else { - return to; - } - } - - public Result<@Nullable Void, Text> check() { - return new Result.Success<>(null); - } - - public static > MapCodec> getCodec(Codec> argumentCodec) { + public static > MapCodec> getCodec(Codec> argumentCodec) { return RecordCodecBuilder.mapCodec(instance -> instance.group( Parameter.CODEC.fieldOf("parameter").forGetter(e -> e.parameter), argumentCodec.fieldOf("argument").forGetter(e -> e.supplier), - ValueConverter.CODEC.listOf().optionalFieldOf("converter", List.of()).forGetter(e -> e.converters) + ConverterList.CODEC.fieldOf("converter").forGetter(e -> e.converters) ).apply(instance, ValueSupplierEntry::new)); } } diff --git a/src/main/java/io/github/skippyall/minions/program/supplier/ValueSupplierType.java b/src/main/java/io/github/skippyall/minions/program/supplier/ValueSupplierType.java index 0d79c3f..7ea95cc 100644 --- a/src/main/java/io/github/skippyall/minions/program/supplier/ValueSupplierType.java +++ b/src/main/java/io/github/skippyall/minions/program/supplier/ValueSupplierType.java @@ -1,9 +1,9 @@ package io.github.skippyall.minions.program.supplier; import com.mojang.serialization.Codec; +import io.github.skippyall.minions.gui.MinionsGui; import io.github.skippyall.minions.program.InstructionRuntime; import io.github.skippyall.minions.program.value.ValueType; -import net.minecraft.server.network.ServerPlayerEntity; import org.jetbrains.annotations.Nullable; import java.util.concurrent.CompletableFuture; @@ -11,5 +11,5 @@ import java.util.concurrent.CompletableFuture; public abstract class ValueSupplierType> { public abstract Codec> getCodec(ValueType type); - public abstract CompletableFuture> openConfiguration(ServerPlayerEntity player, ValueType valueType, @Nullable ValueSupplier previous); + public abstract CompletableFuture> openConfiguration(MinionsGui gui, ValueType valueType, @Nullable ValueSupplier previous); } diff --git a/src/main/java/io/github/skippyall/minions/program/value/RestrictionRule.java b/src/main/java/io/github/skippyall/minions/program/value/RestrictionRule.java deleted file mode 100644 index 79eda44..0000000 --- a/src/main/java/io/github/skippyall/minions/program/value/RestrictionRule.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.github.skippyall.minions.program.value; - -import io.github.skippyall.minions.gui.input.Result; -import net.minecraft.text.Text; - -public interface RestrictionRule { - Result validate(T value); - - default boolean matches(T value) { - return validate(value).isSuccess(); - } -} diff --git a/src/main/java/io/github/skippyall/minions/program/value/SimpleValueType.java b/src/main/java/io/github/skippyall/minions/program/value/SimpleValueType.java index 62ff567..e9ce4cf 100644 --- a/src/main/java/io/github/skippyall/minions/program/value/SimpleValueType.java +++ b/src/main/java/io/github/skippyall/minions/program/value/SimpleValueType.java @@ -1,18 +1,17 @@ package io.github.skippyall.minions.program.value; import com.mojang.serialization.Codec; -import net.minecraft.server.network.ServerPlayerEntity; +import io.github.skippyall.minions.gui.MinionsGui; import net.minecraft.text.Text; -import org.jetbrains.annotations.Nullable; import java.util.concurrent.CompletableFuture; import java.util.function.BiFunction; import java.util.function.Function; -public record SimpleValueType(Codec codec, T defaultValue, Function checkedCast, BiFunction> valueDialogOpener, Function textDisplay) implements ValueType { +public record SimpleValueType(Codec codec, T defaultValue, Function checkedCast, BiFunction> valueDialogOpener, Function textDisplay) implements ValueType { @Override - public CompletableFuture openValueDialog(ServerPlayerEntity player, T previousValue) { - return valueDialogOpener.apply(player, previousValue); + public CompletableFuture openValueDialog(MinionsGui parent, T previousValue) { + return valueDialogOpener.apply(parent, previousValue); } @Override diff --git a/src/main/java/io/github/skippyall/minions/program/value/TypeRestriction.java b/src/main/java/io/github/skippyall/minions/program/value/TypeRestriction.java deleted file mode 100644 index 4e747a4..0000000 --- a/src/main/java/io/github/skippyall/minions/program/value/TypeRestriction.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.skippyall.minions.program.value; - -import java.util.Collection; - -public record TypeRestriction(ValueType type, Collection> rules) { -} diff --git a/src/main/java/io/github/skippyall/minions/program/value/TypedValue.java b/src/main/java/io/github/skippyall/minions/program/value/TypedValue.java new file mode 100644 index 0000000..b1608cd --- /dev/null +++ b/src/main/java/io/github/skippyall/minions/program/value/TypedValue.java @@ -0,0 +1,7 @@ +package io.github.skippyall.minions.program.value; + +public record TypedValue(T value, ValueType type) { + public static TypedValue of(Object o, ValueType type) { + return new TypedValue<>(type.checkedCast(o), type); + } +} diff --git a/src/main/java/io/github/skippyall/minions/program/value/ValueType.java b/src/main/java/io/github/skippyall/minions/program/value/ValueType.java index 9feb2fe..091620c 100644 --- a/src/main/java/io/github/skippyall/minions/program/value/ValueType.java +++ b/src/main/java/io/github/skippyall/minions/program/value/ValueType.java @@ -1,16 +1,14 @@ package io.github.skippyall.minions.program.value; import com.mojang.serialization.Codec; -import net.minecraft.server.network.ServerPlayerEntity; +import io.github.skippyall.minions.gui.MinionsGui; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; import java.util.concurrent.CompletableFuture; -import java.util.function.BiFunction; -import java.util.function.Function; public interface ValueType { - CompletableFuture openValueDialog(ServerPlayerEntity player, T previousValue); + CompletableFuture openValueDialog(MinionsGui gui, T previousValue); Text getDisplayText(T value); diff --git a/src/main/java/io/github/skippyall/minions/registration/ClipboardTypes.java b/src/main/java/io/github/skippyall/minions/registration/ClipboardTypes.java index 7eb4e4a..a66cecf 100644 --- a/src/main/java/io/github/skippyall/minions/registration/ClipboardTypes.java +++ b/src/main/java/io/github/skippyall/minions/registration/ClipboardTypes.java @@ -3,8 +3,8 @@ package io.github.skippyall.minions.registration; import com.mojang.serialization.MapCodec; import io.github.skippyall.minions.Minions; import io.github.skippyall.minions.clipboard.BlockPosClipboard; -import io.github.skippyall.minions.clipboard.InstructionClipboard; import io.github.skippyall.minions.clipboard.Clipboard; +import io.github.skippyall.minions.clipboard.InstructionClipboard; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; diff --git a/src/main/java/io/github/skippyall/minions/registration/Instructions.java b/src/main/java/io/github/skippyall/minions/registration/Instructions.java index 92b1440..e78faf6 100644 --- a/src/main/java/io/github/skippyall/minions/registration/Instructions.java +++ b/src/main/java/io/github/skippyall/minions/registration/Instructions.java @@ -1,17 +1,17 @@ package io.github.skippyall.minions.registration; -import io.github.skippyall.minions.minion.program.instruction.inventory.SwapItemExecution; -import io.github.skippyall.minions.program.instruction.InstructionExecution; -import io.github.skippyall.minions.program.instruction.InstructionType; import io.github.skippyall.minions.Minions; import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack; import io.github.skippyall.minions.minion.program.instruction.ActionExecution; import io.github.skippyall.minions.minion.program.instruction.MineBlockExecution; +import io.github.skippyall.minions.minion.program.instruction.inventory.SwapItemExecution; import io.github.skippyall.minions.minion.program.instruction.move.ContinuousWalkExecution; import io.github.skippyall.minions.minion.program.instruction.move.TurnExecution; import io.github.skippyall.minions.minion.program.instruction.move.TurnVectorExecution; import io.github.skippyall.minions.minion.program.instruction.move.WalkExecution; +import io.github.skippyall.minions.program.instruction.InstructionExecution; +import io.github.skippyall.minions.program.instruction.InstructionType; import io.github.skippyall.minions.program.supplier.Parameter; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; diff --git a/src/main/java/io/github/skippyall/minions/registration/MinionBlocks.java b/src/main/java/io/github/skippyall/minions/registration/MinionBlocks.java index 06c2b9b..29cf009 100644 --- a/src/main/java/io/github/skippyall/minions/registration/MinionBlocks.java +++ b/src/main/java/io/github/skippyall/minions/registration/MinionBlocks.java @@ -9,7 +9,6 @@ import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityT import net.minecraft.block.AbstractBlock; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.block.piston.PistonBehavior; -import net.minecraft.network.packet.CustomPayload; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; diff --git a/src/main/java/io/github/skippyall/minions/registration/MinionComponentTypes.java b/src/main/java/io/github/skippyall/minions/registration/MinionComponentTypes.java index 7eee3d8..b952fbf 100644 --- a/src/main/java/io/github/skippyall/minions/registration/MinionComponentTypes.java +++ b/src/main/java/io/github/skippyall/minions/registration/MinionComponentTypes.java @@ -2,8 +2,8 @@ package io.github.skippyall.minions.registration; import eu.pb4.polymer.core.api.other.PolymerComponent; import io.github.skippyall.minions.Minions; -import io.github.skippyall.minions.module.MinionModule; import io.github.skippyall.minions.clipboard.Clipboard; +import io.github.skippyall.minions.module.MinionModule; import net.fabricmc.fabric.api.item.v1.ComponentTooltipAppenderRegistry; import net.minecraft.component.ComponentType; import net.minecraft.registry.Registries; diff --git a/src/main/java/io/github/skippyall/minions/registration/MinionItems.java b/src/main/java/io/github/skippyall/minions/registration/MinionItems.java index f6b09c6..cf5916d 100644 --- a/src/main/java/io/github/skippyall/minions/registration/MinionItems.java +++ b/src/main/java/io/github/skippyall/minions/registration/MinionItems.java @@ -3,12 +3,12 @@ package io.github.skippyall.minions.registration; import eu.pb4.polymer.core.api.item.PolymerBlockItem; import eu.pb4.polymer.core.api.item.SimplePolymerItem; import io.github.skippyall.minions.block.miniontrigger.MinionTriggerBlockItem; +import io.github.skippyall.minions.clipboard.ClipboardItem; import io.github.skippyall.minions.minion.MinionItem; import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.module.MinionModule; import io.github.skippyall.minions.module.SpecialAbility; import io.github.skippyall.minions.program.instruction.InstructionType; -import io.github.skippyall.minions.clipboard.ClipboardItem; import net.minecraft.component.DataComponentTypes; import net.minecraft.component.type.DamageResistantComponent; import net.minecraft.entity.damage.DamageType; diff --git a/src/main/java/io/github/skippyall/minions/registration/MinionRegistries.java b/src/main/java/io/github/skippyall/minions/registration/MinionRegistries.java index 3468bac..d3e7515 100644 --- a/src/main/java/io/github/skippyall/minions/registration/MinionRegistries.java +++ b/src/main/java/io/github/skippyall/minions/registration/MinionRegistries.java @@ -3,6 +3,7 @@ package io.github.skippyall.minions.registration; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import io.github.skippyall.minions.Minions; +import io.github.skippyall.minions.clipboard.Clipboard; import io.github.skippyall.minions.docs.DocsEntry; import io.github.skippyall.minions.docs.ReferenceEntry; import io.github.skippyall.minions.gui.GuiDisplay; @@ -11,13 +12,12 @@ import io.github.skippyall.minions.minion.MinionListener; import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.minion.skin.SkinProvider; import io.github.skippyall.minions.module.SpecialAbility; -import io.github.skippyall.minions.program.instruction.ConfiguredInstructionListener; -import io.github.skippyall.minions.program.supplier.ValueSupplierType; -import io.github.skippyall.minions.program.instruction.InstructionType; import io.github.skippyall.minions.program.consumer.ValueConsumerType; -import io.github.skippyall.minions.program.value.ValueType; -import io.github.skippyall.minions.clipboard.Clipboard; import io.github.skippyall.minions.program.conversion.ValueConverterType; +import io.github.skippyall.minions.program.instruction.ConfiguredInstructionListener; +import io.github.skippyall.minions.program.instruction.InstructionType; +import io.github.skippyall.minions.program.supplier.ValueSupplierType; +import io.github.skippyall.minions.program.value.ValueType; import net.fabricmc.fabric.api.event.registry.DynamicRegistries; import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder; import net.fabricmc.fabric.api.event.registry.RegistryAttribute; @@ -27,16 +27,16 @@ import net.minecraft.util.Identifier; public class MinionRegistries { public static final Registry> VALUE_TYPES = registry("value_type"); - public static final Registry> VALUE_SUPPLIER_TYPES = registry("value_supplier_type"); - public static final Registry> VALUE_CONSUMER_TYPES = registry("value_consumer_type"); - public static final Registry> INSTRUCTION_TYPES = registry("instruction_type"); - public static final Registry> VALUE_CONVERTER_TYPES = registry("value_converter_type"); + public static final Registry> VALUE_SUPPLIER_TYPES = registry("value_supplier"); + public static final Registry> VALUE_CONSUMER_TYPES = registry("value_consumer"); + public static final Registry> INSTRUCTION_TYPES = registry("instruction"); + public static final Registry> VALUE_CONVERTER_TYPES = registry("value_converter"); public static final Registry SKIN_PROVIDERS = registry("skin_provider"); public static final Registry> GUI_DISPLAY_TYPE = registry("gui_display_type"); public static final Registry> INSTRUCTION_LISTENER_CODECS = registry("instruction_listener_codec"); public static final Registry> MINION_LISTENER_CODECS = registry("minion_listener_codec"); - public static final Registry> CLIPBOARD_TYPES = registry("clipboard_type"); + public static final Registry> CLIPBOARD_TYPES = registry("clipboard"); public static final Registry SPECIAL_ABILITIES = registry("special_ability"); public static final Registry> MINION_CONFIG_OPTIONS = registry("minion_config_option"); public static final Registry> DOCS_ENTRY_TYPES = registry("docs_entry_type"); diff --git a/src/main/java/io/github/skippyall/minions/registration/SkinProviders.java b/src/main/java/io/github/skippyall/minions/registration/SkinProviders.java index 125424c..5ba2c1c 100644 --- a/src/main/java/io/github/skippyall/minions/registration/SkinProviders.java +++ b/src/main/java/io/github/skippyall/minions/registration/SkinProviders.java @@ -1,10 +1,10 @@ package io.github.skippyall.minions.registration; +import io.github.skippyall.minions.Minions; import io.github.skippyall.minions.minion.skin.Base64SkinProvider; import io.github.skippyall.minions.minion.skin.NameSkinProvider; import io.github.skippyall.minions.minion.skin.SkinProvider; import io.github.skippyall.minions.minion.skin.UUIDSkinProvider; -import io.github.skippyall.minions.Minions; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; diff --git a/src/main/java/io/github/skippyall/minions/registration/SpecialAbilities.java b/src/main/java/io/github/skippyall/minions/registration/SpecialAbilities.java index 2e9af45..152f53b 100644 --- a/src/main/java/io/github/skippyall/minions/registration/SpecialAbilities.java +++ b/src/main/java/io/github/skippyall/minions/registration/SpecialAbilities.java @@ -1,7 +1,7 @@ package io.github.skippyall.minions.registration; -import io.github.skippyall.minions.module.MobSpawningAbility; import io.github.skippyall.minions.Minions; +import io.github.skippyall.minions.module.MobSpawningAbility; import io.github.skippyall.minions.module.SpecialAbility; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; diff --git a/src/main/java/io/github/skippyall/minions/registration/ValueConverters.java b/src/main/java/io/github/skippyall/minions/registration/ValueConverters.java index 900f247..fb56ad2 100644 --- a/src/main/java/io/github/skippyall/minions/registration/ValueConverters.java +++ b/src/main/java/io/github/skippyall/minions/registration/ValueConverters.java @@ -8,8 +8,8 @@ import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; public class ValueConverters { - public static final EqualityConverter.EqualityConverterType EQUALITY_CONVERTER = register("equality_converter", new EqualityConverter.EqualityConverterType()); - public static final CastConverter.Type CAST_CONVERTER = register("cast_converter", new CastConverter.Type()); + public static final EqualityConverter.EqualityConverterType EQUALITY_CONVERTER = register("equality", new EqualityConverter.EqualityConverterType()); + public static final CastConverter.Type CAST_CONVERTER = register("cast", new CastConverter.Type()); private static > T register(String name, T type) { return Registry.register(MinionRegistries.VALUE_CONVERTER_TYPES, Identifier.of(Minions.MOD_ID, name), type); diff --git a/src/main/java/io/github/skippyall/minions/registration/ValueSuppliers.java b/src/main/java/io/github/skippyall/minions/registration/ValueSuppliers.java index acd3fa9..2b5884c 100644 --- a/src/main/java/io/github/skippyall/minions/registration/ValueSuppliers.java +++ b/src/main/java/io/github/skippyall/minions/registration/ValueSuppliers.java @@ -1,10 +1,10 @@ package io.github.skippyall.minions.registration; +import io.github.skippyall.minions.Minions; +import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.minion.program.supplier.AnalogInputSupplier; import io.github.skippyall.minions.program.supplier.FixedValueSupplierType; import io.github.skippyall.minions.program.supplier.ValueSupplierType; -import io.github.skippyall.minions.Minions; -import io.github.skippyall.minions.minion.MinionRuntime; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; diff --git a/src/main/java/io/github/skippyall/minions/registration/ValueTypes.java b/src/main/java/io/github/skippyall/minions/registration/ValueTypes.java index 164890a..4c65e98 100644 --- a/src/main/java/io/github/skippyall/minions/registration/ValueTypes.java +++ b/src/main/java/io/github/skippyall/minions/registration/ValueTypes.java @@ -1,16 +1,17 @@ package io.github.skippyall.minions.registration; import com.mojang.serialization.Codec; -import io.github.skippyall.minions.program.value.SimpleValueType; -import io.github.skippyall.minions.program.value.ValueType; import io.github.skippyall.minions.Minions; -import io.github.skippyall.minions.gui.input.ChoiceInput; import io.github.skippyall.minions.gui.input.TextInput; import io.github.skippyall.minions.minion.program.instruction.move.TurnDirection; +import io.github.skippyall.minions.program.value.SimpleValueType; +import io.github.skippyall.minions.program.value.ValueType; import net.minecraft.registry.Registry; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import java.util.concurrent.CompletableFuture; + public class ValueTypes { public static ValueType LONG = register( "long", @@ -18,8 +19,8 @@ public class ValueTypes { Codec.LONG, 0L, o -> o instanceof Long l ? l : null, - (player, oldValue) -> TextInput.inputLong( - player, + (parent, oldValue) -> TextInput.inputLong( + parent, Text.literal("Integer"), String.valueOf(oldValue) ), @@ -33,8 +34,8 @@ public class ValueTypes { Codec.DOUBLE, 0D, o -> o instanceof Double d ? d : null, - (player, oldValue) -> TextInput.inputDouble( - player, + (parent, oldValue) -> TextInput.inputDouble( + parent, Text.literal("Number"), String.valueOf(oldValue) ), @@ -48,7 +49,8 @@ public class ValueTypes { Codec.BOOL, false, o -> o instanceof Boolean b ? b : null, - ChoiceInput.inputBoolean(Text.literal("")), + //TODO Properly implement ChoiceInput + (gui, value) -> CompletableFuture.completedFuture(value),//ChoiceInput.inputBoolean(Text.literal("")), value -> Text.literal(value.toString()) ) ); @@ -59,8 +61,8 @@ public class ValueTypes { Codec.STRING, "", o -> o instanceof String s ? s : null, - ((player, oldValue) -> TextInput.inputString( - player, + ((parent, oldValue) -> TextInput.inputString( + parent, Text.literal("Text"), oldValue) ), @@ -74,7 +76,8 @@ public class ValueTypes { TurnDirection.CODEC, TurnDirection.RIGHT, o -> o instanceof TurnDirection d ? d : null, - ChoiceInput.createDialogOpener(TurnDirection.values()), + //TODO Properly implement ChoiceInput + (parent, oldValue) -> CompletableFuture.completedFuture(oldValue), // ChoiceInput.createDialogOpener(TurnDirection.values()), value -> Text.literal(value.name) ) ); diff --git a/src/main/resources/TODO.txt b/src/main/resources/TODO.txt deleted file mode 100644 index 9a3bffb..0000000 --- a/src/main/resources/TODO.txt +++ /dev/null @@ -1,35 +0,0 @@ -- Module: - - Bewegungsmodul <-- - - Angriffsmodul <-- - - Abbaumodul <-- - - Platziermodul / Verwendungsmodul <-- - - Werfmodul - - Inventarmanagementmodul <-- - - Inventaropenmodul - -- Detektoren: - - Blockdetektor <-- - - Entitydetektor < - - Dimensiondetektor - - Positiondetektor - - Inventardetektor - -- Programmieren: - - Variablen - - (Listen) - - Warten - - Wiederholen - - Wiederhole bis/während - - Wiederhole x mal/(für jedes Element) - - Bedingung - -- VariableTypen: - - Integer - - String - - Position - - Block - - BlockType - - (NBT) - - (World) - - (Chunk) - - Inventory diff --git a/src/main/resources/data/minions/lang/en_us.json b/src/main/resources/assets/minions/lang/en_us.json similarity index 65% rename from src/main/resources/data/minions/lang/en_us.json rename to src/main/resources/assets/minions/lang/en_us.json index 8dfc25f..549fbd3 100644 --- a/src/main/resources/data/minions/lang/en_us.json +++ b/src/main/resources/assets/minions/lang/en_us.json @@ -9,6 +9,7 @@ "minions.gui.confirm": "Confirm", "minions.gui.abort": "Abort", "minions.gui.back": "Back", + "minions.gui.not_set": "Not set", "minions.gui.look.skin.name": "Name", "minions.gui.look.skin.name.title": "Enter a player name", @@ -35,13 +36,24 @@ "minions.gui.instruction.configure.copy.description": "Click here and then use a Minion Trigger Block to bind it", "minions.gui.instruction.run": "Run", "minions.gui.instruction.stop": "Stop", - "minions.gui.instruction.argument.configure.type": "Type: %s", - "minions.gui.instruction.argument.configure.type.unset": "Unset", + "minions.gui.instruction.argument.title": "Argument for %s (%s)", + "minions.gui.instruction.argument.configure.type": "Argument Type", + "minions.gui.instruction.argument.configure.type.title": "Select an Argument Type", + "minions.gui.instruction.argument.configure.data": "Argument Data", + "minions.gui.instruction.argument.configure.data.title": "Configure Argument Data", "minions.gui.instruction.parameter": "%s: %s", "minions.gui.instruction.argument": "Argument: %s", "minions.gui.instruction.check.argument_not_set": "Argument %s is not set", + "minions.gui.instruction.converters": "Converters", + "minions.gui.instruction.converters.cast": "Cast from %s to %s", + "minions.gui.instruction.converter.title": "Configure Converter", + "minions.gui.instruction.converter.type.title": "Select a Converter Type", + "minions.gui.instruction.converter.data": "Converter Data", + + "minions.converter.list.passing_error": "Error while passing previous value to converter #%s: %s", + "minions.command.input.int.fail": "Not an integer", "minions.command.input.float.fail": "Not a number", "minions.command.action.details": "Set how to %s", @@ -60,25 +72,33 @@ "minions.reference.instruction.tooltip": "Linked to instruction %s in %s", "minions.reference.block.tooltip": "Linked to block at %s", - "instruction_type.minions.walk": "Walk", - "instruction_type.minions.walk.description": "Walk forward a specified amount of blocks", - "instruction_type.minions.turn": "Turn", - "instruction_type.minions.turn.description": "Turn the head by specific angle", - "instruction_type.minions.attack": "Attack", - "instruction_type.minions.attack.description": "Attack and mine blocks\n Test", - "instruction_type.minions.use": "Use", - "instruction_type.minions.use.description": "Use and place blocks", + "instruction.minions.walk": "Walk", + "instruction.minions.walk.description": "Walk forward a specified amount of blocks", + "instruction.minions.turn": "Turn", + "instruction.minions.turn.description": "Turn the head by specific angle", + "instruction.minions.attack": "Attack", + "instruction.minions.attack.description": "Attack and mine blocks\n Test", + "instruction.minions.use": "Use", + "instruction.minions.use.description": "Use and place blocks", + "instruction.minions.swap_item": "Swap Items", - "value_type.minions.integer": "Integer", - "value_type.minions.float": "Decimal", + "value_type.minions.long": "Integer", + "value_type.minions.double": "Decimal", + "value_type.minions.boolean": "Boolean", "value_type.minions.string": "Text", "value_type.minions.turn_direction": "Turn Direction", - "value_supplier_type.minions.fixed": "Fixed Value", - "value_supplier_type.minions.fixed.display": "Fixed Value: %s", - "value_supplier_type.minions.analog_input": "Analog Input", - "value_supplier_type.minions.analog_input.display": "Analog Input at %s in %s", - "value_supplier_type.minions.analog_input.config.click_with_reference": "Click here with a position clipboard", + "value_supplier.minions.fixed": "Fixed Value", + "value_supplier.minions.analog_input": "Analog Input", + "value_supplier.minions.analog_input.display": "Analog Input at %s in %s", + "value_supplier.minions.analog_input.config.click_with_reference": "Click here with a position clipboard", + + "value_converter.minions.cast.display": "Cast from %s to %s", + "value_converter.minions.cast.cast_failed": "Cast of value %s to %s failed", + "value_converter.minions.equality.display": "Equal to %s", + + "value_converter.minions.equality": "Equality", + "value_converter.minions.cast": "Cast", "item.minions.attack_module": "Attack Module", "item.minions.interact_module": "Interact Module", diff --git a/src/main/resources/data/minions/minions/gui_display/instruction_type/attack.json b/src/main/resources/data/minions/minions/gui_display/instruction/attack.json similarity index 100% rename from src/main/resources/data/minions/minions/gui_display/instruction_type/attack.json rename to src/main/resources/data/minions/minions/gui_display/instruction/attack.json diff --git a/src/main/resources/data/minions/minions/gui_display/instruction_type/mine_block.json b/src/main/resources/data/minions/minions/gui_display/instruction/mine_block.json similarity index 100% rename from src/main/resources/data/minions/minions/gui_display/instruction_type/mine_block.json rename to src/main/resources/data/minions/minions/gui_display/instruction/mine_block.json diff --git a/src/main/resources/data/minions/minions/gui_display/instruction/swap_item.json b/src/main/resources/data/minions/minions/gui_display/instruction/swap_item.json new file mode 100644 index 0000000..c1164bd --- /dev/null +++ b/src/main/resources/data/minions/minions/gui_display/instruction/swap_item.json @@ -0,0 +1,4 @@ +{ + "type": "minions:item", + "data": "minecraft:chest" +} \ No newline at end of file diff --git a/src/main/resources/data/minions/minions/gui_display/instruction_type/turn.json b/src/main/resources/data/minions/minions/gui_display/instruction/turn.json similarity index 100% rename from src/main/resources/data/minions/minions/gui_display/instruction_type/turn.json rename to src/main/resources/data/minions/minions/gui_display/instruction/turn.json diff --git a/src/main/resources/data/minions/minions/gui_display/instruction_type/turn_vector.json b/src/main/resources/data/minions/minions/gui_display/instruction/turn_vector.json similarity index 100% rename from src/main/resources/data/minions/minions/gui_display/instruction_type/turn_vector.json rename to src/main/resources/data/minions/minions/gui_display/instruction/turn_vector.json diff --git a/src/main/resources/data/minions/minions/gui_display/instruction_type/use.json b/src/main/resources/data/minions/minions/gui_display/instruction/use.json similarity index 100% rename from src/main/resources/data/minions/minions/gui_display/instruction_type/use.json rename to src/main/resources/data/minions/minions/gui_display/instruction/use.json diff --git a/src/main/resources/data/minions/minions/gui_display/instruction_type/walk.json b/src/main/resources/data/minions/minions/gui_display/instruction/walk.json similarity index 100% rename from src/main/resources/data/minions/minions/gui_display/instruction_type/walk.json rename to src/main/resources/data/minions/minions/gui_display/instruction/walk.json diff --git a/src/main/resources/data/minions/minions/gui_display/instruction_type/walk_continuous.json b/src/main/resources/data/minions/minions/gui_display/instruction/walk_continuous.json similarity index 100% rename from src/main/resources/data/minions/minions/gui_display/instruction_type/walk_continuous.json rename to src/main/resources/data/minions/minions/gui_display/instruction/walk_continuous.json diff --git a/src/main/resources/data/minions/minions/gui_display/value_converter/cast.json b/src/main/resources/data/minions/minions/gui_display/value_converter/cast.json new file mode 100644 index 0000000..f53b224 --- /dev/null +++ b/src/main/resources/data/minions/minions/gui_display/value_converter/cast.json @@ -0,0 +1,11 @@ +{ + "type": "minions:stack", + "data": { + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "name": "CastCrafter" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/minions/minions/gui_display/value_converter/equality.json b/src/main/resources/data/minions/minions/gui_display/value_converter/equality.json new file mode 100644 index 0000000..79506f9 --- /dev/null +++ b/src/main/resources/data/minions/minions/gui_display/value_converter/equality.json @@ -0,0 +1,4 @@ +{ + "type": "minions:item", + "data": "minecraft:comparator" +} \ No newline at end of file diff --git a/src/main/resources/data/minions/minions/gui_display/value_supplier/analog_input.json b/src/main/resources/data/minions/minions/gui_display/value_supplier/analog_input.json new file mode 100644 index 0000000..79506f9 --- /dev/null +++ b/src/main/resources/data/minions/minions/gui_display/value_supplier/analog_input.json @@ -0,0 +1,4 @@ +{ + "type": "minions:item", + "data": "minecraft:comparator" +} \ No newline at end of file diff --git a/src/main/resources/data/minions/minions/gui_display/value_supplier_type/fixed.json b/src/main/resources/data/minions/minions/gui_display/value_supplier/fixed.json similarity index 100% rename from src/main/resources/data/minions/minions/gui_display/value_supplier_type/fixed.json rename to src/main/resources/data/minions/minions/gui_display/value_supplier/fixed.json diff --git a/src/main/resources/data/minions/minions/gui_display/value_type/boolean.json b/src/main/resources/data/minions/minions/gui_display/value_type/boolean.json new file mode 100644 index 0000000..ae2a2a4 --- /dev/null +++ b/src/main/resources/data/minions/minions/gui_display/value_type/boolean.json @@ -0,0 +1,4 @@ +{ + "type": "minions:item", + "data": "minecraft:lever" +} \ No newline at end of file