Bugfixes (Minion Mobcap)

ErfinderLabyrinth's changes

build.gradle

@@ -1,11 +1,15 @@
 plugins {
-    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id 'fabric-loom' version '1.8-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
 }
@@ -17,6 +21,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 {
@@ -27,8 +43,11 @@ dependencies {
 
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-    modImplementation include("eu.pb4:polymer-core:${project.polymer_version}")
+    modImplementation "eu.pb4:polymer-core:${project.polymer_version}"
     modImplementation include("eu.pb4:sgui:${project.sgui_version}")
+    modImplementation include("xyz.nucleoid:server-translations-api:${project.server_translations_version}")
+
+    modCompileOnly "maven.modrinth:universal-graves:${project.universal_graves_version}"
 }
 
 processResources {
@@ -76,7 +95,7 @@ jar {
 // configure the maven publication
 publishing {
     publications {
-        mavenJava(MavenPublication) {
+        minions (MavenPublication) {
             from components.java
         }
     }
@@ -87,5 +106,15 @@ publishing {
         // Notice: This block does NOT have the same function as the block in the top level.
         // The repositories here will be used for publishing your artifact, not for
         // retrieving dependencies.
+        maven {
+            def release = "https://maven.foxgalaxy.de/private-releases"
+            def snapshot = "https://maven.foxgalaxy.de/private-snapshot"
+            url = version.endsWith('SNAPSHOT') ? snapshot : release
+
+            credentials {
+                username = "${maven_user}"
+                password = "${maven_password}"
+            }
+        }
     }
 }

gradle.properties

@@ -3,18 +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.3
-	loader_version=0.16.3
+	loader_version=0.16.13
-	yarn_mappings=1.21.1+build.3
+	yarn_mappings=1.21.3+build.2
 
 # Mod Properties
-	mod_version = 0.0.1
+	mod_version = 0.1.2-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.107.0+1.21.3
 
-	polymer_version=0.9.12+1.21.1
+	polymer_version=0.10.0+1.21.2
-	sgui_version=1.6.0+1.21
+	sgui_version=1.7.1+1.21.2
+	server_translations_version=2.4.0+1.21.2-rc1
+
+	universal_graves_version=3.5.0+1.21.2

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.10-bin.zip

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

@@ -1,25 +1,42 @@
 package io.github.skippyall.minions;
 
 import eu.pb4.polymer.core.api.entity.PolymerEntityUtils;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import eu.pb4.polymer.core.api.item.SimplePolymerItem;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.MinionData;
 import io.github.skippyall.minions.minion.MinionItem;
 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.component.DataComponentTypes;
+import net.minecraft.component.type.DamageResistantComponent;
+import net.minecraft.entity.boss.WitherEntity;
+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.server.MinecraftServer;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.tag.TagKey;
+import net.minecraft.server.world.ChunkTicketManager;
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Function;
 
 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 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)),false));
+    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 final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 
@@ -27,13 +44,12 @@ public class Minions implements ModInitializer {
 
     @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 -> {
-                System.out.println("spawn Minion " + data.name);
+                MinionFakePlayer.spawnMinionAt(data, server.getOverworld(), null, null);
-                MinionFakePlayer.spawnMinion(data, server.getOverworld());
             });
         });
         ServerTickEvents.START_SERVER_TICK.register(server -> {
@@ -44,6 +60,20 @@ public class Minions implements ModInitializer {
                 executeOnNextTick.clear();
             });
         });
+
+        CommandRegistrationCallback.EVENT.register((commandDispatcher, commandRegistryAccess, registrationEnvironment) -> {
+            MobCapCommand.registerCommand(commandDispatcher);
+        });
+
+        Modules.register();
+    }
+
+    private static <T extends Item> T registerItem(Identifier identifier, Function<Item.Settings, T> constructor, Item.Settings settings) {
+        return Registry.register(Registries.ITEM, identifier, constructor.apply(settings.registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier))));
+    }
+
+    private static <T extends Item> T registerItem(Identifier identifier, Function<Item.Settings, T> constructor) {
+        return registerItem(identifier, constructor, new Item.Settings());
     }
 
     private static synchronized void exec(Runnable run) {

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

@@ -0,0 +1,24 @@
+package io.github.skippyall.minions;
+
+import com.mojang.brigadier.CommandDispatcher;
+import io.github.skippyall.minions.mixinhelper.ChunkTicketManager$DistanceFromNearestPlayerTrackerAccessor;
+import io.github.skippyall.minions.mixinhelper.ChunkTicketManagerAccessor;
+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 MobCapCommand {
+    public static void registerCommand(CommandDispatcher<ServerCommandSource> dispatcher) {
+        dispatcher.register(literal("mobcapdebug")
+                .executes(context -> {
+                    ChunkTicketManager ticketManager = ((ServerChunkManagerAccessor)context.getSource().getWorld().getChunkManager()).getTicketManager();
+                    int tickedChunkCount = ((ChunkTicketManager$DistanceFromNearestPlayerTrackerAccessor)((ChunkTicketManagerAccessor)ticketManager).getMinionless()).minions$getTickedChunkCount();
+                    context.getSource().sendFeedback(() -> Text.of(String.valueOf(tickedChunkCount)), false);
+                    return 0;
+                })
+        );
+    }
+}

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/Command.java

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

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

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

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

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

src/main/java/io/github/skippyall/minions/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

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

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

@@ -1,28 +1,26 @@
-package io.github.skippyall.minions.minion;
+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;
 
-public class MinionInventory {
+public class MinionGui {
     public static void openInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
         openServerSideInventory(player, minion);
     }
 
     public static void openServerSideInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
         SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, player, false);
-        gui.setTitle(Text.literal("Minion"));
+        gui.setTitle(minion.getName());
 
         gui.setSlot(1, new GuiElementBuilder()
                 .setItem(Items.COMMAND_BLOCK)
-                .setName(Text.literal("Commands"))
+                .setName(Text.translatable("minions.gui.main.commands"))
                 .setCallback((i, clickType, slotActionType) -> {
                     openCommandsGui(player, minion);
                 })
@@ -30,44 +28,47 @@ public class MinionInventory {
         if(minion.isProgrammable()) {
             gui.setSlot(4, new GuiElementBuilder()
                     .setItem(Items.REDSTONE)
-                    .setName(Text.literal("Programming"))
+                    .setName(Text.translatable("minions.gui.main.programming"))
-                    .setCallback((i, clickType, slotActionType) -> {
+                    .setCallback(() -> {
                         openProgrammingInventory(player, minion);
                     })
             );
         }
         gui.setSlot(3, new GuiElementBuilder()
                 .setItem(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE)
-                .setName(Text.literal("Modules and Detectors"))
+                .setName(Text.translatable("minions.gui.main.modules"))
-                .setCallback((i, clickType, slotActionType) -> {
+                .setCallback(() -> {
-                    openModuleInventory(player, minion);
+                    ModuleInventory.openModuleInventory(player, minion);
                 })
         );
         gui.setSlot(5, new GuiElementBuilder()
                 .setItem(Items.CHEST)
-                .setName(Text.literal("Inventory"))
+                .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();
     }
 
     public static void openCommandsGui(ServerPlayerEntity player, MinionFakePlayer minion) {
-        CommandsInventory.openServerCommandsInventory(player, minion);
+        CommandsGui.openServerModuleCommandGui(player, minion);
     }
 
     public static void openProgrammingInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
 
     }
 
-    public static void openModuleInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
-        player.openHandledScreen(new SimpleNamedScreenHandlerFactory((syncId, playerInventory, player2) -> GenericContainerScreenHandler.createGeneric9x3(syncId, playerInventory, minion.getModuleInventory()), Text.literal("")));
-    }
-
     public static void openMinionInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
         SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_9X5, player, false);
-        gui.setTitle(Text.literal("Minion"));
+        gui.setTitle(Text.translatable("minions.gui.inventory.title", minion.getName()));
         for (int i = 0; i < minion.getInventory().size(); i++) {
             gui.setSlotRedirect(i, new Slot(minion.getInventory(), i, 0, 0));
         }

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

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

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

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

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

@@ -0,0 +1,50 @@
+package io.github.skippyall.minions.input;
+
+import eu.pb4.sgui.api.elements.GuiElementBuilder;
+import eu.pb4.sgui.api.gui.AnvilInputGui;
+import net.minecraft.item.Items;
+import net.minecraft.screen.AnvilScreenHandler;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+
+public class TextInput {
+    public static CompletableFuture<String> inputText(ServerPlayerEntity player, Text title, String defaultText) {
+        CompletableFuture<String> future = new CompletableFuture<>();
+
+        AnvilInputGui gui = new AnvilInputGui(player, false);
+        gui.setSlot(AnvilScreenHandler.OUTPUT_ID, new GuiElementBuilder()
+                .setItem(Items.EMERALD_BLOCK)
+                .setName(Text.literal("OK"))
+                .setCallback(() -> {
+                    gui.close();
+                    future.complete(gui.getInput());
+                })
+        );
+        gui.setTitle(title);
+        gui.setDefaultInputValue(defaultText);
+        gui.open();
+        return future;
+    }
+
+    public static <T> CompletableFuture<T> inputParse(ServerPlayerEntity player, Text title, String defaultValue, Function<String, T> parser, Text failureMessage) {
+        return inputText(player, title, String.valueOf(defaultValue)).thenCompose(string -> {
+            try {
+                return CompletableFuture.completedFuture(parser.apply(string));
+            } catch (Exception e) {
+                player.sendMessage(failureMessage);
+                return CompletableFuture.failedFuture(e);
+            }
+        });
+    }
+
+    public static CompletableFuture<Integer> inputInt(ServerPlayerEntity player, Text title, String defaultValue) {
+        return inputParse(player, title, defaultValue, Integer::parseInt, Text.translatable("minions.command.input.int.fail"));
+    }
+
+    public static CompletableFuture<Float> inputFloat(ServerPlayerEntity player, Text title, String defaultValue) {
+        return inputParse(player, title, defaultValue, Float::parseFloat, Text.translatable("minions.command.input.float.fail"));
+    }
+}

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

@@ -1,25 +0,0 @@
-package io.github.skippyall.minions.minion;
-
-import eu.pb4.sgui.api.elements.GuiElementBuilder;
-import eu.pb4.sgui.api.gui.SimpleGui;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
-import net.minecraft.item.Items;
-import net.minecraft.screen.ScreenHandlerType;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.Text;
-
-public class CommandsInventory {
-    public static void openServerCommandsInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
-        SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_9X3, player, false);
-
-        gui.setSlot(0, new GuiElementBuilder()
-                .setItem(Items.MINECART)
-                .setName(Text.literal("Get into minecart"))
-                .setCallback(() -> {
-                    minion.getMinionActionPack().mount(true);
-                })
-        );
-
-        gui.open();
-    }
-}

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

@@ -1,132 +0,0 @@
-package io.github.skippyall.minions.minion;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.Inventories;
-import net.minecraft.inventory.Inventory;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.collection.DefaultedList;
-
-/**
- * A simple {@code Inventory} implementation with only default methods + an item list getter.
- *
- * Originally by Juuz
- */
-public interface ImplementedInventory extends Inventory {
-
-    /**
-     * Retrieves the item list of this inventory.
-     * Must return the same instance every time it's called.
-     */
-    DefaultedList<ItemStack> getItems();
-
-    /**
-     * Creates an inventory from the item list.
-     */
-    static ImplementedInventory of(DefaultedList<ItemStack> items) {
-        return () -> items;
-    }
-
-    /**
-     * Creates a new inventory with the specified size.
-     */
-    static ImplementedInventory ofSize(int size) {
-        return of(DefaultedList.ofSize(size, ItemStack.EMPTY));
-    }
-
-    /**
-     * Returns the inventory size.
-     */
-    @Override
-    default int size() {
-        return getItems().size();
-    }
-
-    /**
-     * Checks if the inventory is empty.
-     * @return true if this inventory has only empty stacks, false otherwise.
-     */
-    @Override
-    default boolean isEmpty() {
-        for (int i = 0; i < size(); i++) {
-            ItemStack stack = getStack(i);
-            if (!stack.isEmpty()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Retrieves the item in the slot.
-     */
-    @Override
-    default ItemStack getStack(int slot) {
-        return getItems().get(slot);
-    }
-
-    /**
-     * Removes items from an inventory slot.
-     * @param slot  The slot to remove from.
-     * @param count How many items to remove. If there are less items in the slot than what are requested,
-     *              takes all items in that slot.
-     */
-    @Override
-    default ItemStack removeStack(int slot, int count) {
-        ItemStack result = Inventories.splitStack(getItems(), slot, count);
-        if (!result.isEmpty()) {
-            markDirty();
-        }
-        return result;
-    }
-
-    /**
-     * Removes all items from an inventory slot.
-     * @param slot The slot to remove from.
-     */
-    @Override
-    default ItemStack removeStack(int slot) {
-        return Inventories.removeStack(getItems(), slot);
-    }
-
-    /**
-     * Replaces the current stack in an inventory slot with the provided stack.
-     * @param slot  The inventory slot of which to replace the itemstack.
-     * @param stack The replacing itemstack. If the stack is too big for
-     *              this inventory ({@link Inventory#getMaxCountPerStack()}),
-     *              it gets resized to this inventory's maximum amount.
-     */
-    @Override
-    default void setStack(int slot, ItemStack stack) {
-        getItems().set(slot, stack);
-        if (stack.getCount() > stack.getMaxCount()) {
-            stack.setCount(stack.getMaxCount());
-        }
-    }
-
-    /**
-     * Clears the inventory.
-     */
-    @Override
-    default void clear() {
-        getItems().clear();
-    }
-
-    /**
-     * Marks the state as dirty.
-     * Must be called after changes in the inventory, so that the game can properly save
-     * the inventory contents and notify neighboring blocks of inventory changes.
-     */
-    @Override
-    default void markDirty() {
-        // Override if you want behavior.
-    }
-
-    /**
-     * @return true if the player can use the inventory, false otherwise.
-     */
-    @Override
-    default boolean canPlayerUse(PlayerEntity player) {
-        return true;
-    }
-}
-

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

@@ -0,0 +1,57 @@
+package io.github.skippyall.minions.minion;
+
+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 io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
+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 org.jetbrains.annotations.NotNull;
+
+import java.util.Optional;
+import java.util.UUID;
+
+public record MinionData(UUID uuid, String name, @NotNull Optional<UUID> skinUuid) {
+    public static final Codec<MinionData> CODEC = RecordCodecBuilder.create(instance ->
+            instance.group(
+                    Uuids.CODEC.fieldOf("uuid").forGetter(MinionData::uuid),
+                    Codec.STRING.fieldOf("name").forGetter(MinionData::name),
+                    Uuids.CODEC.optionalFieldOf("skinUuid").orElse(Optional.empty()).forGetter(MinionData::skinUuid)
+            ).apply(instance, MinionData::new)
+    );
+    public static final ComponentType<MinionData> COMPONENT = Registry.register(Registries.DATA_COMPONENT_TYPE, Identifier.of(Minions.MOD_ID, "minion_data"), ComponentType.<MinionData>builder().codec(CODEC).build());
+
+    public MinionData withUuid(UUID uuid) {
+        return new MinionData(uuid, name, skinUuid);
+    }
+
+    public MinionData withName(String name) {
+        return new MinionData(uuid, name, skinUuid);
+    }
+
+    public MinionData withSkin(Optional<UUID> skinUuid) {
+        return new MinionData(uuid, name, skinUuid);
+    }
+
+    public NbtCompound writeNbt() {
+        return (NbtCompound) MinionData.CODEC.encode(this, NbtOps.INSTANCE, null).getOrThrow();
+    }
+
+    public static MinionData readNbt(NbtCompound nbt) {
+        return MinionData.CODEC.decode(NbtOps.INSTANCE, nbt).getOrThrow().getFirst();
+    }
+
+    public static MinionData fromMinion(MinionFakePlayer minion) {
+        return new MinionData(minion.getUuid(), minion.getMinionName(), minion.getSkinUuid());
+    }
+
+    public static void register() {
+        PolymerComponent.registerDataComponent(COMPONENT);
+    }
+}

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

@@ -2,74 +2,94 @@ 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.minion.fakeplayer.MinionFakePlayer;
-import net.minecraft.client.render.VertexFormatElement;
-import net.minecraft.component.ComponentType;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.NbtComponent;
-import net.minecraft.item.*;
+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.Identifier;
+import net.minecraft.util.math.Vec2f;
 import org.jetbrains.annotations.Nullable;
+import xyz.nucleoid.packettweaker.PacketContext;
+
+import java.util.List;
+import java.util.Optional;
 
 public class MinionItem extends Item implements PolymerItem {
     private final boolean canProgram;
-    public MinionItem(boolean canProgram) {
+
-        super(new Item.Settings());
+    public MinionItem(Settings settings, boolean canProgram) {
+        super(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, List<Text> tooltip, TooltipType type) {
+        MinionData data = stack.get(MinionData.COMPONENT);
+        if(data != null) {
+            tooltip.add(Text.translatable("minions.minion_item.tooltip", data.name()));
+        }
+    }
+
     @Override
     public ActionResult useOnBlock(ItemUsageContext context) {
         String contents = context.getStack().getName().getLiteralString();
         String name;
-        if(contents != null) {
+        if(contents != null && contents.length() <= 16) {
             name = contents;
         } else {
             name = "Minion";
         }
         if(!context.getWorld().isClient) {
-            MinionPersistentState.MinionData data = getData(context.getStack());
+            MinionData data = getData(context.getStack());
-            if (data == null) {
+
-                MinionFakePlayer.createMinion(name, (ServerWorld) context.getWorld(), (ServerPlayerEntity) context.getPlayer(), canProgram, context.getBlockPos().toCenterPos().add(0,0.5,0), 0, 0);
+            if(data == null) {
+                data = new MinionData(null, name, Optional.empty());
+            }
+
+            if (data.uuid() == null) {
+                MinionFakePlayer.createMinion(data, (ServerWorld) context.getWorld(), (ServerPlayerEntity) context.getPlayer(), canProgram, context.getBlockPos().toCenterPos().add(0,0.5,0), new Vec2f(0, 0));
             }else {
-                MinionFakePlayer.spawnMinionAt(data, (ServerWorld) context.getWorld(), context.getBlockPos().toCenterPos().add(0,0.5,0), 0, 0);
+                data = data.withName(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(MinionPersistentState.MinionData data, ItemStack item) {
+    public static void setData(MinionData data, ItemStack item) {
-        NbtCompound nbt = item.getOrDefault(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT).copyNbt();
+        item.set(MinionData.COMPONENT, data);
-        nbt.put("data", data.writeNbt());
-        item.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(nbt));
     }
 
     @Nullable
-    public static MinionPersistentState.MinionData getData(ItemStack item) {
+    public static MinionData getData(ItemStack item) {
-        NbtCompound nbt = item.getOrDefault(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT).copyNbt();
+        return item.get(MinionData.COMPONENT);
-        if (nbt.getType("data") == NbtElement.COMPOUND_TYPE) {
-            return MinionPersistentState.MinionData.readNbt(nbt.getCompound("data"));
-        }
-        return null;
     }
 
     public static boolean containsData(ItemStack item) {

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

@@ -1,7 +1,9 @@
 package io.github.skippyall.minions.minion;
 
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
-import net.minecraft.nbt.*;
+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;
@@ -16,7 +18,8 @@ public class MinionPersistentState extends PersistentState {
 
     public static MinionPersistentState INSTANCE;
 
-    private List<MinionData> minionData = new ArrayList<>();
+    private final List<MinionData> minionData = new ArrayList<>();
+    private final List<UUID> minionUuids = new ArrayList<>();
 
     @Override
     public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
@@ -25,6 +28,14 @@ public class MinionPersistentState extends PersistentState {
             list.add(data.writeNbt());
         }
         nbt.put("minions", list);
+
+        NbtList uuids = new NbtList();
+        for(UUID uuid : minionUuids) {
+            NbtCompound compound = new NbtCompound();
+            compound.putUuid("uuid", uuid);
+            uuids.add(compound);
+        }
+        nbt.put("uuids", uuids);
         return nbt;
     }
 
@@ -34,15 +45,26 @@ public class MinionPersistentState extends PersistentState {
         for(NbtElement element : list) {
             instance.addMinion(MinionData.readNbt((NbtCompound) element));
         }
+
+        NbtList uuids = compound.getList("uuids", NbtElement.COMPOUND_TYPE);
+        for(NbtElement element : uuids) {
+            instance.minionUuids.add(((NbtCompound) element).getUuid("uuid"));
+        }
         return instance;
     }
 
+    public void addMinionUUID(UUID uuid) {
+        if(!minionUuids.contains(uuid)) {
+            minionUuids.add(uuid);
+        }
+    }
+
     public void addMinion(MinionFakePlayer minion) {
         addMinion(MinionData.fromMinion(minion));
     }
 
     public void addMinion(MinionData data) {
-        System.out.println("add Minion " + data.name);
+        System.out.println("add Minion " + data.name());
         minionData.add(data);
         markDirty();
     }
@@ -54,7 +76,7 @@ public class MinionPersistentState extends PersistentState {
     public void removeMinion(UUID minionUUID) {
         MinionData removal = null;
         for (MinionData data : minionData) {
-            if (data.uuid.equals(minionUUID)) {
+            if (data.uuid().equals(minionUUID)) {
                 removal = data;
             }
         }
@@ -68,63 +90,11 @@ public class MinionPersistentState extends PersistentState {
         return minionData;
     }
 
+    public boolean isMinion(UUID uuid) {
+        return minionUuids.contains(uuid);
+    }
+
     public static void create(MinecraftServer server) {
         INSTANCE = server.getWorld(World.OVERWORLD).getPersistentStateManager().getOrCreate(TYPE, "minion");
     }
-
-    public static class MinionData {
-        public UUID uuid;
-        public String name;
-        public boolean programmable;
-
-        public MinionData(UUID uuid, String name, boolean programmable) {
-            this.uuid = uuid;
-            this.name = name;
-            this.programmable = programmable;
-        }
-
-        public NbtCompound writeNbt() {
-            NbtCompound nbt = new NbtCompound();
-
-            /*NbtList posList = new NbtList();
-            posList.add(NbtDouble.of(pos.getX()));
-            posList.add(NbtDouble.of(pos.getY()));
-            posList.add(NbtDouble.of(pos.getZ()));
-            nbt.put("pos", posList);
-
-            NbtList rotList = new NbtList();
-            rotList.add(NbtFloat.of(rot.x));
-            rotList.add(NbtFloat.of(rot.y));
-            nbt.put("rotation", rotList);*/
-
-            nbt.putUuid("uuid", uuid);
-            nbt.putString("name", name);
-            nbt.putBoolean("programmable", programmable);
-
-            return nbt;
-        }
-
-        public static MinionData readNbt(NbtCompound nbt) {
-            /*NbtList posList = nbt.getList("pos", NbtElement.DOUBLE_TYPE);
-            double x = posList.getDouble(0);
-            double y = posList.getDouble(1);
-            double z = posList.getDouble(2);
-            Vec3d pos = new Vec3d(x, y, z);
-
-            NbtList rotList = nbt.getList("rotation", NbtElement.FLOAT_TYPE);
-            float yaw = rotList.getFloat(0);
-            float pitch = rotList.getFloat(1);
-            Vec2f rot = new Vec2f(yaw, pitch);*/
-
-            UUID uuid = nbt.getUuid("uuid");
-            String name = nbt.getString("name");
-            boolean programmable = nbt.getBoolean("programmable");
-
-            return new MinionData(uuid, name, programmable);
-        }
-
-        public static MinionData fromMinion(MinionFakePlayer minion) {
-            return new MinionData(minion.getUuid(), minion.getMinionName(), minion.isProgrammable());
-        }
-    }
 }

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

@@ -0,0 +1,80 @@
+package io.github.skippyall.minions.minion;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.ProfileLookupCallback;
+import com.mojang.authlib.yggdrasil.ProfileResult;
+import net.minecraft.server.MinecraftServer;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ForkJoinPool;
+
+import static io.github.skippyall.minions.Minions.LOGGER;
+
+public class MinionProfileUtils {
+    public static CompletableFuture<@Nullable GameProfile> lookupSkinOwnerProfile(MinecraftServer server, String username) {
+        CompletableFuture<GameProfile> future = new CompletableFuture<>();
+
+        ForkJoinPool.commonPool().execute(() -> {
+            try {
+                server.getGameProfileRepo().findProfilesByNames(new String[]{username}, new ProfileLookupCallback() {
+                    @Override
+                    public void onProfileLookupSucceeded(GameProfile found) {
+                        LOGGER.info("SkinProfile: {}", found);
+                        try {
+                            getSkinOwnerProfile(server, found.getId()).thenAccept(future::complete);
+                        } catch (Throwable ex) {
+                            LOGGER.warn("Exception during Game Profile creation", ex);
+                        }
+                    }
+
+                    @Override
+                    public void onProfileLookupFailed(String profileName, Exception exception) {
+                        LOGGER.warn("Lookup Error: ", exception);
+                        future.complete(null);
+                    }
+                });
+            } catch (Throwable e) {
+                LOGGER.warn("Failed to get UUID for username " + username, e);
+                future.complete(null);
+            }
+        });
+
+        return future;
+    }
+
+    public static 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) {
+        if(uuidMinion == null) {
+            uuidMinion = UUID.randomUUID();
+        }
+        MinionPersistentState.INSTANCE.addMinionUUID(uuidMinion);
+
+        GameProfile newProfile = new GameProfile(uuidMinion, username);
+        if (skinProfile != null) {
+            newProfile.getProperties().putAll(skinProfile.getProperties());
+        }
+        LOGGER.info("Minion Profile: {}", newProfile);
+        return newProfile;
+    }
+
+    public static boolean isMinion(UUID uuid) {
+        return MinionPersistentState.INSTANCE.isMinion(uuid);
+    }
+}

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

@@ -1,43 +0,0 @@
-package io.github.skippyall.minions.minion;
-
-import io.github.skippyall.minions.Minions;
-import net.minecraft.inventory.Inventories;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.registry.RegistryWrapper;
-import net.minecraft.registry.tag.TagKey;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.collection.DefaultedList;
-
-public class ModuleInventory implements ImplementedInventory {
-    private static final TagKey<Item> MODULES = TagKey.of(RegistryKeys.ITEM, Identifier.of(Minions.MOD_ID,"modules"));
-    private DefaultedList<ItemStack> stacks = DefaultedList.ofSize(27, ItemStack.EMPTY);
-
-    public ModuleInventory() {
-    }
-
-    @Override
-    public int getMaxCountPerStack() {
-        return 1;
-    }
-
-    @Override
-    public boolean isValid(int slot, ItemStack stack) {
-        return (stack.getCount() <= getMaxCountPerStack()) && stack.isIn(MODULES);
-    }
-
-    @Override
-    public DefaultedList<ItemStack> getItems() {
-        return stacks;
-    }
-
-    public void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup lookup) {
-        Inventories.readNbt(nbt, stacks, lookup);
-    }
-
-    public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup lookup) {
-        return Inventories.writeNbt(nbt, stacks, lookup);
-    }
-}

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,10 +1,13 @@
-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;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import io.github.skippyall.minions.mixins.EntityAccessor;
 import net.minecraft.block.BlockState;
 import net.minecraft.command.argument.EntityAnchorArgumentType;
 import net.minecraft.entity.Entity;
@@ -80,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;
@@ -167,12 +176,13 @@ public class EntityPlayerActionPack
 
     public EntityPlayerActionPack mount(boolean onlyRideables)
     {
+
         //test what happens
         List<Entity> entities;
         if (onlyRideables)
         {
             entities = player.getWorld().getOtherEntities(player, player.getBoundingBox().expand(3.0D, 1.0D, 3.0D),
-                    e -> e instanceof MinecartEntity || e instanceof BoatEntity || e instanceof AbstractHorseEntity);
+                    e -> (e instanceof MinecartEntity || e instanceof BoatEntity || e instanceof AbstractHorseEntity) && ((EntityAccessor)e).invokeCanAddPassenger(player));
         }
         else
         {
@@ -198,7 +208,7 @@ public class EntityPlayerActionPack
         if (closest instanceof AbstractHorseEntity && onlyRideables)
             ((AbstractHorseEntity) closest).interactMob(player, Hand.MAIN_HAND);
         else
-            player.startRiding(closest,true);
+            player.startRiding(closest, !onlyRideables);
         return this;
     }
     public EntityPlayerActionPack dismount()
@@ -311,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.canPlayerModifyAt(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;
                                         }
@@ -399,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;
                         }
@@ -407,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)
                             {
@@ -432,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,7 +464,7 @@ public class EntityPlayerActionPack
                 EntityPlayerActionPack ap = ((ServerPlayerInterface) player).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.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,16 +1,16 @@
-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 com.mojang.authlib.yggdrasil.ProfileResult;
 import io.github.skippyall.minions.Minions;
-import io.github.skippyall.minions.minion.MinionInventory;
+import io.github.skippyall.minions.minion.MinionData;
+import io.github.skippyall.minions.gui.MinionGui;
 import io.github.skippyall.minions.minion.MinionItem;
 import io.github.skippyall.minions.minion.MinionPersistentState;
-import io.github.skippyall.minions.minion.ModuleInventory;
+import io.github.skippyall.minions.minion.MinionProfileUtils;
-import io.github.skippyall.minions.mixins.GameProfileMixin;
+import io.github.skippyall.minions.gui.ModuleInventory;
 import io.github.skippyall.minions.program.runtime.MinionRuntime;
 import net.minecraft.block.BlockState;
-import net.minecraft.component.ComponentType;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EquipmentSlot;
@@ -25,9 +25,8 @@ 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.network.packet.s2c.play.PlayerListS2CPacket;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.ServerTask;
 import net.minecraft.server.network.ConnectedClientData;
@@ -38,16 +37,21 @@ import net.minecraft.text.TranslatableTextContent;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec2f;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.GameMode;
 import net.minecraft.world.TeleportTarget;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 
 public class MinionFakePlayer extends ServerPlayerEntity {
     public Runnable fixStartingPosition = () -> {};
-    public boolean isAShadow;
 
     private float moveForward;
     private float moveSideways;
@@ -56,159 +60,85 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     private final ModuleInventory moduleInventory = new ModuleInventory();
     private final MinionRuntime runtime = new MinionRuntime(this);
 
-    public static void createMinion(String username, ServerWorld level, ServerPlayerEntity owner, boolean canProgram, Vec3d pos, double yaw, double pitch) {
+    private UUID skinUuid = null;
-        MinecraftServer server = level.getServer();
+
-        server.getUserCache().findByNameAsync(username).thenAcceptAsync((optional) -> {
+    public static void createMinion(MinionData data, ServerWorld level, ServerPlayerEntity owner, boolean canProgram, Vec3d pos, Vec2f rot) {
-            try {
+        spawnMinion(data, level, pos, rot,
-                GameProfile profile = null;
+                (minion, skinProfile) -> {
-                if(optional.isPresent()){
+                    if (skinProfile != null) {
-                    UUID uuid = optional.get().getId();
+                        minion.skinUuid = skinProfile.getId();
-                    ProfileResult result = server.getSessionService().fetchProfile(uuid, true);
-                    if(result != null) {
-                        profile = result.profile();
-                    }
-                }
-                if(profile == null) {
-                    profile = new GameProfile(new UUID(0,0), username);
-                }
-                GameProfile newProfile = new GameProfile(UUID.randomUUID(), username);
-                newProfile.getProperties().putAll(profile.getProperties());
-                GameProfile finalProfile = newProfile;
-                ((GameProfileMixin)finalProfile).setId(UUID.randomUUID());
-                Minions.addExecuteOnNextTick(() -> {
-                    MinionFakePlayer instance = new MinionFakePlayer(server, level, finalProfile, SyncedClientOptions.createDefault(), false, 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(finalProfile, 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);
-                });
-            }catch (Throwable ex) {
-                ex.printStackTrace();
-            }
-        });
                     }
 
-    public static void spawnMinion(MinionPersistentState.MinionData data, ServerWorld level) {
+                    minion.programmable = canProgram;
-        MinecraftServer server = level.getServer();
+                },
-        server.getUserCache().findByNameAsync(data.name).thenAcceptAsync((optional) -> {
+                minion -> {
-            GameProfile profile = null;
+                    MinionPersistentState.INSTANCE.addMinion(minion);
-            if (optional.isPresent()) {
-                ProfileResult result = server.getSessionService().fetchProfile(optional.get().getId(), true);
-                if (result != null) {
-                    profile = result.profile();
                 }
-            }
+        );
-            if (profile == null) {
-                profile = new GameProfile(new UUID(0, 0), data.name);
-            }
-            GameProfile newProfile = new GameProfile(data.uuid, data.name);
-            newProfile.getProperties().putAll(profile.getProperties());
-            GameProfile finalProfile = newProfile;
-            ((GameProfileMixin)finalProfile).setId(data.uuid);
-            Minions.addExecuteOnNextTick(() -> {
-                MinionFakePlayer instance = new MinionFakePlayer(server, level, finalProfile, SyncedClientOptions.createDefault(), false, data.programmable);
-                System.out.println(instance.getPos());
-                server.getPlayerManager().onPlayerConnect(new FakeClientConnection(NetworkSide.SERVERBOUND), instance, new ConnectedClientData(finalProfile, 0, instance.getClientOptions(), false));
-                System.out.println(instance.getPos());
-                instance.setHealth(20.0F);
-                instance.unsetRemoved();
-                instance.interactionManager.changeGameMode(GameMode.SURVIVAL);
-                server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), level.getRegistryKey());//instance.dimension);
-                server.getPlayerManager().sendToDimension(new EntityPositionS2CPacket(instance), level.getRegistryKey());//instance.dimension);
-                //instance.world.getChunkManager(). updatePosition(instance);
-                instance.dataTracker.set(PLAYER_MODEL_PARTS, (byte) 0x7f); // show all model layers (incl. capes)
-                instance.getAbilities().flying = false;
-            });
-        });
     }
 
-    public static void spawnMinionAt(MinionPersistentState.MinionData data, ServerWorld level, Vec3d pos, double yaw, double pitch) {
+    public static void spawnMinionAt(MinionData data, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot) {
+        spawnMinion(data, level, pos, rot, (minion, skinProfile) -> {}, minion -> {});
+    }
+
+    public static void spawnMinion(MinionData data, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot, BiConsumer<MinionFakePlayer, GameProfile> beforeSpawn, Consumer<MinionFakePlayer> afterSpawn) {
         MinecraftServer server = level.getServer();
-        server.getUserCache().findByNameAsync(data.name).thenAcceptAsync((optional) -> {
+
-            GameProfile profile = null;
+        CompletableFuture<GameProfile> future;
-            if (optional.isPresent()) {
+        if(data.skinUuid().isPresent()) {
-                ProfileResult result = server.getSessionService().fetchProfile(optional.get().getId(), true);
+            future = MinionProfileUtils.getSkinOwnerProfile(server, data.skinUuid().get());
-                if (result != null) {
+        } else {
-                    profile = result.profile();
+            future = MinionProfileUtils.lookupSkinOwnerProfile(server, data.name());
         }
-            }
+
-            if (profile == null) {
+        future.thenAccept((skinProfile) -> {
-                profile = new GameProfile(new UUID(0, 0), data.name);
+            GameProfile profile = MinionProfileUtils.makeNewMinionProfile(data.uuid(), data.name(), skinProfile);
-            }
-            GameProfile newProfile = new GameProfile(data.uuid, data.name);
-            newProfile.getProperties().putAll(profile.getProperties());
-            GameProfile finalProfile = newProfile;
-            ((GameProfileMixin)finalProfile).setId(data.uuid);
             Minions.addExecuteOnNextTick(() -> {
-                MinionFakePlayer instance = new MinionFakePlayer(server, level, finalProfile, SyncedClientOptions.createDefault(), false, data.programmable);
+                MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, SyncedClientOptions.createDefault());
-                instance.fixStartingPosition = () -> instance.refreshPositionAndAngles(pos.x, pos.y, pos.z, (float) yaw, (float) pitch);
+                beforeSpawn.accept(instance, skinProfile);
+
+                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());
-                server.getPlayerManager().onPlayerConnect(new FakeClientConnection(NetworkSide.SERVERBOUND), instance, new ConnectedClientData(finalProfile, 0, instance.getClientOptions(), false));
+                if(pos != null && rot != null) {
-                System.out.println(instance.getPos());
+                    instance.teleport(level, pos.x, pos.y, pos.z, Set.of(), rot.x, rot.y, true);
-                instance.teleport(level, pos.x, pos.y, pos.z, (float) yaw, (float) pitch);
+                }
                 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;
+
+                afterSpawn.accept(instance);
             });
         });
     }
 
-    @SuppressWarnings("unused") //Don't know if I'll need this
+    public static MinionFakePlayer respawnFake(MinecraftServer server, ServerWorld level, GameProfile profile, SyncedClientOptions cli)
-    public static MinionFakePlayer createShadow(MinecraftServer server, ServerPlayerEntity player)
     {
-        player.getServer().getPlayerManager().remove(player);
+        return new MinionFakePlayer(server, level, profile, cli);
-        player.networkHandler.disconnect(Text.translatable("multiplayer.disconnect.duplicate_login"));
-        ServerWorld worldIn = player.getServerWorld();//.getWorld(player.dimension);
-        GameProfile gameprofile = player.getGameProfile();
-        MinionFakePlayer playerShadow = new MinionFakePlayer(server, worldIn, gameprofile, player.getClientOptions(), true, false);
-        playerShadow.setSession(player.getSession());
-        server.getPlayerManager().onPlayerConnect(new FakeClientConnection(NetworkSide.SERVERBOUND), playerShadow, new ConnectedClientData(gameprofile, 0, player.getClientOptions(), false));
-
-        playerShadow.setHealth(player.getHealth());
-        playerShadow.networkHandler.requestTeleport(player.getX(), player.getY(), player.getZ(), player.getYaw(), player.getPitch());
-        playerShadow.interactionManager.changeGameMode(player.interactionManager.getGameMode());
-        ((ServerPlayerInterface) playerShadow).getActionPack().copyFrom(((ServerPlayerInterface) player).getActionPack());
-        playerShadow.dataTracker.set(PLAYER_MODEL_PARTS, player.getDataTracker().get(PLAYER_MODEL_PARTS));
-
-
-        server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(playerShadow, (byte) (player.headYaw * 256 / 360)), playerShadow.getWorld().getRegistryKey());
-        server.getPlayerManager().sendToAll(new PlayerListS2CPacket(PlayerListS2CPacket.Action.ADD_PLAYER, playerShadow));
-        //player.world.getChunkManager().updatePosition(playerShadow);
-        playerShadow.getAbilities().flying = player.getAbilities().flying;
-        return playerShadow;
     }
 
-    public static MinionFakePlayer respawnFake(MinecraftServer server, ServerWorld level, GameProfile profile, SyncedClientOptions cli, boolean programmable)
+    private MinionFakePlayer(MinecraftServer server, ServerWorld worldIn, GameProfile profile, SyncedClientOptions cli)
-    {
-        return new MinionFakePlayer(server, level, profile, cli, false, programmable);
-    }
-
-    private MinionFakePlayer(MinecraftServer server, ServerWorld worldIn, GameProfile profile, SyncedClientOptions cli, boolean shadow, boolean programmable)
     {
         super(server, worldIn, profile, cli);
-        isAShadow = shadow;
-        this.programmable = programmable;
     }
 
     public boolean isProgrammable() {
         return programmable;
     }
 
+    public void setProgrammable(boolean programmable) {
+        this.programmable = programmable;
+    }
+
     public ModuleInventory getModuleInventory() {
         return moduleInventory;
     }
@@ -224,7 +154,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     @Override
     public ActionResult interact(PlayerEntity player, Hand hand) {
         if(player instanceof ServerPlayerEntity spe) {
-            MinionInventory.openInventory(spe, this);
+            MinionGui.openInventory(spe, this);
         }
         return ActionResult.CONSUME;
     }
@@ -319,7 +249,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     }
 
     @Override
-    public Entity teleportTo(TeleportTarget target)
+    public ServerPlayerEntity teleportTo(TeleportTarget target)
     {
         super.teleportTo(target);
         if (notInAnyWorld) {
@@ -374,18 +304,14 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     }
 
     @Override
-    protected void drop(ServerWorld world, DamageSource damageSource) {
+    public void drop(ServerWorld world, DamageSource damageSource) {
         super.drop(world, damageSource);
-        dropItem(toItemStack(), true, false);
+        dropStack(world, toItemStack()).setNeverDespawn();
-        for(ItemStack item : moduleInventory.getItems()) {
-            dropItem(item, true, false);
-        }
-        moduleInventory.clear();
     }
 
     private ItemStack toItemStack() {
         ItemStack stack = new ItemStack(Minions.MINION_ITEM);
-        MinionItem.setData(MinionPersistentState.MinionData.fromMinion(this), stack);
+        MinionItem.setData(MinionData.fromMinion(this), stack);
         if (!getMinionName().equals("Minion")) {
             stack.set(DataComponentTypes.CUSTOM_NAME, Text.of(getMinionName()));
         }
@@ -396,15 +322,21 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     public void writeCustomDataToNbt(NbtCompound nbt) {
         super.writeCustomDataToNbt(nbt);
         nbt.put("modules", moduleInventory.writeNbt(new NbtCompound(), getRegistryManager()));
+        nbt.putBoolean("programmable", programmable);
     }
 
     @Override
     public void readCustomDataFromNbt(NbtCompound nbt) {
         super.readCustomDataFromNbt(nbt);
         moduleInventory.readNbt(nbt.getCompound("modules"), getRegistryManager());
+        programmable = nbt.getBoolean("programmable");
     }
 
     public String getMinionName() {
         return getGameProfile().getName();
     }
+
+    public Optional<UUID> getSkinUuid() {
+        return Optional.ofNullable(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 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/mixinhelper/ChunkTicketManager$DistanceFromNearestPlayerTrackerAccessor.java

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

src/main/java/io/github/skippyall/minions/mixinhelper/ChunkTicketManagerAccessor.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.ChunkTicketManager;
+
+public interface ChunkTicketManagerAccessor {
+    ObjectSet<ServerPlayerEntity> getPlayers(long chunkpos);
+
+    ChunkTicketManager.DistanceFromNearestPlayerTracker getMinionless();
+}

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

@@ -7,9 +7,9 @@ import net.minecraft.server.world.ChunkTicketManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
-@Mixin(value = ChunkTicketManager.class, remap = false)
+@Mixin(value = ChunkTicketManager.class)
 public class ChunkTicketManagerFixMixin {
-    @WrapOperation(method = "handleChunkLeave", at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/ObjectSet;remove(Ljava/lang/Object;)Z"))
+    @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) {
         if (instance != null) {
             return original.call(instance, o);
@@ -18,7 +18,7 @@ public class ChunkTicketManagerFixMixin {
         return false;//Unused
     }
 
-    @WrapOperation(method = "handleChunkLeave", at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/ObjectSet;isEmpty()Z"))
+    @WrapOperation(method = "handleChunkLeave", at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/ObjectSet;isEmpty()Z", remap = false))
     public boolean filterIfNull(ObjectSet instance, Operation<Boolean> original) {
         if (instance != null) {
             return original.call(instance);

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/Debug2Mixin.java

@@ -1,24 +0,0 @@
-package io.github.skippyall.minions.mixins;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.world.PlayerSaveHandler;
-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.CallbackInfoReturnable;
-
-import java.util.Optional;
-
-@Mixin(PlayerSaveHandler.class)
-public class Debug2Mixin {
-    @Inject(method = "method_55788", at = @At("HEAD"))
-    public void debug(PlayerEntity playerEntity, NbtCompound nbt, CallbackInfoReturnable<NbtCompound> cir) {
-        System.out.println("loadPlayerData " + playerEntity.getNameForScoreboard());
-    }
-
-    @Inject(method = "loadPlayerData(Lnet/minecraft/entity/player/PlayerEntity;Ljava/lang/String;)Ljava/util/Optional;", at = @At("RETURN"))
-    public void debug(PlayerEntity player, String extension, CallbackInfoReturnable<Optional<NbtCompound>> cir) {
-        System.out.println(cir.getReturnValue().isEmpty() + player.getUuidAsString());
-    }
-}

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

@@ -1,32 +0,0 @@
-package io.github.skippyall.minions.mixins;
-
-import com.llamalad7.mixinextras.sugar.Local;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
-import net.minecraft.entity.Entity;
-import net.minecraft.nbt.NbtCompound;
-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(SectionedEntityCache.class)
-@Mixin(Entity.class)
-public class DebugMixin {
-    /*@Inject(method = "forEachInBox", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/ChunkSectionPos;asLong(III)J", shift = At.Shift.BEFORE, ordinal = 0))
-    private void debug(Box box, LazyIterationConsumer<EntityTrackingSection<?>> consumer, CallbackInfo ci) {
-        System.out.println("call");
-    }*/
-    @Inject(method = "readNbt", at = @At("HEAD"))
-    public void debug(NbtCompound nbt, CallbackInfo ci) {
-        if ((Object) this instanceof MinionFakePlayer) {
-            System.out.println("readNBT");
-        }
-    }
-
-    @Inject(method = "setPos", at = @At("HEAD"))
-    public void debug(double x, double y, double z, CallbackInfo ci) {
-        if ((Object) this instanceof MinionFakePlayer) {
-            System.out.println("Set Minion Pos to " + x + " " + y + " " + z);
-        }
-    }
-}

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

@@ -0,0 +1,11 @@
+package io.github.skippyall.minions.mixins;
+
+import net.minecraft.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(Entity.class)
+public interface EntityAccessor {
+    @Invoker("canAddPassenger")
+    boolean invokeCanAddPassenger(Entity other);
+}

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

@@ -1,15 +0,0 @@
-package io.github.skippyall.minions.mixins;
-
-import com.mojang.authlib.GameProfile;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.util.UUID;
-
-@Mixin(value = GameProfile.class, remap = false)
-public interface GameProfileMixin{
-    @Mutable
-    @Accessor("id")
-    void setId(UUID id);
-}

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

@@ -0,0 +1,29 @@
+package io.github.skippyall.minions.mixins;
+
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
+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;"))
+    public PlayerEntity checkMobDespawningMinion(World instance, Entity entity, double maxDistance) {
+        return instance.getClosestPlayer(entity.getX(), entity.getY(), entity.getZ(), maxDistance, EntityPredicates.EXCEPT_SPECTATOR.and(entity1 -> {
+            if(entity1 instanceof ServerPlayerEntity player) {
+                if(player instanceof MinionFakePlayer minion) {
+                    return MobSpawningModule.canMinionDespawnMobs(minion);
+                }
+                return true;
+            }
+            return false;
+        }));
+    }
+}

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;ILnet/minecraft/network/encryption/PublicPlayerSession$Serialized;)V"))
     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,11 +1,13 @@
+//partially code from https://github.com/gnembon/fabric-carpet
 package io.github.skippyall.minions.mixins;
 
+import com.llamalad7.mixinextras.injector.ModifyReceiver;
 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;
@@ -16,14 +18,15 @@ import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
-import org.apache.logging.log4j.core.jmx.Server;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Mixin(PlayerManager.class)
 public class PlayerListMixin {
 
@@ -49,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, minion.isProgrammable());
+            return MinionFakePlayer.respawnFake(minecraftServer, serverLevel, gameProfile, clientInformation);
         }
         return original.call(minecraftServer, serverLevel, gameProfile, clientInformation);
     }
@@ -60,4 +63,11 @@ public class PlayerListMixin {
             original.call(instance, message, overlay);
         }
     }
+
+    @ModifyReceiver(method = "checkCanJoin", at = @At(value = "INVOKE", target = "Ljava/util/List;size()I"))
+    public List<ServerPlayerEntity> noMinionCounting(List<ServerPlayerEntity> instance) {
+        return instance.stream()
+                .filter(player -> !(player instanceof MinionFakePlayer))
+                .collect(Collectors.toCollection(ArrayList::new));
+    }
 }

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;

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

@@ -0,0 +1,21 @@
+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.minion.fakeplayer.MinionFakePlayer;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.SleepManager;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(SleepManager.class)
+public class SleepManagerMixin {
+    @WrapOperation(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;isSpectator()Z"))
+    public boolean excludeMinions(ServerPlayerEntity instance, Operation<Boolean> original) {
+        if (instance instanceof MinionFakePlayer) {
+            return true;
+        } else {
+            return original.call(instance);
+        }
+    }
+}

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

@@ -0,0 +1,28 @@
+package io.github.skippyall.minions.mixins;
+
+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;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.world.SpawnHelper;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(SpawnHelper.class)
+public class SpawnHelperMixin {
+    @Redirect(method = "spawnEntitiesInChunk(Lnet/minecraft/entity/SpawnGroup;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/chunk/Chunk;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/SpawnHelper$Checker;Lnet/minecraft/world/SpawnHelper$Runner;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerWorld;getClosestPlayer(DDDDZ)Lnet/minecraft/entity/player/PlayerEntity;"))
+    private static PlayerEntity checkMobSpawningMinion(ServerWorld instance, double x, double y, double z, double maxDistance, boolean b) {
+        return instance.getClosestPlayer(x, y, z, maxDistance, EntityPredicates.EXCEPT_SPECTATOR.and(entity -> {
+            if(entity instanceof ServerPlayerEntity player) {
+                if(player instanceof MinionFakePlayer minion) {
+                    return MobSpawningModule.canMinionSpawnMobs(minion);
+                }
+                return true;
+            }
+            return false;
+        }));
+    }
+}

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

@@ -0,0 +1,14 @@
+package io.github.skippyall.minions.mixins.antimobcap;
+
+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(net.minecraft.world.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/ChunkTicketManager$DistanceFromNearestPlayerTrackerMixin.java

@@ -0,0 +1,85 @@
+package io.github.skippyall.minions.mixins.antimobcap;
+
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.mixinhelper.ChunkTicketManager$DistanceFromNearestPlayerTrackerAccessor;
+import io.github.skippyall.minions.mixinhelper.ChunkTicketManagerAccessor;
+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.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 = ChunkTicketManager.DistanceFromNearestPlayerTracker.class)
+public abstract class ChunkTicketManager$DistanceFromNearestPlayerTrackerMixin extends ChunkPosDistanceLevelPropagatorMixin implements ChunkTicketManager$DistanceFromNearestPlayerTrackerAccessor {
+    @Final
+    @Shadow
+    ChunkTicketManager 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 = ((ChunkTicketManagerAccessor)field_17462).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) {
+            ((ChunkTicketManagerAccessor)field_17462).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))) {
+            ((ChunkTicketManagerAccessor)field_17462).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/ChunkTicketManagerMixin.java

@@ -0,0 +1,49 @@
+package io.github.skippyall.minions.mixins.antimobcap;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import io.github.skippyall.minions.mixinhelper.ChunkTicketManager$DistanceFromNearestPlayerTrackerAccessor;
+import io.github.skippyall.minions.mixinhelper.ChunkTicketManagerAccessor;
+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.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.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.concurrent.Executor;
+
+@Mixin(ChunkTicketManager.class)
+public class ChunkTicketManagerMixin implements ChunkTicketManagerAccessor {
+    @Shadow @Final private Long2ObjectMap<ObjectSet<ServerPlayerEntity>> playersByChunkPos;
+    @Shadow @Final private ChunkTicketManager.DistanceFromNearestPlayerTracker distanceFromNearestPlayerTracker;
+    ChunkTicketManager.DistanceFromNearestPlayerTracker minionless;
+
+    @Inject(method = "<init>", at = @At("RETURN"))
+    public void createMinionlessClone(Executor workerExecutor, Executor mainThreadExecutor, CallbackInfo ci) {
+        ChunkTicketManager manager = ((ChunkTicketManager)(Object)this);
+        minionless = manager.new DistanceFromNearestPlayerTracker(8);
+        ((ChunkTicketManager$DistanceFromNearestPlayerTrackerAccessor)minionless).minions$markAsMinionless();
+        ((ChunkTicketManager$DistanceFromNearestPlayerTrackerAccessor)distanceFromNearestPlayerTracker).minions$markAsTarget();
+    }
+
+    public ObjectSet<ServerPlayerEntity> getPlayers(long chunkpos) {
+        return playersByChunkPos.get(chunkpos);
+    }
+
+    @Override
+    public ChunkTicketManager.DistanceFromNearestPlayerTracker 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 (!((ChunkTicketManager$DistanceFromNearestPlayerTrackerAccessor)minionless).minions$isRealPlayerInChunk(chunk)) {
+            minionless.updateLevel(chunk, Integer.MAX_VALUE, false);
+        }
+    }
+}

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,23 @@
+package io.github.skippyall.minions.mixins.antimobcap;
+
+import io.github.skippyall.minions.mixinhelper.ChunkTicketManager$DistanceFromNearestPlayerTrackerAccessor;
+import io.github.skippyall.minions.mixinhelper.ChunkTicketManagerAccessor;
+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 ChunkTicketManager ticketManager;
+
+    @ModifyArg(method = "tickChunks(Lnet/minecraft/util/profiler/Profiler;JLjava/util/List;)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 ((ChunkTicketManager$DistanceFromNearestPlayerTrackerAccessor)((ChunkTicketManagerAccessor)ticketManager).getMinionless()).minions$getTickedChunkCount();
+    }
+}

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

@@ -0,0 +1,62 @@
+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.minion.fakeplayer.EntityPlayerActionPack;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
+import io.github.skippyall.minions.input.TextInput;
+import net.minecraft.item.Items;
+import net.minecraft.screen.ScreenHandlerType;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+public class ActionModules {
+    public static void executeOnce(EntityPlayerActionPack.ActionType actionType, ServerPlayerEntity player, MinionFakePlayer minion) {
+        minion.getMinionActionPack().start(actionType, EntityPlayerActionPack.Action.once());
+    }
+
+    public static void executeContinuous(EntityPlayerActionPack.ActionType actionType, ServerPlayerEntity player, MinionFakePlayer minion) {
+        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) {
+        return (player, minion) -> {
+            SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, player, false);
+            gui.setTitle(Text.translatable("minions.command.action.details", actionName));
+
+            gui.setSlot(1, new GuiElementBuilder()
+                    .setItem(Items.COMMAND_BLOCK)
+                    .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.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

@@ -0,0 +1,22 @@
+package io.github.skippyall.minions.module;
+
+import io.github.skippyall.minions.Minions;
+import io.github.skippyall.minions.command.SimpleCommand;
+import net.minecraft.item.Items;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+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 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);
+
+    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.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

@@ -0,0 +1,30 @@
+package io.github.skippyall.minions.module;
+
+import io.github.skippyall.minions.Minions;
+import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
+import net.minecraft.item.Items;
+import net.minecraft.util.Identifier;
+
+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"),
+                    List.of(),
+                    List.of(),
+                    Items.SPAWNER
+            );
+
+    public static boolean canMinionSpawnMobs(MinionFakePlayer minion) {
+        return minion.getModuleInventory().hasModule(MOB_SPAWNING_MODULE);
+    }
+
+    public static boolean canMinionDespawnMobs(MinionFakePlayer minion) {
+        return minion.getModuleInventory().hasModule(MOB_SPAWNING_MODULE);
+    }
+
+    public static void registerMe() {}
+}

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

@@ -0,0 +1,13 @@
+package io.github.skippyall.minions.module;
+
+import io.github.skippyall.minions.command.Command;
+import io.github.skippyall.minions.program.block.CodeBlock;
+import net.minecraft.item.ItemConvertible;
+
+import java.util.List;
+
+public interface ModuleItem extends ItemConvertible {
+    List<CodeBlock<?,?>> getCodeBlocks();
+
+    List<Command> getCommands();
+}

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

@@ -0,0 +1,31 @@
+package io.github.skippyall.minions.module;
+
+import io.github.skippyall.minions.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) {
+        return Registry.register(Registries.ITEM, id, item);
+    }
+
+    public static SimpleModuleItem register(Identifier id, List<CodeBlock<?,?>> codeBlocks, List<Command> commands, Item vanillaItem) {
+        return Registry.register(Registries.ITEM, id, new SimpleModuleItem(codeBlocks, commands, new Item.Settings().registryKey(RegistryKey.of(RegistryKeys.ITEM, id)), vanillaItem));
+    }
+}

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

@@ -0,0 +1,41 @@
+package io.github.skippyall.minions.module;
+
+import io.github.skippyall.minions.Minions;
+import io.github.skippyall.minions.command.SimpleCommand;
+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 MountModule {
+    public static final SimpleCommand MOUNT_COMMAND = new SimpleCommand(
+            Text.of("Mount"),
+            Text.of("Mount the minion to the nearest mountable Entity"),
+            Items.MINECART,
+            (player, minion) -> minion.getMinionActionPack().mount(true)
+    );
+
+    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

@@ -0,0 +1,74 @@
+package io.github.skippyall.minions.module;
+
+import io.github.skippyall.minions.Minions;
+import io.github.skippyall.minions.command.SimpleCommand;
+import io.github.skippyall.minions.input.TextInput;
+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 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) -> TextInput.inputFloat(player, Text.literal("Amount of Blocks"), "1")
+                            .thenAccept(minion::moveForward)
+            );
+
+    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) -> TextInput.inputFloat(player, Text.literal("Degrees"), "90")
+                            .thenAccept(degrees -> minion.getMinionActionPack().turn(degrees, 0))
+            );
+
+    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) -> TextInput.inputFloat(player, Text.literal("Degrees"), "90")
+                            .thenAccept(degrees -> minion.getMinionActionPack().turn(-degrees, 0))
+            );
+
+    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

@@ -0,0 +1,29 @@
+package io.github.skippyall.minions.module;
+
+import eu.pb4.polymer.core.api.item.SimplePolymerItem;
+import io.github.skippyall.minions.command.Command;
+import io.github.skippyall.minions.program.block.CodeBlock;
+import net.minecraft.item.Item;
+
+import java.util.List;
+
+public class SimpleModuleItem extends SimplePolymerItem implements ModuleItem {
+    private final List<CodeBlock<?,?>> codeBlocks;
+    private final List<Command> commands;
+
+    public SimpleModuleItem(List<CodeBlock<?,?>> codeBlocks, List<Command> commands, Settings settings, Item vanillaItem) {
+        super(settings.maxCount(1), vanillaItem);
+        this.codeBlocks = codeBlocks;
+        this.commands = commands;
+    }
+
+    @Override
+    public List<CodeBlock<?, ?>> getCodeBlocks() {
+        return codeBlocks;
+    }
+
+    @Override
+    public List<Command> getCommands() {
+        return commands;
+    }
+}

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;

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/module/Module.java

@@ -1,21 +0,0 @@
-package io.github.skippyall.minions.program.module;
-
-import eu.pb4.polymer.core.api.item.PolymerItem;
-import io.github.skippyall.minions.program.block.CodeBlock;
-import net.minecraft.item.Item;
-
-import java.util.List;
-
-public abstract class Module extends Item implements PolymerItem {
-    private final String name;
-    public Module(String name) {
-        super(new Item.Settings().maxCount(1));
-        this.name = name;
-    }
-
-    public String getModuleName() {
-        return name;
-    }
-
-    public abstract List<CodeBlock<?,?>> getCodeBlocks();
-}

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

@@ -1,5 +0,0 @@
-package io.github.skippyall.minions.program.module;
-
-public class Modules {
-    MoveModule MOVE = new MoveModule();
-}

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

@@ -1,29 +0,0 @@
-package io.github.skippyall.minions.program.module;
-
-import io.github.skippyall.minions.program.block.CodeBlock;
-import io.github.skippyall.minions.program.block.CodeBlocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.server.network.ServerPlayerEntity;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MoveModule extends Module {
-    MoveModule() {
-        super("Movement");
-    }
-
-    public List<CodeBlock<?,?>> getCodeBlocks() {
-        List<CodeBlock<?,?>> codeBlocks = new ArrayList<>();
-        codeBlocks.add(CodeBlocks.GO);
-        return codeBlocks;
-    }
-
-    @Override
-    public Item getPolymerItem(ItemStack itemStack, @Nullable ServerPlayerEntity player) {
-        return Items.PURPLE_GLAZED_TERRACOTTA;
-    }
-}

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

@@ -0,0 +1,34 @@
+{
+  "minions.gui.main.commands": "Commands",
+  "minions.gui.main.programming": "Programming",
+  "minions.gui.main.modules": "Modules",
+  "minions.gui.main.inventory": "Inventory",
+  "minions.gui.inventory.title": "%s's Inventory",
+  "minions.gui.module_commands.title": "Commands",
+  "minions.gui.commands.title": "%s's Commands",
+  "minions.gui.modules.title": "%s's Modules",
+
+  "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.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"
+}

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

@@ -0,0 +1,17 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "RGR",
+    "GDG",
+    "RGR"
+  ],
+  "key": {
+    "R": "minecraft:redstone_block",
+    "G": "minecraft:gold_ingot",
+    "D": "minecraft:diamond"
+  },
+  "result": {
+    "id": "minions:basic_upgrade_base",
+    "count": 1
+  }
+}

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

@@ -0,0 +1,18 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    " H ",
+    "RAR",
+    " N "
+  ],
+  "key": {
+    "H": "#minecraft:skulls",
+    "R": "minecraft:redstone_torch",
+    "A": "minecraft:armor_stand",
+    "N": "minecraft:netherite_ingot"
+  },
+  "result": {
+    "id": "minions:minion",
+    "count": 1
+  }
+}

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/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/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,22 +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": ">=${loader_version}",
+    "fabricloader": "*",
     "fabric": "*",
-    "minecraft": "${minecraft_version}"
+    "minecraft": "~1.21.3",
+    "polymer-core": "*"
   }
 }

src/main/resources/minions.accesswidener

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

src/main/resources/minions.mixins.json

@@ -6,14 +6,21 @@
   "mixins": [
     "ChunkTicketManagerFixMixin",
     "ConnectionMixin",
-    "Debug2Mixin",
+    "EntityAccessor",
-    "DebugMixin",
+    "GraveCompatMixin",
-    "GameProfileMixin",
     "MinecraftServerMixin",
+    "MobEntityMixin",
     "PlayerListEntryS2CPacket$EntryMixin",
     "PlayerListMixin",
     "ServerPlayerMixin",
-    "ServerPlayNetworkHandlerMixin"
+    "ServerPlayNetworkHandlerMixin",
+    "SleepManagerMixin",
+    "SpawnHelperMixin",
+    "antimobcap.ChunkPosDistanceLevelPropagatorMixin",
+    "antimobcap.ChunkTicketManager$DistanceFromNearestPlayerTrackerMixin",
+    "antimobcap.ChunkTicketManagerMixin",
+    "antimobcap.ServerChunkManagerAccessor",
+    "antimobcap.ServerChunkManagerMixin"
   ],
   "client": [],
   "server": [],