Merge branch 'feature/skin_improvements' into 1.21.3

# Conflicts:
#	src/main/java/io/github/skippyall/minions/module/MoveModule.java
#	src/main/resources/minions.mixins.json

build.gradle

@@ -14,6 +14,10 @@ base {
     archivesName = project.archives_base_name
 }
 
+loom {
+    accessWidenerPath = file("src/main/resources/minions.accesswidener")
+}
+
 repositories {
     // Add repositories to retrieve artifacts from in here.
     // You should only use this when depending on other mods because

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

@@ -34,30 +34,22 @@ import java.util.function.Function;
 public class Minions implements ModInitializer {
     public static final String MOD_ID = "minions";
     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 MinionItem MINION_ITEM = registerItem(Identifier.of(MOD_ID, "minion"), settings -> new MinionItem(settings.component(DataComponentTypes.DAMAGE_RESISTANT, new DamageResistantComponent(MINION_ITEM_RESISTS))));
     public static final SimplePolymerItem BASIC_UPGRADE_BASE = registerItem(Identifier.of(MOD_ID, "basic_upgrade_base"), settings -> new SimplePolymerItem(settings, Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE));
     public static final SimplePolymerItem ADVANCED_UPGRADE_BASE = registerItem(Identifier.of(MOD_ID, "advanced_upgrade_base"), settings -> new SimplePolymerItem(settings, Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE));
 
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 
-    private static final List<Runnable> executeOnNextTick = new ArrayList<>();
-
     @Override
     public void onInitialize() {
         MinionData.register();
         PolymerEntityUtils.registerType();
         ServerLifecycleEvents.SERVER_STARTED.register(server -> {
             MinionPersistentState.create(server);
-            MinionPersistentState.INSTANCE.getMinionData().forEach(data -> {
+            MinionPersistentState.INSTANCE.getMinionData().forEach((uuid, data) -> {
-                MinionFakePlayer.spawnMinionAt(data, server.getOverworld(), null, null);
+                if(data.isSpawned()) {
-            });
+                    MinionFakePlayer.spawnMinion(data, server.getOverworld(), null, null);
-        });
-        ServerTickEvents.START_SERVER_TICK.register(server -> {
-            exec(() -> {
-                for (Runnable run:executeOnNextTick) {
-                    run.run();
                 }
-                executeOnNextTick.clear();
             });
         });
 
@@ -75,14 +67,4 @@ public class Minions implements ModInitializer {
     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) {
-        run.run();
-    }
-
-    public static void addExecuteOnNextTick(Runnable run) {
-        exec(() -> {
-            executeOnNextTick.add(run);
-        });
-    }
 }

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

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

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

@@ -2,7 +2,7 @@ package io.github.skippyall.minions.gui;
 
 import eu.pb4.sgui.api.elements.GuiElementBuilder;
 import eu.pb4.sgui.api.gui.SimpleGui;
-import io.github.skippyall.minions.command.Command;
+import io.github.skippyall.minions.module.command.Command;
 import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import io.github.skippyall.minions.module.ModuleItem;
 import net.minecraft.screen.ScreenHandlerType;

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

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

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

@@ -1,6 +1,6 @@
 package io.github.skippyall.minions.gui;
 
-import io.github.skippyall.minions.command.Command;
+import io.github.skippyall.minions.module.command.Command;
 import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import io.github.skippyall.minions.module.ModuleItem;
 import io.github.skippyall.minions.program.block.CodeBlock;

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

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

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

@@ -9,42 +9,82 @@ import net.minecraft.text.Text;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
-public class TextInput {
+public class TextInput<T> extends AnvilInputGui {
-    public static CompletableFuture<String> inputText(ServerPlayerEntity player, Text title, String defaultText) {
+    private final GuiElementBuilder valid = new GuiElementBuilder()
-        CompletableFuture<String> future = new CompletableFuture<>();
+            .setItem(Items.EMERALD_BLOCK)
+            .setName(Text.literal("OK"))
+            .setCallback(this::onConfirm);
 
-        AnvilInputGui gui = new AnvilInputGui(player, false);
+    private final GuiElementBuilder invalid = new GuiElementBuilder()
-        gui.setSlot(AnvilScreenHandler.OUTPUT_ID, new GuiElementBuilder()
+            .setItem(Items.REDSTONE_BLOCK);
-                .setItem(Items.EMERALD_BLOCK)
+    private final Function<String, CompletableFuture<Result<T, Text>>> parser;
-                .setName(Text.literal("OK"))
+    private final CompletableFuture<T> future;
-                .setCallback(() -> {
+    private Result<T, Text> result;
-                    gui.close();
+
-                    future.complete(gui.getInput());
+    public TextInput(ServerPlayerEntity player, Text title, String defaultValue, Function<String, CompletableFuture<Result<T, Text>>> parser, CompletableFuture<T> future) {
-                })
+        super(player, false);
-        );
+        setTitle(title);
-        gui.setTitle(title);
+        setDefaultInputValue(defaultValue);
-        gui.setDefaultInputValue(defaultText);
+        this.parser = parser;
-        gui.open();
+        this.future = future;
+
+        updateConfirmButton(defaultValue);
+    }
+
+    public static <T> CompletableFuture<T> inputSync(ServerPlayerEntity player, Text title, String defaultValue, Function<String, Result<T, Text>> parser) {
+        return input(player, title, defaultValue, (String string) -> CompletableFuture.completedFuture(parser.apply(string)));
+    }
+
+    public static <T> CompletableFuture<T> input(ServerPlayerEntity player, Text title, String defaultValue, Function<String, CompletableFuture<Result<T, Text>>> parser) {
+        CompletableFuture<T> future = new CompletableFuture<>();
+        new TextInput<>(player, title, defaultValue, parser, future).open();
         return future;
     }
 
-    public static <T> CompletableFuture<T> inputParse(ServerPlayerEntity player, Text title, String defaultValue, Function<String, T> parser, Text failureMessage) {
+    public static CompletableFuture<String> inputString(ServerPlayerEntity player, Text title, String defaultValue) {
-        return inputText(player, title, String.valueOf(defaultValue)).thenCompose(string -> {
+        return inputSync(player, title, defaultValue, Result.Success::new);
-            try {
+    }
-                return CompletableFuture.completedFuture(parser.apply(string));
+
-            } catch (Exception e) {
+    public static CompletableFuture<Integer> inputInt(ServerPlayerEntity player, Text title, String defaultValue) {
-                player.sendMessage(failureMessage);
+        return inputSync(player, title, defaultValue, string -> Result.wrapCustomError(() -> Integer.valueOf(string), Text.translatable("minions.command.input.int.fail")));
-                return CompletableFuture.failedFuture(e);
+    }
+
+    public static CompletableFuture<Float> inputFloat(ServerPlayerEntity player, Text title, String defaultValue) {
+        return inputSync(player, title, defaultValue, string -> Result.wrapCustomError(() -> Float.valueOf(string), Text.translatable("minions.command.input.float.fail")));
+    }
+
+    @Override
+    public void onInput(String input) {
+        updateConfirmButton(input);
+    }
+
+    public void updateConfirmButton(String input) {
+        parser.apply(input).thenAccept(result -> {
+            this.result = result;
+            if(result.isSuccess()) {
+                setSlot(AnvilScreenHandler.OUTPUT_ID, valid);
+            } else {
+                Text text = result.getErrorOrThrow();
+                setSlot(AnvilScreenHandler.OUTPUT_ID, invalid.setName(text));
             }
         });
     }
 
-    public static CompletableFuture<Integer> inputInt(ServerPlayerEntity player, Text title, String defaultValue) {
+    @Override
-        return inputParse(player, title, defaultValue, Integer::parseInt, Text.translatable("minions.command.input.int.fail"));
+    public void onClose() {
+        if(!future.isDone()) {
+            future.cancel(false);
+        }
     }
 
-    public static CompletableFuture<Float> inputFloat(ServerPlayerEntity player, Text title, String defaultValue) {
+    public void onConfirm() {
-        return inputParse(player, title, defaultValue, Float::parseFloat, Text.translatable("minions.command.input.float.fail"));
+        if(result != null) {
+            result.ifSuccess(success -> {
+                future.complete(success);
+                close();
+            });
+        }
     }
 }

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

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

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

@@ -2,9 +2,10 @@ 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.gui.MinionLookGui;
 import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import net.minecraft.component.DataComponentTypes;
-import net.minecraft.component.type.NbtComponent;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemUsageContext;
@@ -14,20 +15,18 @@ import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Vec2f;
+import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 import xyz.nucleoid.packettweaker.PacketContext;
 
 import java.util.List;
-import java.util.Optional;
 
 public class MinionItem extends Item implements PolymerItem {
-    private final boolean canProgram;
+    public MinionItem(Settings settings) {
-
-    public MinionItem(Settings settings, boolean canProgram) {
         super(settings);
-        this.canProgram = canProgram;
     }
 
     @Override
@@ -49,54 +48,56 @@ public class MinionItem extends Item implements PolymerItem {
 
     @Override
     public void appendTooltip(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {
-        MinionData data = stack.get(MinionData.COMPONENT);
+        MinionData data = getData(stack);
         if(data != null) {
             tooltip.add(Text.translatable("minions.minion_item.tooltip", data.name()));
         }
     }
 
     @Override
-    public ActionResult useOnBlock(ItemUsageContext context) {
+    public ActionResult use(World world, PlayerEntity user, Hand hand) {
-        String contents = context.getStack().getName().getLiteralString();
+        if(user instanceof ServerPlayerEntity serverPlayer) {
-        String name;
+            ItemStack stack = user.getStackInHand(hand);
-        if(contents != null && contents.length() <= 16) {
+            MinionLookGui.open(serverPlayer, stack);
-            name = contents;
+            return ActionResult.SUCCESS;
-        } else {
-            name = "Minion";
         }
+
+        return ActionResult.SUCCESS_SERVER;
+    }
+
+    @Override
+    public ActionResult useOnBlock(ItemUsageContext context) {
         if(!context.getWorld().isClient) {
-            MinionData data = getData(context.getStack());
+            MinionData data = getDataOrDefault(context.getStack());
-
+            MinionFakePlayer.spawnMinion(data, (ServerWorld) context.getWorld(), context.getBlockPos().toCenterPos().add(0,0.5,0), new Vec2f(0, 0));
-            if(data == null) {
-                data = new MinionData(null, name, 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 {
-                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(MinionData data, ItemStack item) {
-        item.set(MinionData.COMPONENT, data);
+        item.set(MinionData.COMPONENT, data.uuid());
+        MinionPersistentState.INSTANCE.updateMinionData(data);
     }
 
     @Nullable
     public static MinionData getData(ItemStack item) {
-        return item.get(MinionData.COMPONENT);
+        if(item.contains(MinionData.COMPONENT)) {
+            return MinionPersistentState.INSTANCE.getMinionData(item.get(MinionData.COMPONENT));
+        }
+        return null;
+    }
+
+    public static MinionData getDataOrDefault(ItemStack item) {
+        MinionData data = getData(item);
+        if(data == null) {
+            data = MinionData.createDefault();
+            setData(data, item);
+        }
+        return data;
     }
 
     public static boolean containsData(ItemStack item) {
-        NbtComponent nbt = item.get(DataComponentTypes.CUSTOM_DATA);
+        return item.contains(MinionData.COMPONENT);
-        if (nbt == null) {
-            return false;
-        }
-        return nbt.copyNbt().contains("data");
     }
 }

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

@@ -1,6 +1,5 @@
 package io.github.skippyall.minions.minion;
 
-import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.NbtList;
@@ -9,8 +8,8 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.PersistentState;
 import net.minecraft.world.World;
 
-import java.util.ArrayList;
+import java.util.HashMap;
-import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 public class MinionPersistentState extends PersistentState {
@@ -18,24 +17,16 @@ public class MinionPersistentState extends PersistentState {
 
     public static MinionPersistentState INSTANCE;
 
-    private final List<MinionData> minionData = new ArrayList<>();
+    private final Map<UUID, MinionData> minionData = new HashMap<>();
-    private final List<UUID> minionUuids = new ArrayList<>();
 
     @Override
     public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
         NbtList list = new NbtList();
-        for(MinionData data : minionData) {
+        for(MinionData data : minionData.values()) {
             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;
     }
 
@@ -43,55 +34,33 @@ public class MinionPersistentState extends PersistentState {
         NbtList list = compound.getList("minions", NbtElement.COMPOUND_TYPE);
         MinionPersistentState instance = new MinionPersistentState();
         for(NbtElement element : list) {
-            instance.addMinion(MinionData.readNbt((NbtCompound) element));
+            if(element instanceof NbtCompound compound1) {
-        }
+                MinionData data = MinionData.readNbt(compound1);
-
+                instance.minionData.put(data.uuid(), data);
-        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) {
+    public MinionData getMinionData(UUID uuid) {
-        if(!minionUuids.contains(uuid)) {
+        return minionData.get(uuid);
-            minionUuids.add(uuid);
-        }
     }
 
-    public void addMinion(MinionFakePlayer minion) {
+    public Map<UUID, MinionData> getMinionData() {
-        addMinion(MinionData.fromMinion(minion));
-    }
-
-    public void addMinion(MinionData data) {
-        System.out.println("add Minion " + data.name());
-        minionData.add(data);
-        markDirty();
-    }
-
-    public void removeMinion(MinionFakePlayer minionData) {
-        removeMinion(minionData.getUuid());
-    }
-
-    public void removeMinion(UUID minionUUID) {
-        MinionData removal = null;
-        for (MinionData data : minionData) {
-            if (data.uuid().equals(minionUUID)) {
-                removal = data;
-            }
-        }
-        if (removal != null) {
-            minionData.remove(removal);
-        }
-        markDirty();
-    }
-
-    public List<MinionData> getMinionData() {
         return minionData;
     }
 
+    public void updateMinionData(MinionData data) {
+        minionData.put(data.uuid(), data);
+        markDirty();
+    }
+
     public boolean isMinion(UUID uuid) {
-        return minionUuids.contains(uuid);
+        return minionData.containsKey(uuid);
+    }
+
+    public boolean isMinionNameTaken(String name) {
+        return minionData.values().stream().anyMatch(data -> data.name().equals(name));
     }
 
     public static void create(MinecraftServer server) {

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

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

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

@@ -299,7 +299,7 @@ public class EntityPlayerActionPack
                     @Override
                     boolean execute(ServerPlayerEntity player, Action action)
                     {
-                        EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
+                        EntityPlayerActionPack ap = ((ServerPlayerInterface) player).minions$getActionPack();
                         if (ap.itemUseCooldown > 0)
                         {
                             ap.itemUseCooldown--;
@@ -368,7 +368,7 @@ public class EntityPlayerActionPack
                     @Override
                     void inactiveTick(ServerPlayerEntity player, Action action)
                     {
-                        EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
+                        EntityPlayerActionPack ap = ((ServerPlayerInterface) player).minions$getActionPack();
                         ap.itemUseCooldown = 0;
                         player.stopUsingItem();
                     }
@@ -390,7 +390,7 @@ public class EntityPlayerActionPack
                         return true;
                     }
                     case BLOCK: {
-                        EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
+                        EntityPlayerActionPack ap = ((ServerPlayerInterface) player).minions$getActionPack();
                         if (ap.blockHitDelay > 0)
                         {
                             ap.blockHitDelay--;
@@ -461,7 +461,7 @@ public class EntityPlayerActionPack
             @Override
             void inactiveTick(ServerPlayerEntity player, Action action)
             {
-                EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
+                EntityPlayerActionPack ap = ((ServerPlayerInterface) player).minions$getActionPack();
                 if (ap.currentBlock == null) return;
                 player.getWorld().setBlockBreakingInfo(-1, ap.currentBlock, -1);
                 player.interactionManager.processBlockBreakingAction(ap.currentBlock, PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, Direction.DOWN, player.getWorld().getTopYInclusive(), -1);

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

@@ -2,7 +2,9 @@
 package io.github.skippyall.minions.minion.fakeplayer;
 
 import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.PropertyMap;
 import io.github.skippyall.minions.Minions;
+import io.github.skippyall.minions.MinionsTickExecutor;
 import io.github.skippyall.minions.minion.MinionData;
 import io.github.skippyall.minions.gui.MinionGui;
 import io.github.skippyall.minions.minion.MinionItem;
@@ -11,7 +13,7 @@ import io.github.skippyall.minions.minion.MinionProfileUtils;
 import io.github.skippyall.minions.gui.ModuleInventory;
 import io.github.skippyall.minions.program.runtime.MinionRuntime;
 import net.minecraft.block.BlockState;
-import net.minecraft.component.DataComponentTypes;
+import net.minecraft.block.EndPortalBlock;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.MovementType;
@@ -43,12 +45,8 @@ 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 = () -> {};
@@ -60,75 +58,52 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     private final ModuleInventory moduleInventory = new ModuleInventory();
     private final MinionRuntime runtime = new MinionRuntime(this);
 
-    private UUID skinUuid = null;
+    private final MinionData data;
 
-    public static void createMinion(MinionData data, ServerWorld level, ServerPlayerEntity owner, boolean canProgram, Vec3d pos, Vec2f rot) {
+    public static void spawnMinion(MinionData data, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot) {
-        spawnMinion(data, level, pos, rot,
-                (minion, skinProfile) -> {
-                    if (skinProfile != null) {
-                        minion.skinUuid = skinProfile.getId();
-                    }
-
-                    minion.programmable = canProgram;
-                },
-                minion -> {
-                    MinionPersistentState.INSTANCE.addMinion(minion);
-                }
-        );
-    }
-
-    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();
 
-        CompletableFuture<GameProfile> future;
+        PropertyMap skin = data.skin().orElse(null);
-        if(data.skinUuid().isPresent()) {
+
-            future = MinionProfileUtils.getSkinOwnerProfile(server, data.skinUuid().get());
+        GameProfile profile = MinionProfileUtils.makeNewMinionProfile(data.uuid(), data.name(), skin);
-        } else {
+        doSpawn(data, profile, server, level, pos, rot);
-            future = MinionProfileUtils.lookupSkinOwnerProfile(server, data.name());
+
+    }
+
+    private static void doSpawn(MinionData data, GameProfile profile, MinecraftServer server, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot) {
+
+        MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, SyncedClientOptions.createDefault(), data);
+        MinionPersistentState.INSTANCE.updateMinionData(data.withSpawned(true));
+
+        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));
-        future.thenAccept((skinProfile) -> {
+        System.out.println(instance.getPos());
-            GameProfile profile = MinionProfileUtils.makeNewMinionProfile(data.uuid(), data.name(), skinProfile);
+        if(pos != null && rot != null) {
-            Minions.addExecuteOnNextTick(() -> {
+            instance.teleport(level, pos.x, pos.y, pos.z, Set.of(), rot.x, rot.y, true);
-                MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, SyncedClientOptions.createDefault());
+        }
-                beforeSpawn.accept(instance, skinProfile);
+        instance.setVelocity(0,0,0);
-
+        instance.setHealth(20.0F);
-                if(pos != null && rot != null) {
+        instance.unsetRemoved();
-                    instance.fixStartingPosition = () -> instance.refreshPositionAndAngles(pos.x, pos.y, pos.z, rot.x, rot.y);
+        instance.getAttributeInstance(EntityAttributes.STEP_HEIGHT).setBaseValue(0.6F);
-                }
+        instance.interactionManager.changeGameMode(GameMode.SURVIVAL);
-                server.getPlayerManager().onPlayerConnect(new FakeClientConnection(NetworkSide.SERVERBOUND), instance, new ConnectedClientData(profile, 0, instance.getClientOptions(), false));
+        server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), level.getRegistryKey());//instance.dimension);
-                System.out.println(instance.getPos());
+        server.getPlayerManager().sendToDimension(EntityPositionSyncS2CPacket.create(instance), level.getRegistryKey());//instance.dimension);
-                if(pos != null && rot != null) {
+        //instance.world.getChunkManager(). updatePosition(instance);
-                    instance.teleport(level, pos.x, pos.y, pos.z, Set.of(), rot.x, rot.y, true);
+        instance.dataTracker.set(PLAYER_MODEL_PARTS, (byte) 0x7f); // show all model layers (incl. capes)
-                }
+        instance.getAbilities().flying = false;
-                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(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);
-            });
-        });
     }
 
-    public static MinionFakePlayer respawnFake(MinecraftServer server, ServerWorld level, GameProfile profile, SyncedClientOptions cli)
+    public static MinionFakePlayer respawnFake(MinecraftServer server, ServerWorld level, GameProfile profile, SyncedClientOptions cli, MinionData data)
     {
-        return new MinionFakePlayer(server, level, profile, cli);
+        return new MinionFakePlayer(server, level, profile, cli, data);
     }
 
-    private MinionFakePlayer(MinecraftServer server, ServerWorld worldIn, GameProfile profile, SyncedClientOptions cli)
+    private MinionFakePlayer(MinecraftServer server, ServerWorld worldIn, GameProfile profile, SyncedClientOptions cli, MinionData data)
     {
         super(server, worldIn, profile, cli);
+        this.data = data;
     }
 
     public boolean isProgrammable() {
@@ -148,7 +123,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     }
 
     public EntityPlayerActionPack getMinionActionPack() {
-        return ((ServerPlayerInterface)this).getActionPack();
+        return ((ServerPlayerInterface)this).minions$getActionPack();
     }
 
     @Override
@@ -188,7 +163,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
             }));
         }
 
-        MinionPersistentState.INSTANCE.removeMinion(this);
+        MinionPersistentState.INSTANCE.updateMinionData(data.withSpawned(false));
     }
 
     @Override
@@ -311,13 +286,14 @@ public class MinionFakePlayer extends ServerPlayerEntity {
 
     private ItemStack toItemStack() {
         ItemStack stack = new ItemStack(Minions.MINION_ITEM);
-        MinionItem.setData(MinionData.fromMinion(this), stack);
+        MinionItem.setData(data, stack);
-        if (!getMinionName().equals("Minion")) {
-            stack.set(DataComponentTypes.CUSTOM_NAME, Text.of(getMinionName()));
-        }
         return stack;
     }
 
+    public MinionData getData() {
+        return data;
+    }
+
     @Override
     public void writeCustomDataToNbt(NbtCompound nbt) {
         super.writeCustomDataToNbt(nbt);
@@ -331,12 +307,4 @@ public class MinionFakePlayer extends ServerPlayerEntity {
         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/ServerPlayerInterface.java

@@ -3,5 +3,5 @@ package io.github.skippyall.minions.minion.fakeplayer;
 
 public interface ServerPlayerInterface
 {
-    EntityPlayerActionPack getActionPack();
+    EntityPlayerActionPack minions$getActionPack();
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,29 +1,36 @@
 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 io.github.skippyall.minions.mixinhelpers.EntityViewMixinHelper;
 import io.github.skippyall.minions.module.MobSpawningModule;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
 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.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(MobEntity.class)
 public abstract class MobEntityMixin {
-    @Redirect(method = "checkDespawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getClosestPlayer(Lnet/minecraft/entity/Entity;D)Lnet/minecraft/entity/player/PlayerEntity;"))
+    @WrapOperation(method = "checkDespawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getClosestPlayer(Lnet/minecraft/entity/Entity;D)Lnet/minecraft/entity/player/PlayerEntity;"))
-    public PlayerEntity checkMobDespawningMinion(World instance, Entity entity, double maxDistance) {
+    public PlayerEntity checkMobDespawningMinion(World instance, Entity entity, double maxDistance, Operation<PlayerEntity> original) {
-        return instance.getClosestPlayer(entity.getX(), entity.getY(), entity.getZ(), maxDistance, EntityPredicates.EXCEPT_SPECTATOR.and(entity1 -> {
+        EntityViewMixinHelper.ADDITIONAL_PREDICATE.set(entity2 -> {
-            if(entity1 instanceof ServerPlayerEntity player) {
+            if(entity2 instanceof MinionFakePlayer minion) {
-                if(player instanceof MinionFakePlayer minion) {
+                return MobSpawningModule.canMinionDespawnMobs(minion);
-                    return MobSpawningModule.canMinionDespawnMobs(minion);
+            } else {
-                }
                 return true;
             }
-            return false;
+        });
-        }));
+        PlayerEntity player = original.call(instance, entity, maxDistance);
+        EntityViewMixinHelper.ADDITIONAL_PREDICATE.remove();
+        return player;
     }
 }

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

@@ -52,7 +52,7 @@ public class PlayerListMixin {
     @WrapOperation(method = "respawnPlayer", at = @At(value = "NEW", target = "(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/server/world/ServerWorld;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/network/packet/c2s/common/SyncedClientOptions;)Lnet/minecraft/server/network/ServerPlayerEntity;"))
     public ServerPlayerEntity makePlayerForRespawn(MinecraftServer minecraftServer, ServerWorld serverLevel, GameProfile gameProfile, SyncedClientOptions clientInformation, Operation<ServerPlayerEntity> original, ServerPlayerEntity serverPlayer, boolean bl) {
         if (serverPlayer instanceof MinionFakePlayer minion) {
-            return MinionFakePlayer.respawnFake(minecraftServer, serverLevel, gameProfile, clientInformation);
+            return MinionFakePlayer.respawnFake(minecraftServer, serverLevel, gameProfile, clientInformation, minion.getData());
         }
         return original.call(minecraftServer, serverLevel, gameProfile, clientInformation);
     }

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

@@ -18,7 +18,7 @@ public abstract class ServerPlayerMixin implements ServerPlayerInterface {
     @Unique
     public EntityPlayerActionPack actionPack;
     @Override
-    public EntityPlayerActionPack getActionPack()
+    public EntityPlayerActionPack minions$getActionPack()
     {
         return actionPack;
     }

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

@@ -2,10 +2,10 @@ package io.github.skippyall.minions.module;
 
 import eu.pb4.sgui.api.elements.GuiElementBuilder;
 import eu.pb4.sgui.api.gui.SimpleGui;
-import io.github.skippyall.minions.command.CommandExecutor;
+import io.github.skippyall.minions.module.command.CommandExecutor;
+import io.github.skippyall.minions.input.TextInput;
 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;

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

@@ -1,7 +1,7 @@
 package io.github.skippyall.minions.module;
 
 import io.github.skippyall.minions.Minions;
-import io.github.skippyall.minions.command.SimpleCommand;
+import io.github.skippyall.minions.module.command.SimpleCommand;
 import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
 import net.minecraft.item.Items;
 import net.minecraft.text.Text;

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

@@ -1,7 +1,7 @@
 package io.github.skippyall.minions.module;
 
 import io.github.skippyall.minions.Minions;
-import io.github.skippyall.minions.command.SimpleCommand;
+import io.github.skippyall.minions.module.command.SimpleCommand;
 import net.minecraft.item.Items;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;

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

@@ -1,7 +1,7 @@
 package io.github.skippyall.minions.module;
 
 import io.github.skippyall.minions.Minions;
-import io.github.skippyall.minions.command.SimpleCommand;
+import io.github.skippyall.minions.module.command.SimpleCommand;
 import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
 import net.minecraft.item.Items;
 import net.minecraft.text.Text;

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

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

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

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

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

@@ -1,7 +1,7 @@
 package io.github.skippyall.minions.module;
 
 import io.github.skippyall.minions.Minions;
-import io.github.skippyall.minions.command.SimpleCommand;
+import io.github.skippyall.minions.module.command.SimpleCommand;
 import net.minecraft.item.Items;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;

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

@@ -1,7 +1,7 @@
 package io.github.skippyall.minions.module;
 
 import io.github.skippyall.minions.Minions;
-import io.github.skippyall.minions.command.SimpleCommand;
+import io.github.skippyall.minions.module.command.SimpleCommand;
 import io.github.skippyall.minions.input.TextInput;
 import net.minecraft.item.Items;
 import net.minecraft.text.Text;
@@ -57,6 +57,8 @@ public class MoveModule {
                             .thenAccept(degrees -> minion.getMinionActionPack().turn(0, degrees))
             );
 
+
+
     public static final SimpleModuleItem MOVE_MODULE =
             register(Identifier.of(Minions.MOD_ID, "move_module"),
                     List.of(),

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

@@ -1,7 +1,7 @@
 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.module.command.Command;
 import io.github.skippyall.minions.program.block.CodeBlock;
 import net.minecraft.item.Item;
 

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

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

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

@@ -1,4 +1,4 @@
-package io.github.skippyall.minions.command;
+package io.github.skippyall.minions.module.command;
 
 import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import net.minecraft.server.network.ServerPlayerEntity;

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

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

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

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

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

@@ -7,6 +7,14 @@
   "minions.gui.module_commands.title": "Commands",
   "minions.gui.commands.title": "%s's Commands",
   "minions.gui.modules.title": "%s's Modules",
+  "minions.gui.ok": "OK",
+  "minions.gui.look.skin.name": "Name",
+  "minions.gui.look.skin.name.title": "Enter a player name",
+  "minions.gui.look.skin.uuid": "UUID",
+  "minions.gui.look.skin.uuid.title": "Enter a player UUID",
+  "minions.gui.look.skin.base64": "Base64",
+  "minions.gui.look.skin.base64.title": "Enter a skin in base64 encoding",
+  "minions.gui.look.rename.title": "Enter a name",
 
   "minions.command.input.int.fail": "Not an integer",
   "minions.command.input.float.fail": "Not a number",
@@ -30,5 +38,9 @@
   "item.minions.basic_upgrade_base": "Basic Upgrade Base",
   "item.minions.advanced_upgrade_base": "Advanced Upgrade Base",
 
-  "minions.minion_item.tooltip": "Name: %s"
+  "minions.minion_item.tooltip": "Name: %s",
+  "minions.generic.name.invalid_char": "Name contains invalid character",
+  "minions.generic.name.too_long": "Name is too long",
+  "minions.generic.name.invalid": "Name is invalid",
+  "minions.generic.name.taken": "This name is already used"
 }

src/main/resources/minions.mixins.json

@@ -8,6 +8,7 @@
     "ConnectionMixin",
     "EntityAccessor",
     "GraveCompatMixin",
+    "EntityViewMixin",
     "MinecraftServerMixin",
     "MobEntityMixin",
     "PlayerListEntryS2CPacket$EntryMixin",