Update ActionModules.java

.gitignore

@@ -1,7 +1,5 @@
 # User-specific stuff
 .idea/
-urlaub/
-.kotlin/
 
 *.iml
 *.ipr

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2024 skippyall
+Copyright (c) 2024 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Minions Verbesserungsvorschläge.txt

@@ -1,10 +0,0 @@
-Module ohne Instruction nicht bei Instruction Auswahl vorschlagen ✓
-Mob Spawning durch Instruction an/aus
-Referenz kopieren als Item, das beim linken verschwindet ✓
-zurück-Button (Jain)
-Instructions stoppen / einfrieren bei Entfernung des Moduls ✓
-Verbindung mit Minion anzeigen ✓
-Schlagen auf Entities fixen ✓
-Signaländerung bei Trigger nach Tod des Minions mit Minion synchronisieren ✓
-Menüführung für Argumente verbessern (Nö)
-direkt Wert zeigen ✓

TODO.txt

@@ -1,35 +0,0 @@
-- 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)

build.gradle

@@ -0,0 +1,102 @@
+plugins {
+    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id 'maven-publish'
+}
+
+version = project.mod_version
+group = project.maven_group
+
+base {
+    archivesName = project.archives_base_name
+}
+
+repositories {
+    // Add repositories to retrieve artifacts from in here.
+    // You should only use this when depending on other mods because
+    // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+    // See https://docs.gradle.org/current/userguide/declaring_repositories.html
+    // for more information about repositories.
+    maven { url 'https://maven.nucleoid.xyz' }
+}
+
+dependencies {
+    // To change the versions see the gradle.properties file
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+    // Fabric API. This is technically optional, but you probably want it anyway.
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    modImplementation "eu.pb4:polymer-core:${project.polymer_version}"
+    modImplementation include("eu.pb4:sgui:${project.sgui_version}")
+    modImplementation include("xyz.nucleoid:server-translations-api:${project.server_translations_version}")
+}
+
+processResources {
+    inputs.property "version", project.version
+    inputs.property "minecraft_version", project.minecraft_version
+    inputs.property "loader_version", project.loader_version
+    filteringCharset "UTF-8"
+
+    filesMatching("fabric.mod.json") {
+        expand "version": project.version,
+                "minecraft_version": project.minecraft_version,
+                "loader_version": project.loader_version
+    }
+}
+
+def targetJavaVersion = 21
+tasks.withType(JavaCompile).configureEach {
+    // ensure that the encoding is set to UTF-8, no matter what the system default is
+    // this fixes some edge cases with special characters not displaying correctly
+    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    // If Javadoc is generated, this must be specified in that task too.
+    it.options.encoding = "UTF-8"
+    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
+        it.options.release.set(targetJavaVersion)
+    }
+}
+
+java {
+    def javaVersion = JavaVersion.toVersion(targetJavaVersion)
+    if (JavaVersion.current() < javaVersion) {
+        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
+    }
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
+}
+
+jar {
+    from("LICENSE") {
+        rename { "${it}_${project.archivesBaseName}"}
+    }
+}
+
+// configure the maven publication
+publishing {
+    publications {
+        minions (MavenPublication) {
+            from components.java
+        }
+    }
+
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+    repositories {
+        // Add repositories to publish to here.
+        // Notice: This block does NOT have the same function as the block in the top level.
+        // The repositories here will be used for publishing your artifact, not for
+        // retrieving dependencies.
+        maven {
+            def release = "https://maven.foxgalaxy.de/private-releases"
+            def snapshot = "https://maven.foxgalaxy.de/private-snapshot"
+            url = version.endsWith('SNAPSHOT') ? snapshot : release
+
+            credentials {
+                username = "${maven_user}"
+                password = "${maven_password}"
+            }
+        }
+    }
+}

build.gradle.kts

@@ -1,128 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    id("net.fabricmc.fabric-loom")
-    `maven-publish`
-    id("org.jetbrains.kotlin.jvm") version "2.3.21"
-}
-
-version = providers.gradleProperty("mod_version").get()
-group = providers.gradleProperty("maven_group").get()
-
-repositories {
-    // Add repositories to retrieve artifacts from in here.
-    // You should only use this when depending on other mods because
-    // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
-    // See https://docs.gradle.org/current/userguide/declaring_repositories.html
-    // for more information about repositories.
-
-    maven("https://maven.nucleoid.xyz")
-
-    exclusiveContent {
-        forRepository {
-            maven ("https://api.modrinth.com/maven")
-        }
-        filter {
-            includeGroup("maven.modrinth")
-        }
-    }
-}
-
-loom {
-    splitEnvironmentSourceSets()
-
-    mods {
-        register("minions") {
-            sourceSet(sourceSets.main.get())
-            sourceSet(sourceSets.getByName("client"))
-        }
-    }
-
-    for (settings in runs) {
-        settings.vmArg("-XX:+AllowEnhancedClassRedefinition")
-    }
-
-    accessWidenerPath = file("src/main/resources/minions.classtweaker")
-}
-
-dependencies {
-    // To change the versions see the gradle.properties file
-    minecraft("com.mojang:minecraft:${providers.gradleProperty("minecraft_version").get()}")
-
-    implementation("net.fabricmc:fabric-loader:${providers.gradleProperty("loader_version").get()}")
-
-    // Fabric API. This is technically optional, but you probably want it anyway.
-    implementation("net.fabricmc.fabric-api:fabric-api:${providers.gradleProperty("fabric_api_version").get()}")
-    implementation("net.fabricmc:fabric-language-kotlin:${providers.gradleProperty("fabric_kotlin_version").get()}")
-
-    val polymer_version = providers.gradleProperty("polymer_version").get()
-    implementation("eu.pb4:polymer-core:${polymer_version}")
-    implementation("eu.pb4:polymer-virtual-entity:${polymer_version}")
-    implementation("eu.pb4:polymer-resource-pack:${polymer_version}")
-    localRuntime("eu.pb4:polymer-autohost:${polymer_version}")
-    implementation("eu.pb4:sgui:${providers.gradleProperty("sgui_version").get()}")
-    implementation("xyz.nucleoid:server-translations-api:${providers.gradleProperty("server_translations_version").get()}")
-
-    implementation("com.electronwill.night-config:toml:${providers.gradleProperty("night_config_version").get()}")
-
-    compileOnly("maven.modrinth:universal-graves:${providers.gradleProperty("universal_graves_version").get()}")
-}
-
-tasks.processResources {
-    val version = version
-    inputs.property("version", version)
-
-    filesMatching("fabric.mod.json") {
-        expand("version" to version)
-    }
-}
-
-tasks.withType<JavaCompile>().configureEach {
-    options.release = 25
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget = JvmTarget.JVM_25
-    }
-}
-
-java {
-    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-    // if it is present.
-    // If you remove this line, sources will not be generated.
-    withSourcesJar()
-
-    sourceCompatibility = JavaVersion.VERSION_25
-    targetCompatibility = JavaVersion.VERSION_25
-}
-
-tasks.jar {
-    val projectName = project.name
-    inputs.property("projectName", projectName)
-
-    from("LICENSE") {
-        rename { "${it}_$projectName" }
-    }
-}
-
-// configure the maven publication
-publishing {
-    publications {
-        register<MavenPublication>("mavenJava") {
-            from(components["java"])
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-        // Notice: This block does NOT have the same function as the block in the top level.
-        // The repositories here will be used for publishing your artifact, not for
-        // retrieving dependencies.
-        maven("https://maven.foxgalaxy.de/private") {
-            name = "foxgalaxy"
-            credentials(PasswordCredentials::class.java)
-        }
-    }
-}

gradle.properties

@@ -3,24 +3,19 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://modmuss50.me/fabric.html
-	loom_version=1.16-SNAPSHOT
+	minecraft_version=1.21.1
-	minecraft_version=26.1.2
+	loader_version=0.16.3
-	loader_version=0.19.2
+	yarn_mappings=1.21.1+build.3
 
 # Mod Properties
-	mod_version = 1.0.0-TEST-1
+	mod_version = 0.0.1-SNAPSHOT
 	maven_group = io.github.skippyall
 	archives_base_name = Minions
 
 # Dependencies
 	# check this on https://modmuss50.me/fabric.html
-	fabric_api_version=0.147.0+26.1.2
+	fabric_version=0.103.0+1.21.1
-	fabric_kotlin_version=1.13.11+kotlin.2.3.21
 
-	polymer_version=0.16.3+26.1.2
+	polymer_version=0.9.12+1.21.1
-	sgui_version=2.0.0+26.1
+	sgui_version=1.6.0+1.21
-	server_translations_version=3.0.3+26.1
+	server_translations_version=2.3.1+1.21-pre2
-
-	night_config_version=3.8.3
-
-	universal_graves_version=3.11.0+26.1.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1 @@
-distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
-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

gradlew

@@ -1,248 +0,0 @@
-#!/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" "$@"

gradlew.bat

@@ -1,93 +0,0 @@
-@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

publish

@@ -1,2 +0,0 @@
-#!/bin/bash
-bash gradlew publish -PfoxgalaxyPassword=$(read -s -p "Enter Password: ")

settings.gradle

@@ -0,0 +1,9 @@
+pluginManagement {
+    repositories {
+        maven {
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
+        gradlePluginPortal()
+    }
+}

settings.gradle.kts

@@ -1,17 +0,0 @@
-pluginManagement {
-    repositories {
-        maven {
-            name = "Fabric"
-            url = uri("https://maven.fabricmc.net/")
-        }
-        mavenCentral()
-        gradlePluginPortal()
-    }
-
-    plugins {
-        id("net.fabricmc.fabric-loom") version providers.gradleProperty("loom_version")
-    }
-}
-
-// Should match your modid
-rootProject.name = "minions"

src/client/java/io/github/skippyall/minions/client/MinionsClient.java

@@ -1,12 +0,0 @@
-package io.github.skippyall.minions.client;
-
-import eu.pb4.polymer.networking.api.client.PolymerClientNetworking;
-import io.github.skippyall.minions.polymer.VersionSync;
-import net.fabricmc.api.ClientModInitializer;
-
-public class MinionsClient implements ClientModInitializer {
-    @Override
-    public void onInitializeClient() {
-        PolymerClientNetworking.registerCommonHandler(VersionSync.VersionSyncPayload.class, (client, handler, payload) -> {});
-    }
-}

src/main/java/io/github/skippyall/minions/MinionMixinConfigPlugin.java

@@ -1,49 +0,0 @@
-package io.github.skippyall.minions;
-
-import net.fabricmc.loader.api.FabricLoader;
-import org.jspecify.annotations.Nullable;
-import org.objectweb.asm.tree.ClassNode;
-import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
-import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
-
-import java.util.List;
-import java.util.Set;
-
-public class MinionMixinConfigPlugin implements IMixinConfigPlugin {
-    @Override
-    public void onLoad(String mixinPackage) {
-
-    }
-
-    @Override
-    @Nullable
-    public String getRefMapperConfig() {
-        return null;
-    }
-
-    @Override
-    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        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.minions.mixins.antimobcap.")) {
-            return MinionsConfig.get().minion.enableMobCapHacks;
-        }
-        return true;
-    }
-
-    @Override
-    public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {}
-
-    @Override
-    @Nullable
-    public List<String> getMixins() {
-        return null;
-    }
-
-    @Override
-    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {}
-
-    @Override
-    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {}
-}

src/main/java/io/github/skippyall/minions/Minions.java

@@ -1,43 +1,65 @@
 package io.github.skippyall.minions;
 
-import io.github.skippyall.minions.command.MinionsCommand;
+import eu.pb4.polymer.core.api.entity.PolymerEntityUtils;
-import io.github.skippyall.minions.docs.DocsManager;
+import eu.pb4.polymer.core.api.item.SimplePolymerItem;
+import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.MinionItem;
 import io.github.skippyall.minions.minion.MinionPersistentState;
-import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.module.Modules;
-import io.github.skippyall.minions.polymer.PolymerRegistration;
-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;
-import net.fabricmc.fabric.api.resource.v1.ResourceLoader;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
-import net.minecraft.resources.Identifier;
+import net.minecraft.item.Item;
-import net.minecraft.server.packs.PackType;
+import net.minecraft.item.Items;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class Minions implements ModInitializer {
     public static final String MOD_ID = "minions";
+    public static final MinionItem MINION_ITEM = Registry.register(Registries.ITEM, Identifier.of(MOD_ID, "minion"), new MinionItem(false));
+    public static final SimplePolymerItem BASIC_UPGRADE_BASE = Registry.register(Registries.ITEM, Identifier.of(MOD_ID, "basic_upgrade_base"), new SimplePolymerItem(new Item.Settings(), Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE));
 
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 
+    private static final List<Runnable> executeOnNextTick = new ArrayList<>();
+
     @Override
     public void onInitialize() {
-        MinionsConfig.get();
+        LOGGER.debug("Add Customthing");
-
+        PolymerEntityUtils.registerType();
-        MinionRegistration.register();
-
         ServerLifecycleEvents.SERVER_STARTED.register(server -> {
-            MinionPersistentState.get(server).getMinionData().forEach((uuid, data) -> {
+            MinionPersistentState.create(server);
-                if(data.isSpawned()) {
+            MinionPersistentState.INSTANCE.getMinionData().forEach(data -> {
-                    MinionFakePlayer.spawnMinion(data, server.overworld(), null, null, true);
+                System.out.println("spawn Minion " + data.name);
+                MinionFakePlayer.spawnMinionAt(data, server.getOverworld(), null, null);
+            });
+        });
+        ServerTickEvents.START_SERVER_TICK.register(server -> {
+            exec(() -> {
+                for (Runnable run:executeOnNextTick) {
+                    run.run();
                 }
+                executeOnNextTick.clear();
             });
         });
 
-        CommandRegistrationCallback.EVENT.register(MinionsCommand::register);
+        Modules.register();
+    }
 
-        PolymerRegistration.register();
+    private static synchronized void exec(Runnable run) {
+        run.run();
+    }
 
-        ResourceLoader.get(PackType.SERVER_DATA).registerReloadListener(Identifier.fromNamespaceAndPath(Minions.MOD_ID, "docs"), new DocsManager());
+    public static void addExecuteOnNextTick(Runnable run) {
+        exec(() -> {
+            executeOnNextTick.add(run);
+        });
     }
 }

src/main/java/io/github/skippyall/minions/MinionsConfig.java

@@ -1,87 +0,0 @@
-package io.github.skippyall.minions;
-
-import com.electronwill.nightconfig.core.CommentedConfig;
-import com.electronwill.nightconfig.core.io.ParsingException;
-import com.electronwill.nightconfig.core.io.WritingException;
-import com.electronwill.nightconfig.core.io.WritingMode;
-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.toml.TomlFormat;
-import com.electronwill.nightconfig.toml.TomlParser;
-import net.fabricmc.loader.api.FabricLoader;
-import org.jspecify.annotations.Nullable;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-public class MinionsConfig {
-    private static @Nullable MinionsConfig INSTANCE;
-
-    public Minion minion = new Minion();
-
-    public static class Minion {
-        @SerdeComment("The prefix for all minion names")
-        public String minionPrefix = "+";
-
-        @SerdeComment("Makes minions not raise the mob cap if they can't spawn mobs.")
-        @SerdeComment("Might cause incompatibilities.")
-        public boolean enableMobCapHacks = true;
-    }
-
-    public Compat compat = new Compat();
-
-    public static class Compat {
-        @SerdeComment("Enables compat with Universal Graves, which allows everyone to pick up graves from minions")
-        public boolean enableGravesCompat = true;
-    }
-
-    private static Path getPath() {
-        Path minionsDir = FabricLoader.getInstance().getConfigDir().resolve("minions");
-        if(!Files.isDirectory(minionsDir)) {
-            try {
-                Files.createDirectory(minionsDir);
-            } catch (IOException e) {
-                Minions.LOGGER.error("Could not create config dir", e);
-            }
-        }
-        return minionsDir.resolve(Minions.MOD_ID + ".toml");
-    }
-
-    public static MinionsConfig get() {
-        if(INSTANCE == null) {
-            loadConfig();
-        }
-        return INSTANCE;
-    }
-
-    public static void loadConfig() {
-        try {
-            CommentedConfig defaultConfig = ObjectSerializer.standard().serializeFields(new MinionsConfig(), TomlFormat::newConfig);
-
-            CommentedConfig config = new TomlParser().parse(getPath(), (file, configFormat) -> {
-                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);
-            INSTANCE = new MinionsConfig();
-        }
-    }
-
-    /*public static void saveConfig() {
-        try {
-            CommentedConfig config = ObjectSerializer.standard().serializeFields(INSTANCE, TomlFormat::newConfig);
-            new TomlWriter().write(config, getPath(), WritingMode.REPLACE);
-        } catch (SerdeException | ParsingException | WritingException e) {
-            System.out.println("[minions] Error while writing config");
-            e.printStackTrace();
-        }
-    }*/
-}

src/main/java/io/github/skippyall/minions/block/input/AnalogInputBlock.java

@@ -1,24 +0,0 @@
-package io.github.skippyall.minions.block.input;
-
-import io.github.skippyall.minions.clipboard.ClipboardItem;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.BlockHitResult;
-
-public class AnalogInputBlock extends Block {
-    public AnalogInputBlock(Properties settings) {
-        super(settings);
-    }
-
-    @Override
-    protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
-        if(!world.isClientSide()) {
-            player.getInventory().placeItemBackInInventory(ClipboardItem.createBlockPosReference(world, pos), true);
-        }
-        return InteractionResult.SUCCESS;
-    }
-}

src/main/java/io/github/skippyall/minions/block/input/package-info.java

@@ -1,4 +0,0 @@
-@NullMarked
-package io.github.skippyall.minions.block.input;
-
-import org.jspecify.annotations.NullMarked;

src/main/java/io/github/skippyall/minions/block/instruction_bound/InstructionBoundBlock.java

@@ -1,65 +0,0 @@
-package io.github.skippyall.minions.block.instruction_bound;
-
-import io.github.skippyall.minions.block.miniontrigger.MinionTriggerBlockEntity;
-import io.github.skippyall.minions.clipboard.InstructionClipboard;
-import io.github.skippyall.minions.minion.MinionPersistentState;
-import io.github.skippyall.minions.registration.MinionBlocks;
-import io.github.skippyall.minions.registration.MinionComponentTypes;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.game.ClientboundSoundPacket;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.EntityBlock;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.BlockHitResult;
-
-public abstract class InstructionBoundBlock extends Block implements EntityBlock {
-    public InstructionBoundBlock(Properties settings) {
-        super(settings);
-    }
-
-    protected abstract BlockEntityType<? extends InstructionBoundBlockEntity<?>> getBlockEntityType();
-
-    @Override
-    protected InteractionResult useItemOn(ItemStack stack, BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
-        if(stack.get(MinionComponentTypes.REFERENCE) instanceof InstructionClipboard instruction && player instanceof ServerPlayer serverPlayer) {
-            world.getBlockEntity(pos, getBlockEntityType()).ifPresent(be -> {
-                be.setInstruction(instruction.selectedMinion(), instruction.selectedInstruction());
-                serverPlayer.connection.send(new ClientboundSoundPacket(SoundEvents.NOTE_BLOCK_CHIME, SoundSource.BLOCKS, pos.getX(), pos.getY(), pos.getZ(), 1, 1, 0));
-                stack.shrink(1);
-            });
-            return InteractionResult.SUCCESS;
-        }
-
-        return super.useItemOn(stack, state, world, pos, player, hand, hit);
-    }
-
-    @Override
-    protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
-        if(world.isClientSide()) {
-            return InteractionResult.CONSUME;
-        }
-
-        world.getBlockEntity(pos, getBlockEntityType()).ifPresent(be -> {
-            String name = MinionPersistentState.get(world.getServer()).getMinionData(be.getMinionUuid()).getName();
-            player.sendSystemMessage(Component.translatable("minions.reference.instruction.tooltip", be.getInstructionName(), name));
-        });
-        return InteractionResult.SUCCESS;
-    }
-
-    @Override
-    protected void affectNeighborsAfterRemoval(BlockState state, ServerLevel world, BlockPos pos, boolean moved) {
-        super.affectNeighborsAfterRemoval(state, world, pos, moved);
-        world.getBlockEntity(pos, MinionBlocks.MINION_TRIGGER_BE_TYPE).ifPresent(MinionTriggerBlockEntity::removeListener);
-    }
-}

src/main/java/io/github/skippyall/minions/block/instruction_bound/InstructionBoundBlockEntity.java

@@ -1,79 +0,0 @@
-package io.github.skippyall.minions.block.instruction_bound;
-
-import io.github.skippyall.minions.listener.BlockEntityMinionListener;
-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.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import org.jspecify.annotations.Nullable;
-
-import java.util.Optional;
-import java.util.UUID;
-
-public abstract class InstructionBoundBlockEntity<L extends BlockEntityMinionListener<?>> extends BlockEntity {
-    protected @Nullable UUID minionUuid;
-    protected String instructionName = "";
-
-    public InstructionBoundBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
-        super(type, pos, state);
-    }
-
-    protected abstract L createListener();
-
-    protected abstract Class<L> getListenerClass();
-
-    public void removeListener() {
-        if(level instanceof ServerLevel serverWorld) {
-            L listener = getListener();
-            if(listener != null) {
-                listener.remove(serverWorld.getServer());
-            }
-        }
-    }
-
-    public void addListener() {
-        if(level instanceof ServerLevel serverWorld) {
-            L listener = createListener();
-            listener.add(serverWorld.getServer());
-        }
-    }
-
-    public void setInstruction(UUID minionUuid, String instructionName) {
-        removeListener();
-        this.minionUuid = minionUuid;
-        this.instructionName = instructionName;
-        addListener();
-        setChanged();
-    }
-
-    public Optional<MinionFakePlayer> getMinion() {
-        if(minionUuid != null && level != null && level.getPlayerByUUID(minionUuid) instanceof MinionFakePlayer minion) {
-            return Optional.of(minion);
-        }
-        return Optional.empty();
-    }
-
-    public @Nullable UUID getMinionUuid() {
-        return minionUuid;
-    }
-
-    public String getInstructionName() {
-        return instructionName;
-    }
-
-    public Optional<ConfiguredInstruction<MinionRuntime>> getInstruction(MinionFakePlayer minion) {
-        return Optional.ofNullable(minion.getInstructionManager().getInstruction(instructionName));
-    }
-
-    public Optional<ConfiguredInstruction<MinionRuntime>> getInstruction() {
-        return getMinion().flatMap(this::getInstruction);
-    }
-
-    public @Nullable L getListener() {
-        return BlockEntityMinionListener.getListener(level, worldPosition, minionUuid, getListenerClass());
-    }
-}

src/main/java/io/github/skippyall/minions/block/instruction_bound/package-info.java

@@ -1,4 +0,0 @@
-@NullMarked
-package io.github.skippyall.minions.block.instruction_bound;
-
-import org.jspecify.annotations.NullMarked;

src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerBlock.java

@@ -1,90 +0,0 @@
-package io.github.skippyall.minions.block.miniontrigger;
-
-import com.mojang.serialization.MapCodec;
-import io.github.skippyall.minions.block.instruction_bound.InstructionBoundBlock;
-import io.github.skippyall.minions.registration.MinionBlocks;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.SupportType;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.world.level.block.state.properties.BooleanProperty;
-import net.minecraft.world.level.redstone.Orientation;
-import net.minecraft.world.phys.shapes.CollisionContext;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
-
-public class MinionTriggerBlock extends InstructionBoundBlock {
-    public static final MapCodec<MinionTriggerBlock> CODEC = simpleCodec(MinionTriggerBlock::new);
-
-    public static final BooleanProperty POWERED = BooleanProperty.create("powered");
-    public static final VoxelShape SHAPE = Block.column(16.0, 0.0, 2.0);
-
-    public MinionTriggerBlock(Properties settings) {
-        super(settings);
-        registerDefaultState(defaultBlockState().setValue(POWERED, false));
-    }
-
-    @Override
-    protected VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {
-        return SHAPE;
-    }
-
-    @Override
-    protected boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) {
-        BlockPos blockPos = pos.below();
-        return this.canPlaceAbove(world, blockPos, world.getBlockState(blockPos));
-    }
-
-    protected boolean canPlaceAbove(LevelReader world, BlockPos pos, BlockState state) {
-        return state.isFaceSturdy(world, pos, Direction.UP, SupportType.RIGID);
-    }
-
-    @Override
-    protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
-        builder.add(POWERED);
-    }
-
-    @Override
-    @NullMarked
-    protected void neighborChanged(BlockState state, Level world, BlockPos pos, Block sourceBlock, @Nullable Orientation wireOrientation, boolean notify) {
-        if(!canSurvive(state, world, pos)) {
-            dropResources(state, world, pos);
-            world.removeBlock(pos, false);
-            return;
-        }
-
-        boolean newPower = world.hasNeighborSignal(pos);
-        if(state.getValue(POWERED) != newPower) {
-            world.setBlockAndUpdate(pos, state.setValue(POWERED, newPower));
-            world.getBlockEntity(pos, MinionBlocks.MINION_TRIGGER_BE_TYPE).ifPresent(MinionTriggerBlockEntity::updatePower);
-        }
-    }
-
-    @Override
-    protected boolean hasAnalogOutputSignal(BlockState state) {
-        return true;
-    }
-
-    @Override
-    protected int getAnalogOutputSignal(BlockState state, Level world, BlockPos pos, Direction direction) {
-        return world.getBlockEntity(pos, MinionBlocks.MINION_TRIGGER_BE_TYPE).map(MinionTriggerBlockEntity::getComparatorOutput).orElse(0);
-    }
-
-    @Override
-    public @Nullable BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
-        return new MinionTriggerBlockEntity(pos, state);
-    }
-
-    @Override
-    protected BlockEntityType<MinionTriggerBlockEntity> getBlockEntityType() {
-        return MinionBlocks.MINION_TRIGGER_BE_TYPE;
-    }
-}

src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerBlockEntity.java

@@ -1,66 +0,0 @@
-package io.github.skippyall.minions.block.miniontrigger;
-
-import io.github.skippyall.minions.block.instruction_bound.InstructionBoundBlockEntity;
-import io.github.skippyall.minions.registration.MinionBlocks;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.UUIDUtil;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.ValueInput;
-import net.minecraft.world.level.storage.ValueOutput;
-
-public class MinionTriggerBlockEntity extends InstructionBoundBlockEntity<MinionTriggerMinionListener> {
-    public MinionTriggerBlockEntity(BlockPos pos, BlockState state) {
-        super(MinionBlocks.MINION_TRIGGER_BE_TYPE, pos, state);
-    }
-
-    @Override
-    protected MinionTriggerMinionListener createListener() {
-        return new MinionTriggerMinionListener(level.dimension(), worldPosition, minionUuid, instructionName);
-    }
-
-    @Override
-    protected Class<MinionTriggerMinionListener> getListenerClass() {
-        return MinionTriggerMinionListener.class;
-    }
-
-    public void updatePower() {
-        boolean powered = getBlockState().getValue(MinionTriggerBlock.POWERED);
-
-        MinionTriggerMinionListener listener = getListener();
-        if(listener != null) {
-            listener.incomingPowerCache = powered;
-        }
-
-        getMinion().ifPresent(minion -> {
-            getInstruction().ifPresent(instruction -> {
-                if(powered) {
-                    instruction.run(minion.getInstructionManager());
-                } else {
-                    instruction.stop(minion.getInstructionManager());
-                }
-            });
-        });
-    }
-
-    public int getComparatorOutput() {
-        MinionTriggerMinionListener listener = getListener();
-        if(listener != null && listener.runningCache) {
-            return 15;
-        }
-        return 0;
-    }
-
-    @Override
-    protected void loadAdditional(ValueInput view) {
-        minionUuid = view.read("minionUuid", UUIDUtil.AUTHLIB_CODEC).orElse(null);
-        instructionName = view.getStringOr("instructionName", "");
-    }
-
-    @Override
-    protected void saveAdditional(ValueOutput view) {
-        if(minionUuid != null) {
-            view.store("minionUuid", UUIDUtil.AUTHLIB_CODEC, minionUuid);
-        }
-        view.putString("instructionName", instructionName);
-    }
-}

src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerMinionListener.java

@@ -1,114 +0,0 @@
-package io.github.skippyall.minions.block.miniontrigger;
-
-import com.mojang.serialization.Codec;
-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.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.core.BlockPos;
-import net.minecraft.core.UUIDUtil;
-import net.minecraft.resources.Identifier;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.level.Level;
-
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.UUID;
-
-public class MinionTriggerMinionListener extends BlockEntityMinionInstructionListener<MinionTriggerBlockEntity> {
-    public static final Codec<MinionTriggerMinionListener> CODEC = RecordCodecBuilder.create(instance ->
-            instance.group(
-                    Level.RESOURCE_KEY_CODEC.fieldOf("world").forGetter(listener -> listener.worldKey),
-                    BlockPos.CODEC.fieldOf("pos").forGetter(listener -> listener.pos),
-                    UUIDUtil.AUTHLIB_CODEC.fieldOf("minionUuid").forGetter(listener -> listener.minionUuid),
-                    Codec.STRING.fieldOf("instructionName").forGetter(listener -> listener.instructionName)
-            ).apply(instance, MinionTriggerMinionListener::new));
-
-    String instructionName;
-    final TriggerInstructionListener listener = new TriggerInstructionListener();
-
-    boolean runningCache;
-    boolean incomingPowerCache;
-
-    MinionTriggerMinionListener(ResourceKey<Level> worldKey, BlockPos pos, UUID minionUuid, String instructionName) {
-        super(worldKey, pos, minionUuid, MinionBlocks.MINION_TRIGGER_BE_TYPE);
-        this.instructionName = Objects.requireNonNull(instructionName);
-    }
-
-    @Override
-    protected Map<String, ConfiguredInstructionListener> getInstructionListeners() {
-        return Map.of(instructionName, listener);
-    }
-
-    @Override
-    public void onMinionSpawn(MinionFakePlayer minion) {
-        super.onMinionSpawn(minion);
-        runningCache = minion.getInstructionManager().getInstruction(instructionName).isRunning();
-        updateComparatorsIfLoaded(minion.getServer());
-
-        ConfiguredInstruction<MinionRuntime> instruction = minion.getInstructionManager().getInstruction(instructionName);
-        if(instruction.isRunning() && !incomingPowerCache) {
-            instruction.stop(minion.getInstructionManager());
-        } else if (!instruction.isRunning() && incomingPowerCache) {
-            instruction.run(minion.getInstructionManager());
-        }
-    }
-
-    @Override
-    public void onMinionRemove(MinionFakePlayer minion) {
-        super.onMinionRemove(minion);
-        runningCache = false;
-        updateComparatorsIfLoaded(minion.getServer());
-    }
-
-    @Override
-    public void onInstructionRename(MinionFakePlayer minion, ConfiguredInstruction<?> instruction, String oldName, String newName) {
-        super.onInstructionRename(minion, instruction, oldName, newName);
-        if(instructionName.equals(oldName)) {
-            instructionName = newName;
-        }
-    }
-
-    @Override
-    public void add(MinecraftServer server) {
-        super.add(server);
-        runningCache = minion.getInstructionManager().getInstruction(instructionName).isRunning();
-        updateComparatorsIfLoaded(server);
-    }
-
-    @Override
-    public Optional<Identifier> getCodecId() {
-        return Optional.of(Identifier.fromNamespaceAndPath(Minions.MOD_ID, "minion_trigger"));
-    }
-
-    public void updateComparatorsIfLoaded(MinecraftServer server) {
-        Level world = server.getLevel(worldKey);
-        if(world.isLoaded(pos)) {
-            world.updateNeighbourForOutputSignal(pos, MinionBlocks.MINION_TRIGGER_BLOCK);
-        }
-    }
-
-    public boolean isRunning() {
-        return runningCache;
-    }
-
-    public class TriggerInstructionListener implements ConfiguredInstructionListener {
-        @Override
-        public void onRun(ConfiguredInstruction<?> instruction) {
-            runningCache = true;
-            updateComparatorsIfLoaded(minion.getServer());
-        }
-
-        @Override
-        public void onStop(ConfiguredInstruction<?> instruction) {
-            runningCache = false;
-            updateComparatorsIfLoaded(minion.getServer());
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/block/miniontrigger/package-info.java

@@ -1,4 +0,0 @@
-@NullMarked
-package io.github.skippyall.minions.block.miniontrigger;
-
-import org.jspecify.annotations.NullMarked;

src/main/java/io/github/skippyall/minions/block/package-info.java

@@ -1,4 +0,0 @@
-@NullMarked
-package io.github.skippyall.minions.block;
-
-import org.jspecify.annotations.NullMarked;

src/main/java/io/github/skippyall/minions/client/MinionsClient.java

@@ -0,0 +1,16 @@
+package io.github.skippyall.minions.client;
+
+import io.github.skippyall.minions.networking.ClientToServerNetworking;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationConnectionEvents;
+import net.fabricmc.fabric.api.client.networking.v1.ClientLoginConnectionEvents;
+
+public class MinionsClient implements ClientModInitializer {
+    /**
+     * Runs the mod initializer on the client environment.
+     */
+    @Override
+    public void onInitializeClient() {
+        //ClientConfigurationConnectionEvents.INIT.register(ClientToServerNetworking::onConfigurationInit);
+    }
+}

src/main/java/io/github/skippyall/minions/clipboard/BlockPosClipboard.java

@@ -1,33 +0,0 @@
-package io.github.skippyall.minions.clipboard;
-
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.component.DataComponentGetter;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.level.Level;
-
-import java.util.function.Consumer;
-
-public record BlockPosClipboard(ResourceKey<Level> world, BlockPos pos) implements Clipboard {
-    public static final MapCodec<BlockPosClipboard> CODEC = RecordCodecBuilder.mapCodec(instance ->
-            instance.group(
-                    Level.RESOURCE_KEY_CODEC.fieldOf("world").forGetter(BlockPosClipboard::world),
-                    BlockPos.CODEC.fieldOf("pos").forGetter(BlockPosClipboard::pos)
-            ).apply(instance, BlockPosClipboard::new)
-    );
-
-
-    @Override
-    public MapCodec<BlockPosClipboard> getCodec() {
-        return CODEC;
-    }
-
-    @Override
-    public void addToTooltip(Item.TooltipContext context, Consumer<Component> textConsumer, TooltipFlag type, DataComponentGetter components) {
-        textConsumer.accept(Component.translatable("minions.reference.block.tooltip", pos.toString()));
-    }
-}

src/main/java/io/github/skippyall/minions/clipboard/Clipboard.java

@@ -1,14 +0,0 @@
-package io.github.skippyall.minions.clipboard;
-
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.MapCodec;
-import io.github.skippyall.minions.registration.MinionRegistries;
-import net.minecraft.world.item.component.TooltipProvider;
-
-import java.util.function.Function;
-
-public interface Clipboard extends TooltipProvider {
-    Codec<Clipboard> CODEC = MinionRegistries.CLIPBOARD_TYPES.byNameCodec().dispatch(Clipboard::getCodec, Function.identity());
-
-    MapCodec<? extends Clipboard> getCodec();
-}

src/main/java/io/github/skippyall/minions/clipboard/ClipboardItem.java

@@ -1,23 +0,0 @@
-package io.github.skippyall.minions.clipboard;
-
-import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
-import io.github.skippyall.minions.registration.MinionComponentTypes;
-import io.github.skippyall.minions.registration.MinionItems;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
-
-public class ClipboardItem {
-
-    public static ItemStack createInstructionReference(MinionFakePlayer minion, String instructionName) {
-        ItemStack stack = new ItemStack(MinionItems.REFERENCE_ITEM);
-        stack.set(MinionComponentTypes.REFERENCE, new InstructionClipboard(minion.getUUID(), instructionName, minion.getGameProfile().name()));
-        return stack;
-    }
-
-    public static ItemStack createBlockPosReference(Level world, BlockPos pos) {
-        ItemStack stack = new ItemStack(MinionItems.REFERENCE_ITEM);
-        stack.set(MinionComponentTypes.REFERENCE, new BlockPosClipboard(world.dimension(), pos));
-        return stack;
-    }
-}

src/main/java/io/github/skippyall/minions/clipboard/InstructionClipboard.java

@@ -1,32 +0,0 @@
-package io.github.skippyall.minions.clipboard;
-
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.core.UUIDUtil;
-import net.minecraft.core.component.DataComponentGetter;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.TooltipFlag;
-
-import java.util.UUID;
-import java.util.function.Consumer;
-
-public record InstructionClipboard(UUID selectedMinion, String selectedInstruction, String visualMinionName) implements Clipboard {
-    public static final MapCodec<InstructionClipboard> CODEC = RecordCodecBuilder.mapCodec(instance ->
-            instance.group(
-                    UUIDUtil.AUTHLIB_CODEC.fieldOf("selectedMinion").forGetter(InstructionClipboard::selectedMinion),
-                    Codec.STRING.fieldOf("selectedInstruction").forGetter(InstructionClipboard::selectedInstruction),
-                    Codec.STRING.fieldOf("visualMinionName").forGetter(InstructionClipboard::visualMinionName)
-            ).apply(instance, InstructionClipboard::new));
-
-    @Override
-    public MapCodec<? extends Clipboard> getCodec() {
-        return CODEC;
-    }
-
-    @Override
-    public void addToTooltip(Item.TooltipContext context, Consumer<Component> textConsumer, TooltipFlag type, DataComponentGetter components) {
-        textConsumer.accept(Component.translatable("minions.reference.instruction.tooltip", selectedInstruction, visualMinionName));
-    }
-}

src/main/java/io/github/skippyall/minions/clipboard/package-info.java

@@ -1,4 +0,0 @@
-@NullMarked
-package io.github.skippyall.minions.clipboard;
-
-import org.jspecify.annotations.NullMarked;

src/main/java/io/github/skippyall/minions/command/Command.java

@@ -0,0 +1,10 @@
+package io.github.skippyall.minions.command;
+
+import net.minecraft.item.Item;
+import net.minecraft.text.Text;
+
+public interface Command extends CommandExecutor {
+    Text getName();
+    Text getDescription();
+    Item getItemRepresentation();
+}

src/main/java/io/github/skippyall/minions/command/CommandExecutor.java

@@ -0,0 +1,8 @@
+package io.github.skippyall.minions.command;
+
+import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import net.minecraft.server.network.ServerPlayerEntity;
+
+public interface CommandExecutor {
+    void execute(ServerPlayerEntity player, MinionFakePlayer minion);
+}

src/main/java/io/github/skippyall/minions/command/DocsSubcommand.java

@@ -1,36 +0,0 @@
-package io.github.skippyall.minions.command;
-
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.mojang.brigadier.suggestion.Suggestions;
-import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import io.github.skippyall.minions.docs.DocsManager;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.arguments.IdentifierArgument;
-import net.minecraft.resources.Identifier;
-
-import java.util.concurrent.CompletableFuture;
-
-import static net.minecraft.commands.Commands.argument;
-import static net.minecraft.commands.Commands.literal;
-
-public class DocsSubcommand {
-    public static final LiteralArgumentBuilder<CommandSourceStack> DOCS = literal("docs")
-            .then(
-                    argument("docName", IdentifierArgument.id())
-                            .suggests(DocsSubcommand::getSuggestions)
-                            .executes(DocsSubcommand::execute)
-            );
-
-    public static CompletableFuture<Suggestions> getSuggestions(CommandContext<CommandSourceStack> context, SuggestionsBuilder builder) {
-        DocsManager.getDocsEntryIds().forEach(id -> builder.suggest(id.toString()));
-        return CompletableFuture.completedFuture(builder.build());
-    }
-
-    public static int execute(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
-        Identifier id = IdentifierArgument.getId(context, "docName");
-        DocsManager.showDocsEntry(context.getSource().getPlayerOrException(), id);
-        return 1;
-    }
-}

src/main/java/io/github/skippyall/minions/command/ListSubcommand.java

@@ -1,25 +0,0 @@
-package io.github.skippyall.minions.command;
-
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.context.CommandContext;
-import io.github.skippyall.minions.minion.MinionData;
-import io.github.skippyall.minions.minion.MinionPersistentState;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.network.chat.Component;
-
-import java.util.Collection;
-
-import static net.minecraft.commands.Commands.literal;
-
-public class ListSubcommand {
-    public static final LiteralArgumentBuilder<CommandSourceStack> LIST = literal("list")
-            .executes(ListSubcommand::list);
-
-    public static int list(CommandContext<CommandSourceStack> context) {
-        Collection<MinionData> minions = MinionPersistentState.get(context.getSource().getServer()).getMinionData().values();
-        for (MinionData minion : minions) {
-            context.getSource().sendSuccess(() -> Component.literal(minion.getName() + "(" + minion.getUuid() + "):" + minion.isSpawned()), false);
-        }
-        return 0;
-    }
-}

src/main/java/io/github/skippyall/minions/command/MinionArgument.java

@@ -1,50 +0,0 @@
-package io.github.skippyall.minions.command;
-
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import com.mojang.brigadier.suggestion.SuggestionProvider;
-import com.mojang.brigadier.suggestion.Suggestions;
-import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import io.github.skippyall.minions.minion.MinionData;
-import io.github.skippyall.minions.minion.MinionPersistentState;
-import io.github.skippyall.minions.minion.MinionProfileUtils;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.MinecraftServer;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-
-public class MinionArgument {
-    public static final SimpleCommandExceptionType MINION_NOT_PRESENT = new SimpleCommandExceptionType(Component.translatable("minions.command.minion.not_present"));
-
-    public static final MinionSuggestionProvider SUGGESTION_PROVIDER = new MinionSuggestionProvider();
-
-    public static MinionData parse(MinecraftServer server, String argument) throws CommandSyntaxException {
-        Optional<MinionData> data = Optional.empty();
-        if(argument.startsWith(MinionProfileUtils.getPrefix())) {
-            data = MinionPersistentState.get(server).getMinionWithName(argument);
-        } else {
-            try {
-                data = Optional.ofNullable(MinionPersistentState.get(server).getMinionData(UUID.fromString(argument)));
-            } catch (IllegalArgumentException ignored) {}
-        }
-
-        if(data.isEmpty()) {
-            throw MINION_NOT_PRESENT.create();
-        }
-        return data.get();
-    }
-
-    public static class MinionSuggestionProvider implements SuggestionProvider<CommandSourceStack> {
-        @Override
-        public CompletableFuture<Suggestions> getSuggestions(CommandContext<CommandSourceStack> context, SuggestionsBuilder builder) throws CommandSyntaxException {
-            for (MinionData data : MinionPersistentState.get(context.getSource().getServer()).getMinionDataList()) {
-                builder.suggest(data.getName());
-            }
-
-            return builder.buildFuture();
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/command/MinionsCommand.java

@@ -1,28 +0,0 @@
-package io.github.skippyall.minions.command;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import io.github.skippyall.minions.MinionsConfig;
-import net.minecraft.commands.CommandBuildContext;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-
-import static net.minecraft.commands.Commands.literal;
-
-public class MinionsCommand {
-    public static void register(CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext access, Commands.CommandSelection environment) {
-        LiteralArgumentBuilder<CommandSourceStack> builder = literal("minions")
-                .then(SpawnSubcommand.SPAWN)
-                .then(ListSubcommand.LIST)
-                .then(DocsSubcommand.DOCS)
-                .then(TestSubcommand.TEST);
-
-        if(MinionsConfig.get().minion.enableMobCapHacks) {
-            builder.then(MobCapDebugSubcommand.MOB_CAP_DEBUG);
-        }
-
-        dispatcher.register(
-                builder
-        );
-    }
-}

src/main/java/io/github/skippyall/minions/command/MobCapDebugSubcommand.java

@@ -1,24 +0,0 @@
-package io.github.skippyall.minions.command;
-
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.context.CommandContext;
-import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor;
-import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManagerAccessor;
-import io.github.skippyall.minions.mixins.antimobcap.ServerChunkCacheAccessor;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.DistanceManager;
-
-import static net.minecraft.commands.Commands.literal;
-
-public class MobCapDebugSubcommand {
-    public static final LiteralArgumentBuilder<CommandSourceStack> MOB_CAP_DEBUG = literal("mobcapdebug")
-            .executes(MobCapDebugSubcommand::mobcapdebugCommand);
-
-    public static int mobcapdebugCommand(CommandContext<CommandSourceStack> context) {
-        DistanceManager levelManager = ((ServerChunkCacheAccessor)context.getSource().getLevel().getChunkSource()).getDistanceManager();
-        int tickedChunkCount = ((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)((ChunkLevelManagerAccessor)levelManager).minions$getMinionless()).minions$getTickedChunkCount();
-        context.getSource().sendSuccess(() -> Component.nullToEmpty(String.valueOf(tickedChunkCount)), false);
-        return 0;
-    }
-}

src/main/java/io/github/skippyall/minions/command/SimpleCommand.java

@@ -0,0 +1,40 @@
+package io.github.skippyall.minions.command;
+
+import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import net.minecraft.item.Item;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+public class SimpleCommand implements Command {
+    private final Text name;
+    private final Text description;
+    private final Item itemRepresentation;
+    private final CommandExecutor executor;
+
+    public SimpleCommand(Text name, Text description, Item itemRepresentation, CommandExecutor executor) {
+        this.name = name;
+        this.description = description;
+        this.itemRepresentation = itemRepresentation;
+        this.executor = executor;
+    }
+
+    @Override
+    public Text getName() {
+        return name;
+    }
+
+    @Override
+    public Text getDescription() {
+        return description;
+    }
+
+    @Override
+    public Item getItemRepresentation() {
+        return itemRepresentation;
+    }
+
+    @Override
+    public void execute(ServerPlayerEntity player, MinionFakePlayer minion) {
+        executor.execute(player, minion);
+    }
+}

src/main/java/io/github/skippyall/minions/command/SpawnSubcommand.java

@@ -1,57 +0,0 @@
-package io.github.skippyall.minions.command;
-
-import com.mojang.brigadier.arguments.BoolArgumentType;
-import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import io.github.skippyall.minions.minion.MinionData;
-import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.arguments.coordinates.Coordinates;
-import net.minecraft.commands.arguments.coordinates.Vec3Argument;
-import net.minecraft.server.permissions.Permissions;
-import org.jspecify.annotations.Nullable;
-
-import static net.minecraft.commands.Commands.argument;
-import static net.minecraft.commands.Commands.literal;
-
-public class SpawnSubcommand {
-    public static final LiteralArgumentBuilder<CommandSourceStack> SPAWN = literal("spawn")
-            .requires(source -> source.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
-            .then(argument("minion", StringArgumentType.word())
-                    .suggests(MinionArgument.SUGGESTION_PROVIDER)
-                    .then(argument("pos", Vec3Argument.vec3())
-                            .executes(context ->
-                                    spawnCommand(
-                                            context.getSource(),
-                                            StringArgumentType.getString(context, "minion"),
-                                            Vec3Argument.getCoordinates(context, "pos"),
-                                            false
-                                    )
-                            )
-                            .then(argument("force", BoolArgumentType.bool())
-                                    .executes(context ->
-                                            spawnCommand(
-                                                    context.getSource(),
-                                                    StringArgumentType.getString(context, "minion"),
-                                                    Vec3Argument.getCoordinates(context, "pos"),
-                                                    BoolArgumentType.getBool(context, "force")
-                                            )
-                                    )
-                            )
-                    )
-                    .executes(context ->
-                            spawnCommand(
-                                    context.getSource(),
-                                    StringArgumentType.getString(context, "minion"),
-                                    null,
-                                    false
-                            ))
-            );
-
-    public static int spawnCommand(CommandSourceStack source, String minion, @Nullable Coordinates pos, boolean force) throws CommandSyntaxException {
-        MinionData data = MinionArgument.parse(source.getServer(), minion);
-        MinionFakePlayer.spawnMinion(data, source.getLevel(), pos != null ? pos.getPosition(source) : null, pos != null ? pos.getRotation(source) : null, force);
-        return 0;
-    }
-}

src/main/java/io/github/skippyall/minions/command/TestSubcommand.java

@@ -1,78 +0,0 @@
-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.commands.CommandSourceStack;
-import net.minecraft.commands.arguments.coordinates.BlockPosArgument;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Blocks;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import static net.minecraft.commands.Commands.argument;
-import static net.minecraft.commands.Commands.literal;
-
-public class TestSubcommand {
-    public static LiteralArgumentBuilder<CommandSourceStack> TEST = literal("test")
-            .then(argument("pos", BlockPosArgument.blockPos())
-                    .executes(TestSubcommand::execute)
-            );
-
-
-    private static int execute(CommandContext<CommandSourceStack> context) {
-        try {
-            BlockPos pos = BlockPosArgument.getBlockPos(context, "pos");
-            Collection<BlockPos> result = findInputs(context.getSource().getLevel(), pos);
-            for (BlockPos resultPos : result) {
-                context.getSource().sendSuccess(() -> Component.literal(resultPos.toShortString()), false);
-            }
-        } catch (Throwable e) {
-            Minions.LOGGER.error("Error", e);
-        }
-        return 0;
-    }
-
-    private static Collection<BlockPos> findInputs(Level world, BlockPos pos) {
-        //positions that are already processed
-        Collection<BlockPos> visitedPositions = new HashSet<>();
-        //positions we are currently looking at
-        Collection<BlockPos> currentPositions = new HashSet<>();
-        //new positions are added here
-        Collection<BlockPos> newPositions = new HashSet<>();
-        //resulting machines
-        Collection<BlockPos> 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.relative(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;
-    }
-}

src/main/java/io/github/skippyall/minions/command/package-info.java

@@ -1,4 +0,0 @@
-@NullMarked
-package io.github.skippyall.minions.command;
-
-import org.jspecify.annotations.NullMarked;

src/main/java/io/github/skippyall/minions/docs/DocsEntry.java

@@ -1,29 +0,0 @@
-package io.github.skippyall.minions.docs;
-
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import io.github.skippyall.minions.registration.MinionRegistries;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.server.dialog.body.DialogBody;
-
-import java.util.List;
-import java.util.function.Function;
-
-public interface DocsEntry {
-    Codec<DocsEntry> CODEC = MinionRegistries.DOCS_ENTRY_TYPES.byNameCodec().dispatch(DocsEntry::getCodec, Function.identity());
-
-    Metadata getMetadata();
-
-    List<DialogBody> getDialog(RegistryAccess manager);
-
-    MapCodec<? extends DocsEntry> getCodec();
-
-    record Metadata(String titleKey) {
-        public static final MapCodec<Metadata> CODEC = RecordCodecBuilder.mapCodec(instance ->
-                instance.group(
-                        Codec.STRING.fieldOf("title").forGetter(Metadata::titleKey)
-                ).apply(instance, Metadata::new)
-        );
-    }
-}

src/main/java/io/github/skippyall/minions/docs/DocsManager.java

@@ -1,140 +0,0 @@
-package io.github.skippyall.minions.docs;
-
-import com.google.gson.JsonParseException;
-import com.mojang.serialization.JsonOps;
-import io.github.skippyall.minions.Minions;
-import net.fabricmc.fabric.api.resource.v1.reloader.SimpleReloadListener;
-import net.minecraft.core.Holder;
-import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.Identifier;
-import net.minecraft.server.dialog.ActionButton;
-import net.minecraft.server.dialog.CommonButtonData;
-import net.minecraft.server.dialog.CommonDialogData;
-import net.minecraft.server.dialog.DialogAction;
-import net.minecraft.server.dialog.MultiActionDialog;
-import net.minecraft.server.dialog.action.StaticAction;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.packs.resources.Resource;
-import net.minecraft.util.StrictJsonParser;
-import net.minecraft.util.Tuple;
-import org.jspecify.annotations.Nullable;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-public class DocsManager extends SimpleReloadListener<Tuple<Map<Identifier, DocsEntry>, DocsTree>> {
-    private static @Nullable Map<Identifier, DocsEntry> docs;
-    private static @Nullable DocsTree tree;
-
-    public static @Nullable DocsTree getTree() {
-        return tree;
-    }
-
-    public static void showDocsEntry(ServerPlayer player, Identifier id) {
-        DocsEntry entry = getDocsEntry(id);
-        if(entry == null) {
-            return;
-        }
-
-        List<ActionButton> buttons = new ArrayList<>();
-        if(tree != null) {
-            DocsTree.DocElement element = tree.getElement(id);
-            if (element.previous() != null) {
-                Identifier previousId = element.previous().getId();
-                buttons.add(getDialogButton(Component.literal("<- ").append(Component.translatable(getDocsEntry(previousId).getMetadata().titleKey())), previousId.toString()));
-            }
-            if (element.next() != null) {
-                Identifier nextId = element.next().getId();
-                buttons.add(getDialogButton(Component.translatable(getDocsEntry(nextId).getMetadata().titleKey()).append(Component.literal(" ->")), nextId.toString()));
-            }
-        }
-
-        buttons.add(new ActionButton(
-                new CommonButtonData(Component.translatable("gui.ok"), 100),
-                Optional.empty()
-        ));
-
-        player.openDialog(Holder.direct(new MultiActionDialog(
-                new CommonDialogData(
-                        Component.translatable(entry.getMetadata().titleKey()),
-                        Optional.empty(),
-                        true,
-                        false,
-                        DialogAction.CLOSE,
-                        entry.getDialog(player.registryAccess()),
-                        List.of()
-                ),
-                buttons,
-                Optional.empty(),
-                2
-        )));
-    }
-
-    private static ActionButton getDialogButton(Component text, String dialogToOpen) {
-        return new ActionButton(
-                new CommonButtonData(
-                        text, 100
-                ),
-                Optional.of(new StaticAction(new ClickEvent.RunCommand("/minions docs " + dialogToOpen)))
-        );
-    }
-
-    public static @Nullable DocsEntry getDocsEntry(Identifier id) {
-        if(docs != null) {
-            return docs.get(id);
-        } else {
-            return null;
-        }
-    }
-
-    public static @Nullable Collection<Identifier> getDocsEntryIds() {
-        if (docs != null) {
-            return docs.keySet();
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public Tuple<Map<Identifier, DocsEntry>, DocsTree> prepare(SharedState state) {
-        Map<Identifier, Resource> resources = state.resourceManager().listResources("docs", id -> id.getNamespace().equals(Minions.MOD_ID) && id.getPath().endsWith(".json"));
-
-        final DocsTree. @Nullable BranchElement[] root = {null};
-        Map<Identifier, DocsEntry> docsEntries = new HashMap<>();
-        resources.forEach((id, resource) -> {
-            try(Reader reader = resource.openAsReader()) {
-                if(id.getPath().equals("docs/tree.json")) {
-                    DocsTree.BranchElement.CODEC.decode(JsonOps.INSTANCE, StrictJsonParser.parse(reader))
-                            .ifSuccess(entry -> root[0] = entry.getFirst())
-                            .ifError(error -> Minions.LOGGER.warn("Could not parse docs tree {}: {}", id, error.message()));
-                } else {
-                    Identifier docId = Identifier.fromNamespaceAndPath(id.getNamespace(), id.getPath().substring("docs/".length(), id.getPath().length() - ".json".length()));
-                    DocsEntry.CODEC.decode(JsonOps.INSTANCE, StrictJsonParser.parse(reader))
-                            .ifSuccess(entry -> docsEntries.put(docId, entry.getFirst()))
-                            .ifError(error -> Minions.LOGGER.warn("Could not parse docs entry {}: {}", id, error.message()));
-                }
-            } catch (IOException | JsonParseException e) {
-                Minions.LOGGER.warn("Could not read file {}", id, e);
-            }
-        });
-        if(root[0] != null) {
-            DocsTree tree = new DocsTree(root[0]);
-            return new Tuple<>(docsEntries, tree);
-        } else {
-            return new Tuple<>(docsEntries, null);
-        }
-    }
-
-    @Override
-    public void apply(Tuple<Map<Identifier, DocsEntry>, DocsTree> o, SharedState state) {
-        docs = o.getA();
-        tree = o.getB();
-    }
-}

src/main/java/io/github/skippyall/minions/docs/DocsTree.java

@@ -1,155 +0,0 @@
-package io.github.skippyall.minions.docs;
-
-import com.mojang.datafixers.util.Either;
-import com.mojang.serialization.Codec;
-import net.minecraft.resources.Identifier;
-import org.jspecify.annotations.Nullable;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
-public class DocsTree {
-    private final BranchElement root;
-    private final Map<Identifier, DocElement> entries = new HashMap<>();
-
-    public DocsTree(BranchElement root) {
-        this.root = root;
-        initEntries();
-    }
-
-    private void initEntries() {
-        DocElement element = root.first();
-        do {
-            entries.put(element.id, element);
-            element = element.next();
-        } while (element != null);
-    }
-
-    public BranchElement getRoot() {
-        return root;
-    }
-
-    public DocElement getElement(Identifier id) {
-        return entries.get(id);
-    }
-
-    public static abstract sealed class Element {
-        private @Nullable BranchElement parent;
-
-        public @Nullable BranchElement getParent() {
-            return parent;
-        }
-
-        void setParent(BranchElement parent) {
-            this.parent = parent;
-        }
-
-        public @Nullable DocElement next() {
-            if (parent != null) {
-                return parent.next(this);
-            } else {
-                return null;
-            }
-        }
-
-        public @Nullable DocElement previous() {
-            if (parent != null) {
-                return parent.previous(this);
-            } else {
-                return null;
-            }
-        }
-    }
-
-    public static final class DocElement extends Element {
-        public static final Codec<DocElement> CODEC = Identifier.CODEC.xmap(DocElement::new, DocElement::getId);
-
-        private final Identifier id;
-
-        public DocElement(Identifier element) {
-            this.id = element;
-        }
-
-        public Identifier getId() {
-            return id;
-        }
-    }
-
-    public static final class BranchElement extends Element {
-        public static final Codec<BranchElement> CODEC = Codec.<BranchElement>recursive("DocsBranch", codec ->
-                Codec.either(codec, DocElement.CODEC)
-                        .xmap(
-                                Either::unwrap,
-                                element -> switch (element) {
-                                    case BranchElement branch -> Either.left(branch);
-                                    case DocElement doc -> Either.right(doc);
-                                }
-                        ).listOf()
-                        .xmap(BranchElement::new, branch -> branch.e)
-        ).xmap(BranchElement::setParents, Function.identity());
-
-        private final List<Element> e;
-
-        public BranchElement(List<Element> elements) {
-            e = elements;
-        }
-
-        public DocElement first() {
-            return switch (e.getFirst()) {
-                case BranchElement branch -> branch.first();
-                case DocElement doc -> doc;
-            };
-        }
-
-        public DocElement last() {
-            return switch (e.getLast()) {
-                case BranchElement branch -> branch.last();
-                case DocElement doc -> doc;
-            };
-        }
-
-        public @Nullable DocElement next(Element current) {
-            int nextIndex = e.indexOf(current) + 1;
-            if(nextIndex < e.size()) {
-                return switch (e.get(nextIndex)) {
-                    case BranchElement branch -> branch.first();
-                    case DocElement doc -> doc;
-                };
-            } else {
-                if(getParent() != null) {
-                    return getParent().next(this);
-                } else {
-                    return null;
-                }
-            }
-        }
-
-        public @Nullable DocElement previous(Element current) {
-            int previousIndex = e.indexOf(current) - 1;
-            if(previousIndex >= 0) {
-                return switch (e.get(previousIndex)) {
-                    case BranchElement branch -> branch.first();
-                    case DocElement doc -> doc;
-                };
-            } else {
-                if(getParent() != null) {
-                    return getParent().previous(this);
-                } else {
-                    return null;
-                }
-            }
-        }
-
-        private BranchElement setParents() {
-            for(Element element : e) {
-                element.setParent(this);
-                if(element instanceof BranchElement branch) {
-                    branch.setParents();
-                }
-            }
-            return this;
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/docs/ReferenceEntry.java

@@ -1,82 +0,0 @@
-package io.github.skippyall.minions.docs;
-
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import io.github.skippyall.minions.gui.GuiDisplay;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.ComponentSerialization;
-import net.minecraft.resources.Identifier;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.dialog.body.DialogBody;
-import net.minecraft.server.dialog.body.ItemBody;
-import net.minecraft.server.dialog.body.PlainMessage;
-import net.minecraft.world.item.Item;
-import org.jspecify.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-public record ReferenceEntry(Metadata metadata, ResourceKey<?> object, Component shortDescription, Component longDescription) implements DocsEntry {
-    private static final Codec<ResourceKey<?>> REGISTRY_KEY_CODEC = RecordCodecBuilder.create(instance ->
-            instance.group(
-                    Identifier.CODEC.fieldOf("registry").forGetter(ResourceKey::registry),
-                    Identifier.CODEC.fieldOf("value").forGetter(ResourceKey::identifier)
-            ).apply(instance, (registry, value) -> ResourceKey.create(ResourceKey.createRegistryKey(registry), value))
-    );
-
-    public static final MapCodec<ReferenceEntry> CODEC = RecordCodecBuilder.mapCodec(instance ->
-            instance.group(
-                    Metadata.CODEC.fieldOf("metadata").forGetter(ReferenceEntry::getMetadata),
-                    REGISTRY_KEY_CODEC.fieldOf("object").forGetter(ReferenceEntry::object),
-                    ComponentSerialization.CODEC.fieldOf("shortDescription").forGetter(ReferenceEntry::shortDescription),
-                    ComponentSerialization.CODEC.fieldOf("longDescription").forGetter(ReferenceEntry::longDescription)
-            ).apply(instance, ReferenceEntry::new));
-
-    @Override
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    @Override
-    public List<DialogBody> getDialog(RegistryAccess manager) {
-        List<DialogBody> bodyElements = new ArrayList<>();
-
-        GuiDisplay display = getObjectDisplay(manager);
-        if(display != null) {
-            bodyElements.add(new ItemBody(display.createItemStackTemplate(), Optional.empty(), false, false, 16, 16));
-        }
-        bodyElements.add(new PlainMessage(Component.translatable(object.identifier().toLanguageKey(object.registry().getPath())), 200));
-        bodyElements.add(new PlainMessage(longDescription, 200));
-
-        return bodyElements;
-    }
-
-    public @Nullable GuiDisplay getObjectDisplay(RegistryAccess manager) {
-        GuiDisplay display = GuiDisplay.DEFAULT_DISPLAY;
-        if(object.isFor(Registries.ITEM) || object.isFor(Registries.BLOCK)) {
-            Item item;
-            if(object.isFor(Registries.ITEM)) {
-                item = BuiltInRegistries.ITEM.getValue(object.identifier());
-            } else {
-                item = BuiltInRegistries.BLOCK.getValue(object.identifier()).asItem();
-            }
-            if(item != null) {
-                display = new GuiDisplay.ItemBased(item);
-            }
-        } else {
-            Identifier displayId = object.identifier().withPrefix(object.registry().getPath() + "/");
-            display = GuiDisplay.getGuiDisplay(displayId, manager);
-        }
-        return display;
-    }
-
-    @Override
-    public MapCodec<? extends DocsEntry> getCodec() {
-        return CODEC;
-    }
-}

src/main/java/io/github/skippyall/minions/docs/package-info.java

@@ -1,4 +0,0 @@
-@NullMarked
-package io.github.skippyall.minions.docs;
-
-import org.jspecify.annotations.NullMarked;

src/main/java/io/github/skippyall/minions/fakeplayer/ClientConnectionInterface.java

@@ -1,5 +1,4 @@
-//code from https://github.com/gnembon/fabric-carpet
+package io.github.skippyall.minions.fakeplayer;
-package io.github.skippyall.minions.minion.fakeplayer;
 
 import io.netty.channel.Channel;
 

src/main/java/io/github/skippyall/minions/fakeplayer/EntityPlayerActionPack.java

@@ -1,45 +1,44 @@
-//partially code from https://github.com/gnembon/fabric-carpet
+package io.github.skippyall.minions.fakeplayer;
-package io.github.skippyall.minions.minion.fakeplayer;
 
 
-import io.github.skippyall.minions.mixins.EntityAccessor;
-import net.minecraft.commands.arguments.EntityAnchorArgument;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.network.protocol.game.ClientboundSetHeldSlotPacket;
-import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.util.Mth;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.animal.equine.AbstractHorse;
-import net.minecraft.world.entity.decoration.ItemFrame;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.vehicle.boat.Boat;
-import net.minecraft.world.entity.vehicle.minecart.Minecart;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.EntityHitResult;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec2;
-import net.minecraft.world.phys.Vec3;
-
 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;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.decoration.ItemFrameEntity;
+import net.minecraft.entity.passive.AbstractHorseEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.entity.vehicle.BoatEntity;
+import net.minecraft.entity.vehicle.MinecartEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
+import net.minecraft.network.packet.s2c.play.UpdateSelectedSlotS2CPacket;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.EntityHitResult;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.Vec2f;
+import net.minecraft.util.math.Vec3d;
+
 public class EntityPlayerActionPack
 {
-    private final MinionFakePlayer player;
+    private final ServerPlayerEntity player;
 
     private final Map<ActionType, Action> actions = new EnumMap<>(ActionType.class);
 
     private BlockPos currentBlock;
-    public int blockHitDelay;
+    private int blockHitDelay;
     private boolean isHittingBlock;
     private float curBlockDamageMP;
 
@@ -50,7 +49,7 @@ public class EntityPlayerActionPack
 
     private int itemUseCooldown;
 
-    public EntityPlayerActionPack(MinionFakePlayer playerIn)
+    public EntityPlayerActionPack(ServerPlayerEntity playerIn)
     {
         player = playerIn;
         stopAll();
@@ -71,14 +70,6 @@ public class EntityPlayerActionPack
         itemUseCooldown = other.itemUseCooldown;
     }
 
-    public Action getAction(ActionType type) {
-        return actions.get(type);
-    }
-
-    public boolean hasAction(ActionType type) {
-        return actions.containsKey(type);
-    }
-
     public EntityPlayerActionPack start(ActionType type, Action action)
     {
         Action previous = actions.remove(type);
@@ -91,16 +82,10 @@ public class EntityPlayerActionPack
         return this;
     }
 
-    public EntityPlayerActionPack stop(ActionType type) {
-        Action previous = actions.remove(type);
-        if (previous != null) type.stop(player, previous);
-        return this;
-    }
-
     public EntityPlayerActionPack setSneaking(boolean doSneak)
     {
         sneaking = doSneak;
-        player.setShiftKeyDown(doSneak);
+        player.setSneaking(doSneak);
         if (sprinting && sneaking)
             setSprinting(false);
         return this;
@@ -132,35 +117,35 @@ public class EntityPlayerActionPack
             case SOUTH -> look(0, 0);
             case EAST  -> look(-90, 0);
             case WEST  -> look(90, 0);
-            case UP    -> look(player.getYRot(), -90);
+            case UP    -> look(player.getYaw(), -90);
-            case DOWN  -> look(player.getYRot(), 90);
+            case DOWN  -> look(player.getYaw(), 90);
         };
     }
-    public EntityPlayerActionPack look(Vec2 rotation)
+    public EntityPlayerActionPack look(Vec2f rotation)
     {
         return look(rotation.x, rotation.y);
     }
 
     public EntityPlayerActionPack look(float yaw, float pitch)
     {
-        player.setYRot(yaw % 360); //setYaw
+        player.setYaw(yaw % 360); //setYaw
-        player.setXRot(Mth.clamp(pitch, -90, 90)); // setPitch
+        player.setPitch(MathHelper.clamp(pitch, -90, 90)); // setPitch
         // maybe player.moveTo(player.getX(), player.getY(), player.getZ(), yaw, Mth.clamp(pitch,-90.0F, 90.0F));
         return this;
     }
 
-    public EntityPlayerActionPack lookAt(Vec3 position)
+    public EntityPlayerActionPack lookAt(Vec3d position)
     {
-        player.lookAt(EntityAnchorArgument.Anchor.EYES, position);
+        player.lookAt(EntityAnchorArgumentType.EntityAnchor.EYES, position);
         return this;
     }
 
     public EntityPlayerActionPack turn(float yaw, float pitch)
     {
-        return look(player.getYRot() + yaw, player.getXRot() + pitch);
+        return look(player.getYaw() + yaw, player.getPitch() + pitch);
     }
 
-    public EntityPlayerActionPack turn(Vec2 rotation)
+    public EntityPlayerActionPack turn(Vec2f rotation)
     {
         return turn(rotation.x, rotation.y);
     }
@@ -174,6 +159,12 @@ public class EntityPlayerActionPack
         return this;
     }
 
+    public EntityPlayerActionPack stop(ActionType type) {
+        type.stop(player, actions.get(type));
+        actions.remove(type);
+        return this;
+    }
+
 
     public EntityPlayerActionPack stopAll()
     {
@@ -189,12 +180,12 @@ public class EntityPlayerActionPack
         List<Entity> entities;
         if (onlyRideables)
         {
-            entities = player.level().getEntities(player, player.getBoundingBox().inflate(3.0D, 1.0D, 3.0D),
+            entities = player.getWorld().getOtherEntities(player, player.getBoundingBox().expand(3.0D, 1.0D, 3.0D),
-                    e -> (e instanceof Minecart || e instanceof Boat || e instanceof AbstractHorse) && ((EntityAccessor)e).minions$canAddPassenger(player));
+                    e -> (e instanceof MinecartEntity || e instanceof BoatEntity || e instanceof AbstractHorseEntity) && ((EntityAccessor)e).invokeCanAddPassenger(player));
         }
         else
         {
-            entities = player.level().getEntities(player, player.getBoundingBox().inflate(3.0D, 1.0D, 3.0D));
+            entities = player.getWorld().getOtherEntities(player, player.getBoundingBox().expand(3.0D, 1.0D, 3.0D));
         }
         if (entities.size()==0)
             return this;
@@ -205,7 +196,7 @@ public class EntityPlayerActionPack
         {
             if (e == player || (currentVehicle == e))
                 continue;
-            double dd = player.distanceToSqr(e);
+            double dd = player.squaredDistanceTo(e);
             if (dd<distance)
             {
                 distance = dd;
@@ -213,10 +204,10 @@ public class EntityPlayerActionPack
             }
         }
         if (closest == null) return this;
-        if (closest instanceof AbstractHorse && onlyRideables)
+        if (closest instanceof AbstractHorseEntity && onlyRideables)
-            ((AbstractHorse) closest).mobInteract(player, InteractionHand.MAIN_HAND);
+            ((AbstractHorseEntity) closest).interactMob(player, Hand.MAIN_HAND);
         else
-            player.startRiding(closest, !onlyRideables, true);
+            player.startRiding(closest, !onlyRideables);
         return this;
     }
     public EntityPlayerActionPack dismount()
@@ -256,52 +247,48 @@ public class EntityPlayerActionPack
         float vel = sneaking?0.3F:1.0F;
         // The != 0.0F checks are needed given else real players can't control minecarts, however it works with fakes and else they don't stop immediately
         if (forward != 0.0F || player instanceof MinionFakePlayer) {
-            player.zza = forward * vel;
+            player.forwardSpeed = forward * vel;
         }
         if (strafing != 0.0F || player instanceof MinionFakePlayer) {
-            player.xxa = strafing * vel;
+            player.sidewaysSpeed = strafing * vel;
-        }
-
-        if(blockHitDelay > 0) {
-            blockHitDelay--;
         }
     }
 
-    public static HitResult getTarget(ServerPlayer player)
+    static HitResult getTarget(ServerPlayerEntity player)
     {
-        double reach = player.gameMode.isCreative() ? 5 : 4.5f;
+        double reach = player.interactionManager.isCreative() ? 5 : 4.5f;
         return Tracer.rayTrace(player, 1, reach, false);
     }
 
     private void dropItemFromSlot(int slot, boolean dropAll)
     {
-        Inventory inv = player.getInventory(); // getInventory;
+        PlayerInventory inv = player.getInventory(); // getInventory;
-        if (!inv.getItem(slot).isEmpty())
+        if (!inv.getStack(slot).isEmpty())
-            player.drop(inv.removeItem(slot,
+            player.dropItem(inv.removeStack(slot,
-                    dropAll ? inv.getItem(slot).getCount() : 1
+                    dropAll ? inv.getStack(slot).getCount() : 1
             ), false, true); // scatter, keep owner
     }
 
     public void drop(int selectedSlot, boolean dropAll)
     {
-        Inventory inv = player.getInventory(); // getInventory;
+        PlayerInventory inv = player.getInventory(); // getInventory;
         if (selectedSlot == -2) // all
         {
-            for (int i = inv.getContainerSize(); i >= 0; i--)
+            for (int i = inv.size(); i >= 0; i--)
                 dropItemFromSlot(i, dropAll);
         }
         else // one slot
         {
             if (selectedSlot == -1)
-                selectedSlot = inv.getSelectedSlot();
+                selectedSlot = inv.selectedSlot;
             dropItemFromSlot(selectedSlot, dropAll);
         }
     }
 
     public void setSlot(int slot)
     {
-        player.getInventory().setSelectedSlot(slot-1);
+        player.getInventory().selectedSlot = slot-1;
-        player.connection.send(new ClientboundSetHeldSlotPacket(slot-1));
+        player.networkHandler.sendPacket(new UpdateSelectedSlotS2CPacket(slot-1));
     }
 
     public enum ActionType
@@ -309,9 +296,9 @@ public class EntityPlayerActionPack
         USE(true)
                 {
                     @Override
-                    boolean execute(MinionFakePlayer player, Action action)
+                    boolean execute(ServerPlayerEntity player, Action action)
                     {
-                        EntityPlayerActionPack ap = player.getMinionActionPack();
+                        EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
                         if (ap.itemUseCooldown > 0)
                         {
                             ap.itemUseCooldown--;
@@ -322,23 +309,23 @@ public class EntityPlayerActionPack
                             return true;
                         }
                         HitResult hit = getTarget(player);
-                        for (InteractionHand hand : InteractionHand.values())
+                        for (Hand hand : Hand.values())
                         {
                             switch (hit.getType())
                             {
                                 case BLOCK:
                                 {
-                                    player.resetLastActionTime();
+                                    player.updateLastActionTime();
-                                    ServerLevel world = player.level();
+                                    ServerWorld world = player.getServerWorld();
                                     BlockHitResult blockHit = (BlockHitResult) hit;
                                     BlockPos pos = blockHit.getBlockPos();
-                                    Direction side = blockHit.getDirection();
+                                    Direction side = blockHit.getSide();
-                                    if (pos.getY() < player.level().getMaxY() - (side == Direction.UP ? 1 : 0) && world.mayInteract(player, pos))
+                                    if (pos.getY() < player.getWorld().getTopY() - (side == Direction.UP ? 1 : 0) && world.canPlayerModifyAt(player, pos))
                                     {
-                                        InteractionResult result = player.gameMode.useItemOn(player, world, player.getItemInHand(hand), hand, blockHit);
+                                        ActionResult result = player.interactionManager.interactBlock(player, world, player.getStackInHand(hand), hand, blockHit);
-                                        if (result instanceof InteractionResult.Success success)
+                                        if (result.isAccepted())
                                         {
-                                            if (success.swingSource() == InteractionResult.SwingSource.SERVER) player.swing(hand);
+                                            if (result.shouldSwingHand()) player.swingHand(hand);
                                             ap.itemUseCooldown = 3;
                                             return true;
                                         }
@@ -347,19 +334,19 @@ public class EntityPlayerActionPack
                                 }
                                 case ENTITY:
                                 {
-                                    player.resetLastActionTime();
+                                    player.updateLastActionTime();
                                     EntityHitResult entityHit = (EntityHitResult) hit;
                                     Entity entity = entityHit.getEntity();
-                                    boolean handWasEmpty = player.getItemInHand(hand).isEmpty();
+                                    boolean handWasEmpty = player.getStackInHand(hand).isEmpty();
-                                    boolean itemFrameEmpty = (entity instanceof ItemFrame) && ((ItemFrame) entity).getItem().isEmpty();
+                                    boolean itemFrameEmpty = (entity instanceof ItemFrameEntity) && ((ItemFrameEntity) entity).getHeldItemStack().isEmpty();
-                                    Vec3 relativeHitPos = entityHit.getLocation().subtract(entity.getX(), entity.getY(), entity.getZ());
+                                    Vec3d relativeHitPos = entityHit.getPos().subtract(entity.getX(), entity.getY(), entity.getZ());
-                                    if (entity.interact(player, hand, relativeHitPos).consumesAction())
+                                    if (entity.interactAt(player, relativeHitPos, hand).isAccepted())
                                     {
                                         ap.itemUseCooldown = 3;
                                         return true;
                                     }
                                     // fix for SS itemframe always returns CONSUME even if no action is performed
-                                    if (player.interactOn(entity, hand, relativeHitPos).consumesAction() && !(handWasEmpty && itemFrameEmpty))
+                                    if (player.interact(entity, hand).isAccepted() && !(handWasEmpty && itemFrameEmpty))
                                     {
                                         ap.itemUseCooldown = 3;
                                         return true;
@@ -367,8 +354,8 @@ public class EntityPlayerActionPack
                                     break;
                                 }
                             }
-                            ItemStack handItem = player.getItemInHand(hand);
+                            ItemStack handItem = player.getStackInHand(hand);
-                            if (player.gameMode.useItem(player, player.level(), handItem, hand).consumesAction())
+                            if (player.interactionManager.interactItem(player, player.getWorld(), handItem, hand).isAccepted())
                             {
                                 ap.itemUseCooldown = 3;
                                 return true;
@@ -378,49 +365,50 @@ public class EntityPlayerActionPack
                     }
 
                     @Override
-                    void inactiveTick(MinionFakePlayer player, Action action)
+                    void inactiveTick(ServerPlayerEntity player, Action action)
                     {
-                        EntityPlayerActionPack ap = player.getMinionActionPack();
+                        EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
                         ap.itemUseCooldown = 0;
-                        player.releaseUsingItem();
+                        player.stopUsingItem();
                     }
                 },
         ATTACK(true) {
             @Override
-            boolean execute(MinionFakePlayer player, Action action) {
+            boolean execute(ServerPlayerEntity player, Action action) {
                 HitResult hit = getTarget(player);
                 switch (hit.getType()) {
                     case ENTITY: {
                         EntityHitResult entityHit = (EntityHitResult) hit;
-                        if (!action.isContinuous || action.first)
+                        if (!action.isContinuous)
                         {
                             player.attack(entityHit.getEntity());
-                            player.swing(InteractionHand.MAIN_HAND);
+                            player.swingHand(Hand.MAIN_HAND);
                         }
-                        player.resetAttackStrengthTicker();
+                        player.resetLastAttackedTicks();
-                        player.resetLastActionTime();
+                        player.updateLastActionTime();
                         return true;
                     }
                     case BLOCK: {
-                        EntityPlayerActionPack ap = player.getMinionActionPack();
+                        EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
                         if (ap.blockHitDelay > 0)
                         {
+                            ap.blockHitDelay--;
                             return false;
                         }
                         BlockHitResult blockHit = (BlockHitResult) hit;
                         BlockPos pos = blockHit.getBlockPos();
-                        Direction side = blockHit.getDirection();
+                        Direction side = blockHit.getSide();
-                        if (player.blockActionRestricted(player.level(), pos, player.gameMode.getGameModeForPlayer())) return false;
+                        if (player.isBlockBreakingRestricted(player.getWorld(), pos, player.interactionManager.getGameMode())) return false;
-                        if (ap.currentBlock != null && player.level().getBlockState(ap.currentBlock).isAir())
+                        if (ap.currentBlock != null && player.getWorld().getBlockState(ap.currentBlock).isAir())
                         {
                             ap.currentBlock = null;
                             return false;
                         }
-                        BlockState state = player.level().getBlockState(pos);
+                        BlockState state = player.getWorld().getBlockState(pos);
                         boolean blockBroken = false;
-                        if (player.gameMode.getGameModeForPlayer().isCreative())
+                        if (player.interactionManager.getGameMode().isCreative())
                         {
-                            player.gameMode.handleBlockBreakAction(pos, ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, side, player.level().getMaxY(), -1);
+                            player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, side, player.getWorld().getTopY(), -1);
                             ap.blockHitDelay = 5;
                             blockBroken = true;
                         }
@@ -428,15 +416,15 @@ public class EntityPlayerActionPack
                         {
                             if (ap.currentBlock != null)
                             {
-                                player.gameMode.handleBlockBreakAction(ap.currentBlock, ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, side, player.level().getMaxY(), -1);
+                                player.interactionManager.processBlockBreakingAction(ap.currentBlock, PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, side, player.getWorld().getTopY(), -1);
                             }
-                            player.gameMode.handleBlockBreakAction(pos, ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, side, player.level().getMaxY(), -1);
+                            player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, side, player.getWorld().getTopY(), -1);
                             boolean notAir = !state.isAir();
                             if (notAir && ap.curBlockDamageMP == 0)
                             {
-                                state.attack(player.level(), pos, player);
+                                state.onBlockBreakStart(player.getWorld(), pos, player);
                             }
-                            if (notAir && state.getDestroyProgress(player, player.level(), pos) >= 1)
+                            if (notAir && state.calcBlockBreakingDelta(player, player.getWorld(), pos) >= 1)
                             {
                                 ap.currentBlock = null;
                                 //instamine??
@@ -450,19 +438,19 @@ public class EntityPlayerActionPack
                         }
                         else
                         {
-                            ap.curBlockDamageMP += state.getDestroyProgress(player, player.level(), pos);
+                            ap.curBlockDamageMP += state.calcBlockBreakingDelta(player, player.getWorld(), pos);
                             if (ap.curBlockDamageMP >= 1)
                             {
-                                player.gameMode.handleBlockBreakAction(pos, ServerboundPlayerActionPacket.Action.STOP_DESTROY_BLOCK, side, player.level().getMaxY(), -1);
+                                player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, side, player.getWorld().getTopY(), -1);
                                 ap.currentBlock = null;
                                 ap.blockHitDelay = 5;
                                 blockBroken = true;
                             }
-                            player.level().destroyBlockProgress(-1, pos, (int) (ap.curBlockDamageMP * 10));
+                            player.getWorld().setBlockBreakingInfo(-1, pos, (int) (ap.curBlockDamageMP * 10));
 
                         }
-                        player.resetLastActionTime();
+                        player.updateLastActionTime();
-                        player.swing(InteractionHand.MAIN_HAND);
+                        player.swingHand(Hand.MAIN_HAND);
                         return blockBroken;
                     }
                 }
@@ -470,24 +458,23 @@ public class EntityPlayerActionPack
             }
 
             @Override
-            void inactiveTick(MinionFakePlayer player, Action action)
+            void inactiveTick(ServerPlayerEntity player, Action action)
             {
-                EntityPlayerActionPack ap = player.getMinionActionPack();
+                EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
                 if (ap.currentBlock == null) return;
-                player.level().destroyBlockProgress(-1, ap.currentBlock, -1);
+                player.getWorld().setBlockBreakingInfo(-1, ap.currentBlock, -1);
-                player.gameMode.handleBlockBreakAction(ap.currentBlock, ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, Direction.DOWN, player.level().getMaxY(), -1);
+                player.interactionManager.processBlockBreakingAction(ap.currentBlock, PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, Direction.DOWN, player.getWorld().getTopY(), -1);
                 ap.currentBlock = null;
             }
         },
         JUMP(true)
                 {
                     @Override
-                    boolean execute(MinionFakePlayer player, Action action)
+                    boolean execute(ServerPlayerEntity player, Action action)
                     {
                         if (action.limit == 1)
                         {
-                            if (player.onGround()) player.jumpFromGround();
+                            if (player.isOnGround()) player.jump(); // onGround
-                            else if (!player.onClimbable()) player.tryToStartFallFlying();
                         }
                         else
                         {
@@ -497,7 +484,7 @@ public class EntityPlayerActionPack
                     }
 
                     @Override
-                    void inactiveTick(MinionFakePlayer player, Action action)
+                    void inactiveTick(ServerPlayerEntity player, Action action)
                     {
                         player.setJumping(false);
                     }
@@ -505,32 +492,32 @@ public class EntityPlayerActionPack
         DROP_ITEM(true)
                 {
                     @Override
-                    boolean execute(MinionFakePlayer player, Action action)
+                    boolean execute(ServerPlayerEntity player, Action action)
                     {
-                        player.resetLastActionTime();
+                        player.updateLastActionTime();
-                        player.drop(false); // dropSelectedItem
+                        player.dropSelectedItem(false); // dropSelectedItem
                         return false;
                     }
                 },
         DROP_STACK(true)
                 {
                     @Override
-                    boolean execute(MinionFakePlayer player, Action action)
+                    boolean execute(ServerPlayerEntity player, Action action)
                     {
-                        player.resetLastActionTime();
+                        player.updateLastActionTime();
-                        player.drop(true); // dropSelectedItem
+                        player.dropSelectedItem(true); // dropSelectedItem
                         return false;
                     }
                 },
         SWAP_HANDS(true)
                 {
                     @Override
-                    boolean execute(MinionFakePlayer player, Action action)
+                    boolean execute(ServerPlayerEntity player, Action action)
                     {
-                        player.resetLastActionTime();
+                        player.updateLastActionTime();
-                        ItemStack itemStack_1 = player.getItemInHand(InteractionHand.OFF_HAND);
+                        ItemStack itemStack_1 = player.getStackInHand(Hand.OFF_HAND);
-                        player.setItemInHand(InteractionHand.OFF_HAND, player.getItemInHand(InteractionHand.MAIN_HAND));
+                        player.setStackInHand(Hand.OFF_HAND, player.getStackInHand(Hand.MAIN_HAND));
-                        player.setItemInHand(InteractionHand.MAIN_HAND, itemStack_1);
+                        player.setStackInHand(Hand.MAIN_HAND, itemStack_1);
                         return false;
                     }
                 };
@@ -542,10 +529,10 @@ public class EntityPlayerActionPack
             this.preventSpectator = preventSpectator;
         }
 
-        void start(MinionFakePlayer player, Action action) {}
+        void start(ServerPlayerEntity player, Action action) {}
-        abstract boolean execute(MinionFakePlayer player, Action action);
+        abstract boolean execute(ServerPlayerEntity player, Action action);
-        void inactiveTick(MinionFakePlayer player, Action action) {}
+        void inactiveTick(ServerPlayerEntity player, Action action) {}
-        void stop(MinionFakePlayer player, Action action)
+        void stop(ServerPlayerEntity player, Action action)
         {
             inactiveTick(player, action);
         }
@@ -560,9 +547,8 @@ public class EntityPlayerActionPack
         private int count;
         private int next;
         private final boolean isContinuous;
-        boolean first = true;
 
-        private Action(int limit, int interval, int offset, boolean continuous, boolean first)
+        private Action(int limit, int interval, int offset, boolean continuous)
         {
             this.limit = limit;
             this.interval = interval;
@@ -573,27 +559,22 @@ public class EntityPlayerActionPack
 
         public static Action once()
         {
-            return new Action(1, 1, 0, false, false);
+            return new Action(1, 1, 0, false);
-        }
-
-        public static Action startContinuous()
-        {
-            return new Action(-1, 1, 0, true, true);
         }
 
         public static Action continuous()
         {
-            return new Action(-1, 1, 0, true, false);
+            return new Action(-1, 1, 0, true);
         }
 
         public static Action interval(int interval)
         {
-            return new Action(-1, interval, 0, false, false);
+            return new Action(-1, interval, 0, false);
         }
 
         public static Action interval(int interval, int offset)
         {
-            return new Action(-1, interval, offset, false, false);
+            return new Action(-1, interval, offset, false);
         }
 
         Boolean tick(EntityPlayerActionPack actionPack, ActionType type)
@@ -624,7 +605,6 @@ public class EntityPlayerActionPack
                     return cancel;
                 }
                 next = interval;
-                first = false;
             }
             else
             {

src/main/java/io/github/skippyall/minions/fakeplayer/FakeClientConnection.java

@@ -0,0 +1,36 @@
+package io.github.skippyall.minions.fakeplayer;
+
+import io.netty.channel.embedded.EmbeddedChannel;
+import net.minecraft.network.ClientConnection;
+import net.minecraft.network.NetworkSide;
+import net.minecraft.network.NetworkState;
+import net.minecraft.network.listener.PacketListener;
+import net.minecraft.text.Text;
+
+public class FakeClientConnection extends ClientConnection {
+    public FakeClientConnection(NetworkSide p)
+    {
+        super(p);
+        // compat with adventure-platform-fabric. This does NOT trigger other vanilla handlers for establishing a channel
+        // also makes #isOpen return true, allowing enderpearls to teleport fake players
+        ((ClientConnectionInterface)this).setChannel(new EmbeddedChannel());
+    }
+
+    @Override
+    public void tryDisableAutoRead()
+    {
+    }
+
+    @Override
+    public void handleDisconnection() {
+    }
+
+    @Override
+    public void setInitialPacketListener(PacketListener packetListener)
+    {
+    }
+
+    @Override
+    public <T extends PacketListener> void transitionInbound(NetworkState<T> state, T packetListener) {
+    }
+}

src/main/java/io/github/skippyall/minions/fakeplayer/MinionFakePlayer.java

@@ -0,0 +1,352 @@
+package io.github.skippyall.minions.fakeplayer;
+
+import com.mojang.authlib.GameProfile;
+import io.github.skippyall.minions.Minions;
+import io.github.skippyall.minions.minion.MinionData;
+import io.github.skippyall.minions.gui.MinionGui;
+import io.github.skippyall.minions.minion.MinionItem;
+import io.github.skippyall.minions.minion.MinionPersistentState;
+import io.github.skippyall.minions.minion.MinionProfileUtils;
+import io.github.skippyall.minions.gui.ModuleInventory;
+import io.github.skippyall.minions.program.runtime.MinionRuntime;
+import net.minecraft.block.BlockState;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.entity.MovementType;
+import net.minecraft.entity.attribute.EntityAttributes;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.player.HungerManager;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.network.DisconnectionInfo;
+import net.minecraft.network.NetworkSide;
+import net.minecraft.network.packet.c2s.common.SyncedClientOptions;
+import net.minecraft.network.packet.c2s.play.ClientStatusC2SPacket;
+import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket;
+import net.minecraft.network.packet.s2c.play.EntitySetHeadYawS2CPacket;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.ServerTask;
+import net.minecraft.server.network.ConnectedClientData;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableTextContent;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec2f;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.GameMode;
+import net.minecraft.world.TeleportTarget;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+public class MinionFakePlayer extends ServerPlayerEntity {
+    public Runnable fixStartingPosition = () -> {};
+
+    private float moveForward;
+    private float moveSideways;
+
+    private boolean programmable;
+    private final ModuleInventory moduleInventory = new ModuleInventory();
+    private final MinionRuntime runtime = new MinionRuntime(this);
+
+    private UUID skinUuid = null;
+
+    public static void createMinion(MinionData data, ServerWorld level, ServerPlayerEntity owner, boolean canProgram, Vec3d pos, double yaw, double pitch) {
+        MinecraftServer server = level.getServer();
+
+        CompletableFuture<GameProfile> future;
+        if(data.skinUuid != null) {
+            future = MinionProfileUtils.getSkinOwnerProfile(server, data.skinUuid);
+        } else {
+            future = MinionProfileUtils.lookupSkinOwnerProfile(server, data.name);
+        }
+
+        future.thenAccept(skinProfile -> {
+            GameProfile profile = MinionProfileUtils.makeNewMinionProfile(null, data.name, skinProfile);
+            Minions.addExecuteOnNextTick(() -> {
+                MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, SyncedClientOptions.createDefault());
+                if(skinProfile != null) {
+                    instance.skinUuid = skinProfile.getId();
+                }
+
+                instance.programmable = canProgram;
+                instance.fixStartingPosition = () -> instance.refreshPositionAndAngles(pos.x, pos.y, pos.z, (float) yaw, (float) pitch);
+                server.getPlayerManager().onPlayerConnect(new FakeClientConnection(NetworkSide.SERVERBOUND), instance, new ConnectedClientData(profile, 0, instance.getClientOptions(), false));
+                instance.teleport(level, pos.x, pos.y, pos.z, (float) yaw, (float) pitch);
+                instance.setHealth(20.0F);
+                instance.unsetRemoved();
+                instance.getAttributeInstance(EntityAttributes.GENERIC_STEP_HEIGHT).setBaseValue(0.6F);
+                instance.interactionManager.changeGameMode(GameMode.SURVIVAL);
+                server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), level.getRegistryKey());//instance.dimension);
+                server.getPlayerManager().sendToDimension(new EntityPositionS2CPacket(instance), level.getRegistryKey());//instance.dimension);
+                //instance.world.getChunkManager(). updatePosition(instance);
+                instance.dataTracker.set(PLAYER_MODEL_PARTS, (byte) 0x7f); // show all model layers (incl. capes)
+                instance.getAbilities().flying = false;
+                MinionPersistentState.INSTANCE.addMinion(instance);
+            });
+        });
+    }
+
+    public static void spawnMinionAt(MinionData data, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot) {
+        MinecraftServer server = level.getServer();
+
+        CompletableFuture<GameProfile> future;
+        if(data.skinUuid != null) {
+            future = MinionProfileUtils.getSkinOwnerProfile(server, data.skinUuid);
+        } else {
+            future = MinionProfileUtils.lookupSkinOwnerProfile(server, data.name);
+        }
+
+        future.thenAccept((skinProfile) -> {
+            GameProfile profile = MinionProfileUtils.makeNewMinionProfile(data.uuid, data.name, skinProfile);
+            Minions.addExecuteOnNextTick(() -> {
+                MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, SyncedClientOptions.createDefault());
+                if (skinProfile != null) {
+                    instance.skinUuid = skinProfile.getId();
+                }
+                if(pos != null && rot != null) {
+                    instance.fixStartingPosition = () -> instance.refreshPositionAndAngles(pos.x, pos.y, pos.z, rot.x, rot.y);
+                }
+                server.getPlayerManager().onPlayerConnect(new FakeClientConnection(NetworkSide.SERVERBOUND), instance, new ConnectedClientData(profile, 0, instance.getClientOptions(), false));
+                System.out.println(instance.getPos());
+                if(pos != null && rot != null) {
+                    instance.teleport(level, pos.x, pos.y, pos.z, rot.x, rot.y);
+                }
+                instance.setVelocity(0,0,0);
+                instance.setHealth(20.0F);
+                instance.unsetRemoved();
+                instance.interactionManager.changeGameMode(GameMode.SURVIVAL);
+                server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), level.getRegistryKey());//instance.dimension);
+                server.getPlayerManager().sendToDimension(new EntityPositionS2CPacket(instance), level.getRegistryKey());//instance.dimension);
+                //instance.world.getChunkManager(). updatePosition(instance);
+                instance.dataTracker.set(PLAYER_MODEL_PARTS, (byte) 0x7f); // show all model layers (incl. capes)
+                instance.getAbilities().flying = false;
+            });
+        });
+    }
+
+    public static MinionFakePlayer respawnFake(MinecraftServer server, ServerWorld level, GameProfile profile, SyncedClientOptions cli)
+    {
+        return new MinionFakePlayer(server, level, profile, cli);
+    }
+
+    private MinionFakePlayer(MinecraftServer server, ServerWorld worldIn, GameProfile profile, SyncedClientOptions cli)
+    {
+        super(server, worldIn, profile, cli);
+    }
+
+    public boolean isProgrammable() {
+        return programmable;
+    }
+
+    public void setProgrammable(boolean programmable) {
+        this.programmable = programmable;
+    }
+
+    public ModuleInventory getModuleInventory() {
+        return moduleInventory;
+    }
+
+    public MinionRuntime getRuntime() {
+        return runtime;
+    }
+
+    public EntityPlayerActionPack getMinionActionPack() {
+        return ((ServerPlayerInterface)this).getActionPack();
+    }
+
+    @Override
+    public ActionResult interact(PlayerEntity player, Hand hand) {
+        if(player instanceof ServerPlayerEntity spe) {
+            MinionGui.openInventory(spe, this);
+        }
+        return ActionResult.CONSUME;
+    }
+
+    @Override
+    public ActionResult interactAt(PlayerEntity player, Vec3d hitPos, Hand hand) {
+        return interact(player, hand);
+    }
+
+    @Override
+    public void onEquipStack(final EquipmentSlot slot, final ItemStack previous, final ItemStack stack)
+    {
+        if (!isUsingItem()) super.onEquipStack(slot, previous, stack);
+    }
+
+    /*@Override
+    public void kill()
+    {
+        kill(Text.literal("Killed"));
+    }*/
+
+    public void kill(Text reason)
+    {
+        shakeOff();
+
+        if (reason.getContent() instanceof TranslatableTextContent text && text.getKey().equals("multiplayer.disconnect.duplicate_login")) {
+            this.networkHandler.onDisconnected(new DisconnectionInfo(reason));
+        } else {
+            this.server.send(new ServerTask(this.server.getTicks(), () -> {
+                this.networkHandler.onDisconnected(new DisconnectionInfo(reason));
+            }));
+        }
+
+        MinionPersistentState.INSTANCE.removeMinion(this);
+    }
+
+    @Override
+    public void tick()
+    {
+        if (this.getServer().getTicks() % 10 == 0)
+        {
+            this.networkHandler.syncWithPlayerPosition();
+            this.getServerWorld().getChunkManager().updatePosition(this);
+        }
+        try
+        {
+            super.tick();
+            this.playerTick();
+        }
+        catch (NullPointerException ignored)
+        {
+            // happens with that paper port thingy - not sure what that would fix, but hey
+            // the game not gonna crash violently.
+        }
+        runtime.tick();
+
+    }
+
+    private void shakeOff()
+    {
+        if (getVehicle() instanceof PlayerEntity) stopRiding();
+        for (Entity passenger : getPassengersDeep())
+        {
+            if (passenger instanceof PlayerEntity) passenger.stopRiding();
+        }
+    }
+
+    @Override
+    public void onDeath(DamageSource cause)
+    {
+        shakeOff();
+        super.onDeath(cause);
+        setHealth(20);
+        this.hungerManager = new HungerManager();
+        kill(this.getDamageTracker().getDeathMessage());
+    }
+
+    @Override
+    public String getIp()
+    {
+        return "127.0.0.1";
+    }
+
+    @Override
+    public boolean allowsServerListing() {
+        return false;
+    }
+
+    @Override
+    protected void fall(double y, boolean onGround, BlockState state, BlockPos pos) {
+        handleFall(0.0, y, 0.0, onGround);
+    }
+
+    @Override
+    public Entity teleportTo(TeleportTarget target)
+    {
+        super.teleportTo(target);
+        if (notInAnyWorld) {
+            ClientStatusC2SPacket p = new ClientStatusC2SPacket(ClientStatusC2SPacket.Mode.PERFORM_RESPAWN);
+            networkHandler.onClientStatus(p);
+        }
+
+        // If above branch was taken, *this* has been removed and replaced, the new instance has been set
+        // on 'our' connection (which is now theirs, but we still have a ref).
+        if (networkHandler.player.isInTeleportationState()) {
+            networkHandler.player.onTeleportationDone();
+        }
+        return networkHandler.player;
+    }
+
+    public void moveForward(float forward) {
+        this.moveForward += forward;
+        EntityPlayerActionPack actionPack = getMinionActionPack();
+        if (moveForward != 0) {
+            actionPack.setForward(moveForward > 0 ? 1 : -1);
+        }
+    }
+
+    public void moveSideways(float sideways) {
+        this.moveSideways += sideways;
+        EntityPlayerActionPack actionPack = getMinionActionPack();
+        if (moveSideways != 0) {
+            actionPack.setStrafing(moveSideways > 0 ? 1 : -1);
+        }
+    }
+
+    @Override
+    public void move(MovementType movementType, Vec3d movement) {
+        float newForward = (float) (moveForward - movement.z);
+        float newSideways = (float) (moveSideways - movement.x);
+        Vec3d newMovement = movement;
+        if ((newForward < 0 && moveForward > 0) || (newForward > 0 && moveForward < 0)) {
+            newMovement = new Vec3d(newMovement.x, newMovement.y, moveForward);
+            moveForward = 0;
+            getMinionActionPack().setForward(0);
+        }else {
+            moveForward = newForward;
+        }
+        if ((newSideways < 0 && moveSideways > 0) || (newSideways > 0 && moveSideways < 0)) {
+            newMovement = new Vec3d(newMovement.x, newMovement.y, moveSideways);
+            moveSideways = 0;
+            getMinionActionPack().setStrafing(0);
+        }else {
+            moveSideways = newSideways;
+        }
+        super.move(movementType, newMovement);
+    }
+
+    @Override
+    protected void drop(ServerWorld world, DamageSource damageSource) {
+        super.drop(world, damageSource);
+        dropStack(toItemStack());
+    }
+
+    private ItemStack toItemStack() {
+        ItemStack stack = new ItemStack(Minions.MINION_ITEM);
+        MinionItem.setData(MinionData.fromMinion(this), stack);
+        if (!getMinionName().equals("Minion")) {
+            stack.set(DataComponentTypes.CUSTOM_NAME, Text.of(getMinionName()));
+        }
+        return stack;
+    }
+
+    @Override
+    public void writeCustomDataToNbt(NbtCompound nbt) {
+        super.writeCustomDataToNbt(nbt);
+        nbt.put("modules", moduleInventory.writeNbt(new NbtCompound(), getRegistryManager()));
+        nbt.putBoolean("programmable", programmable);
+    }
+
+    @Override
+    public void readCustomDataFromNbt(NbtCompound nbt) {
+        super.readCustomDataFromNbt(nbt);
+        moduleInventory.readNbt(nbt.getCompound("modules"), getRegistryManager());
+        programmable = nbt.getBoolean("programmable");
+    }
+
+    public String getMinionName() {
+        return getGameProfile().getName();
+    }
+
+    public UUID getSkinUuid() {
+        return skinUuid;
+    }
+}

src/main/java/io/github/skippyall/minions/fakeplayer/NetHandlerPlayServerFake.java

@@ -0,0 +1,45 @@
+package io.github.skippyall.minions.fakeplayer;
+
+import net.minecraft.network.ClientConnection;
+import net.minecraft.network.packet.Packet;
+import net.minecraft.network.packet.s2c.play.PositionFlag;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.network.ConnectedClientData;
+import net.minecraft.server.network.ServerPlayNetworkHandler;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableTextContent;
+import java.util.Set;
+
+public class NetHandlerPlayServerFake extends ServerPlayNetworkHandler
+{
+    public NetHandlerPlayServerFake(final MinecraftServer minecraftServer, final ClientConnection connection, final ServerPlayerEntity serverPlayer, final ConnectedClientData i)
+    {
+        super(minecraftServer, connection, serverPlayer, i);
+    }
+
+    @Override
+    public void sendPacket(final Packet<?> packetIn)
+    {
+    }
+
+    @Override
+    public void disconnect(Text message)
+    {
+        if (message.getContent() instanceof TranslatableTextContent text && (text.getKey().equals("multiplayer.disconnect.idling") || text.getKey().equals("multiplayer.disconnect.duplicate_login")))
+        {
+            ((MinionFakePlayer) player).kill(message);
+        }
+    }
+
+    @Override
+    public void requestTeleport(double d, double e, double f, float g, float h, Set<PositionFlag> set)
+    {
+        super.requestTeleport(d, e, f, g, h, set);
+        if (player.getServerWorld().getPlayerByUuid(player.getUuid()) != null) {
+            syncWithPlayerPosition();
+            player.getServerWorld().getChunkManager().updatePosition(player);
+        }
+    }
+
+}

src/main/java/io/github/skippyall/minions/fakeplayer/ServerPlayerInterface.java

@@ -0,0 +1,8 @@
+package io.github.skippyall.minions.fakeplayer;
+
+import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack;
+
+public interface ServerPlayerInterface
+{
+    EntityPlayerActionPack getActionPack();
+}

src/main/java/io/github/skippyall/minions/fakeplayer/Tracer.java

@@ -1,17 +1,15 @@
-//code from https://github.com/gnembon/fabric-carpet
+package io.github.skippyall.minions.fakeplayer;
-package io.github.skippyall.minions.minion.fakeplayer;
-
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.EntityHitResult;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec3;
 
 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;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.Box;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.RaycastContext;
+import net.minecraft.world.World;
 
 public class Tracer
 {
@@ -21,7 +19,7 @@ public class Tracer
         double maxSqDist = reach * reach;
         if (blockHit != null)
         {
-            maxSqDist = blockHit.getLocation().distanceToSqr(source.getEyePosition(partialTicks));
+            maxSqDist = blockHit.getPos().squaredDistanceTo(source.getCameraPosVec(partialTicks));
         }
         EntityHitResult entityHit = rayTraceEntities(source, partialTicks, reach, maxSqDist);
         return entityHit == null ? blockHit : entityHit;
@@ -29,31 +27,31 @@ public class Tracer
 
     public static BlockHitResult rayTraceBlocks(Entity source, float partialTicks, double reach, boolean fluids)
     {
-        Vec3 pos = source.getEyePosition(partialTicks);
+        Vec3d pos = source.getCameraPosVec(partialTicks);
-        Vec3 rotation = source.getViewVector(partialTicks);
+        Vec3d rotation = source.getRotationVec(partialTicks);
-        Vec3 reachEnd = pos.add(rotation.x * reach, rotation.y * reach, rotation.z * reach);
+        Vec3d reachEnd = pos.add(rotation.x * reach, rotation.y * reach, rotation.z * reach);
-        return source.level().clip(new ClipContext(pos, reachEnd, ClipContext.Block.OUTLINE, fluids ?
+        return source.getWorld().raycast(new RaycastContext(pos, reachEnd, RaycastContext.ShapeType.OUTLINE, fluids ?
-                ClipContext.Fluid.ANY : ClipContext.Fluid.NONE, source));
+                RaycastContext.FluidHandling.ANY : RaycastContext.FluidHandling.NONE, source));
     }
 
     public static EntityHitResult rayTraceEntities(Entity source, float partialTicks, double reach, double maxSqDist)
     {
-        Vec3 pos = source.getEyePosition(partialTicks);
+        Vec3d pos = source.getCameraPosVec(partialTicks);
-        Vec3 reachVec = source.getViewVector(partialTicks).scale(reach);
+        Vec3d reachVec = source.getRotationVec(partialTicks).multiply(reach);
-        AABB box = source.getBoundingBox().expandTowards(reachVec).inflate(1);
+        Box box = source.getBoundingBox().stretch(reachVec).expand(1);
-        return rayTraceEntities(source, pos, pos.add(reachVec), box, e -> !e.isSpectator() && e.isPickable(), maxSqDist);
+        return rayTraceEntities(source, pos, pos.add(reachVec), box, e -> !e.isSpectator() && e.canHit(), maxSqDist);
     }
 
-    public static EntityHitResult rayTraceEntities(Entity source, Vec3 start, Vec3 end, AABB box, Predicate<Entity> predicate, double maxSqDistance)
+    public static EntityHitResult rayTraceEntities(Entity source, Vec3d start, Vec3d end, Box box, Predicate<Entity> predicate, double maxSqDistance)
     {
-        Level world = source.level();
+        World world = source.getWorld();
         double targetDistance = maxSqDistance;
         Entity target = null;
-        Vec3 targetHitPos = null;
+        Vec3d targetHitPos = null;
-        for (Entity current : world.getEntities(source, box, predicate))
+        for (Entity current : world.getOtherEntities(source, box, predicate))
         {
-            AABB currentBox = current.getBoundingBox().inflate(current.getPickRadius());
+            Box currentBox = current.getBoundingBox().expand(current.getTargetingMargin());
-            Optional<Vec3> currentHit = currentBox.clip(start, end);
+            Optional<Vec3d> currentHit = currentBox.raycast(start, end);
             if (currentBox.contains(start))
             {
                 if (targetDistance >= 0)
@@ -65,8 +63,8 @@ public class Tracer
             }
             else if (currentHit.isPresent())
             {
-                Vec3 currentHitPos = currentHit.get();
+                Vec3d currentHitPos = currentHit.get();
-                double currentDistance = start.distanceToSqr(currentHitPos);
+                double currentDistance = start.squaredDistanceTo(currentHitPos);
                 if (currentDistance < targetDistance || targetDistance == 0)
                 {
                     if (current.getRootVehicle() == source.getRootVehicle())

src/main/java/io/github/skippyall/minions/gui/CommandsGui.java

@@ -0,0 +1,52 @@
+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.command.Command;
+import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.module.ModuleItem;
+import net.minecraft.screen.ScreenHandlerType;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+import java.util.List;
+
+public class CommandsGui {
+    public static void openServerModuleCommandGui(ServerPlayerEntity player, MinionFakePlayer minion) {
+        List<ModuleItem> modules = minion.getModuleInventory().getModuleItems();
+
+        SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_9X3, player, false);
+
+        gui.setTitle(Text.translatable("minions.gui.module_commands.title"));
+
+        for (int i = 0; i < modules.size(); i++) {
+            ModuleItem module = modules.get(i);
+            gui.setSlot(i, new GuiElementBuilder()
+                    .setItem(module.asItem())
+                    .setCallback(() -> openServerCommandGui(player, minion, module))
+            );
+        }
+
+        gui.open();
+    }
+
+    public static void openServerCommandGui(ServerPlayerEntity player, MinionFakePlayer minion, ModuleItem module) {
+        List<Command> commands = module.getCommands();
+
+        SimpleGui commandGui = new SimpleGui(ScreenHandlerType.GENERIC_9X3, player, false);
+
+        commandGui.setTitle(Text.translatable("minions.gui.commands.title", module.asItem().getName()));
+
+        for(int j = 0; j < commands.size(); j++) {
+            Command command = commands.get(j);
+            commandGui.setSlot(j, new GuiElementBuilder()
+                    .setItem(command.getItemRepresentation())
+                    .setName(command.getName())
+                    .addLoreLine(command.getDescription())
+                    .setCallback(() -> command.execute(player, minion))
+            );
+        }
+
+        commandGui.open();
+    }
+}

src/main/java/io/github/skippyall/minions/gui/Displayable.java

@@ -1,5 +0,0 @@
-package io.github.skippyall.minions.gui;
-
-public interface Displayable {
-    GuiDisplay getDisplay();
-}

src/main/java/io/github/skippyall/minions/gui/GuiDisplay.java

@@ -1,164 +0,0 @@
-package io.github.skippyall.minions.gui;
-
-import com.mojang.serialization.Codec;
-import io.github.skippyall.minions.registration.MinionRegistries;
-import io.github.skippyall.minions.util.TranslationUtil;
-import net.minecraft.ChatFormatting;
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.core.UUIDUtil;
-import net.minecraft.core.component.DataComponentPatch;
-import net.minecraft.core.component.DataComponentType;
-import net.minecraft.core.component.DataComponents;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.Identifier;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.ItemStackTemplate;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.item.Rarity;
-import net.minecraft.world.item.component.ResolvableProfile;
-import net.minecraft.world.item.component.TooltipDisplay;
-
-import java.util.LinkedHashSet;
-import java.util.UUID;
-
-public interface GuiDisplay {
-    Codec<GuiDisplay> CODEC = MinionRegistries.GUI_DISPLAY_TYPE.byNameCodec().dispatch(GuiDisplay::getCodec, codec -> codec.fieldOf("data"));
-    GuiDisplay DEFAULT_DISPLAY = new ItemBased(Items.BARRIER);
-
-    TooltipDisplay TOOLTIP_HIDE_ALL_COMPONENTS = createHideAllTooltip();
-
-    private static TooltipDisplay createHideAllTooltip() {
-        LinkedHashSet<DataComponentType<?>> set = new LinkedHashSet<>();
-        for(DataComponentType<?> type : BuiltInRegistries.DATA_COMPONENT_TYPE) {
-            if(type != DataComponents.LORE) {
-                set.add(type);
-            }
-        }
-        return new TooltipDisplay(false, set);
-    }
-
-    static GuiDisplay getGuiDisplay(Identifier id, RegistryAccess manager) {
-        return manager.lookup(MinionRegistries.GUI_DISPLAY).map(registry -> registry.getValue(id)).orElse(DEFAULT_DISPLAY);
-    }
-
-    static <T> GuiDisplay getGuiDisplayFor(Registry<T> registry, T element, RegistryAccess manager) {
-        Identifier elementId = registry.getKey(element);
-        if(elementId == null) {
-            return DEFAULT_DISPLAY;
-        }
-        Identifier displayId = elementId.withPrefix(registry.key().identifier().getPath() + "/");
-
-        return getGuiDisplay(displayId, manager);
-    }
-
-    static <T> ItemStack getDisplayStack(Registry<T> registry, T element, RegistryAccess manager) {
-        return getGuiDisplayFor(registry, element, manager).createItemStack();
-    }
-
-    static <T> ItemStack getDisplayStackWithName(Registry<T> registry, T element, RegistryAccess manager) {
-        ItemStack stack = getDisplayStack(registry, element, manager);
-        stack.set(DataComponents.CUSTOM_NAME, Component.translatable(TranslationUtil.getTranslationKey(element, registry)).withStyle(style -> style.withItalic(false).withColor(ChatFormatting.WHITE)));
-        return stack;
-    }
-
-    ItemStackTemplate createItemStackTemplate();
-
-    default ItemStack createItemStack() {
-        return createItemStackTemplate().create();
-    }
-
-    Codec<? extends GuiDisplay> getCodec();
-
-    class ModelBased implements GuiDisplay {
-        public static final Codec<ModelBased> CODEC = Identifier.CODEC.xmap(ModelBased::new, display -> display.model);
-
-        private final Identifier model;
-
-        public ModelBased(Identifier model) {
-            this.model = model;
-        }
-
-        @Override
-        public ItemStackTemplate createItemStackTemplate() {
-            return new ItemStackTemplate(Items.BARRIER, DataComponentPatch.builder()
-                    .set(DataComponents.ITEM_MODEL, model)
-                    .build()
-            );
-        }
-
-        @Override
-        public Codec<? extends GuiDisplay> getCodec() {
-            return CODEC;
-        }
-    }
-
-    class ItemBased implements GuiDisplay {
-        public static final Codec<ItemBased> CODEC = BuiltInRegistries.ITEM.byNameCodec().xmap(ItemBased::new, display -> display.item);
-
-        private final Item item;
-
-        public ItemBased(Item item) {
-            this.item = item;
-        }
-
-        @Override
-        public ItemStackTemplate createItemStackTemplate() {
-            return new ItemStackTemplate(item, DataComponentPatch.builder()
-                    .set(DataComponents.TOOLTIP_DISPLAY, TOOLTIP_HIDE_ALL_COMPONENTS)
-                    .set(DataComponents.RARITY, Rarity.COMMON)
-                    .build());
-        }
-
-        @Override
-        public Codec<? extends GuiDisplay> getCodec() {
-            return CODEC;
-        }
-    }
-
-    class HeadBased implements GuiDisplay {
-        public static final Codec<HeadBased> CODEC = UUIDUtil.AUTHLIB_CODEC.xmap(HeadBased::new, display -> display.uuid);
-
-        private final UUID uuid;
-
-        public HeadBased(UUID uuid) {
-            this.uuid = uuid;
-        }
-
-        @Override
-        public ItemStackTemplate createItemStackTemplate() {
-            return new ItemStackTemplate(Items.PLAYER_HEAD, DataComponentPatch.builder()
-                    .set(DataComponents.PROFILE, ResolvableProfile.createUnresolved(uuid))
-                    .set(DataComponents.TOOLTIP_DISPLAY, TOOLTIP_HIDE_ALL_COMPONENTS)
-                    .build()
-            );
-        }
-
-        @Override
-        public Codec<? extends GuiDisplay> getCodec() {
-            return CODEC;
-        }
-    }
-
-    class StackBased implements GuiDisplay {
-        public static final Codec<StackBased> CODEC = ItemStackTemplate.CODEC.xmap(StackBased::new, StackBased::createItemStackTemplate);
-
-        private final ItemStackTemplate template;
-
-        public StackBased(ItemStackTemplate template) {
-            this.template = template;
-        }
-
-        @Override
-        public ItemStackTemplate createItemStackTemplate() {
-            return template;
-        }
-
-        @Override
-        public Codec<? extends GuiDisplay> getCodec() {
-            return CODEC;
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/gui/MinionGui.java

@@ -0,0 +1,72 @@
+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.fakeplayer.MinionFakePlayer;
+import net.minecraft.item.Items;
+import net.minecraft.screen.GenericContainerScreenHandler;
+import net.minecraft.screen.ScreenHandlerType;
+import net.minecraft.screen.SimpleNamedScreenHandlerFactory;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+public class MinionGui {
+    public static void openInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
+        openServerSideInventory(player, minion);
+    }
+
+    public static void openServerSideInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
+        SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, player, false);
+        gui.setTitle(minion.getName());
+
+        gui.setSlot(1, new GuiElementBuilder()
+                .setItem(Items.COMMAND_BLOCK)
+                .setName(Text.translatable("minions.gui.main.commands"))
+                .setCallback((i, clickType, slotActionType) -> {
+                    openCommandsGui(player, minion);
+                })
+        );
+        if(minion.isProgrammable()) {
+            gui.setSlot(4, new GuiElementBuilder()
+                    .setItem(Items.REDSTONE)
+                    .setName(Text.translatable("minions.gui.main.programming"))
+                    .setCallback((i, clickType, slotActionType) -> {
+                        openProgrammingInventory(player, minion);
+                    })
+            );
+        }
+        gui.setSlot(3, new GuiElementBuilder()
+                .setItem(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE)
+                .setName(Text.translatable("minions.gui.main.modules"))
+                .setCallback((i, clickType, slotActionType) -> {
+                    ModuleInventory.openModuleInventory(player, minion);
+                })
+        );
+        gui.setSlot(5, new GuiElementBuilder()
+                .setItem(Items.CHEST)
+                .setName(Text.translatable("minions.gui.main.inventory"))
+                .setCallback((i, clickType, slotActionType) -> {
+                    openMinionInventory(player, minion);
+                })
+        );
+        gui.open();
+    }
+
+    public static void openCommandsGui(ServerPlayerEntity player, MinionFakePlayer minion) {
+        CommandsGui.openServerModuleCommandGui(player, minion);
+    }
+
+    public static void openProgrammingInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
+
+    }
+
+    public static void openMinionInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
+        SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_9X5, player, false);
+        gui.setTitle(Text.translatable("minions.gui.inventory.title", minion.getName()));
+        for (int i = 0; i < minion.getInventory().size(); i++) {
+            gui.setSlotRedirect(i, new Slot(minion.getInventory(), i, 0, 0));
+        }
+        gui.open();
+    }
+}

src/main/java/io/github/skippyall/minions/gui/MinionLookGui.kt

@@ -1,131 +0,0 @@
-package io.github.skippyall.minions.gui
-
-import com.mojang.authlib.GameProfile
-import eu.pb4.sgui.api.elements.GuiElementBuilder
-import eu.pb4.sgui.api.gui.SimpleGui
-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 kotlinx.coroutines.future.await
-import kotlinx.coroutines.launch
-import net.fabricmc.fabric.api.entity.FakePlayer
-import net.minecraft.core.component.DataComponents
-import net.minecraft.network.chat.Component
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.inventory.MenuType
-import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.Items
-import net.minecraft.world.item.component.ResolvableProfile
-import java.util.*
-
-class MinionLookGui(
-    viewer: ServerPlayer,
-    private val minionItem: ItemStack
-) : MinionsGui(viewer) {
-    private lateinit var gui: SimpleGui
-
-    private var currentSkinProvider: SkinProvider = SkinProviders.NAME
-
-    private val data: MinionData
-        get() = MinionItem.getDataOrDefault(viewer.level().server, minionItem)
-
-    init {
-        open()
-    }
-
-    override fun open() {
-        gui = object : SimpleGui(MenuType.GENERIC_9x3, viewer, false) {
-            override fun onPlayerClose(success: Boolean) {
-                onBackingClosed()
-            }
-        }
-        update()
-        gui.open()
-    }
-
-    override fun closeBacking() {
-        gui.close()
-    }
-
-    fun update() {
-        updateName()
-        updateSkin()
-        updateSkinProvider()
-    }
-
-    private fun updateName() {
-        gui.setSlot(
-            10, GuiElementBuilder()
-                .setItem(Items.OAK_SIGN)
-                .setName(Component.literal(this.data.name))
-                .setCallback(this::openRenameGui)
-        )
-    }
-
-    private fun updateSkin() {
-        val builder = GuiElementBuilder()
-            .setItem(Items.PLAYER_HEAD)
-            .setCallback(this::openSkinGui)
-
-        if (MinionItem.getData(viewer.level().server, minionItem)?.skin?.isPresent ?: false) {
-            builder.setComponent(
-                DataComponents.PROFILE,
-                ResolvableProfile.createResolved(GameProfile(FakePlayer.DEFAULT_UUID, "", this.data.skin.get()))
-            )
-        }
-
-        gui.setSlot(16, builder)
-    }
-
-    private fun updateSkinProvider() {
-        gui.setSlot(
-            25, GuiElementBuilder()
-                .setItem(Items.GREEN_STAINED_GLASS_PANE)
-                .setComponent(DataComponents.CUSTOM_NAME, currentSkinProvider.getDisplayName())
-                .setCallback(Runnable { this.cycleSkinProvider() })
-        )
-    }
-
-    fun openSkinGui() {
-        scope.launch {
-            val profile = currentSkinProvider.openSkinMenu(this@MinionLookGui).await()
-            val skin = profile?.resolveProfile(viewer.level().server.services().profileResolver())?.await()
-
-            data.skin = Optional.ofNullable(skin?.properties())
-
-            updateSkin()
-        }
-    }
-
-    private fun cycleSkinProvider() {
-        var currentId = MinionRegistries.SKIN_PROVIDERS.getId(currentSkinProvider)
-        currentId++
-        if (MinionRegistries.SKIN_PROVIDERS.size() == currentId) {
-            currentId = 0
-        }
-
-        currentSkinProvider = MinionRegistries.SKIN_PROVIDERS.byId(currentId)!!
-        updateSkinProvider()
-    }
-
-    fun openRenameGui() {
-        scope.launch {
-            val newName = TextInput.input(
-                this@MinionLookGui,
-                Component.translatable("minions.gui.look.rename.title"),
-                "Minion",
-            ) { name ->
-                MinionProfileUtils.checkMinionNameWithoutPrefix(viewer.level().server, name)
-            }.await()
-
-            if(newName != null) {
-                data.name = newName
-                updateName()
-            }
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/gui/MinionsGui.kt

@@ -1,84 +0,0 @@
-package io.github.skippyall.minions.gui
-
-import eu.pb4.sgui.api.elements.GuiElementBuilder
-import kotlinx.coroutines.CompletableJob
-import kotlinx.coroutines.CoroutineName
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
-import net.minecraft.network.chat.Component
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.item.Items
-
-abstract class MinionsGui {
-    protected val parent: MinionsGui?
-    @JvmField
-    val viewer: ServerPlayer
-    protected var child: MinionsGui? = null
-    private var open = true
-
-    private val job: CompletableJob
-    val scope: CoroutineScope
-
-    constructor(parent: MinionsGui) {
-        this.viewer = parent.viewer
-        this.parent = parent
-        parent.child = this
-        job = Job(parent.job)
-        scope = CoroutineScope(Dispatchers.Unconfined.plus(CoroutineName("MinionsGui")).plus(job))
-    }
-
-    constructor(viewer: ServerPlayer) {
-        this.viewer = viewer
-        this.parent = null
-        job = Job(null)
-        scope = CoroutineScope(Dispatchers.Unconfined.plus(CoroutineName("MinionsGui")).plus(job))
-    }
-
-    protected abstract fun open()
-
-    protected open fun reopen() {
-        open()
-    }
-
-    fun onBackingClosed() {
-        if (child != null && child!!.open) {
-            return
-        }
-
-        close(true)
-    }
-
-    @JvmOverloads
-    fun close(alreadyClosed: Boolean = false) {
-        if (open) {
-            scope.cancel(null)
-            open = false
-            if (child != null) {
-                child!!.close(alreadyClosed)
-            } else if (!alreadyClosed) {
-                closeBacking()
-            }
-        }
-    }
-
-    fun goBack() {
-        if (parent != null) {
-            open = false
-            parent.child = null
-            parent.reopen()
-            close(true)
-        } else {
-            close(false)
-        }
-    }
-
-    fun backButton(): GuiElementBuilder? {
-        return GuiElementBuilder(Items.MANGROVE_DOOR)
-            .setName(Component.translatable("gui.back"))
-            .setCallback(Runnable { this.goBack() })
-    }
-
-    protected abstract fun closeBacking()
-}

src/main/java/io/github/skippyall/minions/gui/ModuleInventory.java

@@ -0,0 +1,84 @@
+package io.github.skippyall.minions.gui;
+
+import io.github.skippyall.minions.command.Command;
+import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.module.ModuleItem;
+import io.github.skippyall.minions.program.block.CodeBlock;
+import net.minecraft.inventory.Inventories;
+import net.minecraft.inventory.SimpleInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.screen.SimpleNamedScreenHandlerFactory;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ModuleInventory extends SimpleInventory {
+    public ModuleInventory() {
+        super(27);
+    }
+
+    public static void openModuleInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
+        player.openHandledScreen(new SimpleNamedScreenHandlerFactory((syncId, playerInventory, player2) -> new ModuleInventoryScreenHandler(syncId, playerInventory, minion.getModuleInventory()), Text.translatable("minions.gui.modules.title", minion.getName())));
+    }
+
+    @Override
+    public int getMaxCountPerStack() {
+        return 1;
+    }
+
+    @Override
+    public boolean isValid(int slot, ItemStack stack) {
+        return (stack.getCount() <= getMaxCountPerStack()) && stack.getItem() instanceof ModuleItem;
+    }
+
+    public void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup lookup) {
+        Inventories.readNbt(nbt, heldStacks, lookup);
+    }
+
+    public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup lookup) {
+        return Inventories.writeNbt(nbt, heldStacks, lookup);
+    }
+
+    public boolean hasModule(ModuleItem module) {
+        for(ItemStack stack : heldStacks) {
+            if(stack.getItem() instanceof ModuleItem module2 && module2 == module) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public List<ModuleItem> getModuleItems() {
+        ArrayList<ModuleItem> modules = new ArrayList<>();
+        for(ItemStack stack : heldStacks) {
+            if(stack.getItem() instanceof ModuleItem module) {
+                modules.add(module);
+            }
+        }
+        return modules;
+    }
+
+    public List<Command> getAllCommands() {
+        ArrayList<Command> commands = new ArrayList<>();
+        for(ItemStack stack : heldStacks) {
+            if(stack.getItem() instanceof ModuleItem module) {
+                commands.addAll(module.getCommands());
+            }
+        }
+        return commands;
+    }
+
+    public List<CodeBlock<?,?>> getAllCodeBlocks() {
+        ArrayList<CodeBlock<?,?>> commands = new ArrayList<>();
+        for(ItemStack stack : heldStacks) {
+            if(stack.getItem() instanceof ModuleItem module) {
+                commands.addAll(module.getCodeBlocks());
+            }
+        }
+        return commands;
+    }
+}

src/main/java/io/github/skippyall/minions/gui/ModuleInventoryScreenHandler.java

@@ -0,0 +1,80 @@
+package io.github.skippyall.minions.gui;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.screen.GenericContainerScreenHandler;
+import net.minecraft.screen.ScreenHandler;
+import net.minecraft.screen.ScreenHandlerType;
+import net.minecraft.screen.slot.Slot;
+
+public class ModuleInventoryScreenHandler extends ScreenHandler {
+    private final int rows = 3;
+    private final ModuleInventory inventory;
+    public ModuleInventoryScreenHandler(int syncId, ModuleInventory inventory) {
+        super(ScreenHandlerType.GENERIC_9X3, syncId);
+        this.inventory = inventory;
+    }
+
+    public ModuleInventoryScreenHandler(int syncId, PlayerInventory playerInventory, ModuleInventory inventory) {
+        super(ScreenHandlerType.GENERIC_9X3, syncId);
+        int k;
+        int j;
+        GenericContainerScreenHandler.checkSize(inventory, 3 * 9);
+        this.inventory = inventory;
+        inventory.onOpen(playerInventory.player);
+        int i = (rows - 4) * 18;
+        for (j = 0; j < rows; ++j) {
+            for (k = 0; k < 9; ++k) {
+                this.addSlot(new Slot(inventory, k + j * 9, 8 + k * 18, 18 + j * 18) {
+                    @Override
+                    public boolean canInsert(ItemStack stack) {
+                        return super.canInsert(stack) && inventory.isValid(getIndex(), stack);
+                    }
+                });
+            }
+        }
+        for (j = 0; j < 3; ++j) {
+            for (k = 0; k < 9; ++k) {
+                this.addSlot(new Slot(playerInventory, k + j * 9 + 9, 8 + k * 18, 103 + j * 18 + i));
+            }
+        }
+        for (j = 0; j < 9; ++j) {
+            this.addSlot(new Slot(playerInventory, j, 8 + j * 18, 161 + i));
+        }
+    }
+
+    @Override
+    public boolean canUse(PlayerEntity player) {
+        return this.inventory.canPlayerUse(player);
+    }
+
+    @Override
+    public ItemStack quickMove(PlayerEntity player, int slot) {
+        ItemStack itemStack = ItemStack.EMPTY;
+        Slot slot2 = this.slots.get(slot);
+        if (slot2 != null && slot2.hasStack()) {
+            ItemStack itemStack2 = slot2.getStack();
+            itemStack = itemStack2.copy();
+            if (slot < this.rows * 9 ? !this.insertItem(itemStack2, this.rows * 9, this.slots.size(), true) : !this.insertItem(itemStack2, 0, this.rows * 9, false)) {
+                return ItemStack.EMPTY;
+            }
+            if (itemStack2.isEmpty()) {
+                slot2.setStack(ItemStack.EMPTY);
+            } else {
+                slot2.markDirty();
+            }
+        }
+        return itemStack;
+    }
+
+    @Override
+    public void onClosed(PlayerEntity player) {
+        super.onClosed(player);
+        this.inventory.onClose(player);
+    }
+
+    public ModuleInventory getInventory() {
+        return inventory;
+    }
+}

src/main/java/io/github/skippyall/minions/gui/PaginatedList.java

@@ -1,110 +0,0 @@
-package io.github.skippyall.minions.gui;
-
-import eu.pb4.sgui.api.elements.GuiElementBuilder;
-import eu.pb4.sgui.api.gui.SimpleGui;
-import net.minecraft.core.IdMap;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.item.Items;
-import org.jspecify.annotations.Nullable;
-
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
-public class PaginatedList extends MinionsGui {
-    private int page = 0;
-    private SimpleGui gui;
-    private final Component title;
-    private final int size;
-    private final BiFunction<Integer, PaginatedList, GuiElementBuilder> display;
-    private @Nullable Runnable onClose = null;
-
-    public PaginatedList(MinionsGui parent, Component title, int size, BiFunction<Integer, PaginatedList, GuiElementBuilder> display) {
-        super(parent);
-        this.title = title;
-        this.size = size;
-        this.display = display;
-        open();
-    }
-
-    public PaginatedList(MinionsGui parent, Component title, int size, BiFunction<Integer, PaginatedList, GuiElementBuilder> display, Runnable onClose) {
-        this(parent, title, size, display);
-        this.onClose = onClose;
-    }
-
-    @Override
-    protected void open() {
-        gui = new SimpleGui(MenuType.GENERIC_9x6, viewer, false) {
-            @Override
-            public void onPlayerClose(boolean success) {
-                onBackingClosed();
-                if(onClose != null) {
-                    onClose.run();
-                }
-            }
-        };
-        gui.setTitle(title);
-
-        gui.setSlot(8, backButton());
-        addItems();
-        gui.open();
-    }
-
-    @Override
-    protected void closeBacking() {
-        gui.close();
-    }
-
-    public static <T> void createList(MinionsGui parent, Component title, List<T> list, BiFunction<T, PaginatedList, GuiElementBuilder> display) {
-        new PaginatedList(parent, title, list.size(), (i, gui) -> display.apply(list.get(i), gui));
-    }
-
-    public static <T> void createList(MinionsGui parent, Component title, IdMap<T> list, BiFunction<T, PaginatedList, GuiElementBuilder> display) {
-        new PaginatedList(parent, title, list.size(), (i, gui) -> display.apply(list.byId(i), gui));
-    }
-
-    public static <T> CompletableFuture<T> createListFuture(MinionsGui parent, Component title, List<T> list, Function<T, GuiElementBuilder> display) {
-        CompletableFuture<T> future = new CompletableFuture<>();
-        new PaginatedList(parent, title, list.size(), (i, me) -> display.apply(list.get(i))
-                .setCallback(() -> {
-                    future.complete(list.get(i));
-                    me.goBack();
-                })
-        );
-        return future;
-    }
-
-    private void addItems() {
-        int slot = 9;
-        for(int i = 36 * page; i < Math.min(36 * (page + 1), size); i++) {
-            gui.setSlot(slot, display.apply(i, this));
-            slot++;
-        }
-
-        if(page > 0) {
-            gui.setSlot(48, new GuiElementBuilder(Items.SPECTRAL_ARROW)
-                    .setItemName(Component.translatable("book.page_button.previous"))
-                    .setCallback(() -> {
-                        page--;
-                        addItems();
-                    })
-            );
-        } else {
-            gui.clearSlot(48);
-        }
-
-        if(27 * (page + 1) < size) {
-            gui.setSlot(50, new GuiElementBuilder(Items.ARROW)
-                    .setItemName(Component.translatable("book.page_button.next"))
-                    .setCallback(() -> {
-                        page++;
-                        addItems();
-                    })
-            );
-        } else {
-            gui.clearSlot(50);
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/gui/input/BooleanInput.kt

@@ -1,55 +0,0 @@
-package io.github.skippyall.minions.gui.input
-
-import eu.pb4.sgui.api.elements.GuiElementBuilder
-import eu.pb4.sgui.api.gui.SimpleGui
-import io.github.skippyall.minions.gui.MinionsGui
-import io.github.skippyall.minions.gui.minion.SimpleMinionsGui
-import net.minecraft.network.chat.Component
-import net.minecraft.world.inventory.MenuType
-import net.minecraft.world.item.Items
-import java.util.concurrent.CompletableFuture
-
-object BooleanInput {
-    @JvmStatic
-    @JvmOverloads
-    fun confirm(
-        parent: MinionsGui,
-        title: Component,
-        falseText: Component = Component.translatable("minions.gui.abort"),
-        trueText: Component = Component.translatable("minions.gui.confirm")
-    ): CompletableFuture<Boolean> {
-        val future = CompletableFuture<Boolean>()
-
-        SimpleMinionsGui(parent) { onClose: Runnable, me: SimpleMinionsGui ->
-            val gui: SimpleGui = object : SimpleGui(MenuType.GENERIC_3x3, parent.viewer, false) {
-                override fun onPlayerClose(success: Boolean) {
-                    future.complete(false)
-                    onClose.run()
-                }
-            }
-            gui.setTitle(title)
-
-            gui.setSlot(
-                3, GuiElementBuilder(Items.REDSTONE_BLOCK)
-                    .setName(falseText)
-                    .setCallback(Runnable {
-                        future.complete(false)
-                        me.goBack()
-                    })
-            )
-
-            gui.setSlot(
-                5, GuiElementBuilder(Items.EMERALD_BLOCK)
-                    .setName(trueText)
-                    .setCallback(Runnable {
-                        future.complete(true)
-                        me.goBack()
-                    })
-            )
-
-            gui.open()
-            gui
-        }
-        return future
-    }
-}

src/main/java/io/github/skippyall/minions/gui/input/Result.java

@@ -1,183 +0,0 @@
-package io.github.skippyall.minions.gui.input;
-
-import org.jspecify.annotations.Nullable;
-
-import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-public sealed interface Result<T, E> permits Result.Success, Result.Error {
-    static <T> Result<T, String> wrap(UnsafeOperation<T> toWrap) {
-        return wrapCustomError(toWrap, Exception::getMessage);
-    }
-
-    static <T, E> Result<T, E> wrapCustomError(UnsafeOperation<T> toWrap, E error) {
-        return wrapCustomError(toWrap,  e -> error);
-    }
-
-    static <T, E> Result<T, E> wrapCustomError(UnsafeOperation<T> toWrap, Function<Exception, E> errorTransformer) {
-        try {
-            return new Result.Success<>(toWrap.run());
-        } catch (Exception e) {
-            return new Result.Error<>(errorTransformer.apply(e));
-        }
-    }
-
-    static <T, E> Result<T, E> ofNullable(@Nullable T value, E error) {
-        if(value != null) {
-            return new Success<T, E>(value);
-        } else {
-            return new Error<>(error);
-        }
-    }
-
-    static <T, E> Result<T, E> ofNullable(@Nullable T value, Supplier<E> error) {
-        if(value != null) {
-            return new Success<T, E>(value);
-        } else {
-            return new Error<>(error.get());
-        }
-    }
-
-    boolean isSuccess();
-
-    T getOrDefault(T defaultValue);
-
-    T getOrThrow();
-
-    E getErrorOrThrow();
-
-    Optional<T> getOptional();
-
-    Optional<E> getOptionalError();
-
-    void ifSuccess(Consumer<T> handler);
-
-    void ifError(Consumer<Error<T, E>> handler);
-
-    <U> Result<U,E> map(Function<T, U> mapper);
-
-    <U> Result<U,E> flatMap(Function<T, Result<U, E>> mapper);
-
-    <U> Result<T,U> mapError(Function<E, U> mapper);
-
-    record Success<T, E>(T result) implements Result<T, E> {
-        @Override
-        public boolean isSuccess() {
-            return true;
-        }
-
-        @Override
-        public T getOrDefault(T defaultValue) {
-            return result;
-        }
-
-        @Override
-        public Optional<E> getOptionalError() {
-            return Optional.empty();
-        }
-
-        @Override
-        public T getOrThrow() {
-            return result;
-        }
-
-        @Override
-        public E getErrorOrThrow() {
-            throw new RuntimeException("Result was not an Error");
-        }
-
-        @Override
-        public Optional<T> getOptional() {
-            return Optional.ofNullable(result);
-        }
-
-        @Override
-        public void ifSuccess(Consumer<T> handler) {
-            handler.accept(result);
-        }
-
-        @Override
-        public void ifError(Consumer<Error<T, E>> handler) {
-
-        }
-
-        @Override
-        public <U> Result<U, E> map(Function<T, U> mapper) {
-            return new Success<>(mapper.apply(result));
-        }
-
-        @Override
-        public <U> Result<U, E> flatMap(Function<T, Result<U, E>> mapper) {
-            return mapper.apply(result);
-        }
-
-        @Override
-        public <U> Result<T, U> mapError(Function<E, U> mapper) {
-            return new Success<>(result);
-        }
-    }
-
-    record Error<T, E>(E message) implements Result<T, E> {
-        @Override
-        public boolean isSuccess() {
-            return false;
-        }
-
-        @Override
-        public T getOrDefault(
-                T defaultValue) {
-            return defaultValue;
-        }
-
-        @Override
-        public T getOrThrow() {
-            throw new RuntimeException("Result was an error: " + message);
-        }
-
-        @Override
-        public E getErrorOrThrow() {
-            return message;
-        }
-
-        @Override
-        public Optional<T> getOptional() {
-            return Optional.empty();
-        }
-
-        @Override
-        public Optional<E> getOptionalError() {
-            return Optional.ofNullable(message);
-        }
-
-        @Override
-        public void ifSuccess(Consumer<T> handler) {
-
-        }
-
-        @Override
-        public void ifError(Consumer<Error<T, E>> handler) {
-            handler.accept(this);
-        }
-
-        @Override
-        public <U> Result<U, E> map(Function<T, U> mapper) {
-            return new Error<>(message);
-        }
-
-        @Override
-        public <U> Result<U, E> flatMap(Function<T, Result<U, E>> mapper) {
-            return new Error<>(message);
-        }
-
-        @Override
-        public <U> Result<T, U> mapError(Function<E, U> mapper) {
-            return new Error<>(mapper.apply(message));
-        }
-    }
-
-    interface UnsafeOperation<T> {
-        T run() throws Exception;
-    }
-}

src/main/java/io/github/skippyall/minions/gui/input/TextInput.kt

@@ -1,149 +0,0 @@
-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 kotlinx.coroutines.launch
-import net.minecraft.network.chat.Component
-import net.minecraft.world.inventory.AnvilMenu
-import net.minecraft.world.item.Items
-import java.util.concurrent.CompletableFuture
-
-class TextInput<T : Any>(
-    parent: MinionsGui,
-    val title: Component,
-    val defaultValue: String,
-    val parser: suspend (String) -> Result<T, Component>
-) : MinionsGui(parent) {
-    private val valid: GuiElementBuilder = GuiElementBuilder()
-        .setItem(Items.EMERALD_BLOCK)
-        .setName(Component.literal("OK"))
-        .setCallback(Runnable { this.onConfirm() })
-
-    private val invalid: GuiElementBuilder = GuiElementBuilder()
-        .setItem(Items.REDSTONE_BLOCK)
-
-    private lateinit var gui: AnvilInputGui
-
-    private var result: Result<T, Component>? = null
-    val future = CompletableFuture<T?>()
-
-    init {
-        open()
-    }
-
-    override fun open() {
-        gui = object : AnvilInputGui(viewer, false) {
-            override fun onInput(input: String) {
-                updateConfirmButton(input)
-            }
-
-            override fun onPlayerClose(success: Boolean) {
-                onBackingClosed()
-                if (!future.isDone) {
-                    future.complete(null)
-                }
-            }
-        }
-
-        gui.setTitle(title)
-        gui.setDefaultInputValue(defaultValue)
-        updateConfirmButton(defaultValue)
-        gui.open()
-    }
-
-    override fun closeBacking() {
-        gui.close()
-    }
-
-    fun updateConfirmButton(input: String) {
-        scope.launch {
-            val result = parser(input)
-            this@TextInput.result = result
-            if (result.isSuccess()) {
-                gui.setSlot(AnvilMenu.RESULT_SLOT, valid)
-            } else {
-                val text = result.getErrorOrThrow()
-                gui.setSlot(AnvilMenu.RESULT_SLOT, invalid.setName(text))
-            }
-        }
-    }
-
-    fun onConfirm() {
-        result?.ifSuccess { success: T ->
-            future.complete(success)
-            goBack()
-        }
-    }
-
-    companion object {
-        @JvmStatic
-        fun <T : Any>input(
-            gui: MinionsGui,
-            title: Component,
-            defaultValue: String,
-            parser: suspend (String) -> Result<T, Component>,
-        ): CompletableFuture<T?> {
-            val input = TextInput(
-                parent = gui,
-                title = title,
-                defaultValue = defaultValue,
-                parser = parser,
-            )
-
-            return input.future
-        }
-
-        @JvmStatic
-        fun inputString(
-            gui: MinionsGui,
-            title: Component,
-            defaultValue: String,
-        ): CompletableFuture<String?> {
-            return input<String>(
-                gui = gui,
-                title = title,
-                defaultValue = defaultValue,
-                parser = { result -> Result.Success(result) },
-            )
-        }
-
-        @JvmStatic
-        fun inputLong(
-            gui: MinionsGui,
-            title: Component,
-            defaultValue: Long,
-        ): CompletableFuture<Long?> {
-            return input<Long>(
-                gui = gui,
-                title = title,
-                defaultValue = defaultValue.toString(),
-                parser = { string ->
-                    Result.wrapCustomError<Long, Component>(
-                        { string.toLong() },
-                        Component.translatable("value_type.minions.long.not_long")
-                    )
-                },
-            )
-        }
-
-        @JvmStatic
-        fun inputDouble(
-            gui: MinionsGui,
-            title: Component,
-            defaultValue: Double,
-        ): CompletableFuture<Double?> {
-            return input<Double>(
-                gui = gui,
-                title = title,
-                defaultValue = defaultValue.toString(),
-                parser = { string ->
-                    Result.wrapCustomError<Double, Component>(
-                        { string.toDouble() },
-                        Component.translatable("value_type.minions.long.not_long")
-                    )
-                },
-            )
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/gui/input/package-info.java

@@ -1,4 +0,0 @@
-@NullMarked
-package io.github.skippyall.minions.gui.input;
-
-import org.jspecify.annotations.NullMarked;

src/main/java/io/github/skippyall/minions/gui/instruction/ArgumentGui.java

@@ -1,154 +0,0 @@
-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.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.network.chat.Component;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import org.jspecify.annotations.Nullable;
-
-public class ArgumentGui extends MinionsGui {
-    private final GuiContext.ValueSupplier context;
-    private final ConfiguredInstruction<MinionRuntime> instruction;
-    private final Parameter<?> parameter;
-
-    private SimpleGui gui;
-
-    private @Nullable ValueSupplierType<MinionRuntime> argumentType;
-    private ValueSupplierList. @Nullable ValueSupplierEntry<?, MinionRuntime> entry;
-
-    public ArgumentGui(MinionsGui parent, GuiContext.ValueSupplier context) {
-        super(parent);
-        instruction = context.getInstruction();
-        this.parameter = context.getParameter();
-        this.context = context;
-
-        this.entry = instruction.getArguments().getEntry(parameter);
-        this.argumentType = entry.getSupplier().getType();
-        open();
-    }
-
-    public String getInstructionName() {
-        return context.getName();
-    }
-
-    public @Nullable ValueSupplier<?, MinionRuntime> getArgument() {
-        if(entry != null) {
-            return entry.getSupplier();
-        }
-        return null;
-    }
-
-    @Override
-    protected void open() {
-        gui = new SimpleGui(MenuType.GENERIC_3x3, viewer, false) {
-            @Override
-            public void onPlayerClose(boolean success) {
-                onBackingClosed();
-            }
-        };
-        gui.setTitle(Component.translatable(
-                "minions.gui.instruction.argument.title",
-                parameter.name(),
-                Component.translatable(TranslationUtil.getTranslationKey(parameter.type(), MinionRegistries.VALUE_TYPES))
-        ));
-
-        gui.setSlot(2, backButton());
-
-        updateTypeConfiguration();
-        updateArgumentConfiguration();
-        updateConverterConfiguration();
-        gui.open();
-    }
-
-    private void updateTypeConfiguration() {
-        ItemStack displayStack;
-        if(argumentType != null) {
-            displayStack = GuiDisplay.getDisplayStack(MinionRegistries.VALUE_SUPPLIER_TYPES, argumentType, viewer.registryAccess());
-        } else {
-            displayStack = new ItemStack(Items.BARRIER);
-        }
-
-        gui.setSlot(3, new GuiElementBuilder(displayStack)
-                .setName(Component.translatable("minions.gui.instruction.argument.configure.type"))
-                .addLoreLine(Component.translatable(TranslationUtil.getTranslationKey(
-                        argumentType,
-                        MinionRegistries.VALUE_SUPPLIER_TYPES,
-                        "minions.gui.not_set"
-                )))
-                .setCallback(this::selectArgumentType)
-        );
-    }
-
-    private void updateArgumentConfiguration() {
-        if(argumentType != null) {
-            gui.setSlot(4, new GuiElementBuilder(Items.STRUCTURE_VOID)
-                    .setName(Component.translatable("minions.gui.instruction.argument.configure.data"))
-                    .addLoreLine(getArgument() != null ? getArgument().getDisplayText() : Component.translatable("minions.gui.not_set"))
-                    .setCallback(() -> argumentType.openConfiguration(this, parameter.type(), getArgument())
-                            .thenAccept(this::setArgument)
-                    )
-            );
-        }
-    }
-
-    private void updateConverterConfiguration() {
-        if(entry != null) {
-            gui.setSlot(5, new GuiElementBuilder(Items.CRAFTER)
-                    .setName(Component.translatable("minions.gui.instruction.converters"))
-                    .setCallback(this::configureConvertersMenu)
-            );
-        }
-    }
-
-    @Override
-    protected void closeBacking() {
-        gui.close();
-    }
-
-    public void setArgumentType(ValueSupplierType<MinionRuntime> type) {
-        this.argumentType = type;
-        if(entry != null && getArgument().getType() != argumentType) {
-            instruction.getArguments().removeEntry(parameter);
-            entry = null;
-        }
-        updateTypeConfiguration();
-    }
-
-    public void setArgument(ValueSupplier<?, MinionRuntime> argument) {
-        if(entry != null) {
-            entry.setSupplier(argument);
-        } else {
-            entry = instruction.getArguments().createEntry(parameter, argument);
-        }
-    }
-
-    public void selectArgumentType() {
-        PaginatedList.createList(this, Component.translatable("minions.gui.instruction.argument.configure.type.title"), MinionRegistries.VALUE_SUPPLIER_TYPES, (type, me) ->
-                new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_SUPPLIER_TYPES, type, viewer.registryAccess()))
-                        .setCallback(() -> {
-                            setArgumentType(type);
-                            me.goBack();
-                        })
-        );
-    }
-
-    public void configureConvertersMenu() {
-        if(entry != null) {
-            new ConverterListGui(this, entry.getConverters(), entry.getSupplier().getValueType(), entry.getParameter().type());
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/gui/instruction/ConfigureInstructionGui.java

@@ -1,172 +0,0 @@
-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.BooleanInput;
-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 net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.game.ClientboundSoundEntityPacket;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.item.Items;
-
-import java.util.List;
-
-public class ConfigureInstructionGui extends MinionsGui implements ConfiguredInstructionListener, MinionListener {
-    private String name;
-    private final ConfiguredInstruction<MinionRuntime> instruction;
-    private final MinionFakePlayer minion;
-
-    private final GuiContext.Instruction context;
-    
-    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();
-    }
-
-    @Override
-    protected void open() {
-        gui = new SimpleGui(MenuType.GENERIC_9x3, viewer, false) {
-            @Override
-            public void onPlayerClose(boolean success) {
-                onBackingClosed();
-            }
-        };
-        
-        gui.setTitle(Component.literal(name));
-
-        gui.setSlot(6, new GuiElementBuilder(Items.ANVIL)
-                .setName(Component.translatable("minions.gui.instruction.configure.rename"))
-                .setCallback(() -> InstructionGui.inputInstructionName(this, context, name).thenAccept(newName -> {
-                    if(newName != null) {
-                        minion.getInstructionManager().setInstructionName(name, newName);
-                    }
-                    reopen();
-                }))
-        );
-
-        gui.setSlot(7, new GuiElementBuilder(Items.LAVA_BUCKET)
-                .setName(Component.translatable("minions.gui.instruction.configure.delete"))
-                .setCallback(() -> BooleanInput.confirm(this, Component.translatable("minions.gui.instruction.configure.delete.confirm", name))
-                        .thenAccept((confirmed) -> {
-                            if(confirmed) {
-                                minion.getInstructionManager().removeInstruction(name);
-                                goBack();
-                            }
-                        }))
-        );
-
-        gui.setSlot(8, backButton());
-
-        updateSuppliers();
-
-        gui.setSlot(13, InstructionGui.createInstructionElement(instruction.getInstruction(), viewer.registryAccess()));
-
-        gui.setSlot(25, new GuiElementBuilder(Items.FEATHER)
-                .setName(Component.translatable("minions.gui.instruction.configure.copy"))
-                .addLoreLine(Component.translatable("minions.gui.instruction.configure.copy.description"))
-                .setCallback(() -> {
-                    viewer.getInventory().placeItemBackInInventory(ClipboardItem.createInstructionReference(minion, name), true);
-                    viewer.connection.send(new ClientboundSoundEntityPacket(SoundEvents.NOTE_BLOCK_CHIME, SoundSource.BLOCKS, viewer, 1, 1, 0));
-                })
-        );
-
-        updateLastError();
-        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) {
-        gui.setTitle(Component.literal(newName));
-        name = newName;
-        context.setName(newName);
-    }
-
-    @Override
-    public void onRun(ConfiguredInstruction<?> instruction) {
-        updateRunSlot();
-        updateLastError();
-    }
-
-    @Override
-    public void onStop(ConfiguredInstruction<?> instruction) {
-        updateRunSlot();
-    }
-
-    @Override
-    public void onSupplierChange(ConfiguredInstruction<?> instruction, Parameter<?> parameter) {
-        updateSuppliers();
-    }
-
-    private void updateRunSlot() {
-        List<Component> errors = instruction.preCheck();
-        if(errors.isEmpty()) {
-            if (!instruction.isRunning()) {
-                gui.setSlot(26, new GuiElementBuilder(Items.ARROW)
-                        .setName(Component.translatable("minions.gui.instruction.run"))
-                        .setCallback(() -> instruction.run(minion.getInstructionManager()))
-                );
-            } else {
-                gui.setSlot(26, new GuiElementBuilder(Items.BARRIER)
-                        .setName(Component.translatable("minions.gui.instruction.stop"))
-                        .setCallback(() -> instruction.stop(minion.getInstructionManager()))
-                );
-            }
-        } else {
-            GuiElementBuilder builder = new GuiElementBuilder(Items.RED_WOOL)
-                    .setName(Component.translatable("minions.gui.instruction.errors"));
-            for(Component error : errors) {
-                builder.addLoreLine(error);
-            }
-            gui.setSlot(26, builder);
-        }
-    }
-
-    private void updateLastError() {
-        List<Component> errors = instruction.getLastErrors();
-        if(!errors.isEmpty()) {
-            GuiElementBuilder builder = new GuiElementBuilder(Items.RED_WOOL)
-                    .setName(Component.translatable("minions.gui.instruction.last_errors"));
-            for(Component error : errors) {
-                builder.addLoreLine(error);
-            }
-            gui.setSlot(17, builder);
-        }
-    }
-
-    private void updateSuppliers() {
-        int slot = 12;
-        for(Parameter<?> parameter : instruction.getInstruction().getParameters().reversed()) {
-            gui.setSlot(slot, InstructionGui.createParameterElement(parameter, instruction.getArguments().getArgument(parameter), viewer.registryAccess())
-                    .setCallback(() -> new ArgumentGui(this, GuiContext.ValueSupplier.create(context, parameter)))
-            );
-            slot--;
-        }
-    }
-
-}

src/main/java/io/github/skippyall/minions/gui/instruction/ConverterGui.java

@@ -1,123 +0,0 @@
-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.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.value.ValueType;
-import io.github.skippyall.minions.registration.MinionRegistries;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.item.Items;
-import org.jspecify.annotations.Nullable;
-
-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);
-        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;
-
-        open();
-    }
-
-    @Override
-    protected void open() {
-        gui = new SimpleGui(MenuType.GENERIC_3x3, viewer, false) {
-            @Override
-            public void onPlayerClose(boolean success) {
-                onBackingClosed();
-            }
-        };
-
-        gui.setTitle(Component.translatable("minions.gui.instruction.converter.title"));
-
-        updateTypeDisplay();
-        updateConverterDisplay();
-        gui.setSlot(8, backButton());
-
-        gui.open();
-    }
-
-    private void updateTypeDisplay() {
-        gui.setSlot(3, new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, valueConverterType, viewer.registryAccess()))
-                .setCallback(this::configureType)
-        );
-    }
-
-    private void updateConverterDisplay() {
-        gui.setSlot(5, new GuiElementBuilder(Items.STRUCTURE_VOID)
-                .setName(Component.translatable("minions.gui.instruction.converter.title"))
-                .addLoreLine(converter == null ? Component.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,
-                Component.translatable("minions.gui.instruction.converter.type.title"),
-                MinionRegistries.VALUE_CONVERTER_TYPES,
-                (type, me) -> new GuiElementBuilder(
-                        GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, type, viewer.registryAccess())
-                ).setCallback(() -> {
-                    setType(type);
-                    me.goBack();
-                })
-        );
-    }
-
-    private void configureData() {
-        if(valueConverterType != null) {
-            valueConverterType.configure(this, from, to, converter)
-                    .thenAccept(this::setConverter);
-        }
-    }
-
-    public static GuiElementBuilder createConverterElement(ValueConverter<?,?> converter, RegistryAccess manager) {
-        GuiElementBuilder builder = new GuiElementBuilder(GuiDisplay.getDisplayStack(MinionRegistries.VALUE_CONVERTER_TYPES, converter.getType(), manager));
-        builder.addLoreLine(converter.getDisplayText());
-        return builder;
-    }
-}

src/main/java/io/github/skippyall/minions/gui/instruction/ConverterListGui.java

@@ -1,180 +0,0 @@
-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.network.chat.Component;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.item.Items;
-import org.jspecify.annotations.Nullable;
-
-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(MenuType.GENERIC_9x3, viewer, false) {
-            @Override
-            public void onPlayerClose(boolean success) {
-                onBackingClosed();
-            }
-        };
-
-        gui.setTitle(Component.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() + 1) {
-                        page++;
-                        updateConverters();
-                    }
-                })
-        );
-
-        gui.setSlot(26, backButton());
-
-        gui.open();
-    }
-
-    private ValueType<?> getInputTypeOfConverter(int converterIndex) {
-        if(converterIndex < converters.getConverters().size() && converterIndex >= 0) {
-            return converters.getConverters().get(converterIndex).getFrom();
-        } else if(converterIndex == converters.getConverters().size()) {
-            return outputType;
-        } else {
-            throw new IndexOutOfBoundsException("Can't get input type of converter " + converterIndex + ", list size " + converters.getConverters().size());
-        }
-    }
-
-    private ValueType<?> getOutputTypeOfConverter(int converterIndex) {
-        if(converterIndex < converters.getConverters().size() && converterIndex >= 0) {
-            return converters.getConverters().get(converterIndex).getTo();
-        } else if(converterIndex == -1) {
-            return inputType;
-        } else {
-            throw new IndexOutOfBoundsException("Can't get output type of converter " + converterIndex + ", list size " + converters.getConverters().size());
-        }
-    }
-
-    public void updateConverters() {
-        for(int slot = 0; slot < 18; slot++) {
-            gui.clearSlot(slot);
-        }
-
-        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
-            //The input element index is -1, the output element index is the list size
-            int converterIndex = page * 4 + i - 1;
-            int slot = 9 + 2 * i;
-
-            if(converterIndex == converters.getConverters().size()) {
-                gui.setSlot(slot, new GuiElementBuilder(Items.HOPPER));
-            } else {
-                ValueType<?> thisConverterOutput = getOutputTypeOfConverter(converterIndex);
-                ValueType<?> nextConverterInput = getInputTypeOfConverter(converterIndex + 1);
-
-                //What should be shown at the converter's slot
-                if (converterIndex == -1) {
-                    gui.setSlot(slot, new GuiElementBuilder(Items.DROPPER));
-                } else {
-                    ValueType<?> previousConverterOutput = getOutputTypeOfConverter(converterIndex - 1);
-
-                    ValueConverter<?, ?> converter = converters.getConverters().get(converterIndex);
-                    gui.setSlot(slot, createConverterDisplay(converter, previousConverterOutput, nextConverterInput, converterIndex));
-
-                    GuiElementBuilder warning = createConverterWarning(converter);
-                    if (warning != null) {
-                        gui.setSlot(slot - 8, warning);
-                    }
-                }
-
-                //show cast in the next slot
-                if (i != 4 && converterIndex != converters.getConverters().size()) {
-                    gui.setSlot(slot + 1, createCastDisplay(thisConverterOutput, nextConverterInput, converterIndex + 1));
-
-                    GuiElementBuilder warning = createCastWarning(thisConverterOutput, nextConverterInput);
-                    if (warning != null) {
-                        gui.setSlot(slot - 8, warning);
-                    }
-                }
-            }
-        }
-    }
-
-    private GuiElementBuilder createConverterDisplay(ValueConverter<?, ?> converter, ValueType<?> fromType, ValueType<?> toType, int converterIndex) {
-        return new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, converter.getType(), viewer.registryAccess()))
-                .addLoreLine(converter.getDisplayText())
-                .setCallback(() -> new ConverterGui(this, converter, fromType, toType, converters, false, converterIndex));
-    }
-
-    private GuiElementBuilder createCastDisplay(ValueType<?> fromType, ValueType<?> toType, int newConverterIndex) {
-        return new GuiElementBuilder(Items.MAGENTA_GLAZED_TERRACOTTA)
-                .setName(Component.translatable(
-                        "minions.gui.instruction.converters.cast",
-                        Component.translatable(TranslationUtil.getTranslationKey(fromType, MinionRegistries.VALUE_TYPES)),
-                        Component.translatable(TranslationUtil.getTranslationKey(toType, MinionRegistries.VALUE_TYPES))
-                ))
-                .setCallback(() -> new ConverterGui(this, null, fromType, toType, converters, true, newConverterIndex));
-    }
-
-    private @Nullable GuiElementBuilder createCastWarning(ValueType<?> fromType, ValueType<?> toType) {
-        Component warning = ConverterList.createCastWarning(fromType, toType);
-
-        if(warning != null) {
-            return new GuiElementBuilder(Items.RED_BANNER)
-                    .setName(Component.translatable("minions.generic.error"))
-                    .addLoreLine(warning);
-        } else {
-            return null;
-        }
-    }
-
-    private @Nullable GuiElementBuilder createConverterWarning(ValueConverter<?,?> converter) {
-        Component warning = ConverterList.createConverterWarning(converter);
-
-        if(warning != null) {
-            return new GuiElementBuilder(Items.RED_BANNER)
-                    .setName(Component.translatable("minions.generic.error"))
-                    .addLoreLine(warning);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    protected void closeBacking() {
-        gui.close();
-    }
-}

src/main/java/io/github/skippyall/minions/gui/instruction/InstructionGui.java

@@ -1,185 +0,0 @@
-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.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.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.core.RegistryAccess;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import org.jspecify.annotations.Nullable;
-
-import java.util.NoSuchElementException;
-import java.util.concurrent.CompletableFuture;
-
-public class InstructionGui {
-    public static void openInstructionMainMenu(MinionsGui parent, GuiContext.Minion context) {
-        new SimpleMinionsGui(parent, (onClose, me) -> {
-            ServerPlayer player = parent.viewer;
-
-            SimpleGui gui = new SimpleGui(MenuType.GENERIC_3x3, player, false) {
-                @Override
-                public void onPlayerClose(boolean success) {
-                    onClose.run();
-                }
-            };
-            gui.setTitle(Component.translatable("minions.gui.instruction.title"));
-
-            gui.setSlot(2, me.backButton());
-            gui.setSlot(3, new GuiElementBuilder()
-                    .setItem(Items.BOOK)
-                    .setName(Component.translatable("minions.gui.instruction.list"))
-                    .setCallback(() -> new InstructionListGui(me, context))
-            );
-            gui.setSlot(5, new GuiElementBuilder()
-                    .setItem(Items.WRITABLE_BOOK)
-                    .setName(Component.translatable("minions.gui.instruction.create"))
-                    .setCallback(() -> createNewInstruction(me, context))
-            );
-
-            gui.open();
-            return gui;
-        });
-    }
-
-    public static void createNewInstruction(MinionsGui parent, GuiContext.Minion context) {
-        MinionFakePlayer minion = context.getMinion();
-        ServerPlayer viewer = parent.viewer;
-        selectInstructionModuleMenu(parent, context).thenAccept(instructionType ->
-                inputInstructionName(parent, context, "Instruction").thenAccept(name -> {
-                    if (!minion.isRemoved() && !minion.hasDisconnected() && name != null) {
-                        ConfiguredInstruction<MinionRuntime> configuredInstruction = minion.getInstructionManager().createInstruction(name, instructionType);
-                        new ConfigureInstructionGui(parent, GuiContext.Instruction.create(context, configuredInstruction, name));
-                    }
-                })
-        );
-    }
-
-    public static CompletableFuture<@Nullable String> inputInstructionName(MinionsGui parent, GuiContext.Minion context, String defaultValue) {
-        return TextInput.input(parent, Component.translatable("minions.gui.instruction.enter_name"), defaultValue, (name, _) -> {
-            if (context.getMinion().getInstructionManager().hasInstruction(name)) {
-                return new Result.Error<>(Component.translatable("minions.gui.instruction.name_already_used"));
-            }
-            return new Result.Success<>(name);
-        });
-    }
-
-    public static boolean checkInstructionExists(String name, ConfiguredInstruction<?> instruction, MinionFakePlayer minion, ServerPlayer player) {
-        boolean stillExists = !minion.isRemoved() && !minion.hasDisconnected() && minion.getInstructionManager().getInstruction(name) == instruction;
-        if (!stillExists) {
-            player.closeContainer();
-            player.sendSystemMessage(Component.translatable("minions.gui.instruction.removed"));
-        }
-        return stillExists;
-    }
-
-    public static CompletableFuture<InstructionType<MinionRuntime>> selectInstructionModuleMenu(MinionsGui parent, GuiContext.Minion context) {
-        MinionFakePlayer minion = context.getMinion();
-        ServerPlayer viewer = parent.viewer;
-
-        if (minion.getModuleInventory().getModules().isEmpty()) {
-            viewer.sendSystemMessage(Component.translatable("minions.gui.instruction.no_modules"));
-            return CompletableFuture.failedFuture(new NoSuchElementException("No modules"));
-        }
-
-        CompletableFuture<InstructionType<MinionRuntime>> future = new CompletableFuture<>();
-
-        new SimpleMinionsGui(parent, (closeHandler, me) -> {
-            SimpleGui gui = new SimpleGui(MenuType.GENERIC_9x4, viewer, false) {
-                @Override
-                public void onPlayerClose(boolean success) {
-                    if (!future.isDone()) {
-                        future.cancel(false);
-                    }
-                    closeHandler.run();
-                }
-            };
-            gui.setTitle(Component.translatable("minions.gui.instruction.select_instruction"));
-
-            gui.setSlot(8, me.backButton());
-
-            for (int i = 0; i < minion.getModuleInventory().getContainerSize(); i++) {
-                ItemStack moduleItem = minion.getModuleInventory().getItem(i);
-                MinionModule module = moduleItem.get(MinionComponentTypes.MODULE);
-                if (module != null && !module.instructions().isEmpty()) {
-                    gui.setSlot(i + 9, new GuiElementBuilder(moduleItem)
-                            .setCallback(() -> selectInstructionMenu(parent, context, module)
-                                    .thenApply(future::complete)
-                            )
-                    );
-                }
-            }
-
-            gui.open();
-            return gui;
-        });
-        return future;
-    }
-
-    public static CompletableFuture<InstructionType<MinionRuntime>> selectInstructionMenu(MinionsGui parent, GuiContext.Minion context, MinionModule module) {
-        CompletableFuture<InstructionType<MinionRuntime>> future = new CompletableFuture<>();
-
-        new SimpleMinionsGui(parent, (closeHandler, me) -> {
-            SimpleGui gui = new SimpleGui(MenuType.GENERIC_9x4, parent.viewer, false) {
-                @Override
-                public void onPlayerClose(boolean success) {
-                    if (!future.isDone()) {
-                        future.cancel(false);
-                    }
-                    closeHandler.run();
-                }
-            };
-            gui.setTitle(Component.translatable("minions.gui.instruction.select_instruction"));
-
-            gui.setSlot(8, me.backButton());
-            int slot = 9;
-            for (InstructionType<MinionRuntime> instructionType : module.instructions()) {
-                gui.setSlot(slot, createInstructionElement(instructionType, parent.viewer.registryAccess())
-                        .setCallback(() -> future.complete(instructionType))
-                );
-                slot++;
-            }
-
-            gui.open();
-            return gui;
-        });
-        return future;
-    }
-
-    public static GuiElementBuilder createInstructionElement(@Nullable InstructionType<MinionRuntime> instructionType, RegistryAccess manager) {
-        GuiElementBuilder instructionBuilder;
-        if (instructionType != null) {
-            instructionBuilder = new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.INSTRUCTION_TYPES, instructionType, manager));
-        } else {
-            instructionBuilder = new GuiElementBuilder(Items.RED_WOOL)
-                    .setName(Component.translatable("minions.gui.instruction.no_instruction_set"));
-        }
-        return instructionBuilder;
-    }
-
-    public static GuiElementBuilder createParameterElement(Parameter<?> parameter, @Nullable ValueSupplier<?,?> valueSupplier, RegistryAccess manager) {
-        GuiElementBuilder builder = new GuiElementBuilder(GuiDisplay.getDisplayStack(MinionRegistries.VALUE_TYPES, parameter.type(), manager))
-                .setName(Component.translatable("minions.gui.instruction.parameter", parameter.name(), Component.translatable(TranslationUtil.getTranslationKey(parameter.type(), MinionRegistries.VALUE_TYPES))));
-        if(valueSupplier != null) {
-                builder.addLoreLine(Component.translatable("minions.gui.instruction.argument", valueSupplier.getDisplayText()));
-        }
-        return builder;
-    }
-}

src/main/java/io/github/skippyall/minions/gui/instruction/InstructionListGui.java

@@ -1,66 +0,0 @@
-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.network.chat.Component;
-import net.minecraft.world.inventory.MenuType;
-
-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(MenuType.GENERIC_9x4, viewer, false) {
-            @Override
-            public void onPlayerClose(boolean success) {
-                onBackingClosed();
-            }
-        };
-        gui.setTitle(Component.translatable("minions.gui.instruction.title"));
-
-        gui.setSlot(8, backButton());
-        resetInstructionList();
-        gui.open();
-    }
-
-    @Override
-    protected void closeBacking() {
-        minion.removeMinionListener(this);
-        gui.close();
-    }
-
-    private void resetInstructionList() {
-        int i = 9;
-        for (String instructionName : minion.getInstructionManager().getInstructionNames()) {
-            ConfiguredInstruction<MinionRuntime> instruction = minion.getInstructionManager().getInstruction(instructionName);
-            gui.setSlot(i, new GuiElementBuilder(GuiDisplay.getGuiDisplayFor(MinionRegistries.INSTRUCTION_TYPES, instruction.getInstruction(), viewer.registryAccess()).createItemStack())
-                    .setName(Component.literal(instructionName))
-                    .setCallback(() -> new ConfigureInstructionGui(this, GuiContext.Instruction.create(context, instruction, instructionName)))
-            );
-            i++;
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/gui/instruction/package-info.java

@@ -1,4 +0,0 @@
-@NullMarked
-package io.github.skippyall.minions.gui.instruction;
-
-import org.jspecify.annotations.NullMarked;

src/main/java/io/github/skippyall/minions/gui/minion/GuiContext.kt

@@ -1,66 +0,0 @@
-package io.github.skippyall.minions.gui.minion
-
-import io.github.skippyall.minions.gui.minion.GuiContextImpl.InstructionImpl
-import io.github.skippyall.minions.gui.minion.GuiContextImpl.MinionImpl
-import io.github.skippyall.minions.gui.minion.GuiContextImpl.ValueSupplierImpl
-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.level.ServerPlayer
-
-interface GuiContext {
-    val viewer: ServerPlayer
-
-    companion object {
-        @JvmStatic
-        fun create(viewer: ServerPlayer): GuiContext {
-            return GuiContextImpl(viewer)
-        }
-    }
-
-    interface Minion : GuiContext {
-        val minion: MinionFakePlayer
-
-        companion object {
-            @JvmStatic
-            fun create(context: GuiContext, minion: MinionFakePlayer): Minion {
-                return MinionImpl(
-                    if(context is MinionImpl) context.context else context,
-                    minion
-                )
-            }
-        }
-    }
-
-    interface Instruction : Minion {
-        val instruction: ConfiguredInstruction<MinionRuntime>
-
-        var name: String
-
-        companion object {
-            @JvmStatic
-            fun create(context: Minion, instruction: ConfiguredInstruction<MinionRuntime>, name: String): Instruction {
-                return InstructionImpl(
-                    if(context is InstructionImpl) context.context else context,
-                    instruction,
-                    name
-                )
-            }
-        }
-    }
-
-    interface ValueSupplier : Instruction {
-        val parameter: Parameter<*>
-
-        companion object {
-            @JvmStatic
-            fun create(context: Instruction, parameter: Parameter<*>): ValueSupplier {
-                return ValueSupplierImpl(
-                    if(context is ValueSupplierImpl) context.context else context,
-                    parameter
-                )
-            }
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/gui/minion/GuiContextImpl.kt

@@ -1,26 +0,0 @@
-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.level.ServerPlayer
-
-//Thank you kotlin
-class GuiContextImpl(override val viewer: ServerPlayer) : GuiContext {
-    class MinionImpl(
-        val context: GuiContext,
-        override val minion: MinionFakePlayer
-    ) : GuiContext by context, GuiContext.Minion
-
-    class InstructionImpl(
-        val context: GuiContext.Minion,
-        override val instruction: ConfiguredInstruction<MinionRuntime>,
-        override var name: String
-    ) : GuiContext.Minion by context, GuiContext.Instruction
-
-    class ValueSupplierImpl(
-        val context: GuiContext.Instruction,
-        override val parameter: Parameter<*>
-    ) : GuiContext.Instruction by context, GuiContext.ValueSupplier
-}

src/main/java/io/github/skippyall/minions/gui/minion/MinionGui.java

@@ -1,78 +0,0 @@
-package io.github.skippyall.minions.gui.minion;
-
-import eu.pb4.sgui.api.elements.GuiElementBuilder;
-import eu.pb4.sgui.api.gui.SimpleGui;
-import io.github.skippyall.minions.gui.MinionsGui;
-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.network.chat.Component;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.item.Items;
-
-public class MinionGui extends MinionsGui implements MinionListener {
-    private final MinionFakePlayer minion;
-    private SimpleGui gui;
-
-    public MinionGui(ServerPlayer viewer, MinionFakePlayer minion) {
-        super(viewer);
-        this.minion = minion;
-        minion.addMinionListener(this);
-        open();
-    }
-
-    public MinionFakePlayer getMinion() {
-        return minion;
-    }
-
-    @Override
-    protected void open() {
-        gui = new SimpleGui(MenuType.GENERIC_3x3, viewer, false) {
-            @Override
-            public void onPlayerClose(boolean success) {
-                onBackingClosed();
-            }
-        };
-
-        gui.setTitle(minion.getName());
-
-        gui.setSlot(1, new GuiElementBuilder()
-                .setItem(Items.COMMAND_BLOCK)
-                .setName(Component.translatable("minions.gui.main.instructions"))
-                .setCallback(() -> {
-                    InstructionGui.openInstructionMainMenu(this, GuiContext.Minion.create(GuiContext.create(viewer), minion));
-                })
-        );
-        gui.setSlot(3, new GuiElementBuilder()
-                .setItem(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE)
-                .setName(Component.translatable("minions.gui.main.modules"))
-                .setCallback(() -> {
-                    ModuleInventory.openModuleInventory(viewer, minion);
-                })
-        );
-        gui.setSlot(5, new GuiElementBuilder()
-                .setItem(Items.CHEST)
-                .setName(Component.translatable("minions.gui.main.inventory"))
-                .setCallback(() -> new MinionInventoryGui(this))
-        );
-        gui.setSlot(7, new GuiElementBuilder()
-                .setItem(Items.BARRIER)
-                .setName(Component.translatable("minions.gui.main.pickup"))
-                .setCallback(() -> minion.kill(minion.level()))
-        );
-        gui.open();
-    }
-
-    @Override
-    protected void closeBacking() {
-        gui.close();
-        minion.removeMinionListener(this);
-    }
-
-    @Override
-    public void onMinionRemove(MinionFakePlayer minion) {
-        close();
-    }
-}

src/main/java/io/github/skippyall/minions/gui/minion/MinionInventoryGui.java

@@ -1,70 +0,0 @@
-package io.github.skippyall.minions.gui.minion;
-
-import eu.pb4.sgui.api.gui.SimpleGui;
-import io.github.skippyall.minions.gui.MinionsGui;
-import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.inventory.ArmorSlot;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.inventory.Slot;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-
-public class MinionInventoryGui extends MinionsGui {
-    protected final MinionGui parent;
-    private final MinionFakePlayer minion;
-
-    private SimpleGui gui;
-
-    public MinionInventoryGui(MinionGui parent) {
-        super(parent);
-        this.parent = parent;
-        this.minion = parent.getMinion();
-        open();
-    }
-
-    @Override
-    protected void open() {
-        gui = new SimpleGui(MenuType.GENERIC_9x6, viewer, false) {
-            @Override
-            public void onPlayerClose(boolean success) {
-                onBackingClosed();
-            }
-        };
-        gui.setTitle(Component.translatable("minions.gui.inventory.title"));
-
-        for(int i = 0; i < 18; i++) {
-            gui.setSlot(i, new ItemStack(Items.BARRIER));
-        }
-
-        gui.setSlot(2, new ItemStack(Items.LEATHER_HELMET));
-        gui.setSlot(3, new ItemStack(Items.LEATHER_CHESTPLATE));
-        gui.setSlot(4, new ItemStack(Items.LEATHER_LEGGINGS));
-        gui.setSlot(5, new ItemStack(Items.LEATHER_BOOTS));
-        gui.setSlot(6, new ItemStack(Items.SHIELD));
-
-        gui.setSlot(8, backButton());
-
-        gui.setSlot(2 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.HEAD, EquipmentSlot.HEAD.getIndex(Inventory.INVENTORY_SIZE), 0, 0, null));
-        gui.setSlot(3 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.CHEST, EquipmentSlot.CHEST.getIndex(Inventory.INVENTORY_SIZE), 0, 0, null));
-        gui.setSlot(4 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.LEGS, EquipmentSlot.LEGS.getIndex(Inventory.INVENTORY_SIZE), 0, 0, null));
-        gui.setSlot(5 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.FEET, EquipmentSlot.FEET.getIndex(Inventory.INVENTORY_SIZE), 0, 0, null));
-        gui.setSlot(6 + 9, new Slot(minion.getInventory(), Inventory.SLOT_OFFHAND, 0, 0));
-
-        for (int i = Inventory.SELECTION_SIZE; i < Inventory.INVENTORY_SIZE; i++) {
-            gui.setSlot(i + 9, new Slot(minion.getInventory(), i, 0, 0));
-        }
-
-        for (int i = 0; i < Inventory.SELECTION_SIZE; i++) {
-            gui.setSlot(i + 45, new Slot(minion.getInventory(), i, 0, 0));
-        }
-        gui.open();
-    }
-
-    @Override
-    protected void closeBacking() {
-        gui.close();
-    }
-}

src/main/java/io/github/skippyall/minions/gui/minion/SimpleMinionsGui.java

@@ -1,27 +0,0 @@
-package io.github.skippyall.minions.gui.minion;
-
-import eu.pb4.sgui.api.gui.GuiLike;
-import io.github.skippyall.minions.gui.MinionsGui;
-
-import java.util.function.BiFunction;
-
-public class SimpleMinionsGui extends MinionsGui {
-    private GuiLike gui;
-    private final BiFunction<Runnable, SimpleMinionsGui, GuiLike> guiFactory;
-
-    public SimpleMinionsGui(MinionsGui parent, BiFunction<Runnable, SimpleMinionsGui, GuiLike> guiFactory) {
-        super(parent);
-        this.guiFactory = guiFactory;
-        open();
-    }
-
-    @Override
-    protected void open() {
-        gui = guiFactory.apply(this::onBackingClosed, this);
-    }
-
-    @Override
-    protected void closeBacking() {
-        gui.close();
-    }
-}

src/main/java/io/github/skippyall/minions/gui/minion/package-info.java

@@ -1,4 +0,0 @@
-@NullMarked
-package io.github.skippyall.minions.gui.minion;
-
-import org.jspecify.annotations.NullMarked;

src/main/java/io/github/skippyall/minions/gui/package-info.java

@@ -1,4 +0,0 @@
-@NullMarked
-package io.github.skippyall.minions.gui;
-
-import org.jspecify.annotations.NullMarked;

src/main/java/io/github/skippyall/minions/input/TextInput.java

@@ -0,0 +1,27 @@
+package io.github.skippyall.minions.input;
+
+import eu.pb4.sgui.api.elements.GuiElementBuilder;
+import eu.pb4.sgui.api.gui.AnvilInputGui;
+import net.minecraft.item.Items;
+import net.minecraft.screen.AnvilScreenHandler;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+import java.util.concurrent.CompletableFuture;
+
+public class TextInput {
+    public static CompletableFuture<String> inputText(ServerPlayerEntity player, Text title, String defaultText) {
+        CompletableFuture<String> future = new CompletableFuture<>();
+
+        AnvilInputGui gui = new AnvilInputGui(player, false);
+        gui.setSlot(AnvilScreenHandler.OUTPUT_ID, new GuiElementBuilder()
+                .setItem(Items.EMERALD_BLOCK)
+                .setName(Text.literal("OK"))
+                .setCallback(() -> future.complete(gui.getInput()))
+        );
+        gui.setTitle(title);
+        gui.setDefaultInputValue(defaultText);
+        gui.open();
+        return future;
+    }
+}

src/main/java/io/github/skippyall/minions/listener/BlockEntityMinionInstructionListener.java

@@ -1,54 +0,0 @@
-package io.github.skippyall.minions.listener;
-
-import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
-import io.github.skippyall.minions.program.instruction.ConfiguredInstructionListener;
-import net.minecraft.core.BlockPos;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import java.util.Map;
-import java.util.UUID;
-
-public abstract class BlockEntityMinionInstructionListener<E extends BlockEntity> extends BlockEntityMinionListener<E> {
-    protected BlockEntityMinionInstructionListener(ResourceKey<Level> worldKey, BlockPos pos, UUID minionUuid, BlockEntityType<E> type) {
-        super(worldKey, pos, minionUuid, type);
-    }
-
-    protected abstract Map<String, ConfiguredInstructionListener> getInstructionListeners();
-
-    @Override
-    public void onMinionSpawn(MinionFakePlayer minion) {
-        super.onMinionSpawn(minion);
-        registerInstructionListeners();
-    }
-
-    @Override
-    public void add(MinecraftServer server) {
-        super.add(server);
-        if(minion != null) {
-            registerInstructionListeners();
-        }
-    }
-
-    @Override
-    public void remove(MinecraftServer server) {
-        super.remove(server);
-        if(minion != null) {
-            removeInstructionListeners();
-        }
-    }
-
-    public void registerInstructionListeners() {
-        for(Map.Entry<String, ConfiguredInstructionListener> listener : getInstructionListeners().entrySet()) {
-            minion.getInstructionManager().getInstruction(listener.getKey()).addListener(listener.getValue());
-        }
-    }
-
-    public void removeInstructionListeners() {
-        for(Map.Entry<String, ConfiguredInstructionListener> listener : getInstructionListeners().entrySet()) {
-            minion.getInstructionManager().getInstruction(listener.getKey()).removeListener(listener.getValue());
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/listener/BlockEntityMinionListener.java

@@ -1,113 +0,0 @@
-package io.github.skippyall.minions.listener;
-
-import com.mojang.datafixers.util.Function3;
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import io.github.skippyall.minions.minion.MinionListener;
-import io.github.skippyall.minions.minion.MinionPersistentState;
-import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.UUIDUtil;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import org.jspecify.annotations.Nullable;
-
-import java.util.Optional;
-import java.util.UUID;
-
-public abstract class BlockEntityMinionListener<E extends BlockEntity> implements MinionListener {
-    protected ResourceKey<Level> worldKey;
-    protected BlockPos pos;
-    protected UUID minionUuid;
-    protected BlockEntityType<E> type;
-    protected @Nullable MinionFakePlayer minion;
-
-    protected BlockEntityMinionListener(ResourceKey<Level> worldKey, BlockPos pos, UUID minionUuid, BlockEntityType<E> type) {
-        this.worldKey = worldKey;
-        this.pos = pos;
-        this.minionUuid = minionUuid;
-        this.type = type;
-    }
-
-    @Override
-    public void onMinionSpawn(MinionFakePlayer minion) {
-        MinionListener.super.onMinionSpawn(minion);
-        this.minion = minion;
-        removeIfBeRemoved(minion.getServer());
-    }
-
-    @Override
-    public void onMinionRemove(MinionFakePlayer minion) {
-        MinionListener.super.onMinionRemove(minion);
-        this.minion = null;
-    }
-
-    public static <T extends BlockEntityMinionListener<?>> @Nullable T getListener(Level world, BlockPos pos, @Nullable UUID minionUuid, Class<T> clazz) {
-        if(minionUuid != null) {
-            for (MinionListener listener : MinionPersistentState.get(world.getServer()).getMinionData(minionUuid).getListeners()) {
-                if (listener instanceof BlockEntityMinionListener<?> tl && tl.pos.equals(pos) && tl.worldKey.equals(world.dimension()) && clazz.isInstance(tl)) {
-                    return clazz.cast(tl);
-                }
-            }
-        }
-        return null;
-    }
-
-    public static <L extends BlockEntityMinionListener<?>> Codec<L> getCodec(Function3<ResourceKey<Level>, BlockPos, UUID, L> constructor) {
-        return RecordCodecBuilder.create(instance ->
-                instance.group(
-                        Level.RESOURCE_KEY_CODEC.fieldOf("world").forGetter(listener -> listener.worldKey),
-                        BlockPos.CODEC.fieldOf("pos").forGetter(listener -> listener.pos),
-                        UUIDUtil.AUTHLIB_CODEC.fieldOf("minionUuid").forGetter(listener -> listener.minionUuid)
-                ).apply(instance, constructor));
-    }
-
-    private BlockEntityState getBlockEntityState(MinecraftServer server) {
-        Level world = server.getLevel(worldKey);
-        if(world == null || !world.isLoaded(pos)) {
-            return BlockEntityState.UNLOADED;
-        }
-
-        if(world.getBlockEntity(pos, type).isPresent()) {
-            return BlockEntityState.LOADED;
-        } else {
-            return BlockEntityState.REMOVED;
-        }
-    }
-
-    public Optional<E> getBlockEntity(MinecraftServer server) {
-        Level world = server.getLevel(worldKey);
-        if(world != null && world.isLoaded(pos)) {
-            return world.getBlockEntity(pos, type);
-        }
-        return Optional.empty();
-    }
-
-    public boolean removeIfBeRemoved(MinecraftServer server) {
-        if(getBlockEntityState(server) == BlockEntityState.REMOVED) {
-            remove(server);
-            return true;
-        }
-        return false;
-    }
-
-    public void add(MinecraftServer server) {
-        MinionPersistentState.get(server).getMinionData(minionUuid).getListeners().addListener(this);
-        MinionPersistentState.get(server).setDirty();
-        this.minion = (MinionFakePlayer) server.getPlayerList().getPlayer(minionUuid);
-    }
-
-    public void remove(MinecraftServer server) {
-        MinionPersistentState.get(server).getMinionData(minionUuid).getListeners().removeListener(this);
-        MinionPersistentState.get(server).setDirty();
-    }
-
-    public enum BlockEntityState {
-        LOADED,
-        REMOVED,
-        UNLOADED
-    }
-}

src/main/java/io/github/skippyall/minions/listener/ListenerManager.kt

@@ -1,29 +0,0 @@
-package io.github.skippyall.minions.listener
-
-import java.util.concurrent.CopyOnWriteArraySet
-
-open class ListenerManager<T>(
-    protected val listeners: MutableSet<T> = CopyOnWriteArraySet(),
-    val onChange: () -> Unit = {},
-) : MutableIterable<T> by listeners {
-
-    fun addListener(listener: T) {
-        listeners.add(listener)
-        onChange()
-    }
-
-    fun removeListener(listener: T) {
-        listeners.remove(listener)
-        onChange()
-    }
-
-    override fun iterator(): MutableIterator<T> {
-        val iterator = listeners.iterator()
-        return object : MutableIterator<T> by iterator {
-            override fun remove() {
-                iterator.remove()
-                onChange()
-            }
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/listener/SerializableListenerManager.kt

@@ -1,47 +0,0 @@
-package io.github.skippyall.minions.listener
-
-import com.mojang.serialization.Codec
-import com.mojang.serialization.MapCodec
-import io.github.skippyall.minions.listener.SerializableListenerManager.SerializableListener
-import net.minecraft.core.Registry
-import net.minecraft.resources.Identifier
-import java.util.*
-import java.util.concurrent.CopyOnWriteArraySet
-
-class SerializableListenerManager<T : SerializableListener>(
-    listeners: MutableSet<T> = CopyOnWriteArraySet(),
-    onChange: () -> Unit = {},
-) : ListenerManager<T>(listeners, onChange) {
-
-    interface SerializableListener {
-        val codecId: Optional<Identifier>
-            get() = Optional.empty<Identifier>()
-    }
-
-    companion object {
-        @JvmStatic
-        @JvmOverloads
-        fun <T : SerializableListener> getCodec(
-            registry: Registry<Codec<out T>>,
-            onChange: () -> Unit = {},
-        ): Codec<SerializableListenerManager<T>> {
-            return registry.byNameCodec().dispatch(
-                { listener -> listener.codecId.map(registry::getValue)
-                        .orElseGet { MapCodec.unitCodec(null) }
-                },
-                { codec -> codec.fieldOf("data") }
-            ).listOf().xmap(
-                { list -> SerializableListenerManager<T>(CopyOnWriteArraySet<T>(list), onChange) },
-                { manager ->
-                    val serializableListeners: MutableList<T> = mutableListOf()
-                    for (listener in manager.listeners) {
-                        if (listener.codecId.isPresent) {
-                            serializableListeners.add(listener)
-                        }
-                    }
-                    return@xmap serializableListeners
-                }
-            )
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/listener/package-info.java

@@ -1,4 +0,0 @@
-@NullMarked
-package io.github.skippyall.minions.listener;
-
-import org.jspecify.annotations.NullMarked;

src/main/java/io/github/skippyall/minions/minion/MinionComponent.java

@@ -0,0 +1,14 @@
+package io.github.skippyall.minions.minion;
+
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.component.ComponentType;
+
+public class MinionComponent {
+    /*public static final Codec<MinionComponent> CODEC = RecordCodecBuilder.create(instance ->
+            instance.group()
+    );
+    public static final ComponentType<MinionComponent> TYPE = ComponentType.<MinionComponent>builder().codec(CODEC).build();
+*/
+
+}

src/main/java/io/github/skippyall/minions/minion/MinionConfig.java

@@ -1,63 +0,0 @@
-package io.github.skippyall.minions.minion;
-
-import com.mojang.serialization.Codec;
-import io.github.skippyall.minions.registration.MinionRegistries;
-import net.minecraft.resources.Identifier;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-public class MinionConfig {
-    public static final Codec<MinionConfig> CODEC = Codec.<Option<?>, Object>dispatchedMap(
-            MinionRegistries.MINION_CONFIG_OPTIONS.byNameCodec(),
-            Option::codec
-    ).xmap(MinionConfig::new, config -> config.values);
-
-    private final Map<Option<?>, Object> values;
-
-    public MinionConfig() {
-        values = new HashMap<>();
-    }
-
-    private MinionConfig(Map<Option<?>, Object> values) {
-        this.values = new HashMap<>(values);
-    }
-
-    public <T> T getOption(Option<T> option) {
-        if(values.containsKey(option)) {
-            //noinspection unchecked
-            return (T) values.get(option);
-        } else {
-            return option.defaultValue();
-        }
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof MinionConfig that)) return false;
-        return Objects.equals(values, that.values);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(values);
-    }
-
-    public static Option<Boolean> booleanOption(Identifier key, boolean defaultValue) {
-        return new Option<>(key, defaultValue, Codec.BOOL);
-    }
-
-    public record Option<T>(Identifier key, T defaultValue, Codec<T> codec) {
-        @Override
-        public boolean equals(Object o) {
-            if (!(o instanceof Option<?> option)) return false;
-            return Objects.equals(key, option.key);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hashCode(key);
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/minion/MinionData.java

@@ -0,0 +1,45 @@
+package io.github.skippyall.minions.minion;
+
+import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import net.minecraft.nbt.NbtCompound;
+
+import java.util.UUID;
+
+public class MinionData {
+    public UUID uuid;
+    public String name;
+    public UUID skinUuid;
+
+    public MinionData(UUID uuid, String name, UUID skinUuid) {
+        this.uuid = uuid;
+        this.name = name;
+        this.skinUuid = skinUuid;
+    }
+
+    public NbtCompound writeNbt() {
+        NbtCompound nbt = new NbtCompound();
+
+        nbt.putUuid("uuid", uuid);
+        nbt.putString("name", name);
+        if(skinUuid != null) {
+            nbt.putUuid("skinUuid", skinUuid);
+        }
+
+        return nbt;
+    }
+
+    public static MinionData readNbt(NbtCompound nbt) {
+        UUID uuid = nbt.getUuid("uuid");
+        String name = nbt.getString("name");
+        UUID skinUuid = null;
+        if(nbt.contains("skinUuid")) {
+            skinUuid = nbt.getUuid("skinUuid");
+        }
+
+        return new MinionData(uuid, name, skinUuid);
+    }
+
+    public static MinionData fromMinion(MinionFakePlayer minion) {
+        return new MinionData(minion.getUuid(), minion.getMinionName(), minion.getSkinUuid());
+    }
+}

src/main/java/io/github/skippyall/minions/minion/MinionData.kt

@@ -1,81 +0,0 @@
-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.listener.SerializableListenerManager
-import io.github.skippyall.minions.registration.MinionRegistries
-import net.minecraft.core.UUIDUtil
-import net.minecraft.server.MinecraftServer
-import net.minecraft.util.ExtraCodecs
-import java.util.*
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
-
-class MinionData(
-    initialUuid: UUID,
-    initialName: String,
-    initialSkin: Optional<PropertyMap>,
-    initialIsSpawned: Boolean,
-    val listeners: SerializableListenerManager<MinionListener>,
-    initialConfig: MinionConfig,
-    var onDirty: Runnable = {},
-) {
-    var uuid by DirtyProperty(initialUuid, this::setDirty)
-    var name by DirtyProperty(initialName, this::setDirty)
-    var skin by DirtyProperty(initialSkin, this::setDirty)
-    var isSpawned by DirtyProperty(initialIsSpawned, this::setDirty)
-    var config by DirtyProperty(initialConfig, this::setDirty)
-
-    fun setDirty() {
-        this@MinionData.onDirty.run()
-    }
-
-    companion object {
-        @JvmField
-        val CODEC: Codec<MinionData> =
-            RecordCodecBuilder.create { instance ->
-                instance.group(
-                    UUIDUtil.AUTHLIB_CODEC.fieldOf("uuid").forGetter(MinionData::uuid),
-                    Codec.STRING.fieldOf("name").forGetter(MinionData::name),
-                    ExtraCodecs.PROPERTY_MAP.optionalFieldOf("skin").forGetter(MinionData::skin),
-                    Codec.BOOL.optionalFieldOf("isSpawned", false).forGetter(MinionData::isSpawned),
-                    SerializableListenerManager.getCodec<MinionListener>(MinionRegistries.MINION_LISTENER_CODECS)
-                            .optionalFieldOf("listeners").xmap(
-                                { optional -> optional.orElseGet { SerializableListenerManager() } },
-                                Optional<SerializableListenerManager<MinionListener>>::of
-                            ).forGetter(MinionData::listeners),
-                    MinionConfig.CODEC.optionalFieldOf("config", MinionConfig())
-                            .forGetter(MinionData::config)
-                ).apply(
-                    instance,
-                    ::MinionData
-                )
-            }
-
-        @JvmStatic
-        fun createDefault(server: MinecraftServer): MinionData {
-            return MinionData(
-                UUID.randomUUID(),
-                MinionProfileUtils.newDefaultMinionName(server),
-                Optional.empty<PropertyMap>(),
-                false,
-                SerializableListenerManager(),
-                MinionConfig()
-            ) {
-                MinionPersistentState.get(server).isDirty = true
-            }
-        }
-    }
-
-    class DirtyProperty<V>(var value: V, val onDirty: () -> Unit) : ReadWriteProperty<Any?, V> {
-        override fun getValue(thisRef: Any?, property: KProperty<*>): V {
-            return value
-        }
-
-        override fun setValue(thisRef: Any?, property: KProperty<*>, value: V) {
-            this.value = value
-            onDirty()
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/minion/MinionItem.java

@@ -1,78 +1,92 @@
 package io.github.skippyall.minions.minion;
 
-import io.github.skippyall.minions.gui.MinionLookGui;
+import eu.pb4.polymer.core.api.item.PolymerItem;
-import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
+import eu.pb4.polymer.core.api.item.PolymerItemUtils;
-import io.github.skippyall.minions.registration.MinionComponentTypes;
+import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
-import net.minecraft.server.MinecraftServer;
+import net.minecraft.component.DataComponentTypes;
-import net.minecraft.server.level.ServerLevel;
+import net.minecraft.component.type.NbtComponent;
-import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.item.Item;
-import net.minecraft.world.InteractionHand;
+import net.minecraft.item.ItemStack;
-import net.minecraft.world.InteractionResult;
+import net.minecraft.item.ItemUsageContext;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.item.Items;
-import net.minecraft.world.item.Item;
+import net.minecraft.item.tooltip.TooltipType;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
-import net.minecraft.world.item.context.UseOnContext;
+import net.minecraft.nbt.NbtElement;
-import net.minecraft.world.level.Level;
+import net.minecraft.registry.RegistryWrapper;
-import net.minecraft.world.phys.Vec2;
+import net.minecraft.server.network.ServerPlayerEntity;
-import org.jspecify.annotations.Nullable;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.math.Vec2f;
+import org.jetbrains.annotations.Nullable;
 
-public class MinionItem extends Item {
+public class MinionItem extends Item implements PolymerItem {
-    public MinionItem(Properties settings) {
+    private final boolean canProgram;
-        super(settings);
-    }
 
-    /*@Override
+    public MinionItem(boolean canProgram) {
-    public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay component, Consumer<Component> tooltip, TooltipFlag type) {
+        super(new Item.Settings());
-        //MinionData data = getData(stack);
+        this.canProgram = canProgram;
-        //if(data != null) {
-        //    tooltip.accept(Component.translatable("minions.minion_item.tooltip", data.name()));
-        //}
-    }*/
-
-    @Override
-    public InteractionResult use(Level world, Player user, InteractionHand hand) {
-        if(user instanceof ServerPlayer serverPlayer) {
-            ItemStack stack = user.getItemInHand(hand);
-            new MinionLookGui(serverPlayer, stack);
-            return InteractionResult.SUCCESS;
-        }
-
-        return InteractionResult.SUCCESS_SERVER;
     }
 
     @Override
-    public InteractionResult useOn(UseOnContext context) {
+    public Item getPolymerItem(ItemStack itemStack, @Nullable ServerPlayerEntity player) {
-        if(!context.getLevel().isClientSide()) {
+        return Items.ARMOR_STAND;
-            MinionData data = getDataOrDefault(context.getLevel().getServer(), context.getItemInHand());
-            MinionFakePlayer.spawnMinion(data, (ServerLevel) context.getLevel(), context.getClickedPos().getCenter().add(0,0.5,0), new Vec2(0, 0));
-        }
-        context.getItemInHand().shrink(1);
-        return InteractionResult.SUCCESS;
     }
 
-    public static void setData(MinecraftServer server, MinionData data, ItemStack item) {
+    @Override
-        item.set(MinionComponentTypes.MINION_DATA, data.getUuid());
+    public ItemStack getPolymerItemStack(ItemStack stack, TooltipType tooltipType, RegistryWrapper.WrapperLookup lookup, ServerPlayerEntity player) {
-        MinionPersistentState.get(server).updateMinionData(data);
+        ItemStack out = PolymerItemUtils.createItemStack(stack, lookup, player);
+        out.set(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, true);
+        return out;
+    }
+
+    @Override
+    public ActionResult useOnBlock(ItemUsageContext context) {
+        String contents = context.getStack().getName().getLiteralString();
+        String name;
+        if(contents != null && contents.length() <= 16) {
+            name = contents;
+        } else {
+            name = "Minion";
+        }
+        if(!context.getWorld().isClient) {
+            MinionData data = getData(context.getStack());
+
+            if(data == null) {
+                data = new MinionData(null, name, null);
+            }
+
+            if (data.uuid == null) {
+                MinionFakePlayer.createMinion(data, (ServerWorld) context.getWorld(), (ServerPlayerEntity) context.getPlayer(), canProgram, context.getBlockPos().toCenterPos().add(0,0.5,0), 0, 0);
+            }else {
+                data.name = name;
+                MinionFakePlayer.spawnMinionAt(data, (ServerWorld) context.getWorld(), context.getBlockPos().toCenterPos().add(0,0.5,0), new Vec2f(0, 0));
+                MinionPersistentState.INSTANCE.addMinion(data);
+            }
+        }
+        context.getStack().decrement(1);
+        return ActionResult.SUCCESS;
+    }
+
+    public static void setData(MinionData data, ItemStack item) {
+        NbtCompound nbt = item.getOrDefault(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT).copyNbt();
+        nbt.put("data", data.writeNbt());
+        item.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(nbt));
     }
 
     @Nullable
-    public static MinionData getData(MinecraftServer server, ItemStack item) {
+    public static MinionData getData(ItemStack item) {
-        if(item.has(MinionComponentTypes.MINION_DATA)) {
+        NbtCompound nbt = item.getOrDefault(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT).copyNbt();
-            return MinionPersistentState.get(server).getMinionData(item.get(MinionComponentTypes.MINION_DATA));
+        if (nbt.getType("data") == NbtElement.COMPOUND_TYPE) {
+            return MinionData.readNbt(nbt.getCompound("data"));
         }
         return null;
     }
 
-    public static MinionData getDataOrDefault(MinecraftServer server, ItemStack item) {
-        MinionData data = getData(server, item);
-        if(data == null) {
-            data = MinionData.createDefault(server);
-            setData(server, data, item);
-        }
-        return data;
-    }
-
     public static boolean containsData(ItemStack item) {
-        return item.has(MinionComponentTypes.MINION_DATA);
+        NbtComponent nbt = item.get(DataComponentTypes.CUSTOM_DATA);
+        if (nbt == null) {
+            return false;
+        }
+        return nbt.copyNbt().contains("data");
     }
 }

src/main/java/io/github/skippyall/minions/minion/MinionListener.java

@@ -1,48 +0,0 @@
-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 org.jspecify.annotations.Nullable;
-
-public interface MinionListener extends SerializableListenerManager.SerializableListener {
-    default void onMinionSpawn(MinionFakePlayer minion) {}
-
-    default void onMinionRemove(MinionFakePlayer minion) {}
-
-    default void onInstructionsUpdate(MinionFakePlayer minion) {}
-
-    default void onInstructionRename(MinionFakePlayer minion, ConfiguredInstruction<?> instruction, String oldName, String newName) {}
-
-    interface Delegating extends MinionListener {
-        @Nullable MinionListener getBacking();
-
-        @Override
-        default void onMinionSpawn(MinionFakePlayer minion) {
-            if(getBacking() != null) {
-                getBacking().onMinionSpawn(minion);
-            }
-        }
-
-        @Override
-        default void onMinionRemove(MinionFakePlayer minion) {
-            if(getBacking() != null) {
-                getBacking().onMinionRemove(minion);
-            }
-        }
-
-        @Override
-        default void onInstructionsUpdate(MinionFakePlayer minion) {
-            if(getBacking() != null) {
-                getBacking().onInstructionsUpdate(minion);
-            }
-        }
-
-        @Override
-        default void onInstructionRename(MinionFakePlayer minion, ConfiguredInstruction<?> instruction, String oldName, String newName) {
-            if(getBacking() != null) {
-                getBacking().onInstructionRename(minion, instruction, oldName, newName);
-            }
-        }
-    }
-}

src/main/java/io/github/skippyall/minions/minion/MinionPersistentState.java

@@ -1,76 +1,76 @@
 package io.github.skippyall.minions.minion;
 
-import com.mojang.serialization.Codec;
+import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
-import io.github.skippyall.minions.Minions;
+import net.minecraft.nbt.NbtCompound;
-import net.minecraft.resources.Identifier;
+import net.minecraft.nbt.NbtElement;
+import net.minecraft.nbt.NbtList;
+import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.level.Level;
+import net.minecraft.world.PersistentState;
-import net.minecraft.world.level.saveddata.SavedData;
+import net.minecraft.world.World;
-import net.minecraft.world.level.saveddata.SavedDataType;
-import org.jspecify.annotations.Nullable;
 
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.Optional;
 import java.util.UUID;
 
-public class MinionPersistentState extends SavedData {
+public class MinionPersistentState extends PersistentState {
-    public static final Codec<MinionPersistentState> CODEC = MinionData.CODEC.listOf().xmap(MinionPersistentState::new, MinionPersistentState::getMinionDataList);
+    public static Type<MinionPersistentState> TYPE = new Type<>(MinionPersistentState::new, MinionPersistentState::read, null);
 
-    public static SavedDataType<MinionPersistentState> TYPE = new SavedDataType<>(
+    public static MinionPersistentState INSTANCE;
-            Identifier.fromNamespaceAndPath(Minions.MOD_ID, "minion"),
-            MinionPersistentState::new,
-            MinionPersistentState.CODEC,
-            null
-    );
 
-    private final Map<UUID, MinionData> minionData = new HashMap<>();
+    private List<MinionData> minionData = new ArrayList<>();
 
-    public MinionPersistentState() {
+    @Override
-
+    public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
-    }
+        NbtList list = new NbtList();
-
+        for(MinionData data : minionData) {
-    public MinionPersistentState(List<MinionData> dataList) {
+            list.add(data.writeNbt());
-        for (MinionData data : dataList) {
-            data.setOnDirty(this::setDirty);
-            minionData.put(data.getUuid(), data);
         }
+        nbt.put("minions", list);
+        return nbt;
     }
 
-    public @Nullable MinionData getMinionData(UUID uuid) {
+    public static MinionPersistentState read(NbtCompound compound, RegistryWrapper.WrapperLookup lookup) {
-        return minionData.get(uuid);
+        NbtList list = compound.getList("minions", NbtElement.COMPOUND_TYPE);
+        MinionPersistentState instance = new MinionPersistentState();
+        for(NbtElement element : list) {
+            instance.addMinion(MinionData.readNbt((NbtCompound) element));
+        }
+        return instance;
     }
 
-    public Map<UUID, MinionData> getMinionData() {
+    public void addMinion(MinionFakePlayer minion) {
+        addMinion(MinionData.fromMinion(minion));
+    }
+
+    public void addMinion(MinionData data) {
+        System.out.println("add Minion " + data.name);
+        minionData.add(data);
+        markDirty();
+    }
+
+    public void removeMinion(MinionFakePlayer minionData) {
+        removeMinion(minionData.getUuid());
+    }
+
+    public void removeMinion(UUID minionUUID) {
+        MinionData removal = null;
+        for (MinionData data : minionData) {
+            if (data.uuid.equals(minionUUID)) {
+                removal = data;
+            }
+        }
+        if (removal != null) {
+            minionData.remove(removal);
+        }
+        markDirty();
+    }
+
+    public List<MinionData> getMinionData() {
         return minionData;
     }
 
-    public List<MinionData> getMinionDataList() {
+    public static void create(MinecraftServer server) {
-        return List.copyOf(minionData.values());
+        INSTANCE = server.getWorld(World.OVERWORLD).getPersistentStateManager().getOrCreate(TYPE, "minion");
-    }
-
-    public void updateMinionData(MinionData data) {
-        minionData.put(data.getUuid(), data);
-        data.setOnDirty(this::setDirty);
-        setDirty();
-    }
-
-    public boolean isMinion(UUID uuid) {
-        return minionData.containsKey(uuid);
-    }
-
-    public boolean isMinionNameTaken(String name) {
-        return getMinionWithName(name).isPresent();
-    }
-
-    public Optional<MinionData> getMinionWithName(String name) {
-        return minionData.values().stream()
-                .filter(data -> data.getName().equals(name))
-                .findFirst();
-    }
-
-    public static MinionPersistentState get(MinecraftServer server) {
-        return server.getLevel(Level.OVERWORLD).getDataStorage().computeIfAbsent(TYPE);
     }
 }

src/main/java/io/github/skippyall/minions/minion/MinionProfileUtils.java

@@ -1,65 +1,71 @@
 package io.github.skippyall.minions.minion;
 
 import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.properties.PropertyMap;
+import com.mojang.authlib.ProfileLookupCallback;
-import com.mojang.brigadier.StringReader;
+import com.mojang.authlib.yggdrasil.ProfileResult;
-import io.github.skippyall.minions.MinionsConfig;
-import io.github.skippyall.minions.gui.input.Result;
-import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.StringUtil;
+import org.jetbrains.annotations.Nullable;
-import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ForkJoinPool;
 
 import static io.github.skippyall.minions.Minions.LOGGER;
 
 public class MinionProfileUtils {
-    public static String getPrefix() {
+    public static CompletableFuture<@Nullable GameProfile> lookupSkinOwnerProfile(MinecraftServer server, String username) {
-        return MinionsConfig.get().minion.minionPrefix;
+        CompletableFuture<GameProfile> future = new CompletableFuture<>();
+
+        ForkJoinPool.commonPool().execute(() -> {
+            try {
+                server.getGameProfileRepo().findProfilesByNames(new String[]{username}, new ProfileLookupCallback() {
+                    @Override
+                    public void onProfileLookupSucceeded(GameProfile found) {
+                        LOGGER.info("SkinProfile: {}", found);
+                        try {
+                            getSkinOwnerProfile(server, found.getId()).thenAccept(future::complete);
+                        } catch (Throwable ex) {
+                            LOGGER.warn("Exception during Game Profile creation", ex);
+                        }
+                    }
+
+                    @Override
+                    public void onProfileLookupFailed(String profileName, Exception exception) {
+                        LOGGER.warn("Lookup Error: ", exception);
+                        future.complete(null);
+                    }
+                });
+            } catch (Throwable e) {
+                LOGGER.warn("Failed to get UUID for username " + username, e);
+                future.complete(null);
+            }
+        });
+
+        return future;
     }
 
-    public static GameProfile makeNewMinionProfile(@Nullable UUID uuidMinion, String username, @Nullable PropertyMap skin) {
+    public static CompletableFuture<@Nullable GameProfile> getSkinOwnerProfile(MinecraftServer server, @Nullable UUID uuid) {
-        if(uuidMinion == null) {
+        CompletableFuture<GameProfile> future = new CompletableFuture<>();
-            uuidMinion = UUID.randomUUID();
+        future.completeAsync(() -> {
-        }
+            GameProfile profile = null;
+            if(uuid != null) {
+                ProfileResult result = server.getSessionService().fetchProfile(uuid, true);
+                if (result != null) {
+                    profile = result.profile();
+                    LOGGER.info("Full SkinProfile: {}", profile);
+                }
+            }
+            return profile;
+        });
+        return future;
+    }
 
-        GameProfile newProfile = new GameProfile(uuidMinion, username, skin != null ? skin : PropertyMap.EMPTY);
+    public static GameProfile makeNewMinionProfile(@Nullable UUID uuidMinion, String username, @Nullable GameProfile skinProfile) {
+        GameProfile newProfile = new GameProfile(uuidMinion != null ? uuidMinion : UUID.randomUUID(), username);
+        if (skinProfile != null) {
+            newProfile.getProperties().putAll(skinProfile.getProperties());
+        }
         LOGGER.info("Minion Profile: {}", newProfile);
         return newProfile;
     }
-
-    public static Result<String, Component> checkMinionNameWithoutPrefix(MinecraftServer server, String name) {
-        for(char c : name.toCharArray()) {
-            if(!StringReader.isAllowedInUnquotedString(c)) {
-                return new Result.Error<>(Component.translatable("minions.generic.name.invalid_char"));
-            }
-        }
-
-        if((getPrefix() + name).length() > 16)  {
-            return new Result.Error<>(Component.translatable("minions.generic.name.too_long"));
-        }
-
-        if(!StringUtil.isValidPlayerName(getPrefix() + name)) {
-            return new Result.Error<>(Component.translatable("minions.generic.name.invalid"));
-        }
-
-        if(MinionPersistentState.get(server).isMinionNameTaken(getPrefix() + name)) {
-            return new Result.Error<>(Component.translatable("minions.generic.name.taken"));
-        }
-
-        return new Result.Success<>(name);
-    }
-
-    public static String newDefaultMinionName(MinecraftServer server) {
-        int i = 0;
-        while (MinionPersistentState.get(server).isMinionNameTaken("+Minion" + i)) {
-            i++;
-        }
-        return "+Minion" + i;
-    }
-
-    public static boolean isMinion(MinecraftServer server, UUID uuid) {
-        return MinionPersistentState.get(server).isMinion(uuid);
-    }
 }

src/main/java/io/github/skippyall/minions/minion/MinionRuntime.java

@@ -1,146 +0,0 @@
-package io.github.skippyall.minions.minion;
-
-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.consumer.ValueConsumerType;
-import io.github.skippyall.minions.program.instruction.ConfiguredInstruction;
-import io.github.skippyall.minions.program.instruction.InstructionType;
-import io.github.skippyall.minions.program.supplier.ValueSupplierType;
-import io.github.skippyall.minions.registration.MinionRegistries;
-import net.minecraft.core.Registry;
-import net.minecraft.world.level.storage.ValueInput;
-import net.minecraft.world.level.storage.ValueOutput;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-public class MinionRuntime implements InstructionRuntime<MinionRuntime> {
-    private final MinionFakePlayer minion;
-    private final Map<String, ConfiguredInstruction<MinionRuntime>> configuredInstructions = new HashMap<>();
-
-    public MinionRuntime(MinionFakePlayer minion) {
-        this.minion = minion;
-    }
-
-    public MinionFakePlayer getMinion() {
-        return minion;
-    }
-
-    public void tick() {
-        for (ConfiguredInstruction<MinionRuntime> instruction : configuredInstructions.values()) {
-            instruction.tick(this);
-        }
-    }
-
-    public void disableInstructionType(InstructionType<MinionRuntime> instructionType) {
-        updatePausedStatus(instructionType);
-    }
-
-    public void enableInstructionType(InstructionType<MinionRuntime> instructionType) {
-        updatePausedStatus(instructionType);
-    }
-
-    public void updatePausedStatus(InstructionType<MinionRuntime> instructionType) {
-        for(ConfiguredInstruction<MinionRuntime> instruction : configuredInstructions.values()) {
-            if(instruction.getInstruction() == instructionType) {
-                instruction.updatePauseStatus(this);
-            }
-        }
-    }
-
-    @Override
-    public boolean isInstructionEnabled(InstructionType<MinionRuntime> type) {
-        return minion.getModuleInventory().hasInstruction(type);
-    }
-
-    public Set<String> getInstructionNames() {
-        return configuredInstructions.keySet();
-    }
-
-    public ConfiguredInstruction<MinionRuntime> createInstruction(String name, InstructionType<MinionRuntime> instructionType) {
-        if(configuredInstructions.containsKey(name)) {
-            return null;
-        }
-
-        ConfiguredInstruction<MinionRuntime> instruction = new ConfiguredInstruction<>(instructionType);
-        configuredInstructions.put(name, instruction);
-        minion.forEachMinionListener(listener -> listener.onInstructionsUpdate(minion));
-        return instruction;
-    }
-
-    public void removeInstruction(String name) {
-        ConfiguredInstruction<MinionRuntime> instruction = getInstruction(name);
-        instruction.stop(this);
-        configuredInstructions.remove(name);
-
-        instruction.onInstructionRemove();
-        minion.forEachMinionListener(listener -> listener.onInstructionsUpdate(minion));
-    }
-
-    public ConfiguredInstruction<MinionRuntime> getInstruction(String name) {
-        return configuredInstructions.get(name);
-    }
-
-    public boolean hasInstruction(String name) {
-        return configuredInstructions.containsKey(name);
-    }
-
-    public void setInstructionName(String oldName, String newName) {
-        if(!configuredInstructions.containsKey(newName) && configuredInstructions.containsKey(oldName)) {
-            ConfiguredInstruction<MinionRuntime> instruction = configuredInstructions.get(oldName);
-            configuredInstructions.remove(oldName);
-            configuredInstructions.put(newName, instruction);
-
-
-            minion.forEachMinionListener(minionListener -> {
-                minionListener.onInstructionRename(minion, instruction, oldName, newName);
-                minionListener.onInstructionsUpdate(minion);
-            });
-        }
-    }
-
-    public void save(ValueOutput view) {
-        ValueOutput.ValueOutputList list = view.childrenList("configuredInstructions");
-        for (Map.Entry<String, ConfiguredInstruction<MinionRuntime>> instruction : configuredInstructions.entrySet()) {
-            ValueOutput inner = list.addChild();
-            inner.putString("name", instruction.getKey());
-            instruction.getValue().save(inner, this);
-        }
-    }
-
-    public void load(ValueInput view) {
-        ValueInput.ValueInputList list = view.childrenListOrEmpty("configuredInstructions");
-        for (ValueInput inner : list) {
-            Optional<String> name = inner.getString("name");
-            if(name.isEmpty()) {
-                Minions.LOGGER.error("Tried deserializing configured instruction without a name of minion \"{}\":", minion.getGameProfile().name());
-                continue;
-            }
-
-            try {
-                ConfiguredInstruction<MinionRuntime> instruction = ConfiguredInstruction.load(inner, this);
-                configuredInstructions.put(name.get(), instruction);
-            } catch (Exception e) {
-                Minions.LOGGER.error("Could not deserialize configured instruction \"{}\" of minion \"{}\":", name.get(), minion.getGameProfile().name(), e);
-            }
-        }
-    }
-
-    @Override
-    public Registry<ValueSupplierType<MinionRuntime>> getArgumentTypeRegistry() {
-        return MinionRegistries.VALUE_SUPPLIER_TYPES;
-    }
-
-    @Override
-    public Registry<InstructionType<MinionRuntime>> getInstructionTypeRegistry() {
-        return MinionRegistries.INSTRUCTION_TYPES;
-    }
-
-    @Override
-    public Registry<ValueConsumerType<MinionRuntime>> getValueConsumerTypeRegistry() {
-        return MinionRegistries.VALUE_CONSUMER_TYPES;
-    }
-}

src/main/java/io/github/skippyall/minions/minion/fakeplayer/FakeClientConnection.java

@@ -1,44 +0,0 @@
-//code from https://github.com/gnembon/fabric-carpet
-package io.github.skippyall.minions.minion.fakeplayer;
-
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.embedded.EmbeddedChannel;
-import net.minecraft.network.Connection;
-import net.minecraft.network.PacketListener;
-import net.minecraft.network.ProtocolInfo;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.PacketFlow;
-import org.jspecify.annotations.Nullable;
-
-public class FakeClientConnection extends Connection {
-    public FakeClientConnection(PacketFlow p)
-    {
-        super(p);
-        // compat with adventure-platform-fabric. This does NOT trigger other vanilla handlers for establishing a channel
-        // also makes #isOpen return true, allowing enderpearls to teleport fake players
-        ((ClientConnectionInterface)this).setChannel(new EmbeddedChannel());
-    }
-
-    @Override
-    public void send(Packet<?> packet, @Nullable ChannelFutureListener listener, boolean flush) {
-
-    }
-
-    @Override
-    public void setReadOnly()
-    {
-    }
-
-    @Override
-    public void handleDisconnection() {
-    }
-
-    @Override
-    public void setListenerForServerboundHandshake(PacketListener packetListener)
-    {
-    }
-
-    @Override
-    public <T extends PacketListener> void setupInboundProtocol(ProtocolInfo<T> state, T packetListener) {
-    }
-}