Delete oldSrc directory

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id 'fabric-loom' version '1.5-SNAPSHOT'
     id 'maven-publish'
 }
 
@@ -27,9 +27,8 @@ dependencies {
 
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-    modImplementation "eu.pb4:polymer-core:${project.polymer_version}"
+    modImplementation include("eu.pb4:polymer-core:${project.polymer_version}")
     modImplementation include("eu.pb4:sgui:${project.sgui_version}")
-    modImplementation include("xyz.nucleoid:server-translations-api:${project.server_translations_version}")
 }
 
 processResources {
@@ -45,7 +44,7 @@ processResources {
     }
 }
 
-def targetJavaVersion = 21
+def targetJavaVersion = 17
 tasks.withType(JavaCompile).configureEach {
     // ensure that the encoding is set to UTF-8, no matter what the system default is
     // this fixes some edge cases with special characters not displaying correctly
@@ -77,7 +76,7 @@ jar {
 // configure the maven publication
 publishing {
     publications {
-        minions (MavenPublication) {
+        mavenJava(MavenPublication) {
             from components.java
         }
     }
@@ -88,15 +87,5 @@ 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,19 +3,18 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://modmuss50.me/fabric.html
-	minecraft_version=1.21.1
+	minecraft_version=1.20.4
-	loader_version=0.16.3
+	loader_version=0.15.6
-	yarn_mappings=1.21.1+build.3
+	yarn_mappings=1.20.4+build.3
 
 # Mod Properties
-	mod_version = 0.0.1-SNAPSHOT
+	mod_version = 0.0.1
 	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.95.4+1.20.4
 
-	polymer_version=0.9.12+1.21.1
+	polymer_version=0.7.5+1.20.4
-	sgui_version=1.6.0+1.21
+	sgui_version=1.4.1+1.20.4
-	server_translations_version=2.3.1+1.21-pre2

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

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

@@ -1,65 +1,21 @@
 package io.github.skippyall.minions;
 
 import eu.pb4.polymer.core.api.entity.PolymerEntityUtils;
-import eu.pb4.polymer.core.api.item.SimplePolymerItem;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
 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.event.lifecycle.v1.ServerLifecycleEvents;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
-import net.minecraft.item.Item;
-import net.minecraft.item.Items;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class Minions implements ModInitializer {
     public static final String MOD_ID = "minions";
-    public static final MinionItem MINION_ITEM = Registry.register(Registries.ITEM, Identifier.of(MOD_ID, "minion"), new MinionItem(false));
+    public static final MinionItem MINION_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "minion"), new MinionItem());
-    public static final SimplePolymerItem BASIC_UPGRADE_BASE = Registry.register(Registries.ITEM, Identifier.of(MOD_ID, "basic_upgrade_base"), new SimplePolymerItem(new Item.Settings(), Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE));
 
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
-
-    private static final List<Runnable> executeOnNextTick = new ArrayList<>();
-
     @Override
     public void onInitialize() {
-        LOGGER.debug("Add Customthing");
         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);
-            });
-        });
-        ServerTickEvents.START_SERVER_TICK.register(server -> {
-            exec(() -> {
-                for (Runnable run:executeOnNextTick) {
-                    run.run();
-                }
-                executeOnNextTick.clear();
-            });
-        });
-
-        Modules.register();
-    }
-
-    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/client/MinionsClient.java

@@ -11,6 +11,6 @@ public class MinionsClient implements ClientModInitializer {
      */
     @Override
     public void onInitializeClient() {
-        //ClientConfigurationConnectionEvents.INIT.register(ClientToServerNetworking::onConfigurationInit);
+        ClientConfigurationConnectionEvents.INIT.register(ClientToServerNetworking::onConfigurationInit);
     }
 }

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

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

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

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

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

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

@@ -5,8 +5,6 @@ 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;
@@ -159,12 +157,6 @@ public class EntityPlayerActionPack
         return this;
     }
 
-    public EntityPlayerActionPack stop(ActionType type) {
-        type.stop(player, actions.get(type));
-        actions.remove(type);
-        return this;
-    }
-
 
     public EntityPlayerActionPack stopAll()
     {
@@ -175,13 +167,12 @@ 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) && ((EntityAccessor)e).invokeCanAddPassenger(player));
+                    e -> e instanceof MinecartEntity || e instanceof BoatEntity || e instanceof AbstractHorseEntity);
         }
         else
         {
@@ -207,7 +198,7 @@ public class EntityPlayerActionPack
         if (closest instanceof AbstractHorseEntity && onlyRideables)
             ((AbstractHorseEntity) closest).interactMob(player, Hand.MAIN_HAND);
         else
-            player.startRiding(closest, !onlyRideables);
+            player.startRiding(closest,true);
         return this;
     }
     public EntityPlayerActionPack dismount()

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

@@ -3,7 +3,6 @@ package io.github.skippyall.minions.fakeplayer;
 import io.netty.channel.embedded.EmbeddedChannel;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.NetworkSide;
-import net.minecraft.network.NetworkState;
 import net.minecraft.network.listener.PacketListener;
 import net.minecraft.text.Text;
 
@@ -23,6 +22,7 @@ public class FakeClientConnection extends ClientConnection {
 
     @Override
     public void handleDisconnection() {
+        getPacketListener().onDisconnected(getDisconnectReason()==null ? Text.literal("Disconnected"): getDisconnectReason());
     }
 
     @Override
@@ -31,6 +31,7 @@ public class FakeClientConnection extends ClientConnection {
     }
 
     @Override
-    public <T extends PacketListener> void transitionInbound(NetworkState<T> state, T packetListener) {
+    public void setPacketListener(PacketListener packetListener) {
+
     }
 }

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

@@ -1,31 +1,24 @@
 package io.github.skippyall.minions.fakeplayer;
 
 import com.mojang.authlib.GameProfile;
-import io.github.skippyall.minions.Minions;
+import com.mojang.authlib.yggdrasil.ProfileResult;
-import io.github.skippyall.minions.minion.MinionData;
+import io.github.skippyall.minions.minion.MinionInventory;
-import io.github.skippyall.minions.gui.MinionGui;
+import io.github.skippyall.minions.minion.ModuleInventory;
-import io.github.skippyall.minions.minion.MinionItem;
+import net.fabricmc.fabric.api.entity.FakePlayer;
-import io.github.skippyall.minions.minion.MinionPersistentState;
-import io.github.skippyall.minions.minion.MinionProfileUtils;
-import io.github.skippyall.minions.gui.ModuleInventory;
-import io.github.skippyall.minions.program.runtime.MinionRuntime;
 import net.minecraft.block.BlockState;
-import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.MovementType;
-import net.minecraft.entity.attribute.EntityAttributes;
 import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.player.HungerManager;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.network.DisconnectionInfo;
 import net.minecraft.network.NetworkSide;
 import net.minecraft.network.packet.c2s.common.SyncedClientOptions;
 import net.minecraft.network.packet.c2s.play.ClientStatusC2SPacket;
 import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntitySetHeadYawS2CPacket;
+import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.ServerTask;
 import net.minecraft.server.network.ConnectedClientData;
@@ -35,136 +28,107 @@ import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableTextContent;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
+import net.minecraft.util.Uuids;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec2f;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.GameMode;
-import net.minecraft.world.TeleportTarget;
-import org.jetbrains.annotations.Nullable;
-
 import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
 
 public class MinionFakePlayer extends ServerPlayerEntity {
     public Runnable fixStartingPosition = () -> {};
+    public boolean isAShadow;
 
     private float moveForward;
     private float moveSideways;
 
     private boolean programmable;
-    private final ModuleInventory moduleInventory = new ModuleInventory();
+    private ModuleInventory moduleInventory = new ModuleInventory();
-    private final MinionRuntime runtime = new MinionRuntime(this);
 
-    private UUID skinUuid = null;
+    public static void createMinion(String username, ServerWorld level, ServerPlayerEntity owner, boolean canProgram, Vec3d pos, double yaw, double pitch) {
-
-    public static void createMinion(MinionData data, ServerWorld level, ServerPlayerEntity owner, boolean canProgram, Vec3d pos, double yaw, double pitch) {
         MinecraftServer server = level.getServer();
-
+        server.getUserCache().findByNameAsync(username).thenAcceptAsync((optional) -> {
-        CompletableFuture<GameProfile> future;
+            GameProfile profile = null;
-        if(data.skinUuid != null) {
+            if(optional.isPresent()){
-            future = MinionProfileUtils.getSkinOwnerProfile(server, data.skinUuid);
+                UUID uuid = optional.get().getId();
-        } else {
+                ProfileResult result = server.getSessionService().fetchProfile(uuid, true);
-            future = MinionProfileUtils.lookupSkinOwnerProfile(server, data.name);
+                if(result != null) {
+                    profile = result.profile();
                 }
-
-        future.thenAccept(skinProfile -> {
-            GameProfile profile = MinionProfileUtils.makeNewMinionProfile(null, data.name, skinProfile);
-            Minions.addExecuteOnNextTick(() -> {
-                MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, SyncedClientOptions.createDefault());
-                if(skinProfile != null) {
-                    instance.skinUuid = skinProfile.getId();
             }
-
+            if(profile == null) {
-                instance.programmable = canProgram;
+                profile = new GameProfile(Uuids.getOfflinePlayerUuid(username), username);
+            }
+            MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, 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(profile, 0, instance.getClientOptions(), false));
+            server.getPlayerManager().onPlayerConnect(new FakeClientConnection(NetworkSide.SERVERBOUND), instance, new ConnectedClientData(profile, 0, instance.getClientOptions()));
             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);
+            instance.setStepHeight(0.6F);
-            });
         });
+
+
     }
 
-    public static void spawnMinionAt(MinionData data, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot) {
+    @SuppressWarnings("unused") //Don't know if I'll need this
-        MinecraftServer server = level.getServer();
+    public static MinionFakePlayer createShadow(MinecraftServer server, ServerPlayerEntity player)
-
-        CompletableFuture<GameProfile> future;
-        if(data.skinUuid != null) {
-            future = MinionProfileUtils.getSkinOwnerProfile(server, data.skinUuid);
-        } else {
-            future = MinionProfileUtils.lookupSkinOwnerProfile(server, data.name);
-        }
-
-        future.thenAccept((skinProfile) -> {
-            GameProfile profile = MinionProfileUtils.makeNewMinionProfile(data.uuid, data.name, skinProfile);
-            Minions.addExecuteOnNextTick(() -> {
-                MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, SyncedClientOptions.createDefault());
-                if (skinProfile != null) {
-                    instance.skinUuid = skinProfile.getId();
-                }
-                if(pos != null && rot != null) {
-                    instance.fixStartingPosition = () -> instance.refreshPositionAndAngles(pos.x, pos.y, pos.z, rot.x, rot.y);
-                }
-                server.getPlayerManager().onPlayerConnect(new FakeClientConnection(NetworkSide.SERVERBOUND), instance, new ConnectedClientData(profile, 0, instance.getClientOptions(), false));
-                System.out.println(instance.getPos());
-                if(pos != null && rot != null) {
-                    instance.teleport(level, pos.x, pos.y, pos.z, rot.x, rot.y);
-                }
-                instance.setVelocity(0,0,0);
-                instance.setHealth(20.0F);
-                instance.unsetRemoved();
-                instance.interactionManager.changeGameMode(GameMode.SURVIVAL);
-                server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), level.getRegistryKey());//instance.dimension);
-                server.getPlayerManager().sendToDimension(new EntityPositionS2CPacket(instance), level.getRegistryKey());//instance.dimension);
-                //instance.world.getChunkManager(). updatePosition(instance);
-                instance.dataTracker.set(PLAYER_MODEL_PARTS, (byte) 0x7f); // show all model layers (incl. capes)
-                instance.getAbilities().flying = false;
-            });
-        });
-    }
-
-    public static MinionFakePlayer respawnFake(MinecraftServer server, ServerWorld level, GameProfile profile, SyncedClientOptions cli)
     {
-        return new MinionFakePlayer(server, level, profile, cli);
+        player.getServer().getPlayerManager().remove(player);
+        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()));
+
+        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;
     }
 
-    private MinionFakePlayer(MinecraftServer server, ServerWorld worldIn, GameProfile profile, SyncedClientOptions cli)
+    public static MinionFakePlayer respawnFake(MinecraftServer server, ServerWorld level, GameProfile profile, SyncedClientOptions cli, boolean programmable)
+    {
+        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;
+
     }
 
     public boolean isProgrammable() {
         return programmable;
     }
 
-    public void setProgrammable(boolean programmable) {
-        this.programmable = programmable;
-    }
-
     public ModuleInventory getModuleInventory() {
         return moduleInventory;
     }
 
-    public MinionRuntime getRuntime() {
+    public EntityPlayerActionPack getActionPack() {
-        return runtime;
-    }
-
-    public EntityPlayerActionPack getMinionActionPack() {
         return ((ServerPlayerInterface)this).getActionPack();
     }
 
     @Override
     public ActionResult interact(PlayerEntity player, Hand hand) {
         if(player instanceof ServerPlayerEntity spe) {
-            MinionGui.openInventory(spe, this);
+            MinionInventory.openInventory(spe, this);
         }
         return ActionResult.CONSUME;
     }
@@ -180,25 +144,23 @@ public class MinionFakePlayer extends ServerPlayerEntity {
         if (!isUsingItem()) super.onEquipStack(slot, previous, stack);
     }
 
-    /*@Override
+    @Override
     public void kill()
     {
         kill(Text.literal("Killed"));
-    }*/
+    }
 
     public void kill(Text reason)
     {
         shakeOff();
 
         if (reason.getContent() instanceof TranslatableTextContent text && text.getKey().equals("multiplayer.disconnect.duplicate_login")) {
-            this.networkHandler.onDisconnected(new DisconnectionInfo(reason));
+            this.networkHandler.onDisconnected(reason);
         } else {
             this.server.send(new ServerTask(this.server.getTicks(), () -> {
-                this.networkHandler.onDisconnected(new DisconnectionInfo(reason));
+                this.networkHandler.onDisconnected(reason);
             }));
         }
-
-        MinionPersistentState.INSTANCE.removeMinion(this);
     }
 
     @Override
@@ -219,7 +181,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
             // happens with that paper port thingy - not sure what that would fix, but hey
             // the game not gonna crash violently.
         }
-        runtime.tick();
+
 
     }
 
@@ -259,9 +221,9 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     }
 
     @Override
-    public Entity teleportTo(TeleportTarget target)
+    public Entity moveToWorld(ServerWorld serverLevel)
     {
-        super.teleportTo(target);
+        super.moveToWorld(serverLevel);
         if (notInAnyWorld) {
             ClientStatusC2SPacket p = new ClientStatusC2SPacket(ClientStatusC2SPacket.Mode.PERFORM_RESPAWN);
             networkHandler.onClientStatus(p);
@@ -277,7 +239,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
 
     public void moveForward(float forward) {
         this.moveForward += forward;
-        EntityPlayerActionPack actionPack = getMinionActionPack();
+        EntityPlayerActionPack actionPack = getActionPack();
         if (moveForward != 0) {
             actionPack.setForward(moveForward > 0 ? 1 : -1);
         }
@@ -285,7 +247,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
 
     public void moveSideways(float sideways) {
         this.moveSideways += sideways;
-        EntityPlayerActionPack actionPack = getMinionActionPack();
+        EntityPlayerActionPack actionPack = getActionPack();
         if (moveSideways != 0) {
             actionPack.setStrafing(moveSideways > 0 ? 1 : -1);
         }
@@ -296,57 +258,20 @@ public class MinionFakePlayer extends ServerPlayerEntity {
         float newForward = (float) (moveForward - movement.z);
         float newSideways = (float) (moveSideways - movement.x);
         Vec3d newMovement = movement;
-        if ((newForward < 0 && moveForward > 0) || (newForward > 0 && moveForward < 0)) {
+        if ((newForward < 0 && moveForward >= 0) || (newForward > 0 && moveForward <= 0)) {
             newMovement = new Vec3d(newMovement.x, newMovement.y, moveForward);
             moveForward = 0;
-            getMinionActionPack().setForward(0);
+            getActionPack().setForward(0);
         }else {
             moveForward = newForward;
         }
-        if ((newSideways < 0 && moveSideways > 0) || (newSideways > 0 && moveSideways < 0)) {
+        if ((newSideways < 0 && moveSideways >= 0) || (newSideways > 0 && moveSideways <= 0)) {
             newMovement = new Vec3d(newMovement.x, newMovement.y, moveSideways);
             moveSideways = 0;
-            getMinionActionPack().setStrafing(0);
+            getActionPack().setStrafing(0);
         }else {
             moveSideways = newSideways;
         }
         super.move(movementType, newMovement);
     }
-
-    @Override
-    protected void drop(ServerWorld world, DamageSource damageSource) {
-        super.drop(world, damageSource);
-        dropStack(toItemStack());
-    }
-
-    private ItemStack toItemStack() {
-        ItemStack stack = new ItemStack(Minions.MINION_ITEM);
-        MinionItem.setData(MinionData.fromMinion(this), stack);
-        if (!getMinionName().equals("Minion")) {
-            stack.set(DataComponentTypes.CUSTOM_NAME, Text.of(getMinionName()));
-        }
-        return stack;
-    }
-
-    @Override
-    public void writeCustomDataToNbt(NbtCompound nbt) {
-        super.writeCustomDataToNbt(nbt);
-        nbt.put("modules", moduleInventory.writeNbt(new NbtCompound(), getRegistryManager()));
-        nbt.putBoolean("programmable", programmable);
-    }
-
-    @Override
-    public void readCustomDataFromNbt(NbtCompound nbt) {
-        super.readCustomDataFromNbt(nbt);
-        moduleInventory.readNbt(nbt.getCompound("modules"), getRegistryManager());
-        programmable = nbt.getBoolean("programmable");
-    }
-
-    public String getMinionName() {
-        return getGameProfile().getName();
-    }
-
-    public UUID getSkinUuid() {
-        return skinUuid;
-    }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package io.github.skippyall.minions.gui;
+package io.github.skippyall.minions.minion;
 
 import eu.pb4.sgui.api.elements.GuiElementBuilder;
 import eu.pb4.sgui.api.gui.SimpleGui;
@@ -11,59 +11,49 @@ import net.minecraft.screen.slot.Slot;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 
-public class MinionGui {
+public class MinionInventory {
     public static void openInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
         openServerSideInventory(player, minion);
     }
 
     public static void openServerSideInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
         SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, player, false);
-        gui.setTitle(minion.getName());
+        gui.setTitle(Text.literal("Minion"));
-
-        gui.setSlot(1, new GuiElementBuilder()
-                .setItem(Items.COMMAND_BLOCK)
-                .setName(Text.translatable("minions.gui.main.commands"))
-                .setCallback((i, clickType, slotActionType) -> {
-                    openCommandsGui(player, minion);
-                })
-        );
-        if(minion.isProgrammable()) {
         gui.setSlot(4, new GuiElementBuilder()
                 .setItem(Items.REDSTONE)
-                    .setName(Text.translatable("minions.gui.main.programming"))
+                .setName(Text.literal("Programming"))
-                    .setCallback((i, clickType, slotActionType) -> {
+                .setCallback((i, clickType, clickType1) -> {
                     openProgrammingInventory(player, minion);
                 })
         );
-        }
         gui.setSlot(3, new GuiElementBuilder()
                 .setItem(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE)
-                .setName(Text.translatable("minions.gui.main.modules"))
+                .setName(Text.literal("Modules and Detectors"))
-                .setCallback((i, clickType, slotActionType) -> {
+                .setCallback((i, clickType, clickType1) -> {
-                    ModuleInventory.openModuleInventory(player, minion);
+                    openModuleInventory(player, minion);
                 })
         );
         gui.setSlot(5, new GuiElementBuilder()
                 .setItem(Items.CHEST)
-                .setName(Text.translatable("minions.gui.main.inventory"))
+                .setName(Text.literal("Inventory"))
-                .setCallback((i, clickType, slotActionType) -> {
+                .setCallback((i, clickType, clickType1) -> {
                     openMinionInventory(player, minion);
                 })
         );
         gui.open();
     }
 
-    public static void openCommandsGui(ServerPlayerEntity player, MinionFakePlayer minion) {
-        CommandsGui.openServerModuleCommandGui(player, minion);
-    }
-
     public static void openProgrammingInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
 
     }
 
+    public static void 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.translatable("minions.gui.inventory.title", minion.getName()));
+        gui.setTitle(Text.literal("Minion"));
         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/minion/MinionItem.java

@@ -3,28 +3,22 @@ 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 net.minecraft.component.DataComponentTypes;
+import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
-import net.minecraft.component.type.NbtComponent;
+import net.minecraft.client.item.TooltipContext;
-import net.minecraft.item.Item;
+import net.minecraft.enchantment.Enchantments;
-import net.minecraft.item.ItemStack;
+import net.minecraft.item.*;
-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.PlainTextContent;
+import net.minecraft.text.TextContent;
 import net.minecraft.util.ActionResult;
-import net.minecraft.util.math.Vec2f;
 import org.jetbrains.annotations.Nullable;
 
 public class MinionItem extends Item implements PolymerItem {
-    private final boolean canProgram;
+    private boolean canProgram;
-
     public MinionItem(boolean canProgram) {
-        super(new Item.Settings());
+        super(new FabricItemSettings());
-        this.canProgram = canProgram;
     }
 
     @Override
@@ -33,9 +27,9 @@ public class MinionItem extends Item implements PolymerItem {
     }
 
     @Override
-    public ItemStack getPolymerItemStack(ItemStack stack, TooltipType tooltipType, RegistryWrapper.WrapperLookup lookup, ServerPlayerEntity player) {
+    public ItemStack getPolymerItemStack(ItemStack stack, TooltipContext flag, ServerPlayerEntity player) {
-        ItemStack out = PolymerItemUtils.createItemStack(stack, lookup, player);
+        ItemStack out = PolymerItemUtils.createItemStack(stack, flag, player);
-        out.set(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, true);
+        out.addEnchantment(Enchantments.MENDING, 1);
         return out;
     }
 
@@ -43,50 +37,14 @@ public class MinionItem extends Item implements PolymerItem {
     public ActionResult useOnBlock(ItemUsageContext context) {
         String contents = context.getStack().getName().getLiteralString();
         String name;
-        if(contents != null && contents.length() <= 16) {
+        if(contents != null) {
             name = contents;
         } else {
             name = "Minion";
         }
         if(!context.getWorld().isClient) {
-            MinionData data = getData(context.getStack());
+            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, null);
         }
-
-            if (data.uuid == null) {
-                MinionFakePlayer.createMinion(data, (ServerWorld) context.getWorld(), (ServerPlayerEntity) context.getPlayer(), canProgram, context.getBlockPos().toCenterPos().add(0,0.5,0), 0, 0);
-            }else {
-                data.name = name;
-                MinionFakePlayer.spawnMinionAt(data, (ServerWorld) context.getWorld(), context.getBlockPos().toCenterPos().add(0,0.5,0), new Vec2f(0, 0));
-                MinionPersistentState.INSTANCE.addMinion(data);
-            }
-        }
-        context.getStack().decrement(1);
         return ActionResult.SUCCESS;
     }
-
-    public static void setData(MinionData data, ItemStack item) {
-        NbtCompound nbt = item.getOrDefault(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT).copyNbt();
-        nbt.put("data", data.writeNbt());
-        item.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(nbt));
-    }
-
-    @Nullable
-    public static MinionData getData(ItemStack item) {
-        NbtCompound nbt = item.getOrDefault(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT).copyNbt();
-        if (nbt.getType("data") == NbtElement.COMPOUND_TYPE) {
-            return MinionData.readNbt(nbt.getCompound("data"));
-        }
-        return null;
-    }
-
-    public static boolean containsData(ItemStack item) {
-        NbtComponent nbt = item.get(DataComponentTypes.CUSTOM_DATA);
-        if (nbt == null) {
-            return false;
-        }
-        return nbt.copyNbt().contains("data");
-    }
 }

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

@@ -1,76 +0,0 @@
-package io.github.skippyall.minions.minion;
-
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtElement;
-import net.minecraft.nbt.NbtList;
-import net.minecraft.registry.RegistryWrapper;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.PersistentState;
-import net.minecraft.world.World;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-public class MinionPersistentState extends PersistentState {
-    public static Type<MinionPersistentState> TYPE = new Type<>(MinionPersistentState::new, MinionPersistentState::read, null);
-
-    public static MinionPersistentState INSTANCE;
-
-    private List<MinionData> minionData = new ArrayList<>();
-
-    @Override
-    public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
-        NbtList list = new NbtList();
-        for(MinionData data : minionData) {
-            list.add(data.writeNbt());
-        }
-        nbt.put("minions", list);
-        return nbt;
-    }
-
-    public static MinionPersistentState read(NbtCompound compound, RegistryWrapper.WrapperLookup lookup) {
-        NbtList list = compound.getList("minions", NbtElement.COMPOUND_TYPE);
-        MinionPersistentState instance = new MinionPersistentState();
-        for(NbtElement element : list) {
-            instance.addMinion(MinionData.readNbt((NbtCompound) element));
-        }
-        return instance;
-    }
-
-    public void addMinion(MinionFakePlayer minion) {
-        addMinion(MinionData.fromMinion(minion));
-    }
-
-    public void addMinion(MinionData data) {
-        System.out.println("add Minion " + data.name);
-        minionData.add(data);
-        markDirty();
-    }
-
-    public void removeMinion(MinionFakePlayer minionData) {
-        removeMinion(minionData.getUuid());
-    }
-
-    public void removeMinion(UUID minionUUID) {
-        MinionData removal = null;
-        for (MinionData data : minionData) {
-            if (data.uuid.equals(minionUUID)) {
-                removal = data;
-            }
-        }
-        if (removal != null) {
-            minionData.remove(removal);
-        }
-        markDirty();
-    }
-
-    public List<MinionData> getMinionData() {
-        return minionData;
-    }
-
-    public static void create(MinecraftServer server) {
-        INSTANCE = server.getWorld(World.OVERWORLD).getPersistentStateManager().getOrCreate(TYPE, "minion");
-    }
-}

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

@@ -1,71 +0,0 @@
-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) {
-        GameProfile newProfile = new GameProfile(uuidMinion != null ? uuidMinion : UUID.randomUUID(), username);
-        if (skinProfile != null) {
-            newProfile.getProperties().putAll(skinProfile.getProperties());
-        }
-        LOGGER.info("Minion Profile: {}", newProfile);
-        return newProfile;
-    }
-}

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

@@ -0,0 +1,42 @@
+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.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, new Identifier(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) {
+        Inventories.readNbt(nbt, stacks);
+    }
+
+    public void writeNbt(NbtCompound nbt) {
+        Inventories.writeNbt(nbt, stacks);
+    }
+}

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

@@ -1,29 +0,0 @@
-package io.github.skippyall.minions.mixins;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import it.unimi.dsi.fastutil.objects.ObjectSet;
-import net.minecraft.server.world.ChunkTicketManager;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-@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", remap = false))
-    public boolean filterIfNull(ObjectSet instance, Object o, Operation<Boolean> original) {
-        if (instance != null) {
-            return original.call(instance, o);
-        }
-
-        return false;//Unused
-    }
-
-    @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);
-        }
-
-        return true;//Unused
-    }
-}

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

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

@@ -1,22 +0,0 @@
-package io.github.skippyall.minions.mixins;
-
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.network.ServerPlayerEntity;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Mixin(MinecraftServer.class)
-public class MinecraftServerMixin {
-    @ModifyExpressionValue(method = "createMetadataPlayers", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;getPlayerList()Ljava/util/List;"))
-    public List<ServerPlayerEntity> ignoreFakePlayers(List<ServerPlayerEntity> original) {
-        return original.stream()
-                .filter(player -> !(player instanceof MinionFakePlayer))
-                .collect(Collectors.toCollection(ArrayList::new));
-    }
-}

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

@@ -1,29 +0,0 @@
-package io.github.skippyall.minions.mixins;
-
-import io.github.skippyall.minions.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,21 +0,0 @@
-package io.github.skippyall.minions.mixins;
-
-import com.llamalad7.mixinextras.sugar.Local;
-import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
-import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket;
-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(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"))
-    private static boolean removeMinionFromTabList(boolean original, @Local(argsOnly = true) ServerPlayerEntity player) {
-        if(player instanceof MinionFakePlayer) {
-            return false;
-        }
-
-        return original;
-    }
-}

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

@@ -1,9 +1,7 @@
 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.fakeplayer.NetHandlerPlayServerFake;
@@ -16,16 +14,13 @@ import net.minecraft.server.network.ConnectedClientData;
 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.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 {
 
@@ -51,22 +46,8 @@ 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.isProgrammable());
         }
         return original.call(minecraftServer, serverLevel, gameProfile, clientInformation);
     }
-
-    @WrapOperation(method = "onPlayerConnect", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;broadcast(Lnet/minecraft/text/Text;Z)V"))
-    public void noLoginMessage(PlayerManager instance, Text message, boolean overlay, Operation<Void> original, @Local(argsOnly = true) ServerPlayerEntity player) {
-        if(!(player instanceof MinionFakePlayer)) {
-            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

@@ -1,25 +0,0 @@
-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 net.minecraft.server.PlayerManager;
-import net.minecraft.server.network.ServerPlayNetworkHandler;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.Text;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-
-@Mixin(ServerPlayNetworkHandler.class)
-public class ServerPlayNetworkHandlerMixin {
-    @Shadow
-    public ServerPlayerEntity player;
-
-    @WrapOperation(method = "cleanUp", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;broadcast(Lnet/minecraft/text/Text;Z)V"))
-    public void noLogoutMessage(PlayerManager instance, Text message, boolean overlay, Operation<Void> original) {
-        if(!(player instanceof MinionFakePlayer)) {
-            original.call(instance, message, overlay);
-        }
-    }
-}

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

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

@@ -1,28 +0,0 @@
-package io.github.skippyall.minions.mixins;
-
-import io.github.skippyall.minions.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/module/ActionModules.java

@@ -1,69 +0,0 @@
-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.fakeplayer.EntityPlayerActionPack;
-import io.github.skippyall.minions.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 ModuleItem makeModule(EntityPlayerActionPack.ActionType actionType, Text actionName, Item vanillaItem, Text name, Text description) {
-        return new SimpleModuleItem(List.of(), List.of(new SimpleCommand(name, description, vanillaItem, detailSelectionExecutor(actionType, actionName))), vanillaItem);
-    }
-    
-    public static void executeOnce(EntityPlayerActionPack.ActionType actionType, ServerPlayerEntity player, MinionFakePlayer minion) {
-        minion.getMinionActionPack().start(actionType, EntityPlayerActionPack.Action.once());
-    }
-
-    public static void executeInterval(EntityPlayerActionPack.ActionType actionType, ServerPlayerEntity player, MinionFakePlayer minion) {
-        TextInput.inputText(player, Text.translatable("minions.command.action.interval.enter_interval"), "1")
-                .thenAccept(string -> {
-                    try {
-                        int ticks = Integer.parseInt(string);
-                        minion.getMinionActionPack().start(actionType, EntityPlayerActionPack.Action.interval(ticks));
-                    } catch (NumberFormatException ignored) {}
-                });
-    }
-
-    public static void executeContinuous(EntityPlayerActionPack.ActionType actionType, ServerPlayerEntity player, MinionFakePlayer minion) {
-        minion.getMinionActionPack().start(actionType, EntityPlayerActionPack.Action.continuous());
-    }
-
-    public static void stop(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(3, new GuiElementBuilder()
-                    .setItem(Items.COMMAND_BLOCK)
-                    .setName(Text.translatable("minions.command.action.once", actionName))
-                    .setCallback(() -> executeOnce(actionType, player, minion))
-            );
-            gui.setSlot(4, new GuiElementBuilder()
-                    .setItem(Items.CHAIN_COMMAND_BLOCK)
-                    .setName(Text.translatable("minions.command.action.interval", actionName))
-                    .setCallback(() -> executeInterval(actionType, player, minion))
-            );
-            gui.setSlot(5, new GuiElementBuilder()
-                    .setItem(Items.REPEATING_COMMAND_BLOCK)
-                    .setName(Text.translatable("minions.command.action.continuous", actionName))
-                    .setCallback(() -> executeContinuous())
-            );
-            gui.setSlot(7, new GuiElementBuilder()
-                    .setItem(Items.BARRIER)
-                    .setName(Text.translatable("minions.command.action.stop", actionName))
-                    .setCallback(() -> stop(actionType, player, minion))
-            );
-        };
-    }
-}

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

@@ -1,22 +0,0 @@
-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 SimpleModuleItem(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/MobSpawningModule.java

@@ -1,24 +0,0 @@
-package io.github.skippyall.minions.module;
-
-import io.github.skippyall.minions.Minions;
-import io.github.skippyall.minions.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"), new SimpleModuleItem(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

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

@@ -1,19 +0,0 @@
-package io.github.skippyall.minions.module;
-
-import net.minecraft.item.Item;
-import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
-import net.minecraft.util.Identifier;
-
-public class Modules {
-    public static void register() {
-        ChatModule.registerMe();
-        MountModule.registerMe();
-        MoveModule.registerMe();
-        MobSpawningModule.registerMe();
-    }
-
-    public static <T extends Item & ModuleItem> T register(Identifier id, T item) {
-        return Registry.register(Registries.ITEM, id, item);
-    }
-}

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

@@ -1,24 +0,0 @@
-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 MountModule {
-    public static final SimpleModuleItem MOUNT_MODULE = register(Identifier.of(Minions.MOD_ID, "mount_module"),
-            new SimpleModuleItem(new ArrayList<>(), Arrays.asList(
-                    new SimpleCommand(Text.of("Mount"), Text.of("Mount the minion to the nearest mountable Entity"), Items.MINECART, (player, minion) -> minion.getMinionActionPack().mount(true)),
-                    new SimpleCommand(Text.of("Dismount"), Text.of("Dismount the minion"), Items.BARRIER, (player, minion) -> minion.getMinionActionPack().dismount())
-            ), Items.MINECART)
-    );
-
-    public static void registerMe() {}
-
-}

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

@@ -1,54 +0,0 @@
-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.inputText(player, Text.literal("Amount of Blocks"), "1")
-                .thenAccept(string -> {
-                    try {
-                        float blocks = Float.parseFloat(string);
-                        minion.moveForward(blocks);
-                    } catch (NumberFormatException e) {
-                        player.sendMessage(Text.literal("No valid number"));
-                    }
-                });
-    });
-
-    public static final SimpleCommand TURN_RIGHT_COMMAND = new SimpleCommand(Text.literal("Turn Right"), Text.literal("Turn a specific amount of degrees right"), Items.COMPASS, ((player, minion) -> {
-        TextInput.inputText(player, Text.literal("Degrees"), "90")
-                .thenAccept(string -> {
-                    try {
-                        float degrees = Float.parseFloat(string);
-                        minion.getMinionActionPack().turn(degrees, 0);
-                    } catch (NumberFormatException e) {
-                        player.sendMessage(Text.literal("No valid number"));
-                    }
-                });
-    }));
-
-    public static final SimpleCommand TURN_LEFT_COMMAND = new SimpleCommand(Text.literal("Turn Left"), Text.literal("Turn a specific amount of degrees left"), Items.COMPASS, ((player, minion) -> {
-        TextInput.inputText(player, Text.literal("Degrees"), "90")
-                .thenAccept(string -> {
-                    try {
-                        float degrees = Float.parseFloat(string);
-                        minion.getMinionActionPack().turn(-degrees, 0);
-                    } catch (NumberFormatException e) {
-                        player.sendMessage(Text.literal("No valid number"));
-                    }
-                });
-    }));
-
-    public static final SimpleModuleItem MOVE_MODULE = register(Identifier.of(Minions.MOD_ID, "move_module"), new SimpleModuleItem(List.of(), List.of(WALK_COMMAND, TURN_RIGHT_COMMAND, TURN_LEFT_COMMAND), Items.IRON_BOOTS));
-
-    public static void registerMe() {}
-}

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

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

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

@@ -15,7 +15,7 @@ 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");
+    public static final Identifier RL = new Identifier(Minions.MOD_ID, "network");
     @Environment(EnvType.CLIENT)
     public static void sendJoinPacket(PlayerEntity player) {
         PacketByteBuf pbf = new PacketByteBuf(Unpooled.buffer());
@@ -36,5 +36,5 @@ public class ClientToServerNetworking {
         }
         String[] parts = message.split("|");
 
-    }*/
+    }
 }

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

@@ -0,0 +1,26 @@
+package io.github.skippyall.minions.program;
+
+import io.github.skippyall.minions.program.statement.StatementList;
+import io.github.skippyall.minions.program.variables.Variable;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class MinionRuntime implements Runnable{
+    private boolean run = true;
+    public final Map<String, Variable> variables = new HashMap<>();
+    private final List<StatementList.Run> runs = new ArrayList<>();
+
+    @Override
+    public void run() {
+        while(run) {
+
+        }
+    }
+
+    public void stop() {
+        run = false;
+    }
+}

src/main/java/io/github/skippyall/minions/program/argument/Arg.java

@@ -1,9 +0,0 @@
-package io.github.skippyall.minions.program.argument;
-
-import io.github.skippyall.minions.program.runtime.ProgramRuntime;
-import io.github.skippyall.minions.program.variables.Type;
-
-public interface Arg<T> {
-    T resolve(ProgramRuntime runtime);
-    Type<T> getType();
-}

src/main/java/io/github/skippyall/minions/program/argument/ArgUtils.java

@@ -1,16 +0,0 @@
-package io.github.skippyall.minions.program.argument;
-
-import io.github.skippyall.minions.program.runtime.ProgramRuntime;
-import io.github.skippyall.minions.program.tuple.Tuple;
-import io.github.skippyall.minions.program.tuple.Tuple0;
-
-public class ArgUtils {
-    public static Tuple resolveArgs(Tuple args, ProgramRuntime runtime) {
-        Tuple tuple = new Tuple0();
-        for(Object object : args) {
-            Arg<?> arg =(Arg<?>) object;
-            tuple = tuple.add(arg.getType().cast(arg.resolve(runtime)));
-        }
-        return tuple;
-    }
-}

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

@@ -1,34 +1,23 @@
 package io.github.skippyall.minions.program.block;
 
-import io.github.skippyall.minions.program.argument.Arg;
+import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
-import io.github.skippyall.minions.program.runtime.ProgramRuntime;
+import io.github.skippyall.minions.program.statement.Arg;
-import io.github.skippyall.minions.program.statement.Statement;
-import io.github.skippyall.minions.program.tuple.Tuple;
 import io.github.skippyall.minions.program.variables.Type;
 
 import java.util.List;
-import java.util.concurrent.ForkJoinPool;
 
-public abstract class CodeBlock<R, A extends Tuple> {
+public abstract class CodeBlock {
     private String name;
-    private final List<Type<?>> arguments;
+    private final List<Type> arguments;
-    private final Type<?> returnType;
+    private final Type returnType;
-
+    public CodeBlock(String name, List<Type> arguments, Type returnType) {
-    public CodeBlock(String name, List<Type<?>> arguments, Type<?> returnType) {
         this.arguments = arguments;
         this.returnType = returnType;
     }
 
-    protected abstract R execute(ProgramRuntime runtime, A args, Statement<R,A>.Run run);
+    public abstract Object execute(MinionFakePlayer minion, Object... args);
 
-    public boolean fits(Arg<?> arg, int slot) {
+    public boolean fits(Arg arg, int slot) {
         return arguments.get(slot) == arg.getType();
     }
-
-    public void start(ProgramRuntime runtime, A args, Statement<R,A>.Run run) {
-        ForkJoinPool.commonPool().execute(() -> {
-            R result = execute(runtime, args, run);
-            run.afterRun(result);
-        });
-    }
 }

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

@@ -3,26 +3,23 @@ package io.github.skippyall.minions.program.block;
 import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack;
 import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
 import io.github.skippyall.minions.fakeplayer.ServerPlayerInterface;
-import io.github.skippyall.minions.program.runtime.MinionRuntime;
+import io.github.skippyall.minions.program.variables.IntegerType;
-import io.github.skippyall.minions.program.runtime.ProgramRuntime;
+import io.github.skippyall.minions.program.variables.Type;
-import io.github.skippyall.minions.program.statement.Statement;
-import io.github.skippyall.minions.program.tuple.Tuple2;
 import io.github.skippyall.minions.program.variables.Types;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
-public class GoBlock extends CodeBlock<Void, Tuple2<Float, Float>> {
+public class GoBlock extends CodeBlock{
     public GoBlock() {
         super("move", List.of(Types.FLOAT, Types.FLOAT), Types.VOID);
     }
 
-    public Void execute(ProgramRuntime runtime, Tuple2<Float, Float> args, Statement<Void, Tuple2<Float, Float>>.Run run) {
+    public Object execute(MinionFakePlayer minion, Object... args) {
-        if(runtime instanceof MinionRuntime minionRuntime) {
+        EntityPlayerActionPack action = ((ServerPlayerInterface)minion).getActionPack();
-            MinionFakePlayer minion = minionRuntime.getMinion();
+        minion.moveForward((Float) args[0]);
-            EntityPlayerActionPack action = ((ServerPlayerInterface) minion).getActionPack();
+        minion.moveSideways((Float) args[1]);
-            minion.moveForward(args.v0());
-            minion.moveSideways(args.v1());
-        }
         return null;
     }
 }

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

@@ -2,25 +2,20 @@ package io.github.skippyall.minions.program.block;
 
 import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack;
 import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
-import io.github.skippyall.minions.program.runtime.MinionRuntime;
+import io.github.skippyall.minions.fakeplayer.ServerPlayerInterface;
-import io.github.skippyall.minions.program.runtime.ProgramRuntime;
+import io.github.skippyall.minions.program.variables.Type;
-import io.github.skippyall.minions.program.statement.Statement;
-import io.github.skippyall.minions.program.tuple.Tuple0;
 import io.github.skippyall.minions.program.variables.Types;
 
 import java.util.List;
 
-public class UseBlock extends CodeBlock<Void, Tuple0>{
+public class UseBlock extends CodeBlock{
-    public UseBlock(String name) {
+    public UseBlock(String name, List<Type> arguments, Type returnType) {
         super("use", List.of(), Types.VOID);
     }
 
     @Override
-    public Void execute(ProgramRuntime runtime, Tuple0 args, Statement<Void,Tuple0>.Run run) {
+    public Object execute(MinionFakePlayer minion, Object... args) {
-        if(runtime instanceof MinionRuntime minionRuntime) {
+        minion.getActionPack().start(EntityPlayerActionPack.ActionType.USE, EntityPlayerActionPack.Action.once());
-            MinionFakePlayer minion = minionRuntime.getMinion();
-            minion.getMinionActionPack().start(EntityPlayerActionPack.ActionType.USE, EntityPlayerActionPack.Action.once());
-        }
         return null;
     }
 }

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

@@ -0,0 +1,22 @@
+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.fabricmc.fabric.api.item.v1.FabricItemSettings;
+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 FabricItemSettings().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

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

@@ -0,0 +1,29 @@
+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,19 +0,0 @@
-package io.github.skippyall.minions.program.runtime;
-
-import io.github.skippyall.minions.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;
-
-    public MinionRuntime(MinionFakePlayer minion) {
-        this.minion = minion;
-    }
-
-    public MinionFakePlayer getMinion() {
-        return minion;
-    }
-}

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

@@ -1,42 +0,0 @@
-package io.github.skippyall.minions.program.runtime;
-
-import io.github.skippyall.minions.program.statement.StatementList;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public abstract class ProgramRuntime {
-    private final Map<String, Object> variables = new HashMap<>();
-    private StatementList statements;
-    private StatementList.Run run;
-
-    public ProgramRuntime() {
-        this(new StatementList());
-    }
-
-    public ProgramRuntime(StatementList statements) {
-        this.statements = statements;
-    }
-
-    public void start() {
-        run = statements.start(this);
-    }
-
-    public void tick() {
-        if(run != null) {
-            run.tick();
-        }
-    }
-
-    public StatementList getStatementList() {
-        return statements;
-    }
-
-    public Object getVariable(String name) {
-        return variables.get(name);
-    }
-
-    public void setVariable(String name, Object value) {
-        variables.put(name, value);
-    }
-}

src/main/java/io/github/skippyall/minions/program/statement/Arg.java

@@ -0,0 +1,8 @@
+package io.github.skippyall.minions.program.statement;
+
+import io.github.skippyall.minions.program.variables.Type;
+
+public interface Arg {
+    Object getValue();
+    Type getType();
+}

src/main/java/io/github/skippyall/minions/program/statement/Statement.java

@@ -1,73 +1,15 @@
 package io.github.skippyall.minions.program.statement;
 
-import io.github.skippyall.minions.program.argument.ArgUtils;
+import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
 import io.github.skippyall.minions.program.block.CodeBlock;
-import io.github.skippyall.minions.program.runtime.ProgramRuntime;
-import io.github.skippyall.minions.program.tuple.Tuple;
-import io.github.skippyall.minions.program.variables.ValueStorage;
 
-public record Statement<R,A extends Tuple>(CodeBlock<R,A> codeBlock, A args, ValueStorage<R> valueStorage) {
+import java.util.List;
-    @SuppressWarnings("unchecked")
-    public Run start(ProgramRuntime runtime) {
-        Run run = new Run(runtime);
-        codeBlock.start(runtime, (A) ArgUtils.resolveArgs(args, runtime), run);
-        return run;
-    }
 
-    public class Run {
+public class Statement {
-        private boolean running = false;
+    private CodeBlock codeBlock;
-        private boolean waiting = false;
+    private List<Arg> args;
-        private boolean afterRun = false;
-        private R cachedResult;
-        private int ticksRunning = 0;
-        private int ticksLeft = 0;
 
-        private final ProgramRuntime runtime;
+    public void execute(MinionFakePlayer minion) {
 
-        Run(ProgramRuntime runtime) {
-            this.runtime = runtime;
-        }
-
-        public boolean isDone() {
-            return !running;
-        }
-
-        public void tick() {
-            if(running) {
-                ticksRunning ++;
-                ticksLeft --;
-                if(ticksLeft == 0 && waiting && afterRun) {
-                    complete(cachedResult);
-                }
-            }
-        }
-
-        public void afterRun(R result) {
-            afterRun = true;
-            if(ticksLeft == 0) {
-                complete(result);
-            }
-        }
-
-        private void complete(R result) {
-            if(valueStorage != null) {
-                valueStorage.storeValue(result, runtime);
-            }
-            running = false;
-            waiting = false;
-            cachedResult = null;
-            ticksRunning = 0;
-            ticksLeft = 0;
-        }
-
-        public void completeAfter(int ticks, R value) {
-            waiting = true;
-            ticksLeft = ticks;
-            cachedResult = value;
-        }
-
-        public int getTicksRunning() {
-            return ticksRunning;
-        }
     }
 }

src/main/java/io/github/skippyall/minions/program/statement/StatementList.java

@@ -1,50 +1,37 @@
 package io.github.skippyall.minions.program.statement;
 
-import io.github.skippyall.minions.program.runtime.ProgramRuntime;
+import java.util.ArrayList;
-
-import java.util.Iterator;
 import java.util.List;
 
 public class StatementList {
-    private final List<Statement<?,?>> statements;
+    private final List<Statement> statements;
+    private boolean finish;
 
-    public StatementList() {
+    StatementList() {
-        this.statements = List.of();
+        this(new ArrayList<>());
     }
 
-    public StatementList(List<Statement<?,?>> statements) {
+    StatementList(List<Statement> statements) {
-        this.statements = List.copyOf(statements);
+        this.statements = statements;
     }
 
-    public Run start(ProgramRuntime runtime) {
+    public void runNext(Run run) {
-        return new Run(runtime);
+
+    }
+
+    public boolean canRunNext(Run run) {
+        return true;
+    }
+
+    public boolean isFinish(Run run) {
+        return finish;
+    }
+
+    public Run createRunInstance() {
+        return null;
     }
 
     public class Run {
-        final ProgramRuntime runtime;
-        final Iterator<Statement<?,?>> iterator;
-        Statement<?,?>.Run run;
 
-        public Run(ProgramRuntime runtime) {
-            this.runtime = runtime;
-            iterator = statements.iterator();
-            startNext();
-        }
-
-        private boolean startNext() {
-            if(iterator.hasNext()) {
-                run = iterator.next().start(runtime);
-                return true;
-            } else {
-                return false;
-            }
-        }
-
-        public void tick() {
-            run.tick();
-            if(run.isDone()){
-                startNext();
-            }
-        }
     }
 }

src/main/java/io/github/skippyall/minions/program/tuple/Tuple.java

@@ -1,29 +0,0 @@
-package io.github.skippyall.minions.program.tuple;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Iterator;
-import java.util.List;
-
-public interface Tuple extends Iterable<Object>{
-    <T> Tuple add(T value);
-    Tuple removeLast();
-    List<Object> getValueList();
-    int size();
-
-    @NotNull
-    @Override
-    default Iterator<Object> iterator() {
-        return getValueList().iterator();
-    }
-
-    static Tuple ofList(List<?> list) {
-        return switch (list.size()) {
-            case 0 -> new Tuple0();
-            case 1 -> new Tuple1<Object>(list.get(0));
-            case 2 -> new Tuple2<Object, Object>(list.get(0), list.get(1));
-            case 3 -> new Tuple3<Object, Object, Object>(list.get(0), list.get(1), list.get(2));
-            default -> throw new UnsupportedOperationException();
-        };
-    }
-}

src/main/java/io/github/skippyall/minions/program/tuple/Tuple0.java

@@ -1,25 +0,0 @@
-package io.github.skippyall.minions.program.tuple;
-
-import java.util.List;
-
-public record Tuple0() implements Tuple{
-    @Override
-    public <T> Tuple add(T value) {
-        return new Tuple1<>(value);
-    }
-
-    @Override
-    public Tuple removeLast() {
-        throw new UnsupportedOperationException("Cannot remove element from length 0 tuple.");
-    }
-
-    @Override
-    public List<Object> getValueList() {
-        return List.of();
-    }
-
-    @Override
-    public int size() {
-        return 0;
-    }
-}

src/main/java/io/github/skippyall/minions/program/tuple/Tuple1.java

@@ -1,25 +0,0 @@
-package io.github.skippyall.minions.program.tuple;
-
-import java.util.List;
-
-public record Tuple1<T0>(T0 v0) implements Tuple{
-    @Override
-    public <T> Tuple add(T value) {
-        return new Tuple2<>(v0, value);
-    }
-
-    @Override
-    public Tuple removeLast() {
-        return new Tuple0();
-    }
-
-    @Override
-    public List<Object> getValueList() {
-        return List.of(v0);
-    }
-
-    @Override
-    public int size() {
-        return 1;
-    }
-}

src/main/java/io/github/skippyall/minions/program/tuple/Tuple2.java

@@ -1,25 +0,0 @@
-package io.github.skippyall.minions.program.tuple;
-
-import java.util.List;
-
-public record Tuple2<T0, T1>(T0 v0, T1 v1) implements Tuple {
-    @Override
-    public <T> Tuple add(T value) {
-        return new Tuple3<>(v0, v1, value);
-    }
-
-    @Override
-    public Tuple removeLast() {
-        return new Tuple1<>(v0);
-    }
-
-    @Override
-    public List<Object> getValueList() {
-        return List.of(v0, v1);
-    }
-
-    @Override
-    public int size() {
-        return 2;
-    }
-}

src/main/java/io/github/skippyall/minions/program/tuple/Tuple3.java

@@ -1,25 +0,0 @@
-package io.github.skippyall.minions.program.tuple;
-
-import java.util.List;
-
-public record Tuple3<T0, T1, T2>(T0 v0, T1 v1, T2 v2) implements Tuple {
-    @Override
-    public <T> Tuple add(T value) {
-        return new Tuple4<>(v0, v1, v2, value);
-    }
-
-    @Override
-    public Tuple removeLast() {
-        return new Tuple2<>(v0, v1);
-    }
-
-    @Override
-    public List<Object> getValueList() {
-        return List.of(v0, v1, v2);
-    }
-
-    @Override
-    public int size() {
-        return 3;
-    }
-}

src/main/java/io/github/skippyall/minions/program/tuple/Tuple4.java

@@ -1,25 +0,0 @@
-package io.github.skippyall.minions.program.tuple;
-
-import java.util.List;
-
-public record Tuple4<T0, T1, T2, T3, T4>(T0 v0, T1 v1, T2 v2, T3 v3) implements Tuple {
-    @Override
-    public <T> Tuple add(T value) {
-        return new Tuple5<>(v0, v1, v2, v3, value);
-    }
-
-    @Override
-    public Tuple removeLast() {
-        return new Tuple3<>(v0, v1, v2);
-    }
-
-    @Override
-    public List<Object> getValueList() {
-        return List.of(v0, v1, v2, v3);
-    }
-
-    @Override
-    public int size() {
-        return 4;
-    }
-}

src/main/java/io/github/skippyall/minions/program/tuple/Tuple5.java

@@ -1,25 +0,0 @@
-package io.github.skippyall.minions.program.tuple;
-
-import java.util.List;
-
-public record Tuple5<T0, T1, T2, T3, T4>(T0 v0, T1 v1, T2 v2, T3 v3, T4 v4) implements Tuple {
-    @Override
-    public <T> Tuple add(T value) {
-        throw new UnsupportedOperationException("Cannot add element to length 5 tuple.");
-    }
-
-    @Override
-    public Tuple removeLast() {
-        return new Tuple4<>(v0, v1, v2, v3);
-    }
-
-    @Override
-    public List<Object> getValueList() {
-        return List.of(v0, v1, v2, v3, v4);
-    }
-
-    @Override
-    public int size() {
-        return 5;
-    }
-}

src/main/java/io/github/skippyall/minions/program/variables/FloatType.java

@@ -1,4 +1,4 @@
 package io.github.skippyall.minions.program.variables;
 
-public class FloatType extends Type<Float>{
+public class FloatType extends Type{
 }

src/main/java/io/github/skippyall/minions/program/variables/IntegerType.java

@@ -1,4 +1,4 @@
 package io.github.skippyall.minions.program.variables;
 
-public class IntegerType extends Type<Integer>{
+public class IntegerType extends Type{
 }

src/main/java/io/github/skippyall/minions/program/variables/Type.java

@@ -1,8 +1,4 @@
 package io.github.skippyall.minions.program.variables;
 
-public abstract class Type<T> {
+public abstract class Type {
-    @SuppressWarnings("unchecked")
-    public T cast(Object object) throws ClassCastException {
-        return (T) object;
-    }
 }

src/main/java/io/github/skippyall/minions/program/variables/Types.java

@@ -3,5 +3,5 @@ package io.github.skippyall.minions.program.variables;
 public class Types {
     public static final IntegerType INTEGER = new IntegerType();
     public static final FloatType FLOAT = new FloatType();
-    public static final Type<Void> VOID = new Type<>() {};
+    public static final Type VOID = new Type() {};
 }

src/main/java/io/github/skippyall/minions/program/variables/ValueStorage.java

@@ -1,7 +0,0 @@
-package io.github.skippyall.minions.program.variables;
-
-import io.github.skippyall.minions.program.runtime.ProgramRuntime;
-
-public interface ValueStorage<T> {
-    void storeValue(T value, ProgramRuntime runtime);
-}

src/main/java/io/github/skippyall/minions/program/variables/Variable.java

@@ -1,29 +1,24 @@
 package io.github.skippyall.minions.program.variables;
 
-import io.github.skippyall.minions.program.argument.Arg;
+import io.github.skippyall.minions.program.statement.Arg;
-import io.github.skippyall.minions.program.runtime.ProgramRuntime;
 
-public class Variable<T> implements Arg<T>, ValueStorage<T> {
+public class Variable implements Arg {
-    private final Type<T> type;
+    private final Type type;
     private final String name;
+    private Object value;
 
-    public Variable(Type<T> type, String name) {
+    public Variable(Type type, String name) {
         this.type = type;
         this.name = name;
     }
 
     @Override
-    public T resolve(ProgramRuntime runtime) {
+    public Object getValue() {
-        return type.cast(runtime.getVariable(name));
+        return value;
     }
 
     @Override
-    public Type<T> getType() {
+    public Type getType() {
         return type;
     }
-
-    @Override
-    public void storeValue(T value, ProgramRuntime runtime) {
-        runtime.setVariable(name, value);
-    }
 }

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

@@ -11,13 +11,12 @@ import net.minecraft.server.network.ServerConfigurationNetworkHandler;
 public class MinionsServer implements DedicatedServerModInitializer {
     @Override
     public void onInitializeServer() {
-        /*ServerConfigurationNetworking.registerGlobalReceiver(ClientToServerNetworking.RL, ClientToServerNetworking::receive);
+        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

@@ -1,14 +0,0 @@
-{
-  "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.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"
-}

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

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

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

@@ -1,26 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    " H ",
-    "RAR",
-    " L "
-  ],
-  "key": {
-    "H": {
-      "tag": "minecraft:skulls"
-    },
-    "R": {
-      "item": "minecraft:redstone_torch"
-    },
-    "A": {
-      "item": "minecraft:armor_stand"
-    },
-    "L": {
-      "item":"minecraft:lodestone"
-    }
-  },
-  "result": {
-    "id": "minions:minion",
-    "count": 1
-  }
-}

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

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

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

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

src/main/resources/fabric.mod.json

@@ -26,9 +26,8 @@
     "minions.mixins.json"
   ],
   "depends": {
-    "fabricloader": "*",
+    "fabricloader": ">=${loader_version}",
     "fabric": "*",
-    "minecraft": "~1.21",
+    "minecraft": "${minecraft_version}"
-    "polymer-core": "*"
   }
 }

src/main/resources/minions.mixins.json

@@ -4,17 +4,9 @@
   "package": "io.github.skippyall.minions.mixins",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "ChunkTicketManagerFixMixin",
     "ConnectionMixin",
-    "EntityAccessor",
-    "MinecraftServerMixin",
-    "MobEntityMixin",
-    "PlayerListEntryS2CPacket$EntryMixin",
     "PlayerListMixin",
-    "ServerPlayerMixin",
+    "ServerPlayerMixin"
-    "ServerPlayNetworkHandlerMixin",
-    "SleepManagerMixin",
-    "SpawnHelperMixin"
   ],
   "client": [],
   "server": [],