ModuleInventory optimization

# Conflicts:
#	gradle.properties

build.gradle

@@ -1,15 +1,23 @@
 plugins {
-    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id 'fabric-loom' version '1.10-SNAPSHOT'
     id 'maven-publish'
 }
 
 version = project.mod_version
 group = project.maven_group
 
+loom {
+    accessWidenerPath = file("src/main/resources/minions.accesswidener")
+}
+
 base {
     archivesName = project.archives_base_name
 }
 
+loom {
+    accessWidenerPath = file("src/main/resources/minions.accesswidener")
+}
+
 repositories {
     // Add repositories to retrieve artifacts from in here.
     // You should only use this when depending on other mods because
@@ -17,6 +25,18 @@ repositories {
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html
     // for more information about repositories.
     maven { url 'https://maven.nucleoid.xyz' }
+
+    exclusiveContent {
+        forRepository {
+            maven {
+                name = "Modrinth"
+                url = "https://api.modrinth.com/maven"
+            }
+        }
+        filter {
+            includeGroup "maven.modrinth"
+        }
+    }
 }
 
 dependencies {
@@ -30,6 +50,8 @@ dependencies {
     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}")
+
+    modCompileOnly "maven.modrinth:universal-graves:${project.universal_graves_version}"
 }
 
 processResources {

gradle.properties

@@ -3,19 +3,21 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://modmuss50.me/fabric.html
-	minecraft_version=1.21.1
+	minecraft_version=1.21.5
-	loader_version=0.16.3
+	loader_version=0.16.13
-	yarn_mappings=1.21.1+build.3
+	yarn_mappings=1.21.5+build.1
 
 # Mod Properties
-	mod_version = 0.0.1-SNAPSHOT
+	mod_version = 0.2.0-SNAPSHOT
 	maven_group = io.github.skippyall
 	archives_base_name = Minions
 
 # Dependencies
 	# check this on https://modmuss50.me/fabric.html
-	fabric_version=0.103.0+1.21.1
+	fabric_version=0.121.0+1.21.5
 
-	polymer_version=0.9.12+1.21.1
+	polymer_version=0.12.3+1.21.5
-	sgui_version=1.6.0+1.21
+	sgui_version=1.9.0+1.21.5
-	server_translations_version=2.3.1+1.21-pre2
+	server_translations_version=2.5.0+1.21.5-rc1
+
+	universal_graves_version=3.7.1+1.21.5

gradle/wrapper/gradle-wrapper.properties

@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip

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

@@ -0,0 +1,35 @@
+package io.github.skippyall.minions;
+
+import eu.pb4.polymer.core.api.item.PolymerItemGroupUtils;
+import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemStack;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MinionCreativeTab {
+    public static ItemGroup group;
+
+    private static final List<ItemStack> items = new ArrayList<>();
+
+    public static void add(Item entry) {
+        items.add(entry.getDefaultStack());
+    }
+
+    public static void collectEntries(ItemGroup.DisplayContext displayContext, ItemGroup.Entries entries) {
+        entries.addAll(items);
+    }
+
+    public static void registerGroup() {
+        group = FabricItemGroup.builder()
+                .displayName(Text.translatable("minions.generic.mod_name"))
+                .icon(MinionItems.MINION_ITEM::getDefaultStack)
+                .entries(MinionCreativeTab::collectEntries)
+                .build();
+        PolymerItemGroupUtils.registerPolymerItemGroup(Identifier.of(Minions.MOD_ID, "main"), group);
+    }
+}

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

@@ -0,0 +1,44 @@
+package io.github.skippyall.minions;
+
+import eu.pb4.polymer.core.api.item.SimplePolymerItem;
+import io.github.skippyall.minions.minion.MinionItem;
+import io.github.skippyall.minions.module.Modules;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.DamageResistantComponent;
+import net.minecraft.entity.damage.DamageType;
+import net.minecraft.item.Item;
+import net.minecraft.item.Items;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.tag.TagKey;
+import net.minecraft.util.Identifier;
+
+import java.util.function.Function;
+
+import static io.github.skippyall.minions.Minions.MOD_ID;
+
+public class MinionItems {
+    public static final TagKey<DamageType> MINION_ITEM_RESISTS = TagKey.of(RegistryKeys.DAMAGE_TYPE, Identifier.of(MOD_ID, "minion_item_resists"));
+    public static final MinionItem MINION_ITEM = registerItem(Identifier.of(MOD_ID, "minion"), settings -> new MinionItem(settings.component(DataComponentTypes.DAMAGE_RESISTANT, new DamageResistantComponent(MINION_ITEM_RESISTS))));
+    public static final SimplePolymerItem BASIC_UPGRADE_BASE = registerItem(Identifier.of(MOD_ID, "basic_upgrade_base"), settings -> new SimplePolymerItem(settings, Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE));
+    public static final SimplePolymerItem ADVANCED_UPGRADE_BASE = registerItem(Identifier.of(MOD_ID, "advanced_upgrade_base"), settings -> new SimplePolymerItem(settings, Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE));
+
+
+    public static <T extends Item> T registerItem(Identifier identifier, Function<Item.Settings, T> constructor, Item.Settings settings) {
+        T item = constructor.apply(settings.registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier)));
+
+        MinionCreativeTab.add(item);
+
+        return Registry.register(Registries.ITEM, identifier, item);
+    }
+
+    public static <T extends Item> T registerItem(Identifier identifier, Function<Item.Settings, T> constructor) {
+        return registerItem(identifier, constructor, new Item.Settings());
+    }
+
+    public static void register() {
+        Modules.register();
+    }
+}

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

@@ -1,65 +1,39 @@
 package io.github.skippyall.minions;
 
 import eu.pb4.polymer.core.api.entity.PolymerEntityUtils;
-import eu.pb4.polymer.core.api.item.SimplePolymerItem;
+import io.github.skippyall.minions.command.MinionsCommand;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
-import io.github.skippyall.minions.minion.MinionItem;
+import io.github.skippyall.minions.minion.MinionData;
 import io.github.skippyall.minions.minion.MinionPersistentState;
-import io.github.skippyall.minions.module.Modules;
 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.event.lifecycle.v1.ServerTickEvents;
-import net.minecraft.item.Item;
-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() {
-        LOGGER.debug("Add Customthing");
+        MinionData.register();
         PolymerEntityUtils.registerType();
         ServerLifecycleEvents.SERVER_STARTED.register(server -> {
             MinionPersistentState.create(server);
-            MinionPersistentState.INSTANCE.getMinionData().forEach(data -> {
+            MinionPersistentState.INSTANCE.getMinionData().forEach((uuid, data) -> {
-                System.out.println("spawn Minion " + data.name);
+                if(data.isSpawned()) {
-                MinionFakePlayer.spawnMinionAt(data, server.getOverworld(), null, null);
+                    MinionFakePlayer.spawnMinion(data, server.getOverworld(), null, null);
-            });
-        });
-        ServerTickEvents.START_SERVER_TICK.register(server -> {
-            exec(() -> {
-                for (Runnable run:executeOnNextTick) {
-                    run.run();
                 }
-                executeOnNextTick.clear();
             });
         });
 
-        Modules.register();
+        CommandRegistrationCallback.EVENT.register((commandDispatcher, commandRegistryAccess, registrationEnvironment) -> {
-    }
+            MinionsCommand.register(commandDispatcher);
-
-    private static synchronized void exec(Runnable run) {
-        run.run();
-    }
-
-    public static void addExecuteOnNextTick(Runnable run) {
-        exec(() -> {
-            executeOnNextTick.add(run);
         });
+
+        MinionItems.register();
+        MinionCreativeTab.registerGroup();
     }
 }

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

@@ -0,0 +1,27 @@
+package io.github.skippyall.minions;
+
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class MinionsTickExecutor {
+    private static final List<Runnable> executeOnNextTick = Collections.synchronizedList(new ArrayList<>());
+
+    public static void register() {
+        ServerTickEvents.START_SERVER_TICK.register(server -> {
+            synchronized (executeOnNextTick) {
+                for (Runnable run:executeOnNextTick) {
+                    run.run();
+                }
+                executeOnNextTick.clear();
+            }
+        });
+    }
+
+    public static void addExecuteOnNextTick(Runnable run) {
+        executeOnNextTick.add(run);
+
+    }
+}

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

@@ -1,16 +0,0 @@
-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/command/MinionArgument.java

@@ -0,0 +1,52 @@
+package io.github.skippyall.minions.command;
+
+import com.mojang.brigadier.Message;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandExceptionType;
+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.server.command.ServerCommandSource;
+import net.minecraft.text.Text;
+
+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(Text.translatable("minions.command.minion.not_present"));
+
+    public static final MinionSuggestionProvider SUGGESTION_PROVIDER = new MinionSuggestionProvider();
+
+    public static MinionData parse(String argument) throws CommandSyntaxException {
+        Optional<MinionData> data = Optional.empty();
+        if(argument.startsWith(MinionProfileUtils.PREFIX)) {
+            data = MinionPersistentState.INSTANCE.getMinionWithName(argument);
+        } else {
+            try {
+                data = Optional.ofNullable(MinionPersistentState.INSTANCE.getMinionData(UUID.fromString(argument)));
+            } catch (IllegalArgumentException ignored) {}
+        }
+
+        if(data.isEmpty()) {
+            throw MINION_NOT_PRESENT.create();
+        }
+        return data.get();
+    }
+
+    public static class MinionSuggestionProvider implements SuggestionProvider<ServerCommandSource> {
+        @Override
+        public CompletableFuture<Suggestions> getSuggestions(CommandContext<ServerCommandSource> context, SuggestionsBuilder builder) throws CommandSyntaxException {
+            for (MinionData data : MinionPersistentState.INSTANCE.getMinionDataList()) {
+                builder.suggest(data.name());
+            }
+
+            return builder.buildFuture();
+        }
+    }
+}

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

@@ -0,0 +1,18 @@
+package io.github.skippyall.minions.command;
+
+import com.mojang.brigadier.CommandDispatcher;
+import net.minecraft.server.command.ServerCommandSource;
+
+import static net.minecraft.server.command.CommandManager.literal;
+
+public class MinionsCommand {
+    public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
+        dispatcher.register(
+                literal("minions")
+                        .then(SpawnSubcommand.SPAWN)
+                        .then(MobCapDebugSubcommand.MOB_CAP_DEBUG)
+        );
+    }
+
+
+}

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

@@ -0,0 +1,24 @@
+package io.github.skippyall.minions.command;
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import io.github.skippyall.minions.mixinhelper.ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor;
+import io.github.skippyall.minions.mixinhelper.ChunkLevelManagerAccessor;
+import io.github.skippyall.minions.mixins.antimobcap.ServerChunkManagerAccessor;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.server.world.ChunkTicketManager;
+import net.minecraft.text.Text;
+
+import static net.minecraft.server.command.CommandManager.literal;
+
+public class MobCapDebugSubcommand {
+    public static final LiteralArgumentBuilder<ServerCommandSource> MOB_CAP_DEBUG = literal("mobcapdebug")
+            .executes(MobCapDebugSubcommand::mobcapdebugCommand);
+
+    public static int mobcapdebugCommand(CommandContext<ServerCommandSource> context) {
+        ChunkTicketManager ticketManager = ((ServerChunkManagerAccessor)context.getSource().getWorld().getChunkManager()).getTicketManager();
+        int tickedChunkCount = ((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)((ChunkLevelManagerAccessor)ticketManager).minions$getMinionless()).minions$getTickedChunkCount();
+        context.getSource().sendFeedback(() -> Text.of(String.valueOf(tickedChunkCount)), false);
+        return 0;
+    }
+}

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

@@ -0,0 +1,47 @@
+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.command.argument.PosArgument;
+import net.minecraft.command.argument.Vec3ArgumentType;
+import net.minecraft.server.command.ServerCommandSource;
+
+import static net.minecraft.server.command.CommandManager.argument;
+import static net.minecraft.server.command.CommandManager.literal;
+
+public class SpawnSubcommand {
+    public static final LiteralArgumentBuilder<ServerCommandSource> SPAWN = literal("spawn")
+            .then(argument("minion", StringArgumentType.word())
+                    .suggests(MinionArgument.SUGGESTION_PROVIDER)
+                    .then(argument("pos", Vec3ArgumentType.vec3()))
+                    .executes(context ->
+                            spawnCommand(
+                                    context.getSource(),
+                                    StringArgumentType.getString(context, "minion"),
+                                    Vec3ArgumentType.getPosArgument(context, "pos"),
+                                    false
+                            )
+                    )
+
+                    .then(argument("force", BoolArgumentType.bool())
+                            .executes(context ->
+                                    spawnCommand(
+                                            context.getSource(),
+                                            StringArgumentType.getString(context, "minion"),
+                                            Vec3ArgumentType.getPosArgument(context, "pos"),
+                                            BoolArgumentType.getBool(context, "force")
+                                    )
+                            )
+                    )
+            );
+
+    public static int spawnCommand(ServerCommandSource source, String minion, PosArgument pos, boolean force) throws CommandSyntaxException {
+        MinionData data = MinionArgument.parse(minion);
+        MinionFakePlayer.spawnMinion(data, source.getWorld(), pos.getPos(source), pos.getRotation(source), force);
+        return 0;
+    }
+}

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

@@ -1,8 +0,0 @@
-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/gui/CommandsGui.java

@@ -2,8 +2,8 @@ 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.module.command.Command;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import io.github.skippyall.minions.module.ModuleItem;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.server.network.ServerPlayerEntity;

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

@@ -2,11 +2,9 @@ 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 io.github.skippyall.minions.minion.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;
@@ -27,29 +25,27 @@ public class MinionGui {
                     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) -> {
+                .setCallback(() -> {
                     ModuleInventory.openModuleInventory(player, minion);
                 })
         );
         gui.setSlot(5, new GuiElementBuilder()
                 .setItem(Items.CHEST)
                 .setName(Text.translatable("minions.gui.main.inventory"))
-                .setCallback((i, clickType, slotActionType) -> {
+                .setCallback(() -> {
                     openMinionInventory(player, minion);
                 })
         );
+        gui.setSlot(7, new GuiElementBuilder()
+                .setItem(Items.BARRIER)
+                .setName(Text.translatable("minions.gui.main.pickup"))
+                .setCallback(() -> {
+                    minion.kill(minion.getServerWorld());
+                })
+        );
         gui.open();
     }
 

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

@@ -0,0 +1,95 @@
+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.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.minion.skin.SkinProviders;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.ProfileComponent;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.screen.ScreenHandlerType;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+import java.util.Optional;
+
+public class MinionLookGui extends SimpleGui {
+    private ItemStack minionItem;
+    private SkinProvider currentSkinProvider;
+
+    public MinionLookGui(ServerPlayerEntity player, ItemStack minionItem) {
+        super(ScreenHandlerType.GENERIC_9X3, player, false);
+        this.minionItem = minionItem;
+        this.currentSkinProvider = SkinProviders.NAME;
+    }
+
+    public void update() {
+        updateName();
+        updateSkin();
+        updateSkinProvider();
+    }
+
+    private void updateName() {
+        setSlot(10, new GuiElementBuilder()
+                .setItem(Items.OAK_SIGN)
+                .setName(Text.literal(getData().name()))
+                .setCallback(() -> {
+                    openRenameGui(player, minionItem);
+                })
+        );
+    }
+
+    private void updateSkin() {
+        GuiElementBuilder builder = new GuiElementBuilder()
+                .setItem(Items.PLAYER_HEAD)
+                .setCallback(() -> currentSkinProvider.openSkinMenu(player).thenAccept(skin -> {
+                    MinionItem.setData(getData().withSkin(skin), minionItem);
+                }));
+        if(MinionItem.getData(minionItem) != null && MinionItem.getData(minionItem).skin().isPresent()) {
+            builder.setComponent(DataComponentTypes.PROFILE, new ProfileComponent(Optional.empty(), Optional.empty(), getData().skin().get()));
+        }
+        setSlot(16, builder);
+    }
+
+    private void cycleSkinProvider() {
+        int currentId = SkinProviders.SKIN_PROVIDERS.getRawId(currentSkinProvider);
+        currentId++;
+        if(SkinProviders.SKIN_PROVIDERS.size() == currentId) {
+            currentId = 0;
+        }
+
+        currentSkinProvider = SkinProviders.SKIN_PROVIDERS.get(currentId);
+        updateSkinProvider();
+    }
+
+    private void updateSkinProvider() {
+        setSlot(25, new GuiElementBuilder()
+                .setItem(Items.GREEN_STAINED_GLASS_PANE)
+                .setComponent(DataComponentTypes.CUSTOM_NAME, currentSkinProvider.getDisplayName())
+                .setCallback(this::cycleSkinProvider)
+        );
+    }
+
+    private MinionData getData() {
+        return MinionItem.getDataOrDefault(minionItem);
+    }
+
+    public static void open(ServerPlayerEntity player, ItemStack minionItem) {
+        MinionLookGui gui = new MinionLookGui(player, minionItem);
+        gui.update();
+        gui.open();
+    }
+
+    public void openRenameGui(ServerPlayerEntity player, ItemStack minionItem) {
+        TextInput.inputSync(player, Text.translatable("minions.gui.look.rename.title"), "Minion", MinionProfileUtils::checkMinionNameWithoutPrefix)
+                .thenAccept(name -> {
+                    MinionItem.setData(getData().withName(MinionProfileUtils.PREFIX + name), minionItem);
+                    open();
+                });
+    }
+}

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

@@ -1,9 +1,12 @@
 package io.github.skippyall.minions.gui;
 
-import io.github.skippyall.minions.command.Command;
+import io.github.skippyall.minions.module.command.Command;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import io.github.skippyall.minions.module.ModuleItem;
 import io.github.skippyall.minions.program.block.CodeBlock;
+import net.fabricmc.fabric.impl.transfer.item.ComposterWrapper;
+import net.fabricmc.fabric.mixin.transfer.JukeboxBlockEntityMixin;
+import net.minecraft.block.ComposterBlock;
 import net.minecraft.inventory.Inventories;
 import net.minecraft.inventory.SimpleInventory;
 import net.minecraft.item.ItemStack;
@@ -14,9 +17,13 @@ import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class ModuleInventory extends SimpleInventory {
+    private final Set<ModuleItem> modules = new HashSet<>();
     public ModuleInventory() {
         super(27);
     }
@@ -35,8 +42,24 @@ public class ModuleInventory extends SimpleInventory {
         return (stack.getCount() <= getMaxCountPerStack()) && stack.getItem() instanceof ModuleItem;
     }
 
+    @Override
+    public void markDirty() {
+        super.markDirty();
+        updateModules();
+    }
+
+    public void updateModules() {
+        modules.clear();
+        for (ItemStack heldStack : heldStacks) {
+            if(heldStack.getItem() instanceof ModuleItem moduleItem) {
+                modules.add(moduleItem);
+            }
+        }
+    }
+
     public void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup lookup) {
         Inventories.readNbt(nbt, heldStacks, lookup);
+        updateModules();
     }
 
     public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup lookup) {
@@ -44,21 +67,10 @@ public class ModuleInventory extends SimpleInventory {
     }
 
     public boolean hasModule(ModuleItem module) {
-        for(ItemStack stack : heldStacks) {
+        return modules.contains(module);
-            if(stack.getItem() instanceof ModuleItem module2 && module2 == module) {
-                return true;
-            }
-        }
-        return false;
     }
 
-    public List<ModuleItem> getModuleItems() {
+    public Collection<ModuleItem> getModuleItems() {
-        ArrayList<ModuleItem> modules = new ArrayList<>();
-        for(ItemStack stack : heldStacks) {
-            if(stack.getItem() instanceof ModuleItem module) {
-                modules.add(module);
-            }
-        }
         return modules;
     }
 

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

@@ -0,0 +1,117 @@
+package io.github.skippyall.minions.input;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+public interface Result<T, E> {
+    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));
+        }
+    }
+
+    boolean isSuccess();
+
+    @NotNull T getOrDefault(@NotNull T defaultValue);
+
+    @NotNull T getOrThrow();
+
+    @NotNull E getErrorOrThrow();
+
+    @NotNull Optional<T> getOptional();
+
+    void ifSuccess(@NotNull Consumer<T> handler);
+
+    void ifError(@NotNull Consumer<Error<T, E>> handler);
+
+    record Success<T, E>(@NotNull T result) implements Result<T, E> {
+        @Override
+        public boolean isSuccess() {
+            return true;
+        }
+
+        @Override
+        public @NotNull T getOrDefault(@NotNull T defaultValue) {
+            return result;
+        }
+
+        @Override
+        public @NotNull T getOrThrow() {
+            return result;
+        }
+
+        @Override
+        public @NotNull E getErrorOrThrow() {
+            throw new RuntimeException("Result was not an Error");
+        }
+
+        @Override
+        public @NotNull Optional<T> getOptional() {
+            return Optional.of(result);
+        }
+
+        @Override
+        public void ifSuccess(@NotNull Consumer<T> handler) {
+            handler.accept(result);
+        }
+
+        @Override
+        public void ifError(@NotNull Consumer<Error<T, E>> handler) {
+
+        }
+    }
+
+    record Error<T, E>(@NotNull E message) implements Result<T, E> {
+        @Override
+        public boolean isSuccess() {
+            return false;
+        }
+
+        @Override
+        public @NotNull T getOrDefault(@NotNull T defaultValue) {
+            return defaultValue;
+        }
+
+        @Override
+        public @NotNull T getOrThrow() {
+            throw new RuntimeException("Result was an error: " + message.toString());
+        }
+
+        @Override
+        public @NotNull E getErrorOrThrow() {
+            return message;
+        }
+
+        @Override
+        public @NotNull Optional<T> getOptional() {
+            return Optional.empty();
+        }
+
+        @Override
+        public void ifSuccess(@NotNull Consumer<T> handler) {
+
+        }
+
+        @Override
+        public void ifError(Consumer<Error<T, E>> handler) {
+            handler.accept(this);
+        }
+    }
+
+    interface UnsafeOperation<T> {
+        T run() throws Exception;
+    }
+}

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

@@ -8,20 +8,83 @@ import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.function.Predicate;
 
-public class TextInput {
+public class TextInput<T> extends AnvilInputGui {
-    public static CompletableFuture<String> inputText(ServerPlayerEntity player, Text title, String defaultText) {
+    private final GuiElementBuilder valid = new GuiElementBuilder()
-        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()))
+            .setCallback(this::onConfirm);
-        );
+
-        gui.setTitle(title);
+    private final GuiElementBuilder invalid = new GuiElementBuilder()
-        gui.setDefaultInputValue(defaultText);
+            .setItem(Items.REDSTONE_BLOCK);
-        gui.open();
+    private final Function<String, CompletableFuture<Result<T, Text>>> parser;
+    private final CompletableFuture<T> future;
+    private Result<T, Text> result;
+
+    public TextInput(ServerPlayerEntity player, Text title, String defaultValue, Function<String, CompletableFuture<Result<T, Text>>> parser, CompletableFuture<T> future) {
+        super(player, false);
+        setTitle(title);
+        setDefaultInputValue(defaultValue);
+        this.parser = parser;
+        this.future = future;
+
+        updateConfirmButton(defaultValue);
+    }
+
+    public static <T> CompletableFuture<T> inputSync(ServerPlayerEntity player, Text title, String defaultValue, Function<String, Result<T, Text>> parser) {
+        return input(player, title, defaultValue, (String string) -> CompletableFuture.completedFuture(parser.apply(string)));
+    }
+
+    public static <T> CompletableFuture<T> input(ServerPlayerEntity player, Text title, String defaultValue, Function<String, CompletableFuture<Result<T, Text>>> parser) {
+        CompletableFuture<T> future = new CompletableFuture<>();
+        new TextInput<>(player, title, defaultValue, parser, future).open();
         return future;
     }
+
+    public static CompletableFuture<String> inputString(ServerPlayerEntity player, Text title, String defaultValue) {
+        return inputSync(player, title, defaultValue, Result.Success::new);
+    }
+
+    public static CompletableFuture<Integer> inputInt(ServerPlayerEntity player, Text title, String defaultValue) {
+        return inputSync(player, title, defaultValue, string -> Result.wrapCustomError(() -> Integer.valueOf(string), Text.translatable("minions.command.input.int.fail")));
+    }
+
+    public static CompletableFuture<Float> inputFloat(ServerPlayerEntity player, Text title, String defaultValue) {
+        return inputSync(player, title, defaultValue, string -> Result.wrapCustomError(() -> Float.valueOf(string), Text.translatable("minions.command.input.float.fail")));
+    }
+
+    @Override
+    public void onInput(String input) {
+        updateConfirmButton(input);
+    }
+
+    public void updateConfirmButton(String input) {
+        parser.apply(input).thenAccept(result -> {
+            this.result = result;
+            if(result.isSuccess()) {
+                setSlot(AnvilScreenHandler.OUTPUT_ID, valid);
+            } else {
+                Text text = result.getErrorOrThrow();
+                setSlot(AnvilScreenHandler.OUTPUT_ID, invalid.setName(text));
+            }
+        });
+    }
+
+    @Override
+    public void onClose() {
+        if(!future.isDone()) {
+            future.cancel(false);
+        }
+    }
+
+    public void onConfirm() {
+        if(result != null) {
+            result.ifSuccess(success -> {
+                future.complete(success);
+                close();
+            });
+        }
+    }
 }

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

@@ -1,14 +0,0 @@
-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/MinionData.java

@@ -1,45 +1,65 @@
 package io.github.skippyall.minions.minion;
 
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import com.mojang.authlib.properties.PropertyMap;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import eu.pb4.polymer.core.api.other.PolymerComponent;
+import io.github.skippyall.minions.Minions;
+import net.minecraft.component.ComponentType;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.Uuids;
+import net.minecraft.util.dynamic.Codecs;
+import org.jetbrains.annotations.Nullable;
 
+import java.util.Optional;
 import java.util.UUID;
 
-public class MinionData {
+public record MinionData(UUID uuid, String name, Optional<PropertyMap> skin, boolean isSpawned) {
-    public UUID uuid;
+    public static final Codec<MinionData> CODEC = RecordCodecBuilder.create(instance ->
-    public String name;
+            instance.group(
-    public UUID skinUuid;
+                    Uuids.CODEC.fieldOf("uuid").forGetter(MinionData::uuid),
+                    Codec.STRING.fieldOf("name").forGetter(MinionData::name),
+                    Codecs.GAME_PROFILE_PROPERTY_MAP.optionalFieldOf("skin").forGetter(MinionData::skin),
+                    Codec.BOOL.optionalFieldOf("isSpawned", false).forGetter(MinionData::isSpawned)
+            ).apply(instance, MinionData::new)
+    );
 
-    public MinionData(UUID uuid, String name, UUID skinUuid) {
+    public static final ComponentType<UUID> COMPONENT = Registry.register(Registries.DATA_COMPONENT_TYPE, Identifier.of(Minions.MOD_ID, "minion_data"), ComponentType.<UUID>builder().codec(Uuids.CODEC).build());
-        this.uuid = uuid;
+
-        this.name = name;
+    public static MinionData createDefault() {
-        this.skinUuid = skinUuid;
+        return new MinionData(UUID.randomUUID(), MinionProfileUtils.newDefaultMinionName(), Optional.empty(), false);
+    }
+
+    public MinionData withUuid(UUID uuid) {
+        return new MinionData(uuid, name, skin, isSpawned);
+    }
+
+    public MinionData withName(String name) {
+        return new MinionData(uuid, name, skin, isSpawned);
+    }
+
+    public MinionData withSkin(Optional<PropertyMap> skin) {
+        return new MinionData(uuid, name, skin, isSpawned);
+    }
+
+    public MinionData withSpawned(boolean isSpawned) {
+        return new MinionData(uuid, name, skin, isSpawned);
     }
 
     public NbtCompound writeNbt() {
-        NbtCompound nbt = new NbtCompound();
+        return (NbtCompound) MinionData.CODEC.encode(this, NbtOps.INSTANCE, null).result().orElse(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");
+        return MinionData.CODEC.decode(NbtOps.INSTANCE, nbt).resultOrPartial().map(Pair::getFirst).orElseGet(MinionData::createDefault);
-        String name = nbt.getString("name");
-        UUID skinUuid = null;
-        if(nbt.contains("skinUuid")) {
-            skinUuid = nbt.getUuid("skinUuid");
     }
 
-        return new MinionData(uuid, name, skinUuid);
+    public static void register() {
-    }
+        PolymerComponent.registerDataComponent(COMPONENT);
-
-    public static MinionData fromMinion(MinionFakePlayer minion) {
-        return new MinionData(minion.getUuid(), minion.getMinionName(), minion.getSkinUuid());
     }
 }

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

@@ -2,91 +2,104 @@ package io.github.skippyall.minions.minion;
 
 import eu.pb4.polymer.core.api.item.PolymerItem;
 import eu.pb4.polymer.core.api.item.PolymerItemUtils;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.gui.MinionLookGui;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import net.minecraft.component.DataComponentTypes;
-import net.minecraft.component.type.NbtComponent;
+import net.minecraft.component.type.TooltipDisplayComponent;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.item.Items;
 import net.minecraft.item.tooltip.TooltipType;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtElement;
-import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
+import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Vec2f;
+import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
+import xyz.nucleoid.packettweaker.PacketContext;
+
+import java.util.List;
+import java.util.function.Consumer;
 
 public class MinionItem extends Item implements PolymerItem {
-    private final boolean canProgram;
+    public MinionItem(Settings settings) {
-
+        super(settings);
-    public MinionItem(boolean canProgram) {
-        super(new Item.Settings());
-        this.canProgram = canProgram;
     }
 
     @Override
-    public Item getPolymerItem(ItemStack itemStack, @Nullable ServerPlayerEntity player) {
+    public @Nullable Identifier getPolymerItemModel(ItemStack stack, PacketContext context) {
+        return null;
+    }
+
+    @Override
+    public Item getPolymerItem(ItemStack itemStack, PacketContext player) {
         return Items.ARMOR_STAND;
     }
 
     @Override
-    public ItemStack getPolymerItemStack(ItemStack stack, TooltipType tooltipType, RegistryWrapper.WrapperLookup lookup, ServerPlayerEntity player) {
+    public ItemStack getPolymerItemStack(ItemStack stack, TooltipType tooltipType, PacketContext player) {
-        ItemStack out = PolymerItemUtils.createItemStack(stack, lookup, player);
+        ItemStack out = PolymerItemUtils.createItemStack(stack, tooltipType, player);
         out.set(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, true);
         return out;
     }
 
+    @Override
+    public void appendTooltip(ItemStack stack, TooltipContext context, TooltipDisplayComponent component,  Consumer<Text> tooltip, TooltipType type) {
+        MinionData data = getData(stack);
+        if(data != null) {
+            tooltip.accept(Text.translatable("minions.minion_item.tooltip", data.name()));
+        }
+    }
+
+    @Override
+    public ActionResult use(World world, PlayerEntity user, Hand hand) {
+        if(user instanceof ServerPlayerEntity serverPlayer) {
+            ItemStack stack = user.getStackInHand(hand);
+            MinionLookGui.open(serverPlayer, stack);
+            return ActionResult.SUCCESS;
+        }
+
+        return ActionResult.SUCCESS_SERVER;
+    }
+
     @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());
+            MinionData data = getDataOrDefault(context.getStack());
-
+            MinionFakePlayer.spawnMinion(data, (ServerWorld) context.getWorld(), context.getBlockPos().toCenterPos().add(0,0.5,0), new Vec2f(0, 0));
-            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();
+        item.set(MinionData.COMPONENT, data.uuid());
-        nbt.put("data", data.writeNbt());
+        MinionPersistentState.INSTANCE.updateMinionData(data);
-        item.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(nbt));
     }
 
     @Nullable
     public static MinionData getData(ItemStack item) {
-        NbtCompound nbt = item.getOrDefault(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT).copyNbt();
+        if(item.contains(MinionData.COMPONENT)) {
-        if (nbt.getType("data") == NbtElement.COMPOUND_TYPE) {
+            return MinionPersistentState.INSTANCE.getMinionData(item.get(MinionData.COMPONENT));
-            return MinionData.readNbt(nbt.getCompound("data"));
         }
         return null;
     }
 
+    public static MinionData getDataOrDefault(ItemStack item) {
+        MinionData data = getData(item);
+        if(data == null) {
+            data = MinionData.createDefault();
+            setData(data, item);
+        }
+        return data;
+    }
+
     public static boolean containsData(ItemStack item) {
-        NbtComponent nbt = item.get(DataComponentTypes.CUSTOM_DATA);
+        return item.contains(MinionData.COMPONENT);
-        if (nbt == null) {
-            return false;
-        }
-        return nbt.copyNbt().contains("data");
     }
 }

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

@@ -1,76 +1,73 @@
 package io.github.skippyall.minions.minion;
 
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import com.mojang.serialization.Codec;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.NbtList;
 import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.PersistentState;
+import net.minecraft.world.PersistentStateType;
 import net.minecraft.world.World;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 
 public class MinionPersistentState extends PersistentState {
-    public static Type<MinionPersistentState> TYPE = new Type<>(MinionPersistentState::new, MinionPersistentState::read, null);
+    public static final Codec<MinionPersistentState> CODEC = MinionData.CODEC.listOf().xmap(MinionPersistentState::new, MinionPersistentState::getMinionDataList);
+
+    public static PersistentStateType<MinionPersistentState> TYPE = new PersistentStateType<>("minion", MinionPersistentState::new, MinionPersistentState.CODEC, null);
 
     public static MinionPersistentState INSTANCE;
 
-    private List<MinionData> minionData = new ArrayList<>();
+    private final Map<UUID, MinionData> minionData = new HashMap<>();
+
+    public MinionPersistentState() {
 
-    @Override
-    public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
-        NbtList list = new NbtList();
-        for(MinionData data : minionData) {
-            list.add(data.writeNbt());
-        }
-        nbt.put("minions", list);
-        return nbt;
     }
 
-    public static MinionPersistentState read(NbtCompound compound, RegistryWrapper.WrapperLookup lookup) {
+    public MinionPersistentState(List<MinionData> dataList) {
-        NbtList list = compound.getList("minions", NbtElement.COMPOUND_TYPE);
+        for (MinionData data : dataList) {
-        MinionPersistentState instance = new MinionPersistentState();
+            minionData.put(data.uuid(), data);
-        for(NbtElement element : list) {
-            instance.addMinion(MinionData.readNbt((NbtCompound) element));
         }
-        return instance;
     }
 
-    public void addMinion(MinionFakePlayer minion) {
+    public MinionData getMinionData(UUID uuid) {
-        addMinion(MinionData.fromMinion(minion));
+        return minionData.get(uuid);
     }
 
-    public void addMinion(MinionData data) {
+    public Map<UUID, MinionData> getMinionData() {
-        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() {
+        return List.copyOf(minionData.values());
+    }
+
+    public void updateMinionData(MinionData data) {
+        minionData.put(data.uuid(), data);
+        markDirty();
+    }
+
+    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.name().equals(name))
+                .findFirst();
+    }
+
     public static void create(MinecraftServer server) {
-        INSTANCE = server.getWorld(World.OVERWORLD).getPersistentStateManager().getOrCreate(TYPE, "minion");
+        INSTANCE = server.getWorld(World.OVERWORLD).getPersistentStateManager().getOrCreate(TYPE);
     }
 }

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

@@ -2,8 +2,14 @@ package io.github.skippyall.minions.minion;
 
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.ProfileLookupCallback;
+import com.mojang.authlib.properties.PropertyMap;
 import com.mojang.authlib.yggdrasil.ProfileResult;
+import com.mojang.brigadier.StringReader;
+import io.github.skippyall.minions.input.Result;
+import net.minecraft.block.entity.SkullBlockEntity;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.text.Text;
+import net.minecraft.util.StringHelper;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.UUID;
@@ -13,59 +19,52 @@ import java.util.concurrent.ForkJoinPool;
 import static io.github.skippyall.minions.Minions.LOGGER;
 
 public class MinionProfileUtils {
-    public static CompletableFuture<@Nullable GameProfile> lookupSkinOwnerProfile(MinecraftServer server, String username) {
+    public static final String PREFIX = "+";
-        CompletableFuture<GameProfile> future = new CompletableFuture<>();
 
-        ForkJoinPool.commonPool().execute(() -> {
+    public static GameProfile makeNewMinionProfile(UUID uuidMinion, String username, PropertyMap skin) {
-            try {
+        if(uuidMinion == null) {
-                server.getGameProfileRepo().findProfilesByNames(new String[]{username}, new ProfileLookupCallback() {
+            uuidMinion = UUID.randomUUID();
-                    @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
+        GameProfile newProfile = new GameProfile(uuidMinion, username);
-                    public void onProfileLookupFailed(String profileName, Exception exception) {
+        if (skin != null) {
-                        LOGGER.warn("Lookup Error: ", exception);
+            newProfile.getProperties().putAll(skin);
-                        future.complete(null);
-                    }
-                });
-            } catch (Throwable e) {
-                LOGGER.warn("Failed to get UUID for username " + username, e);
-                future.complete(null);
-            }
-        });
-
-        return future;
-    }
-
-    public static CompletableFuture<@Nullable GameProfile> getSkinOwnerProfile(MinecraftServer server, @Nullable UUID uuid) {
-        CompletableFuture<GameProfile> future = new CompletableFuture<>();
-        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;
-    }
-
-    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, Text> checkMinionNameWithoutPrefix(String name) {
+        for(char c : name.toCharArray()) {
+            if(!StringReader.isAllowedInUnquotedString(c)) {
+                return new Result.Error<>(Text.translatable("minions.generic.name.invalid_char"));
+            }
+        }
+
+        if((PREFIX + name).length() > 16)  {
+            return new Result.Error<>(Text.translatable("minions.generic.name.too_long"));
+        }
+
+        if(!StringHelper.isValidPlayerName(PREFIX + name)) {
+            return new Result.Error<>(Text.translatable("minions.generic.name.invalid"));
+        }
+
+        if(MinionPersistentState.INSTANCE.isMinionNameTaken(PREFIX + name)) {
+            return new Result.Error<>(Text.translatable("minions.generic.name.taken"));
+        }
+
+        return new Result.Success<>(name);
+    }
+
+    public static String newDefaultMinionName() {
+        int i = 0;
+        while (MinionPersistentState.INSTANCE.isMinionNameTaken("+Minion" + i)) {
+            i++;
+        }
+        return "+Minion" + i;
+    }
+
+    public static boolean isMinion(UUID uuid) {
+        return MinionPersistentState.INSTANCE.isMinion(uuid);
+    }
 }

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

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

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

@@ -1,4 +1,5 @@
-package io.github.skippyall.minions.fakeplayer;
+//partially code from https://github.com/gnembon/fabric-carpet
+package io.github.skippyall.minions.minion.fakeplayer;
 
 
 import java.util.EnumMap;
@@ -82,6 +83,12 @@ 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;
@@ -274,14 +281,14 @@ public class EntityPlayerActionPack
         else // one slot
         {
             if (selectedSlot == -1)
-                selectedSlot = inv.selectedSlot;
+                selectedSlot = inv.getSelectedSlot();
             dropItemFromSlot(selectedSlot, dropAll);
         }
     }
 
     public void setSlot(int slot)
     {
-        player.getInventory().selectedSlot = slot-1;
+        player.getInventory().setSelectedSlot(slot-1);
         player.networkHandler.sendPacket(new UpdateSelectedSlotS2CPacket(slot-1));
     }
 
@@ -292,7 +299,7 @@ public class EntityPlayerActionPack
                     @Override
                     boolean execute(ServerPlayerEntity player, Action action)
                     {
-                        EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
+                        EntityPlayerActionPack ap = ((ServerPlayerInterface) player).minions$getActionPack();
                         if (ap.itemUseCooldown > 0)
                         {
                             ap.itemUseCooldown--;
@@ -314,12 +321,12 @@ public class EntityPlayerActionPack
                                     BlockHitResult blockHit = (BlockHitResult) hit;
                                     BlockPos pos = blockHit.getBlockPos();
                                     Direction side = blockHit.getSide();
-                                    if (pos.getY() < player.getWorld().getTopY() - (side == Direction.UP ? 1 : 0) && world.canPlayerModifyAt(player, pos))
+                                    if (pos.getY() < player.getServerWorld().getTopYInclusive() - (side == Direction.UP ? 1 : 0) && world.canEntityModifyAt(player, pos))
                                     {
                                         ActionResult result = player.interactionManager.interactBlock(player, world, player.getStackInHand(hand), hand, blockHit);
-                                        if (result.isAccepted())
+                                        if (result instanceof ActionResult.Success success)
                                         {
-                                            if (result.shouldSwingHand()) player.swingHand(hand);
+                                            if (success.swingSource() == ActionResult.SwingSource.SERVER) player.swingHand(hand);
                                             ap.itemUseCooldown = 3;
                                             return true;
                                         }
@@ -361,7 +368,7 @@ public class EntityPlayerActionPack
                     @Override
                     void inactiveTick(ServerPlayerEntity player, Action action)
                     {
-                        EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
+                        EntityPlayerActionPack ap = ((ServerPlayerInterface) player).minions$getActionPack();
                         ap.itemUseCooldown = 0;
                         player.stopUsingItem();
                     }
@@ -383,7 +390,7 @@ public class EntityPlayerActionPack
                         return true;
                     }
                     case BLOCK: {
-                        EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
+                        EntityPlayerActionPack ap = ((ServerPlayerInterface) player).minions$getActionPack();
                         if (ap.blockHitDelay > 0)
                         {
                             ap.blockHitDelay--;
@@ -402,7 +409,7 @@ public class EntityPlayerActionPack
                         boolean blockBroken = false;
                         if (player.interactionManager.getGameMode().isCreative())
                         {
-                            player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, side, player.getWorld().getTopY(), -1);
+                            player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, side, player.getWorld().getTopYInclusive(), -1);
                             ap.blockHitDelay = 5;
                             blockBroken = true;
                         }
@@ -410,9 +417,9 @@ public class EntityPlayerActionPack
                         {
                             if (ap.currentBlock != null)
                             {
-                                player.interactionManager.processBlockBreakingAction(ap.currentBlock, PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, side, player.getWorld().getTopY(), -1);
+                                player.interactionManager.processBlockBreakingAction(ap.currentBlock, PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, side, player.getWorld().getTopYInclusive(), -1);
                             }
-                            player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, side, player.getWorld().getTopY(), -1);
+                            player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, side, player.getWorld().getTopYInclusive(), -1);
                             boolean notAir = !state.isAir();
                             if (notAir && ap.curBlockDamageMP == 0)
                             {
@@ -435,7 +442,7 @@ public class EntityPlayerActionPack
                             ap.curBlockDamageMP += state.calcBlockBreakingDelta(player, player.getWorld(), pos);
                             if (ap.curBlockDamageMP >= 1)
                             {
-                                player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, side, player.getWorld().getTopY(), -1);
+                                player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, side, player.getWorld().getTopYInclusive(), -1);
                                 ap.currentBlock = null;
                                 ap.blockHitDelay = 5;
                                 blockBroken = true;
@@ -454,10 +461,10 @@ public class EntityPlayerActionPack
             @Override
             void inactiveTick(ServerPlayerEntity player, Action action)
             {
-                EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
+                EntityPlayerActionPack ap = ((ServerPlayerInterface) player).minions$getActionPack();
                 if (ap.currentBlock == null) return;
                 player.getWorld().setBlockBreakingInfo(-1, ap.currentBlock, -1);
-                player.interactionManager.processBlockBreakingAction(ap.currentBlock, PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, Direction.DOWN, player.getWorld().getTopY(), -1);
+                player.interactionManager.processBlockBreakingAction(ap.currentBlock, PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, Direction.DOWN, player.getWorld().getTopYInclusive(), -1);
                 ap.currentBlock = null;
             }
         },

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

@@ -1,11 +1,11 @@
-package io.github.skippyall.minions.fakeplayer;
+//code from https://github.com/gnembon/fabric-carpet
+package io.github.skippyall.minions.minion.fakeplayer;
 
 import io.netty.channel.embedded.EmbeddedChannel;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.NetworkSide;
-import net.minecraft.network.NetworkState;
+import net.minecraft.network.state.NetworkState;
 import net.minecraft.network.listener.PacketListener;
-import net.minecraft.text.Text;
 
 public class FakeClientConnection extends ClientConnection {
     public FakeClientConnection(NetworkSide p)

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

@@ -1,7 +1,9 @@
-package io.github.skippyall.minions.fakeplayer;
+//partially code from https://github.com/gnembon/fabric-carpet
+package io.github.skippyall.minions.minion.fakeplayer;
 
 import com.mojang.authlib.GameProfile;
-import io.github.skippyall.minions.Minions;
+import com.mojang.authlib.properties.PropertyMap;
+import io.github.skippyall.minions.MinionItems;
 import io.github.skippyall.minions.minion.MinionData;
 import io.github.skippyall.minions.gui.MinionGui;
 import io.github.skippyall.minions.minion.MinionItem;
@@ -10,9 +12,9 @@ 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.ItemEntity;
 import net.minecraft.entity.MovementType;
 import net.minecraft.entity.attribute.EntityAttributes;
 import net.minecraft.entity.damage.DamageSource;
@@ -24,7 +26,7 @@ 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.EntityPositionSyncS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntitySetHeadYawS2CPacket;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.ServerTask;
@@ -42,8 +44,7 @@ import net.minecraft.world.GameMode;
 import net.minecraft.world.TeleportTarget;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.UUID;
+import java.util.Set;
-import java.util.concurrent.CompletableFuture;
 
 public class MinionFakePlayer extends ServerPlayerEntity {
     public Runnable fixStartingPosition = () -> {};
@@ -51,102 +52,59 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     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;
+    private final MinionData data;
 
-    public static void createMinion(MinionData data, ServerWorld level, ServerPlayerEntity owner, boolean canProgram, Vec3d pos, double yaw, double pitch) {
+    public static void spawnMinion(MinionData data, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot) {
+        spawnMinion(data, level, pos, rot, false);
+    }
+
+    public static void spawnMinion(MinionData data, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot, boolean force) {
+        if(!data.isSpawned() || force) {
             MinecraftServer server = level.getServer();
 
-        CompletableFuture<GameProfile> future;
+            PropertyMap skin = data.skin().orElse(null);
-        if(data.skinUuid != null) {
+
-            future = MinionProfileUtils.getSkinOwnerProfile(server, data.skinUuid);
+            GameProfile profile = MinionProfileUtils.makeNewMinionProfile(data.uuid(), data.name(), skin);
-        } else {
+            doSpawn(data, profile, server, level, pos, rot);
-            future = MinionProfileUtils.lookupSkinOwnerProfile(server, data.name);
+        }
     }
 
-        future.thenAccept(skinProfile -> {
+    private static void doSpawn(MinionData data, GameProfile profile, MinecraftServer server, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot) {
-            GameProfile profile = MinionProfileUtils.makeNewMinionProfile(null, data.name, skinProfile);
+        MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, SyncedClientOptions.createDefault(), data);
-            Minions.addExecuteOnNextTick(() -> {
+        MinionPersistentState.INSTANCE.updateMinionData(data.withSpawned(true));
-                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.teleport(level, pos.x, pos.y, pos.z, Set.of(), rot.x, rot.y, true);
         }
         instance.setVelocity(0,0,0);
         instance.setHealth(20.0F);
         instance.unsetRemoved();
+        instance.getAttributeInstance(EntityAttributes.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);
+        server.getPlayerManager().sendToDimension(EntityPositionSyncS2CPacket.create(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)
+    public static MinionFakePlayer respawnFake(MinecraftServer server, ServerWorld level, GameProfile profile, SyncedClientOptions cli, MinionData data)
     {
-        return new MinionFakePlayer(server, level, profile, cli);
+        return new MinionFakePlayer(server, level, profile, cli, data);
     }
 
-    private MinionFakePlayer(MinecraftServer server, ServerWorld worldIn, GameProfile profile, SyncedClientOptions cli)
+    private MinionFakePlayer(MinecraftServer server, ServerWorld worldIn, GameProfile profile, SyncedClientOptions cli, MinionData data)
     {
         super(server, worldIn, profile, cli);
-    }
+        this.data = data;
-
-    public boolean isProgrammable() {
-        return programmable;
-    }
-
-    public void setProgrammable(boolean programmable) {
-        this.programmable = programmable;
     }
 
     public ModuleInventory getModuleInventory() {
@@ -158,7 +116,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     }
 
     public EntityPlayerActionPack getMinionActionPack() {
-        return ((ServerPlayerInterface)this).getActionPack();
+        return ((ServerPlayerInterface)this).minions$getActionPack();
     }
 
     @Override
@@ -198,7 +156,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
             }));
         }
 
-        MinionPersistentState.INSTANCE.removeMinion(this);
+        MinionPersistentState.INSTANCE.updateMinionData(data.withSpawned(false));
     }
 
     @Override
@@ -259,7 +217,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     }
 
     @Override
-    public Entity teleportTo(TeleportTarget target)
+    public ServerPlayerEntity teleportTo(TeleportTarget target)
     {
         super.teleportTo(target);
         if (notInAnyWorld) {
@@ -314,39 +272,33 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     }
 
     @Override
-    protected void drop(ServerWorld world, DamageSource damageSource) {
+    public void drop(ServerWorld world, DamageSource damageSource) {
         super.drop(world, damageSource);
-        dropStack(toItemStack());
+        ItemEntity entity = dropStack(world, toItemStack());
+        if (entity != null) {
+            entity.setNeverDespawn();
+        }
     }
 
     private ItemStack toItemStack() {
-        ItemStack stack = new ItemStack(Minions.MINION_ITEM);
+        ItemStack stack = new ItemStack(MinionItems.MINION_ITEM);
-        MinionItem.setData(MinionData.fromMinion(this), stack);
+        MinionItem.setData(data, stack);
-        if (!getMinionName().equals("Minion")) {
-            stack.set(DataComponentTypes.CUSTOM_NAME, Text.of(getMinionName()));
-        }
         return stack;
     }
 
+    public MinionData getData() {
+        return data;
+    }
+
     @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());
+        moduleInventory.readNbt(nbt.getCompoundOrEmpty("modules"), getRegistryManager());
-        programmable = nbt.getBoolean("programmable");
-    }
-
-    public String getMinionName() {
-        return getGameProfile().getName();
-    }
-
-    public UUID getSkinUuid() {
-        return skinUuid;
     }
 }

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

@@ -1,5 +1,7 @@
-package io.github.skippyall.minions.fakeplayer;
+//code from https://github.com/gnembon/fabric-carpet
+package io.github.skippyall.minions.minion.fakeplayer;
 
+import net.minecraft.entity.player.PlayerPosition;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.s2c.play.PositionFlag;
@@ -33,9 +35,9 @@ public class NetHandlerPlayServerFake extends ServerPlayNetworkHandler
     }
 
     @Override
-    public void requestTeleport(double d, double e, double f, float g, float h, Set<PositionFlag> set)
+    public void requestTeleport(PlayerPosition pos, Set<PositionFlag> set)
     {
-        super.requestTeleport(d, e, f, g, h, set);
+        super.requestTeleport(pos, set);
         if (player.getServerWorld().getPlayerByUuid(player.getUuid()) != null) {
             syncWithPlayerPosition();
             player.getServerWorld().getChunkManager().updatePosition(player);

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

@@ -0,0 +1,7 @@
+//code from https://github.com/gnembon/fabric-carpet
+package io.github.skippyall.minions.minion.fakeplayer;
+
+public interface ServerPlayerInterface
+{
+    EntityPlayerActionPack minions$getActionPack();
+}

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

@@ -1,4 +1,5 @@
-package io.github.skippyall.minions.fakeplayer;
+//code from https://github.com/gnembon/fabric-carpet
+package io.github.skippyall.minions.minion.fakeplayer;
 
 import java.util.Optional;
 import java.util.function.Predicate;

src/main/java/io/github/skippyall/minions/minion/skin/Base64SkinProvider.java

@@ -0,0 +1,27 @@
+package io.github.skippyall.minions.minion.skin;
+
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
+import io.github.skippyall.minions.input.TextInput;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+public class Base64SkinProvider implements SkinProvider {
+    @Override
+    public CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayerEntity player) {
+        return TextInput.inputString(player, Text.translatable("minions.gui.look.skin.base64.title"), "")
+                .thenApply(base64String -> {
+                    PropertyMap map = new PropertyMap();
+                    map.put("textures", new Property("textures", base64String));
+                    return Optional.of(map);
+                });
+    }
+
+    @Override
+    public Text getDisplayName() {
+        return Text.translatable("minions.gui.look.skin.base64");
+    }
+}

src/main/java/io/github/skippyall/minions/minion/skin/NameSkinProvider.java

@@ -0,0 +1,25 @@
+package io.github.skippyall.minions.minion.skin;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.PropertyMap;
+import io.github.skippyall.minions.input.TextInput;
+import net.minecraft.block.entity.SkullBlockEntity;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+public class NameSkinProvider implements SkinProvider {
+    @Override
+    public CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayerEntity player) {
+        return TextInput.inputString(player, Text.translatable("minions.gui.look.skin.name.title"), "")
+                .thenCompose(SkullBlockEntity::fetchProfileByName)
+                .thenApply(gameProfile -> gameProfile.map(GameProfile::getProperties));
+    }
+
+    @Override
+    public Text getDisplayName() {
+        return Text.translatable("minions.gui.look.skin.name");
+    }
+}

src/main/java/io/github/skippyall/minions/minion/skin/SkinProvider.java

@@ -0,0 +1,14 @@
+package io.github.skippyall.minions.minion.skin;
+
+import com.mojang.authlib.properties.PropertyMap;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+public interface SkinProvider {
+    CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayerEntity player);
+
+    Text getDisplayName();
+}

src/main/java/io/github/skippyall/minions/minion/skin/SkinProviders.java

@@ -0,0 +1,25 @@
+package io.github.skippyall.minions.minion.skin;
+
+import com.mojang.serialization.Lifecycle;
+import io.github.skippyall.minions.Minions;
+import net.minecraft.registry.Registry;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.SimpleRegistry;
+import net.minecraft.util.Identifier;
+
+public class SkinProviders {
+    public static final Registry<SkinProvider> SKIN_PROVIDERS = new SimpleRegistry<>(RegistryKey.ofRegistry(Identifier.of(Minions.MOD_ID, "skin_providers")), Lifecycle.stable());
+
+    public static NameSkinProvider NAME = register(new NameSkinProvider(), "name");
+    public static UUIDSkinProvider UUID = register(new UUIDSkinProvider(), "uuid");
+    public static Base64SkinProvider BASE64 = register(new Base64SkinProvider(), "base64");
+
+
+    public static <T extends SkinProvider> T register(T skinProvider, String path) {
+        return Registry.register(SKIN_PROVIDERS, Identifier.of(Minions.MOD_ID, path), skinProvider);
+    }
+
+    public static void register() {
+
+    }
+}

src/main/java/io/github/skippyall/minions/minion/skin/UUIDSkinProvider.java

@@ -0,0 +1,32 @@
+package io.github.skippyall.minions.minion.skin;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.PropertyMap;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import io.github.skippyall.minions.input.TextInput;
+import io.github.skippyall.minions.minion.MinionProfileUtils;
+import net.minecraft.block.entity.SkullBlockEntity;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+import net.minecraft.util.Uuids;
+import net.minecraft.util.dynamic.Codecs;
+
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+public class UUIDSkinProvider implements SkinProvider {
+    @Override
+    public CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayerEntity player) {
+        return TextInput.inputString(player, Text.translatable("minions.gui.look.skin.uuid.title"), "")
+                .thenCompose(uuidString -> SkullBlockEntity.fetchProfileByUuid(UUID.fromString(uuidString)))
+                .thenApply(gameProfile -> gameProfile.map(GameProfile::getProperties));
+    }
+
+    @Override
+    public Text getDisplayName() {
+        return Text.translatable("minions.gui.look.skin.uuid");
+    }
+}

src/main/java/io/github/skippyall/minions/mixinhelper/ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor.java

@@ -0,0 +1,9 @@
+package io.github.skippyall.minions.mixinhelper;
+
+public interface ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor {
+    void minions$markAsMinionless();
+    void minions$markAsTarget();
+    int minions$getTickedChunkCount();
+
+    boolean minions$isRealPlayerInChunk(long chunkPos);
+}

src/main/java/io/github/skippyall/minions/mixinhelper/ChunkLevelManagerAccessor.java

@@ -0,0 +1,11 @@
+package io.github.skippyall.minions.mixinhelper;
+
+import it.unimi.dsi.fastutil.objects.ObjectSet;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ChunkLevelManager;
+
+public interface ChunkLevelManagerAccessor {
+    ObjectSet<ServerPlayerEntity> minions$getPlayers(long chunkpos);
+
+    ChunkLevelManager.DistanceFromNearestPlayerTracker minions$getMinionless();
+}

src/main/java/io/github/skippyall/minions/mixinhelper/EntityViewMixinHelper.java

@@ -0,0 +1,9 @@
+package io.github.skippyall.minions.mixinhelper;
+
+import net.minecraft.entity.Entity;
+
+import java.util.function.Predicate;
+
+public class EntityViewMixinHelper {
+    public static final ThreadLocal<Predicate<Entity>> ADDITIONAL_PREDICATE = ThreadLocal.withInitial(() -> entity -> true);
+}

src/main/java/io/github/skippyall/minions/mixins/ChunkTicketManagerFixMixin.java

@@ -3,11 +3,12 @@ package io.github.skippyall.minions.mixins;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import it.unimi.dsi.fastutil.objects.ObjectSet;
+import net.minecraft.server.world.ChunkLevelManager;
 import net.minecraft.server.world.ChunkTicketManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
-@Mixin(value = ChunkTicketManager.class)
+@Mixin(value = ChunkLevelManager.class)
 public class ChunkTicketManagerFixMixin {
     @WrapOperation(method = "handleChunkLeave", at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/ObjectSet;remove(Ljava/lang/Object;)Z", remap = false))
     public boolean filterIfNull(ObjectSet instance, Object o, Operation<Boolean> original) {

src/main/java/io/github/skippyall/minions/mixins/ConnectionMixin.java

@@ -1,6 +1,7 @@
+//code from https://github.com/gnembon/fabric-carpet
 package io.github.skippyall.minions.mixins;
 
-import io.github.skippyall.minions.fakeplayer.ClientConnectionInterface;
+import io.github.skippyall.minions.minion.fakeplayer.ClientConnectionInterface;
 import io.netty.channel.Channel;
 import net.minecraft.network.ClientConnection;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/io/github/skippyall/minions/mixins/EntityViewMixin.java

@@ -0,0 +1,24 @@
+package io.github.skippyall.minions.mixins;
+
+import io.github.skippyall.minions.mixinhelper.EntityViewMixinHelper;
+import net.minecraft.entity.Entity;
+import net.minecraft.world.EntityView;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+import java.util.function.Predicate;
+
+@Mixin(EntityView.class)
+public interface EntityViewMixin {
+    @ModifyArg(method = "getClosestPlayer(DDDDZ)Lnet/minecraft/entity/player/PlayerEntity;", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/EntityView;getClosestPlayer(DDDDLjava/util/function/Predicate;)Lnet/minecraft/entity/player/PlayerEntity;"))
+    private @Nullable Predicate<Entity> addMinionPredicate(@Nullable Predicate<Entity> targetPredicate) {
+        Predicate<Entity> predicate = EntityViewMixinHelper.ADDITIONAL_PREDICATE.get();
+        if(targetPredicate != null) {
+            return predicate.and(targetPredicate);
+        } else {
+            return predicate;
+        }
+    }
+}

src/main/java/io/github/skippyall/minions/mixins/GraveCompatMixin.java

@@ -0,0 +1,20 @@
+package io.github.skippyall.minions.mixins;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import eu.pb4.graves.grave.Grave;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
+import net.minecraft.server.network.ServerPlayerEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+@Mixin(Grave.class)
+public class GraveCompatMixin {
+    @ModifyArg(method = "createBlock", at = @At(value = "INVOKE", target = "Leu/pb4/graves/grave/Grave;<init>(JLcom/mojang/authlib/GameProfile;BLnet/minecraft/util/Arm;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/Identifier;Leu/pb4/graves/grave/GraveType;JJILnet/minecraft/text/Text;Ljava/util/Collection;Ljava/util/Collection;ZI)V"))
+    private static boolean createGrave(boolean profile, @Local(argsOnly = true) ServerPlayerEntity player) {
+        if(player instanceof MinionFakePlayer) {
+            return false;
+        }
+        return profile;
+    }
+}

src/main/java/io/github/skippyall/minions/mixins/MinecraftServerMixin.java

@@ -1,7 +1,7 @@
 package io.github.skippyall.minions.mixins;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/io/github/skippyall/minions/mixins/MobEntityMixin.java

@@ -1,29 +1,30 @@
 package io.github.skippyall.minions.mixins;
 
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.mixinhelper.EntityViewMixinHelper;
 import io.github.skippyall.minions.module.MobSpawningModule;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.predicate.entity.EntityPredicates;
-import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(MobEntity.class)
 public abstract class MobEntityMixin {
-    @Redirect(method = "checkDespawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getClosestPlayer(Lnet/minecraft/entity/Entity;D)Lnet/minecraft/entity/player/PlayerEntity;"))
+    @WrapOperation(method = "checkDespawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getClosestPlayer(Lnet/minecraft/entity/Entity;D)Lnet/minecraft/entity/player/PlayerEntity;"))
-    public PlayerEntity checkMobDespawningMinion(World instance, Entity entity, double maxDistance) {
+    public PlayerEntity checkMobDespawningMinion(World instance, Entity entity, double maxDistance, Operation<PlayerEntity> original) {
-        return instance.getClosestPlayer(entity.getX(), entity.getY(), entity.getZ(), maxDistance, EntityPredicates.EXCEPT_SPECTATOR.and(entity1 -> {
+        EntityViewMixinHelper.ADDITIONAL_PREDICATE.set(entity2 -> {
-            if(entity1 instanceof ServerPlayerEntity player) {
+            if(entity2 instanceof MinionFakePlayer minion) {
-                if(player instanceof MinionFakePlayer minion) {
                 return MobSpawningModule.canMinionDespawnMobs(minion);
-                }
+            } else {
                 return true;
             }
-            return false;
+        });
-        }));
+        PlayerEntity player = original.call(instance, entity, maxDistance);
+        EntityViewMixinHelper.ADDITIONAL_PREDICATE.remove();
+        return player;
     }
 }

src/main/java/io/github/skippyall/minions/mixins/PlayerListEntryS2CPacket$EntryMixin.java

@@ -1,7 +1,7 @@
 package io.github.skippyall.minions.mixins;
 
 import com.llamalad7.mixinextras.sugar.Local;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket;
 import net.minecraft.server.network.ServerPlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.ModifyArg;
 
 @Mixin(PlayerListS2CPacket.Entry.class)
 public class PlayerListEntryS2CPacket$EntryMixin {
-    @ModifyArg(method = "<init>(Lnet/minecraft/server/network/ServerPlayerEntity;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/play/PlayerListS2CPacket$Entry;<init>(Ljava/util/UUID;Lcom/mojang/authlib/GameProfile;ZILnet/minecraft/world/GameMode;Lnet/minecraft/text/Text;Lnet/minecraft/network/encryption/PublicPlayerSession$Serialized;)V"))
+    @ModifyArg(method = "<init>(Lnet/minecraft/server/network/ServerPlayerEntity;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/play/PlayerListS2CPacket$Entry;<init>(Ljava/util/UUID;Lcom/mojang/authlib/GameProfile;ZILnet/minecraft/world/GameMode;Lnet/minecraft/text/Text;ZILnet/minecraft/network/encryption/PublicPlayerSession$Serialized;)V"), index = 2)
     private static boolean removeMinionFromTabList(boolean original, @Local(argsOnly = true) ServerPlayerEntity player) {
         if(player instanceof MinionFakePlayer) {
             return false;

src/main/java/io/github/skippyall/minions/mixins/PlayerListMixin.java

@@ -1,3 +1,4 @@
+//partially code from https://github.com/gnembon/fabric-carpet
 package io.github.skippyall.minions.mixins;
 
 import com.llamalad7.mixinextras.injector.ModifyReceiver;
@@ -5,8 +6,8 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.authlib.GameProfile;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
-import io.github.skippyall.minions.fakeplayer.NetHandlerPlayServerFake;
+import io.github.skippyall.minions.minion.fakeplayer.NetHandlerPlayServerFake;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.packet.c2s.common.SyncedClientOptions;
@@ -51,7 +52,7 @@ public class PlayerListMixin {
     @WrapOperation(method = "respawnPlayer", at = @At(value = "NEW", target = "(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/server/world/ServerWorld;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/network/packet/c2s/common/SyncedClientOptions;)Lnet/minecraft/server/network/ServerPlayerEntity;"))
     public ServerPlayerEntity makePlayerForRespawn(MinecraftServer minecraftServer, ServerWorld serverLevel, GameProfile gameProfile, SyncedClientOptions clientInformation, Operation<ServerPlayerEntity> original, ServerPlayerEntity serverPlayer, boolean bl) {
         if (serverPlayer instanceof MinionFakePlayer minion) {
-            return MinionFakePlayer.respawnFake(minecraftServer, serverLevel, gameProfile, clientInformation);
+            return MinionFakePlayer.respawnFake(minecraftServer, serverLevel, gameProfile, clientInformation, minion.getData());
         }
         return original.call(minecraftServer, serverLevel, gameProfile, clientInformation);
     }

src/main/java/io/github/skippyall/minions/mixins/ServerPlayNetworkHandlerMixin.java

@@ -2,7 +2,7 @@ package io.github.skippyall.minions.mixins;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import net.minecraft.server.PlayerManager;
 import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;

src/main/java/io/github/skippyall/minions/mixins/ServerPlayerMixin.java

@@ -1,8 +1,8 @@
 package io.github.skippyall.minions.mixins;
 
 import com.mojang.authlib.GameProfile;
-import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack;
+import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
-import io.github.skippyall.minions.fakeplayer.ServerPlayerInterface;
+import io.github.skippyall.minions.minion.fakeplayer.ServerPlayerInterface;
 import net.minecraft.network.packet.c2s.common.SyncedClientOptions;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -18,7 +18,7 @@ public abstract class ServerPlayerMixin implements ServerPlayerInterface {
     @Unique
     public EntityPlayerActionPack actionPack;
     @Override
-    public EntityPlayerActionPack getActionPack()
+    public EntityPlayerActionPack minions$getActionPack()
     {
         return actionPack;
     }

src/main/java/io/github/skippyall/minions/mixins/SleepManagerMixin.java

@@ -2,7 +2,7 @@ package io.github.skippyall.minions.mixins;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.SleepManager;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/io/github/skippyall/minions/mixins/SpawnHelperMixin.java

@@ -1,6 +1,6 @@
 package io.github.skippyall.minions.mixins;
 
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import io.github.skippyall.minions.module.MobSpawningModule;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.predicate.entity.EntityPredicates;

src/main/java/io/github/skippyall/minions/mixins/antimobcap/ChunkLevelManager$DistanceFromNearestPlayerTrackerMixin.java

@@ -0,0 +1,86 @@
+package io.github.skippyall.minions.mixins.antimobcap;
+
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.mixinhelper.ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor;
+import io.github.skippyall.minions.mixinhelper.ChunkLevelManagerAccessor;
+import io.github.skippyall.minions.module.MobSpawningModule;
+import it.unimi.dsi.fastutil.longs.Long2ByteMap;
+import it.unimi.dsi.fastutil.objects.ObjectSet;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ChunkLevelManager;
+import net.minecraft.server.world.ChunkTicketManager;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(value = ChunkLevelManager.DistanceFromNearestPlayerTracker.class)
+public abstract class ChunkLevelManager$DistanceFromNearestPlayerTrackerMixin extends ChunkPosDistanceLevelPropagatorMixin implements ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor {
+    @Final
+    @Shadow
+    ChunkLevelManager field_17462;
+
+    @Shadow
+    @Final
+    protected Long2ByteMap distanceFromNearestPlayer;
+
+    @Shadow protected abstract boolean isPlayerInChunk(long chunkPos);
+
+    @Unique
+    boolean minions$minionless, minions$target;
+
+    @Inject(method = "isPlayerInChunk", at = @At("RETURN"), cancellable = true)
+    public void minions$filterMinions(long chunkPos, CallbackInfoReturnable<Boolean> cir) {
+        if (minions$minionless) {
+            cir.setReturnValue(minions$isRealPlayerInChunk(chunkPos));
+        }
+    }
+
+    @Override
+    public boolean minions$isRealPlayerInChunk(long chunkPos) {
+        ObjectSet<ServerPlayerEntity> players = ((ChunkLevelManagerAccessor)field_17462).minions$getPlayers(chunkPos);
+        boolean contains = false;
+        if(players != null) {
+            contains = players.stream().anyMatch(player -> {
+                if (player instanceof MinionFakePlayer minion) {
+                    return MobSpawningModule.canMinionSpawnMobs(minion);
+                }
+                return true;
+            });
+        }
+        return contains;
+    }
+
+    @Inject(method = "updateLevels", at = @At("HEAD"))
+    public void minions$sync(CallbackInfo info) {
+        if (minions$target) {
+            ((ChunkLevelManagerAccessor)field_17462).minions$getMinionless().updateLevels();
+        }
+    }
+
+    @Override
+    public void minions$updateLevel(long chunkPos, int distance, boolean decrease, CallbackInfo info) {
+        if (minions$target && (distance == Integer.MAX_VALUE || minions$isRealPlayerInChunk(chunkPos))) {
+            ((ChunkLevelManagerAccessor)field_17462).minions$getMinionless().updateLevel(chunkPos, distance, decrease);
+        }
+    }
+
+    @Override
+    public void minions$markAsMinionless() {
+        minions$minionless = true;
+    }
+
+    @Override
+    public void minions$markAsTarget() {
+        minions$target = true;
+    }
+
+    @Override
+    public int minions$getTickedChunkCount() {
+        return distanceFromNearestPlayer.size();
+    }
+}

src/main/java/io/github/skippyall/minions/mixins/antimobcap/ChunkLevelManagerMixin.java

@@ -0,0 +1,52 @@
+package io.github.skippyall.minions.mixins.antimobcap;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import io.github.skippyall.minions.mixinhelper.ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor;
+import io.github.skippyall.minions.mixinhelper.ChunkLevelManagerAccessor;
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
+import it.unimi.dsi.fastutil.objects.ObjectSet;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ChunkLevelManager;
+import net.minecraft.server.world.ChunkTicketManager;
+import net.minecraft.util.math.ChunkSectionPos;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.concurrent.Executor;
+
+@Mixin(ChunkLevelManager.class)
+public class ChunkLevelManagerMixin implements ChunkLevelManagerAccessor {
+    @Shadow @Final private Long2ObjectMap<ObjectSet<ServerPlayerEntity>> playersByChunkPos;
+    @Shadow @Final private ChunkLevelManager.DistanceFromNearestPlayerTracker distanceFromNearestPlayerTracker;
+    @Unique
+    ChunkLevelManager.DistanceFromNearestPlayerTracker minionless;
+
+    @Inject(method = "<init>", at = @At("RETURN"))
+    public void createMinionlessClone(ChunkTicketManager ticketManager, Executor executor, Executor mainThreadExecutor, CallbackInfo ci) {
+        ChunkLevelManager manager = ((ChunkLevelManager)(Object)this);
+        minionless = manager.new DistanceFromNearestPlayerTracker(8);
+        ((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)minionless).minions$markAsMinionless();
+        ((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)distanceFromNearestPlayerTracker).minions$markAsTarget();
+    }
+
+    public ObjectSet<ServerPlayerEntity> minions$getPlayers(long chunkpos) {
+        return playersByChunkPos.get(chunkpos);
+    }
+
+    @Override
+    public ChunkLevelManager.DistanceFromNearestPlayerTracker minions$getMinionless() {
+        return minionless;
+    }
+
+    @Inject(method = "handleChunkLeave", at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/ObjectSet;remove(Ljava/lang/Object;)Z", shift = At.Shift.AFTER, remap = false))
+    public void minion$updateMinionlessIfNoMinionInChunk(ChunkSectionPos pos, ServerPlayerEntity player, CallbackInfo ci, @Local long chunk) {
+        if (!((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)minionless).minions$isRealPlayerInChunk(chunk)) {
+            minionless.updateLevel(chunk, Integer.MAX_VALUE, false);
+        }
+    }
+}

src/main/java/io/github/skippyall/minions/mixins/antimobcap/ChunkPosDistanceLevelPropagatorMixin.java

@@ -0,0 +1,15 @@
+package io.github.skippyall.minions.mixins.antimobcap;
+
+import net.minecraft.server.world.ChunkPosDistanceLevelPropagator;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ChunkPosDistanceLevelPropagator.class)
+public class ChunkPosDistanceLevelPropagatorMixin {
+    @Inject(method = "updateLevel", at = @At("HEAD"))
+    public void minions$updateLevel(long chunkPos, int distance, boolean decrease, CallbackInfo info) {
+
+    }
+}

src/main/java/io/github/skippyall/minions/mixins/antimobcap/ServerChunkManagerAccessor.java

@@ -0,0 +1,12 @@
+package io.github.skippyall.minions.mixins.antimobcap;
+
+import net.minecraft.server.world.ChunkTicketManager;
+import net.minecraft.server.world.ServerChunkManager;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(ServerChunkManager.class)
+public interface ServerChunkManagerAccessor {
+    @Accessor
+    ChunkTicketManager getTicketManager();
+}

src/main/java/io/github/skippyall/minions/mixins/antimobcap/ServerChunkManagerMixin.java

@@ -0,0 +1,24 @@
+package io.github.skippyall.minions.mixins.antimobcap;
+
+import io.github.skippyall.minions.mixinhelper.ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor;
+import io.github.skippyall.minions.mixinhelper.ChunkLevelManagerAccessor;
+import net.minecraft.server.world.ChunkLevelManager;
+import net.minecraft.server.world.ChunkTicketManager;
+import net.minecraft.server.world.ServerChunkManager;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+@Mixin(ServerChunkManager.class)
+public class ServerChunkManagerMixin {
+    @Shadow
+    @Final
+    private ChunkLevelManager levelManager;
+
+    @ModifyArg(method = "tickChunks(Lnet/minecraft/util/profiler/Profiler;J)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/SpawnHelper;setupSpawn(ILjava/lang/Iterable;Lnet/minecraft/world/SpawnHelper$ChunkSource;Lnet/minecraft/world/SpawnDensityCapper;)Lnet/minecraft/world/SpawnHelper$Info;"))
+    public int useMinionless(int spawningChunkCount) {
+        return ((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)((ChunkLevelManagerAccessor)levelManager).minions$getMinionless()).minions$getTickedChunkCount();
+    }
+}

src/main/java/io/github/skippyall/minions/module/ActionModules.java

@@ -2,9 +2,10 @@ package io.github.skippyall.minions.module;
 
 import eu.pb4.sgui.api.elements.GuiElementBuilder;
 import eu.pb4.sgui.api.gui.SimpleGui;
-import io.github.skippyall.minions.command.CommandExecutor;
+import io.github.skippyall.minions.module.command.CommandExecutor;
-import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack;
+import io.github.skippyall.minions.input.TextInput;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import net.minecraft.item.Items;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -15,8 +16,19 @@ public class ActionModules {
         minion.getMinionActionPack().start(actionType, EntityPlayerActionPack.Action.once());
     }
 
-    public static void intervalExecutor(EntityPlayerActionPack.ActionType actionType, ServerPlayerEntity player, MinionFakePlayer minion) {
+    public static void executeContinuous(EntityPlayerActionPack.ActionType actionType, ServerPlayerEntity player, MinionFakePlayer minion) {
-        minion.getMinionActionPack().start(actionType, EntityPlayerActionPack.Action.interval());
+        minion.getMinionActionPack().start(actionType, EntityPlayerActionPack.Action.continuous());
+    }
+
+    public static void executeInterval(EntityPlayerActionPack.ActionType actionType, ServerPlayerEntity player, MinionFakePlayer minion) {
+        TextInput.inputFloat(player, Text.translatable("minions.command.action.interval.enter"), "3.5").thenAccept(interval -> {
+            int ticks = Math.round(interval * 20);
+            minion.getMinionActionPack().start(actionType, EntityPlayerActionPack.Action.interval(ticks));
+        });
+    }
+
+    public static void executeStop(EntityPlayerActionPack.ActionType actionType, ServerPlayerEntity player, MinionFakePlayer minion) {
+        minion.getMinionActionPack().stop(actionType);
     }
 
     public static CommandExecutor detailSelectionExecutor(EntityPlayerActionPack.ActionType actionType, Text actionName) {
@@ -29,6 +41,22 @@ public class ActionModules {
                     .setName(Text.translatable("minions.command.action.once", actionName))
                     .setCallback(() -> executeOnce(actionType, player, minion))
             );
+            gui.setSlot(3, new GuiElementBuilder()
+                    .setItem(Items.REPEATING_COMMAND_BLOCK)
+                    .setName(Text.translatable("minions.command.action.continuous", actionName))
+                    .setCallback(() -> executeContinuous(actionType, player, minion))
+            );
+            gui.setSlot(5, new GuiElementBuilder()
+                    .setItem(Items.CHAIN_COMMAND_BLOCK)
+                    .setName(Text.translatable("minions.command.action.interval", actionName))
+                    .setCallback(() -> executeInterval(actionType, player, minion))
+            );
+            gui.setSlot(4, new GuiElementBuilder()
+                    .setItem(Items.BARRIER)
+                    .setName(Text.translatable("minions.command.action.stop", actionName))
+                    .setCallback(() -> executeStop(actionType, player, minion))
+            );
+            gui.open();
         };
     }
 }

src/main/java/io/github/skippyall/minions/module/AttackModule.java

@@ -0,0 +1,33 @@
+package io.github.skippyall.minions.module;
+
+import io.github.skippyall.minions.Minions;
+import io.github.skippyall.minions.module.command.SimpleCommand;
+import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
+import net.minecraft.item.Items;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+
+import java.util.List;
+
+import static io.github.skippyall.minions.module.Modules.register;
+
+public class AttackModule {
+    public static final SimpleCommand ATTACK_COMMAND = new SimpleCommand(
+            Text.translatable("minions.command.attack.name"),
+            Text.translatable("minions.command.attack.description"),
+            Items.DIAMOND_PICKAXE,
+            ActionModules.detailSelectionExecutor(EntityPlayerActionPack.ActionType.ATTACK, Text.translatable("minions.command.attack.name"))
+    );
+
+    public static final SimpleModuleItem ATTACK_MODULE = register(
+            Identifier.of(Minions.MOD_ID, "attack_module"),
+            List.of(),
+            List.of(ATTACK_COMMAND),
+            Items.DIAMOND_PICKAXE
+    );
+
+    public static void registerMe() {
+
+    }
+}
+

src/main/java/io/github/skippyall/minions/module/ChatModule.java

@@ -1,7 +1,7 @@
 package io.github.skippyall.minions.module;
 
 import io.github.skippyall.minions.Minions;
-import io.github.skippyall.minions.command.SimpleCommand;
+import io.github.skippyall.minions.module.command.SimpleCommand;
 import net.minecraft.item.Items;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
@@ -13,10 +13,10 @@ import static io.github.skippyall.minions.module.Modules.register;
 
 public class ChatModule {
     public static final SimpleModuleItem CHAT_MODULE = register(Identifier.of(Minions.MOD_ID, "chat_module"),
-            new SimpleModuleItem(new ArrayList<>(), Arrays.asList(
+            new ArrayList<>(), Arrays.asList(
                     new SimpleCommand(Text.of("Message"), Text.of("Send Message in Public Chat"), Items.PAPER, (player, minion) -> minion.getServer().getPlayerManager().broadcast(Text.of("message"), true)),
                     new SimpleCommand(Text.of("Prvt-Message"), Text.of("Send Message to one Person"), Items.TRIAL_KEY, (player, minion) -> {})
-            ), Items.PAPER));
+            ), Items.PAPER);
 
     public static void registerMe() {}
 }

src/main/java/io/github/skippyall/minions/module/InteractModule.java

@@ -0,0 +1,33 @@
+package io.github.skippyall.minions.module;
+
+import io.github.skippyall.minions.Minions;
+import io.github.skippyall.minions.module.command.SimpleCommand;
+import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
+import net.minecraft.item.Items;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+
+import java.util.List;
+
+import static io.github.skippyall.minions.module.Modules.register;
+
+public class InteractModule {
+    public static final SimpleCommand INTERACT_COMMAND = new SimpleCommand(
+            Text.translatable("minions.command.interact.name"),
+            Text.translatable("minions.command.interact.description"),
+            Items.LEVER,
+            ActionModules.detailSelectionExecutor(EntityPlayerActionPack.ActionType.USE, Text.translatable("minions.command.interact.name"))
+    );
+
+    public static final SimpleModuleItem INTERACT_MODULE = register(
+            Identifier.of(Minions.MOD_ID, "interact_module"),
+            List.of(),
+            List.of(INTERACT_COMMAND),
+            Items.LEVER
+    );
+
+    public static void registerMe() {
+
+    }
+}
+

src/main/java/io/github/skippyall/minions/module/MobSpawningModule.java

@@ -1,7 +1,7 @@
 package io.github.skippyall.minions.module;
 
 import io.github.skippyall.minions.Minions;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import net.minecraft.item.Items;
 import net.minecraft.util.Identifier;
 
@@ -10,7 +10,13 @@ import java.util.List;
 import static io.github.skippyall.minions.module.Modules.register;
 
 public class MobSpawningModule {
-    public static final SimpleModuleItem MOB_SPAWNING_MODULE = register(Identifier.of(Minions.MOD_ID, "mob_spawning_module"), new SimpleModuleItem(List.of(), List.of(), Items.SPAWNER));
+    public static final SimpleModuleItem MOB_SPAWNING_MODULE =
+            register(
+                    Identifier.of(Minions.MOD_ID, "mob_spawning_module"),
+                    List.of(),
+                    List.of(),
+                    Items.SPAWNER
+            );
 
     public static boolean canMinionSpawnMobs(MinionFakePlayer minion) {
         return minion.getModuleInventory().hasModule(MOB_SPAWNING_MODULE);

src/main/java/io/github/skippyall/minions/module/ModuleItem.java

@@ -1,6 +1,6 @@
 package io.github.skippyall.minions.module;
 
-import io.github.skippyall.minions.command.Command;
+import io.github.skippyall.minions.module.command.Command;
 import io.github.skippyall.minions.program.block.CodeBlock;
 import net.minecraft.item.ItemConvertible;
 

src/main/java/io/github/skippyall/minions/module/Modules.java

@@ -1,19 +1,28 @@
 package io.github.skippyall.minions.module;
 
+import io.github.skippyall.minions.MinionItems;
+import io.github.skippyall.minions.module.command.Command;
+import io.github.skippyall.minions.program.block.CodeBlock;
 import net.minecraft.item.Item;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryKeys;
 import net.minecraft.util.Identifier;
 
+import java.util.List;
+
 public class Modules {
     public static void register() {
         ChatModule.registerMe();
         MountModule.registerMe();
         MoveModule.registerMe();
         MobSpawningModule.registerMe();
+        InteractModule.registerMe();
+        AttackModule.registerMe();
     }
 
-    public static <T extends Item & ModuleItem> T register(Identifier id, T item) {
+    public static SimpleModuleItem register(Identifier id, List<CodeBlock<?,?>> codeBlocks, List<Command> commands, Item vanillaItem) {
-        return Registry.register(Registries.ITEM, id, item);
+        return MinionItems.registerItem(id, settings -> new SimpleModuleItem(codeBlocks, commands, settings, vanillaItem));
     }
 }

src/main/java/io/github/skippyall/minions/module/MountModule.java

@@ -1,24 +1,41 @@
 package io.github.skippyall.minions.module;
 
 import io.github.skippyall.minions.Minions;
-import io.github.skippyall.minions.command.SimpleCommand;
+import io.github.skippyall.minions.module.command.SimpleCommand;
 import net.minecraft.item.Items;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
-import java.util.ArrayList;
+import java.util.List;
-import java.util.Arrays;
 
 import static io.github.skippyall.minions.module.Modules.register;
 
 public class MountModule {
-    public static final SimpleModuleItem MOUNT_MODULE = register(Identifier.of(Minions.MOD_ID, "mount_module"),
+    public static final SimpleCommand MOUNT_COMMAND = new SimpleCommand(
-            new SimpleModuleItem(new ArrayList<>(), Arrays.asList(
+            Text.of("Mount"),
-                    new SimpleCommand(Text.of("Mount"), Text.of("Mount the minion to the nearest mountable Entity"), Items.MINECART, (player, minion) -> minion.getMinionActionPack().mount(true)),
+            Text.of("Mount the minion to the nearest mountable Entity"),
-                    new SimpleCommand(Text.of("Dismount"), Text.of("Dismount the minion"), Items.BARRIER, (player, minion) -> minion.getMinionActionPack().dismount())
+            Items.MINECART,
-            ), Items.MINECART)
+            (player, minion) -> minion.getMinionActionPack().mount(true)
     );
 
-    public static void registerMe() {}
+    public static final SimpleCommand DISMOUNT_COMMAND = new SimpleCommand(
+            Text.of("Dismount"),
+            Text.of("Dismount the minion"),
+            Items.BARRIER,
+            (player, minion) -> minion.getMinionActionPack().dismount()
+    );
+
+    public static final SimpleModuleItem MOUNT_MODULE =
+            register(Identifier.of(Minions.MOD_ID, "mount_module"),
+                    List.of(),
+                    List.of(
+                            MOUNT_COMMAND,
+                            DISMOUNT_COMMAND
+                    ),
+                    Items.MINECART
+            );
+
+    public static void registerMe() {
+    }
 
 }

src/main/java/io/github/skippyall/minions/module/MoveModule.java

@@ -1,7 +1,7 @@
 package io.github.skippyall.minions.module;
 
 import io.github.skippyall.minions.Minions;
-import io.github.skippyall.minions.command.SimpleCommand;
+import io.github.skippyall.minions.module.command.SimpleCommand;
 import io.github.skippyall.minions.input.TextInput;
 import net.minecraft.item.Items;
 import net.minecraft.text.Text;
@@ -12,43 +12,65 @@ import java.util.List;
 import static io.github.skippyall.minions.module.Modules.register;
 
 public class MoveModule {
-    public static final SimpleCommand WALK_COMMAND = new SimpleCommand(Text.literal("Walk"), Text.literal("Walk a specific amount of blocks forward"), Items.IRON_BOOTS, (player, minion) -> {
+    public static final SimpleCommand WALK_COMMAND =
-        TextInput.inputText(player, Text.literal("Amount of Blocks"), "1")
+            new SimpleCommand(
-                .thenAccept(string -> {
+                    Text.literal("Walk"),
-                    try {
+                    Text.literal("Walk a specific amount of blocks forward"),
-                        float blocks = Float.parseFloat(string);
+                    Items.IRON_BOOTS,
-                        minion.moveForward(blocks);
+                    (player, minion) -> TextInput.inputFloat(player, Text.literal("Amount of Blocks"), "1")
-                    } catch (NumberFormatException e) {
+                            .thenAccept(minion::moveForward)
-                        player.sendMessage(Text.literal("No valid number"));
+            );
-                    }
-                });
-    });
 
-    public static final SimpleCommand TURN_RIGHT_COMMAND = new SimpleCommand(Text.literal("Turn Right"), Text.literal("Turn a specific amount of degrees right"), Items.COMPASS, ((player, minion) -> {
+    public static final SimpleCommand TURN_RIGHT_COMMAND =
-        TextInput.inputText(player, Text.literal("Degrees"), "90")
+            new SimpleCommand(
-                .thenAccept(string -> {
+                    Text.literal("Turn Right"),
-                    try {
+                    Text.literal("Turn a specific amount of degrees right"),
-                        float degrees = Float.parseFloat(string);
+                    Items.COMPASS,
-                        minion.getMinionActionPack().turn(degrees, 0);
+                    (player, minion) -> TextInput.inputFloat(player, Text.literal("Degrees"), "90")
-                    } catch (NumberFormatException e) {
+                            .thenAccept(degrees -> minion.getMinionActionPack().turn(degrees, 0))
-                        player.sendMessage(Text.literal("No valid number"));
+            );
-                    }
-                });
-    }));
 
-    public static final SimpleCommand TURN_LEFT_COMMAND = new SimpleCommand(Text.literal("Turn Left"), Text.literal("Turn a specific amount of degrees left"), Items.COMPASS, ((player, minion) -> {
+    public static final SimpleCommand TURN_LEFT_COMMAND =
-        TextInput.inputText(player, Text.literal("Degrees"), "90")
+            new SimpleCommand(
-                .thenAccept(string -> {
+                    Text.literal("Turn Left"),
-                    try {
+                    Text.literal("Turn a specific amount of degrees left"),
-                        float degrees = Float.parseFloat(string);
+                    Items.COMPASS,
-                        minion.getMinionActionPack().turn(-degrees, 0);
+                    (player, minion) -> TextInput.inputFloat(player, Text.literal("Degrees"), "90")
-                    } catch (NumberFormatException e) {
+                            .thenAccept(degrees -> minion.getMinionActionPack().turn(-degrees, 0))
-                        player.sendMessage(Text.literal("No valid number"));
+            );
-                    }
-                });
-    }));
 
-    public static final SimpleModuleItem MOVE_MODULE = register(Identifier.of(Minions.MOD_ID, "move_module"), new SimpleModuleItem(List.of(), List.of(WALK_COMMAND, TURN_RIGHT_COMMAND, TURN_LEFT_COMMAND), Items.IRON_BOOTS));
+    public static final SimpleCommand TURN_UP_COMMAND =
+            new SimpleCommand(
+                    Text.literal("Turn Up"),
+                    Text.literal("Turn a specific amount of degrees up"),
+                    Items.COMPASS,
+                    (player, minion) -> TextInput.inputFloat(player, Text.literal("Degrees"), "90")
+                            .thenAccept(degrees -> minion.getMinionActionPack().turn(0, -degrees))
+            );
+
+    public static final SimpleCommand TURN_DOWN_COMMAND =
+            new SimpleCommand(
+                    Text.literal("Turn Down"),
+                    Text.literal("Turn a specific amount of degrees down"),
+                    Items.COMPASS,
+                    (player, minion) -> TextInput.inputFloat(player, Text.literal("Degrees"), "90")
+                            .thenAccept(degrees -> minion.getMinionActionPack().turn(0, degrees))
+            );
+
+
+
+    public static final SimpleModuleItem MOVE_MODULE =
+            register(Identifier.of(Minions.MOD_ID, "move_module"),
+                    List.of(),
+                    List.of(
+                            WALK_COMMAND,
+                            TURN_RIGHT_COMMAND,
+                            TURN_LEFT_COMMAND,
+                            TURN_UP_COMMAND,
+                            TURN_DOWN_COMMAND
+                    ),
+                    Items.IRON_BOOTS
+            );
 
     public static void registerMe() {}
 }

src/main/java/io/github/skippyall/minions/module/SimpleModuleItem.java

@@ -1,25 +1,20 @@
 package io.github.skippyall.minions.module;
 
-import eu.pb4.polymer.core.api.item.PolymerItem;
+import eu.pb4.polymer.core.api.item.SimplePolymerItem;
-import io.github.skippyall.minions.command.Command;
+import io.github.skippyall.minions.module.command.Command;
 import io.github.skippyall.minions.program.block.CodeBlock;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.server.network.ServerPlayerEntity;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
-public class SimpleModuleItem extends Item implements PolymerItem, ModuleItem {
+public class SimpleModuleItem extends SimplePolymerItem implements ModuleItem {
     private final List<CodeBlock<?,?>> codeBlocks;
     private final List<Command> commands;
-    private final Item vanillaItem;
 
-    public SimpleModuleItem(List<CodeBlock<?,?>> codeBlocks, List<Command> commands, Item vanillaItem) {
+    public SimpleModuleItem(List<CodeBlock<?,?>> codeBlocks, List<Command> commands, Settings settings, Item vanillaItem) {
-        super(new Item.Settings().maxCount(1));
+        super(settings.maxCount(1), vanillaItem);
         this.codeBlocks = codeBlocks;
         this.commands = commands;
-        this.vanillaItem = vanillaItem;
     }
 
     @Override
@@ -31,9 +26,4 @@ public class SimpleModuleItem extends Item implements PolymerItem, ModuleItem {
     public List<Command> getCommands() {
         return commands;
     }
-
-    @Override
-    public Item getPolymerItem(ItemStack itemStack, @Nullable ServerPlayerEntity player) {
-        return vanillaItem;
-    }
 }

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

@@ -1,4 +1,4 @@
-package io.github.skippyall.minions.command;
+package io.github.skippyall.minions.module.command;
 
 import net.minecraft.item.Item;
 import net.minecraft.text.Text;

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

@@ -1,6 +1,6 @@
-package io.github.skippyall.minions.command;
+package io.github.skippyall.minions.module.command;
 
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import net.minecraft.server.network.ServerPlayerEntity;
 
 public interface CommandExecutor {

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

@@ -1,6 +1,6 @@
-package io.github.skippyall.minions.command;
+package io.github.skippyall.minions.module.command;
 
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import net.minecraft.item.Item;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;

src/main/java/io/github/skippyall/minions/networking/ClientToServerNetworking.java

@@ -1,40 +0,0 @@
-package io.github.skippyall.minions.networking;
-
-import io.github.skippyall.minions.Minions;
-import io.netty.buffer.Unpooled;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationNetworking;
-import net.fabricmc.fabric.api.networking.v1.PacketSender;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.ClientConfigurationNetworkHandler;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.network.PacketByteBuf;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.network.ServerConfigurationNetworkHandler;
-import net.minecraft.util.Identifier;
-
-public class ClientToServerNetworking {
-    /*public static final Identifier RL = Identifier.of(Minions.MOD_ID, "network");
-    @Environment(EnvType.CLIENT)
-    public static void sendJoinPacket(PlayerEntity player) {
-        PacketByteBuf pbf = new PacketByteBuf(Unpooled.buffer());
-        pbf.writeString("BN|Init|V0.1");
-        ClientConfigurationNetworking.send(RL, pbf);
-    }
-
-    @Environment(EnvType.CLIENT)
-    public static void onConfigurationInit(ClientConfigurationNetworkHandler handler, MinecraftClient client) {
-        sendJoinPacket(client.player);
-    }
-
-    @Environment(EnvType.SERVER)
-    public static void receive(MinecraftServer server, ServerConfigurationNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) {
-        String message = buf.readString();
-        if (!message.startsWith("BN|")) {
-            Minions.LOGGER.debug("Message with wrong format: " + message);
-        }
-        String[] parts = message.split("|");
-
-    }*/
-}

src/main/java/io/github/skippyall/minions/networking/VersionChecker.java

@@ -1,21 +0,0 @@
-package io.github.skippyall.minions.networking;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import net.minecraft.entity.player.PlayerEntity;
-
-public class VersionChecker {
-    protected static List<UUID> hasSupportedMod = new ArrayList<>();
-    public static boolean supportVersion(String version) {
-        return version.equals("v0.1");
-    }
-
-    public static boolean useSupportedMod(PlayerEntity p) {
-        return hasSupportedMod.contains(p.getUuid());
-    }
-
-    public static void resetPlayer(UUID uuid) {
-        hasSupportedMod.remove(uuid);
-    }
-}

src/main/java/io/github/skippyall/minions/program/block/GoBlock.java

@@ -1,8 +1,8 @@
 package io.github.skippyall.minions.program.block;
 
-import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack;
+import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
-import io.github.skippyall.minions.fakeplayer.ServerPlayerInterface;
+import io.github.skippyall.minions.minion.fakeplayer.ServerPlayerInterface;
 import io.github.skippyall.minions.program.runtime.MinionRuntime;
 import io.github.skippyall.minions.program.runtime.ProgramRuntime;
 import io.github.skippyall.minions.program.statement.Statement;
@@ -19,7 +19,7 @@ public class GoBlock extends CodeBlock<Void, Tuple2<Float, Float>> {
     public Void execute(ProgramRuntime runtime, Tuple2<Float, Float> args, Statement<Void, Tuple2<Float, Float>>.Run run) {
         if(runtime instanceof MinionRuntime minionRuntime) {
             MinionFakePlayer minion = minionRuntime.getMinion();
-            EntityPlayerActionPack action = ((ServerPlayerInterface) minion).getActionPack();
+            EntityPlayerActionPack action = ((ServerPlayerInterface) minion).minions$getActionPack();
             minion.moveForward(args.v0());
             minion.moveSideways(args.v1());
         }

src/main/java/io/github/skippyall/minions/program/block/UseBlock.java

@@ -1,7 +1,7 @@
 package io.github.skippyall.minions.program.block;
 
-import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack;
+import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import io.github.skippyall.minions.program.runtime.MinionRuntime;
 import io.github.skippyall.minions.program.runtime.ProgramRuntime;
 import io.github.skippyall.minions.program.statement.Statement;

src/main/java/io/github/skippyall/minions/program/runtime/MinionRuntime.java

@@ -1,10 +1,6 @@
 package io.github.skippyall.minions.program.runtime;
 
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
-import net.fabricmc.fabric.api.entity.event.v1.ServerEntityCombatEvents;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
-import net.fabricmc.fabric.api.event.player.AttackEntityCallback;
-import net.fabricmc.fabric.api.message.v1.ServerMessageEvents;
 
 public class MinionRuntime extends ProgramRuntime {
     private final MinionFakePlayer minion;

src/main/java/io/github/skippyall/minions/server/MinionsServer.java

@@ -1,23 +0,0 @@
-package io.github.skippyall.minions.server;
-
-import io.github.skippyall.minions.networking.ClientToServerNetworking;
-import io.github.skippyall.minions.networking.VersionChecker;
-import net.fabricmc.api.DedicatedServerModInitializer;
-import net.fabricmc.fabric.api.networking.v1.ServerConfigurationConnectionEvents;
-import net.fabricmc.fabric.api.networking.v1.ServerConfigurationNetworking;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.network.ServerConfigurationNetworkHandler;
-
-public class MinionsServer implements DedicatedServerModInitializer {
-    @Override
-    public void onInitializeServer() {
-        /*ServerConfigurationNetworking.registerGlobalReceiver(ClientToServerNetworking.RL, ClientToServerNetworking::receive);
-        ServerConfigurationConnectionEvents.CONFIGURE.register(new ServerConfigurationConnectionEvents.Configure() {
-            @Override
-            public void onSendConfiguration(ServerConfigurationNetworkHandler handler, MinecraftServer server) {
-                VersionChecker.resetPlayer(handler.getDebugProfile().getId());
-            }
-        });*/
-
-    }
-}

src/main/resources/data/minions/lang/en_us.json

@@ -7,8 +7,42 @@
   "minions.gui.module_commands.title": "Commands",
   "minions.gui.commands.title": "%s's Commands",
   "minions.gui.modules.title": "%s's Modules",
+  "minions.gui.ok": "OK",
+  "minions.gui.look.skin.name": "Name",
+  "minions.gui.look.skin.name.title": "Enter a player name",
+  "minions.gui.look.skin.uuid": "UUID",
+  "minions.gui.look.skin.uuid.title": "Enter a player UUID",
+  "minions.gui.look.skin.base64": "Base64",
+  "minions.gui.look.skin.base64.title": "Enter a skin in base64 encoding",
+  "minions.gui.look.rename.title": "Enter a name",
+
+  "minions.command.input.int.fail": "Not an integer",
+  "minions.command.input.float.fail": "Not a number",
   "minions.command.action.details": "Set how to %s",
   "minions.command.action.once": "%s once",
   "minions.command.action.continuous": "%s continuously",
-  "minions.command.action.interval": "%s every x seconds"
+  "minions.command.action.interval": "%s every x seconds",
+  "minions.command.action.stop": "Stop %s",
+  "minions.command.action.interval.enter": "Enter an interval in seconds",
+  "minions.command.interact.name": "Interact",
+  "minions.command.interact.description": "Use and place blocks",
+  "minions.command.attack.name": "Attack",
+  "minions.command.attack.description": "Attack and mine blocks",
+
+  "item.minions.attack_module": "Attack Module",
+  "item.minions.interact_module": "Interact Module",
+  "item.minions.mob_spawning_module": "Mob Spawning Module",
+  "item.minions.mount_module": "Mount Module",
+  "item.minions.move_module": "Move Module",
+  "item.minions.minion": "Minion",
+  "item.minions.basic_upgrade_base": "Basic Upgrade Base",
+  "item.minions.advanced_upgrade_base": "Advanced Upgrade Base",
+
+  "minions.minion_item.tooltip": "Name: %s",
+  "minions.generic.name.invalid_char": "Name contains invalid character",
+  "minions.generic.name.too_long": "Name is too long",
+  "minions.generic.name.invalid": "Name is invalid",
+  "minions.generic.name.taken": "This name is already used",
+  "minions.generic.mod_name": "Minions",
+  "minions.command.minion.not_present": "This minion does not exist"
 }

src/main/resources/data/minions/recipe/advanced_upgrade_base.json

@@ -0,0 +1,17 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "DND",
+    "NBN",
+    "DND"
+  ],
+  "key": {
+    "D": "minecraft:diamond",
+    "N": "minecraft:netherite_scrap",
+    "B": "minions:basic_upgrade_base"
+  },
+  "result": {
+    "id": "minions:advanced_upgrade_base",
+    "count": 1
+  }
+}

src/main/resources/data/minions/recipe/attack_module.json

@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:smithing_transform",
+  "base": "minions:advanced_upgrade_base",
+  "addition": "minecraft:diamond_pickaxe",
+  "template": "minecraft:netherite_upgrade_smithing_template",
+  "result": {
+    "id": "minions:attack_module"
+  }
+}

src/main/resources/data/minions/recipe/basic_upgrade_base.json

@@ -6,15 +6,9 @@
     "RGR"
   ],
   "key": {
-    "R": {
+    "R": "minecraft:redstone_block",
-      "item":"minecraft:redstone_block"
+    "G": "minecraft:gold_ingot",
-    },
+    "D": "minecraft:diamond"
-    "G": {
-      "item": "minecraft:gold_ingot"
-    },
-    "D": {
-      "item": "minecraft:diamond_block"
-    }
   },
   "result": {
     "id": "minions:basic_upgrade_base",

src/main/resources/data/minions/recipe/interact_module.json

@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:smithing_transform",
+  "base": "minions:advanced_upgrade_base",
+  "addition": "minecraft:lever",
+  "template": "minecraft:netherite_upgrade_smithing_template",
+  "result": {
+    "id": "minions:interact_module"
+  }
+}

src/main/resources/data/minions/recipe/minion.json

@@ -3,21 +3,13 @@
   "pattern": [
     " H ",
     "RAR",
-    " L "
+    " N "
   ],
   "key": {
-    "H": {
+    "H": "#minecraft:skulls",
-      "tag": "minecraft:skulls"
+    "R": "minecraft:redstone_torch",
-    },
+    "A": "minecraft:armor_stand",
-    "R": {
+    "N": "minecraft:netherite_ingot"
-      "item": "minecraft:redstone_torch"
-    },
-    "A": {
-      "item": "minecraft:armor_stand"
-    },
-    "L": {
-      "item":"minecraft:lodestone"
-    }
   },
   "result": {
     "id": "minions:minion",

src/main/resources/data/minions/recipe/mob_spawning_module.json

@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:smithing_transform",
+  "base": "minions:basic_upgrade_base",
+  "addition": "minecraft:rotten_flesh",
+  "template": "minecraft:netherite_upgrade_smithing_template",
+  "result": {
+    "id": "minions:mob_spawning_module"
+  }
+}

src/main/resources/data/minions/recipe/mount_module.json

@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:smithing_transform",
+  "base": "minions:basic_upgrade_base",
+  "addition": "minecraft:minecart",
+  "template": "minecraft:netherite_upgrade_smithing_template",
+  "result": {
+    "id": "minions:mount_module"
+  }
+}

src/main/resources/data/minions/recipe/mount_upgrade.json

@@ -1,15 +0,0 @@
-{
-  "type": "minecraft:smithing_transform",
-  "base": {
-    "item": "minions:basic_upgrade_base"
-  },
-  "addition": {
-    "item": "minecraft:minecart"
-  },
-  "template": {
-    "item": "minecraft:netherite_upgrade_smithing_template"
-  },
-  "result": {
-    "id": "minions:mount_module"
-  }
-}

src/main/resources/data/minions/recipe/move_module.json

@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:smithing_transform",
+  "base": "minions:basic_upgrade_base",
+  "addition": "minecraft:iron_boots",
+  "template": "minecraft:netherite_upgrade_smithing_template",
+  "result": {
+    "id": "minions:move_module"
+  }
+}

src/main/resources/data/minions/recipe/move_upgrade.json

@@ -1,15 +0,0 @@
-{
-  "type": "minecraft:smithing_transform",
-  "base": {
-    "item": "minions:basic_upgrade_base"
-  },
-  "addition": {
-    "item": "minecraft:iron_boots"
-  },
-  "template": {
-    "item": "minecraft:netherite_upgrade_smithing_template"
-  },
-  "result": {
-    "id": "minions:move_module"
-  }
-}

src/main/resources/data/minions/tags/damage_type/minion_item_resists.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "#minecraft:is_fire",
+    "#minecraft:is_explosion"
+  ]
+}

src/main/resources/fabric.mod.json

@@ -12,23 +12,18 @@
   "icon": "assets/minions/icon.png",
   "environment": "*",
   "entrypoints": {
-    "client": [
-      "io.github.skippyall.minions.client.MinionsClient"
-    ],
     "main": [
       "io.github.skippyall.minions.Minions"
-    ],
-    "server": [
-      "io.github.skippyall.minions.server.MinionsServer"
     ]
   },
   "mixins": [
     "minions.mixins.json"
   ],
+  "accessWidener" : "minions.accesswidener",
   "depends": {
     "fabricloader": "*",
     "fabric": "*",
-    "minecraft": "~1.21",
+    "minecraft": "~1.21.5",
     "polymer-core": "*"
   }
 }

src/main/resources/minions.accesswidener

@@ -0,0 +1,4 @@
+accessWidener v2 named
+
+accessible class net/minecraft/server/world/ChunkLevelManager$DistanceFromNearestPlayerTracker
+accessible method net/minecraft/server/world/ChunkLevelManager$DistanceFromNearestPlayerTracker <init> (Lnet/minecraft/server/world/ChunkLevelManager;I)V

src/main/resources/minions.mixins.json

@@ -7,6 +7,8 @@
     "ChunkTicketManagerFixMixin",
     "ConnectionMixin",
     "EntityAccessor",
+    "GraveCompatMixin",
+    "EntityViewMixin",
     "MinecraftServerMixin",
     "MobEntityMixin",
     "PlayerListEntryS2CPacket$EntryMixin",
@@ -14,7 +16,12 @@
     "ServerPlayerMixin",
     "ServerPlayNetworkHandlerMixin",
     "SleepManagerMixin",
-    "SpawnHelperMixin"
+    "SpawnHelperMixin",
+    "antimobcap.ChunkPosDistanceLevelPropagatorMixin",
+    "antimobcap.ChunkLevelManager$DistanceFromNearestPlayerTrackerMixin",
+    "antimobcap.ChunkLevelManagerMixin",
+    "antimobcap.ServerChunkManagerAccessor",
+    "antimobcap.ServerChunkManagerMixin"
   ],
   "client": [],
   "server": [],