ModuleInventory optimization

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.8-SNAPSHOT'
+    id 'fabric-loom' version '1.10-SNAPSHOT'
     id 'maven-publish'
 }
 

gradle.properties

@@ -3,21 +3,21 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://modmuss50.me/fabric.html
-	minecraft_version=1.21.4
+	minecraft_version=1.21.5
 	loader_version=0.16.13
-	yarn_mappings=1.21.4+build.8
+	yarn_mappings=1.21.5+build.1
 
 # Mod Properties
-	mod_version = 0.1.2-SNAPSHOT
+	mod_version = 0.2.0-SNAPSHOT
 	maven_group = io.github.skippyall
 	archives_base_name = Minions
 
 # Dependencies
 	# check this on https://modmuss50.me/fabric.html
-	fabric_version=0.115.1+1.21.4
+	fabric_version=0.121.0+1.21.5
 
-	polymer_version=0.11.5+1.21.4
+	polymer_version=0.12.3+1.21.5
-	sgui_version=1.8.2+1.21.4
+	sgui_version=1.9.0+1.21.5
-	server_translations_version=2.4.0+1.21.2-rc1
+	server_translations_version=2.5.0+1.21.5-rc1
 
-	universal_graves_version=3.5.0+1.21.2
+	universal_graves_version=3.7.1+1.21.5

gradle/wrapper/gradle-wrapper.properties

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

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

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

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

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

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

@@ -1,42 +1,18 @@
 package io.github.skippyall.minions;
 
 import eu.pb4.polymer.core.api.entity.PolymerEntityUtils;
-import eu.pb4.polymer.core.api.item.SimplePolymerItem;
+import io.github.skippyall.minions.command.MinionsCommand;
 import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import io.github.skippyall.minions.minion.MinionData;
-import io.github.skippyall.minions.minion.MinionItem;
 import io.github.skippyall.minions.minion.MinionPersistentState;
-import io.github.skippyall.minions.module.Modules;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
-import net.minecraft.component.DataComponentTypes;
-import net.minecraft.component.type.DamageResistantComponent;
-import net.minecraft.entity.boss.WitherEntity;
-import net.minecraft.entity.damage.DamageType;
-import net.minecraft.item.Item;
-import net.minecraft.item.Items;
-import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.registry.tag.TagKey;
-import net.minecraft.server.world.ChunkTicketManager;
-import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Function;
-
 public class Minions implements ModInitializer {
     public static final String MOD_ID = "minions";
-    public static final TagKey<DamageType> MINION_ITEM_RESISTS = TagKey.of(RegistryKeys.DAMAGE_TYPE, Identifier.of(MOD_ID, "minion_item_resists"));
-    public static final MinionItem MINION_ITEM = registerItem(Identifier.of(MOD_ID, "minion"), settings -> new MinionItem(settings.component(DataComponentTypes.DAMAGE_RESISTANT, new DamageResistantComponent(MINION_ITEM_RESISTS))));
-    public static final SimplePolymerItem BASIC_UPGRADE_BASE = registerItem(Identifier.of(MOD_ID, "basic_upgrade_base"), settings -> new SimplePolymerItem(settings, Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE));
-    public static final SimplePolymerItem ADVANCED_UPGRADE_BASE = registerItem(Identifier.of(MOD_ID, "advanced_upgrade_base"), settings -> new SimplePolymerItem(settings, Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE));
 
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 
@@ -54,17 +30,10 @@ public class Minions implements ModInitializer {
         });
 
         CommandRegistrationCallback.EVENT.register((commandDispatcher, commandRegistryAccess, registrationEnvironment) -> {
-            MobCapCommand.registerCommand(commandDispatcher);
+            MinionsCommand.register(commandDispatcher);
         });
 
-        Modules.register();
+        MinionItems.register();
-    }
+        MinionCreativeTab.registerGroup();
-
-    private static <T extends Item> T registerItem(Identifier identifier, Function<Item.Settings, T> constructor, Item.Settings settings) {
-        return Registry.register(Registries.ITEM, identifier, constructor.apply(settings.registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier))));
-    }
-
-    private static <T extends Item> T registerItem(Identifier identifier, Function<Item.Settings, T> constructor) {
-        return registerItem(identifier, constructor, new Item.Settings());
     }
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -25,15 +25,6 @@ public class MinionGui {
                     openCommandsGui(player, minion);
                 })
         );
-        if(minion.isProgrammable()) {
-            gui.setSlot(4, new GuiElementBuilder()
-                    .setItem(Items.REDSTONE)
-                    .setName(Text.translatable("minions.gui.main.programming"))
-                    .setCallback(() -> {
-                        openProgrammingInventory(player, minion);
-                    })
-            );
-        }
         gui.setSlot(3, new GuiElementBuilder()
                 .setItem(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE)
                 .setName(Text.translatable("minions.gui.main.modules"))

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

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

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

@@ -5,6 +5,7 @@ import eu.pb4.polymer.core.api.item.PolymerItemUtils;
 import io.github.skippyall.minions.gui.MinionLookGui;
 import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
 import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.TooltipDisplayComponent;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -23,6 +24,7 @@ import org.jetbrains.annotations.Nullable;
 import xyz.nucleoid.packettweaker.PacketContext;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 public class MinionItem extends Item implements PolymerItem {
     public MinionItem(Settings settings) {
@@ -47,10 +49,10 @@ public class MinionItem extends Item implements PolymerItem {
     }
 
     @Override
-    public void appendTooltip(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {
+    public void appendTooltip(ItemStack stack, TooltipContext context, TooltipDisplayComponent component,  Consumer<Text> tooltip, TooltipType type) {
         MinionData data = getData(stack);
         if(data != null) {
-            tooltip.add(Text.translatable("minions.minion_item.tooltip", data.name()));
+            tooltip.accept(Text.translatable("minions.minion_item.tooltip", data.name()));
         }
     }
 

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

@@ -1,46 +1,40 @@
 package io.github.skippyall.minions.minion;
 
+import com.mojang.serialization.Codec;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.NbtList;
 import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.PersistentState;
+import net.minecraft.world.PersistentStateType;
 import net.minecraft.world.World;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 
 public class MinionPersistentState extends PersistentState {
-    public static Type<MinionPersistentState> TYPE = new Type<>(MinionPersistentState::new, MinionPersistentState::read, null);
+    public static final Codec<MinionPersistentState> CODEC = MinionData.CODEC.listOf().xmap(MinionPersistentState::new, MinionPersistentState::getMinionDataList);
+
+    public static PersistentStateType<MinionPersistentState> TYPE = new PersistentStateType<>("minion", MinionPersistentState::new, MinionPersistentState.CODEC, null);
 
     public static MinionPersistentState INSTANCE;
 
     private final Map<UUID, MinionData> minionData = new HashMap<>();
 
-    @Override
+    public MinionPersistentState() {
-    public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
-        NbtList list = new NbtList();
-        for(MinionData data : minionData.values()) {
-            list.add(data.writeNbt());
-        }
-        nbt.put("minions", list);
 
-        return nbt;
     }
 
-    public static MinionPersistentState read(NbtCompound compound, RegistryWrapper.WrapperLookup lookup) {
+    public MinionPersistentState(List<MinionData> dataList) {
-        NbtList list = compound.getList("minions", NbtElement.COMPOUND_TYPE);
+        for (MinionData data : dataList) {
-        MinionPersistentState instance = new MinionPersistentState();
+            minionData.put(data.uuid(), data);
-        for(NbtElement element : list) {
-            if(element instanceof NbtCompound compound1) {
-                MinionData data = MinionData.readNbt(compound1);
-                instance.minionData.put(data.uuid(), data);
         }
     }
-        return instance;
-    }
 
     public MinionData getMinionData(UUID uuid) {
         return minionData.get(uuid);
@@ -50,6 +44,10 @@ public class MinionPersistentState extends PersistentState {
         return minionData;
     }
 
+    public List<MinionData> getMinionDataList() {
+        return List.copyOf(minionData.values());
+    }
+
     public void updateMinionData(MinionData data) {
         minionData.put(data.uuid(), data);
         markDirty();
@@ -60,10 +58,16 @@ public class MinionPersistentState extends PersistentState {
     }
 
     public boolean isMinionNameTaken(String name) {
-        return minionData.values().stream().anyMatch(data -> data.name().equals(name));
+        return getMinionWithName(name).isPresent();
+    }
+
+    public Optional<MinionData> getMinionWithName(String name) {
+        return minionData.values().stream()
+                .filter(data -> data.name().equals(name))
+                .findFirst();
     }
 
     public static void create(MinecraftServer server) {
-        INSTANCE = server.getWorld(World.OVERWORLD).getPersistentStateManager().getOrCreate(TYPE, "minion");
+        INSTANCE = server.getWorld(World.OVERWORLD).getPersistentStateManager().getOrCreate(TYPE);
     }
 }

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

@@ -281,14 +281,14 @@ public class EntityPlayerActionPack
         else // one slot
         {
             if (selectedSlot == -1)
-                selectedSlot = inv.selectedSlot;
+                selectedSlot = inv.getSelectedSlot();
             dropItemFromSlot(selectedSlot, dropAll);
         }
     }
 
     public void setSlot(int slot)
     {
-        player.getInventory().selectedSlot = slot-1;
+        player.getInventory().setSelectedSlot(slot-1);
         player.networkHandler.sendPacket(new UpdateSelectedSlotS2CPacket(slot-1));
     }
 
@@ -321,7 +321,7 @@ public class EntityPlayerActionPack
                                     BlockHitResult blockHit = (BlockHitResult) hit;
                                     BlockPos pos = blockHit.getBlockPos();
                                     Direction side = blockHit.getSide();
-                                    if (pos.getY() < player.getServerWorld().getTopYInclusive() - (side == Direction.UP ? 1 : 0) && world.canPlayerModifyAt(player, pos))
+                                    if (pos.getY() < player.getServerWorld().getTopYInclusive() - (side == Direction.UP ? 1 : 0) && world.canEntityModifyAt(player, pos))
                                     {
                                         ActionResult result = player.interactionManager.interactBlock(player, world, player.getStackInHand(hand), hand, blockHit);
                                         if (result instanceof ActionResult.Success success)

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

@@ -4,7 +4,7 @@ package io.github.skippyall.minions.minion.fakeplayer;
 import io.netty.channel.embedded.EmbeddedChannel;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.NetworkSide;
-import net.minecraft.network.NetworkState;
+import net.minecraft.network.state.NetworkState;
 import net.minecraft.network.listener.PacketListener;
 
 public class FakeClientConnection extends ClientConnection {

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

@@ -3,8 +3,7 @@ package io.github.skippyall.minions.minion.fakeplayer;
 
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.PropertyMap;
-import io.github.skippyall.minions.Minions;
+import io.github.skippyall.minions.MinionItems;
-import io.github.skippyall.minions.MinionsTickExecutor;
 import io.github.skippyall.minions.minion.MinionData;
 import io.github.skippyall.minions.gui.MinionGui;
 import io.github.skippyall.minions.minion.MinionItem;
@@ -13,9 +12,9 @@ import io.github.skippyall.minions.minion.MinionProfileUtils;
 import io.github.skippyall.minions.gui.ModuleInventory;
 import io.github.skippyall.minions.program.runtime.MinionRuntime;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.EndPortalBlock;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.MovementType;
 import net.minecraft.entity.attribute.EntityAttributes;
 import net.minecraft.entity.damage.DamageSource;
@@ -46,7 +45,6 @@ import net.minecraft.world.TeleportTarget;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Set;
-import java.util.concurrent.CompletableFuture;
 
 public class MinionFakePlayer extends ServerPlayerEntity {
     public Runnable fixStartingPosition = () -> {};
@@ -54,24 +52,27 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     private float moveForward;
     private float moveSideways;
 
-    private boolean programmable;
     private final ModuleInventory moduleInventory = new ModuleInventory();
     private final MinionRuntime runtime = new MinionRuntime(this);
 
     private final MinionData data;
 
     public static void spawnMinion(MinionData data, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot) {
+        spawnMinion(data, level, pos, rot, false);
+    }
+
+    public static void spawnMinion(MinionData data, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot, boolean force) {
+        if(!data.isSpawned() || force) {
             MinecraftServer server = level.getServer();
 
             PropertyMap skin = data.skin().orElse(null);
 
             GameProfile profile = MinionProfileUtils.makeNewMinionProfile(data.uuid(), data.name(), skin);
             doSpawn(data, profile, server, level, pos, rot);
-
+        }
     }
 
     private static void doSpawn(MinionData data, GameProfile profile, MinecraftServer server, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot) {
-
         MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, SyncedClientOptions.createDefault(), data);
         MinionPersistentState.INSTANCE.updateMinionData(data.withSpawned(true));
 
@@ -106,14 +107,6 @@ public class MinionFakePlayer extends ServerPlayerEntity {
         this.data = data;
     }
 
-    public boolean isProgrammable() {
-        return programmable;
-    }
-
-    public void setProgrammable(boolean programmable) {
-        this.programmable = programmable;
-    }
-
     public ModuleInventory getModuleInventory() {
         return moduleInventory;
     }
@@ -281,11 +274,14 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     @Override
     public void drop(ServerWorld world, DamageSource damageSource) {
         super.drop(world, damageSource);
-        dropStack(world, toItemStack()).setNeverDespawn();
+        ItemEntity entity = dropStack(world, toItemStack());
+        if (entity != null) {
+            entity.setNeverDespawn();
+        }
     }
 
     private ItemStack toItemStack() {
-        ItemStack stack = new ItemStack(Minions.MINION_ITEM);
+        ItemStack stack = new ItemStack(MinionItems.MINION_ITEM);
         MinionItem.setData(data, stack);
         return stack;
     }
@@ -298,13 +294,11 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     public void writeCustomDataToNbt(NbtCompound nbt) {
         super.writeCustomDataToNbt(nbt);
         nbt.put("modules", moduleInventory.writeNbt(new NbtCompound(), getRegistryManager()));
-        nbt.putBoolean("programmable", programmable);
     }
 
     @Override
     public void readCustomDataFromNbt(NbtCompound nbt) {
         super.readCustomDataFromNbt(nbt);
-        moduleInventory.readNbt(nbt.getCompound("modules"), getRegistryManager());
+        moduleInventory.readNbt(nbt.getCompoundOrEmpty("modules"), getRegistryManager());
-        programmable = nbt.getBoolean("programmable");
     }
 }

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

@@ -1,6 +1,6 @@
 package io.github.skippyall.minions.mixinhelper;
 
-public interface ChunkTicketManager$DistanceFromNearestPlayerTrackerAccessor {
+public interface ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor {
     void minions$markAsMinionless();
     void minions$markAsTarget();
     int minions$getTickedChunkCount();

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

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

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

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

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

@@ -1,4 +1,4 @@
-package io.github.skippyall.minions.mixinhelpers;
+package io.github.skippyall.minions.mixinhelper;
 
 import net.minecraft.entity.Entity;
 

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

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

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

@@ -1,6 +1,6 @@
 package io.github.skippyall.minions.mixins;
 
-import io.github.skippyall.minions.mixinhelpers.EntityViewMixinHelper;
+import io.github.skippyall.minions.mixinhelper.EntityViewMixinHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.world.EntityView;
 import org.jetbrains.annotations.Nullable;

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

@@ -3,20 +3,14 @@ package io.github.skippyall.minions.mixins;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
-import io.github.skippyall.minions.mixinhelpers.EntityViewMixinHelper;
+import io.github.skippyall.minions.mixinhelper.EntityViewMixinHelper;
 import io.github.skippyall.minions.module.MobSpawningModule;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.predicate.entity.EntityPredicates;
-import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(MobEntity.class)
 public abstract class MobEntityMixin {

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

@@ -1,12 +1,13 @@
 package io.github.skippyall.minions.mixins.antimobcap;
 
 import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
-import io.github.skippyall.minions.mixinhelper.ChunkTicketManager$DistanceFromNearestPlayerTrackerAccessor;
+import io.github.skippyall.minions.mixinhelper.ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor;
-import io.github.skippyall.minions.mixinhelper.ChunkTicketManagerAccessor;
+import io.github.skippyall.minions.mixinhelper.ChunkLevelManagerAccessor;
 import io.github.skippyall.minions.module.MobSpawningModule;
 import it.unimi.dsi.fastutil.longs.Long2ByteMap;
 import it.unimi.dsi.fastutil.objects.ObjectSet;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ChunkLevelManager;
 import net.minecraft.server.world.ChunkTicketManager;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -17,11 +18,11 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(value = ChunkTicketManager.DistanceFromNearestPlayerTracker.class)
+@Mixin(value = ChunkLevelManager.DistanceFromNearestPlayerTracker.class)
-public abstract class ChunkTicketManager$DistanceFromNearestPlayerTrackerMixin extends ChunkPosDistanceLevelPropagatorMixin implements ChunkTicketManager$DistanceFromNearestPlayerTrackerAccessor {
+public abstract class ChunkLevelManager$DistanceFromNearestPlayerTrackerMixin extends ChunkPosDistanceLevelPropagatorMixin implements ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor {
     @Final
     @Shadow
-    ChunkTicketManager field_17462;
+    ChunkLevelManager field_17462;
 
     @Shadow
     @Final
@@ -41,7 +42,7 @@ public abstract class ChunkTicketManager$DistanceFromNearestPlayerTrackerMixin e
 
     @Override
     public boolean minions$isRealPlayerInChunk(long chunkPos) {
-        ObjectSet<ServerPlayerEntity> players = ((ChunkTicketManagerAccessor)field_17462).getPlayers(chunkPos);
+        ObjectSet<ServerPlayerEntity> players = ((ChunkLevelManagerAccessor)field_17462).minions$getPlayers(chunkPos);
         boolean contains = false;
         if(players != null) {
             contains = players.stream().anyMatch(player -> {
@@ -57,14 +58,14 @@ public abstract class ChunkTicketManager$DistanceFromNearestPlayerTrackerMixin e
     @Inject(method = "updateLevels", at = @At("HEAD"))
     public void minions$sync(CallbackInfo info) {
         if (minions$target) {
-            ((ChunkTicketManagerAccessor)field_17462).getMinionless().updateLevels();
+            ((ChunkLevelManagerAccessor)field_17462).minions$getMinionless().updateLevels();
         }
     }
 
     @Override
     public void minions$updateLevel(long chunkPos, int distance, boolean decrease, CallbackInfo info) {
         if (minions$target && (distance == Integer.MAX_VALUE || minions$isRealPlayerInChunk(chunkPos))) {
-            ((ChunkTicketManagerAccessor)field_17462).getMinionless().updateLevel(chunkPos, distance, decrease);
+            ((ChunkLevelManagerAccessor)field_17462).minions$getMinionless().updateLevel(chunkPos, distance, decrease);
         }
     }
 

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

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

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

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

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

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

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

@@ -1,5 +1,6 @@
 package io.github.skippyall.minions.module;
 
+import io.github.skippyall.minions.MinionItems;
 import io.github.skippyall.minions.module.command.Command;
 import io.github.skippyall.minions.program.block.CodeBlock;
 import net.minecraft.item.Item;
@@ -21,11 +22,7 @@ public class Modules {
         AttackModule.registerMe();
     }
 
-    public static <T extends Item & ModuleItem> T register(Identifier id, T item) {
-        return Registry.register(Registries.ITEM, id, item);
-    }
-
     public static SimpleModuleItem register(Identifier id, List<CodeBlock<?,?>> codeBlocks, List<Command> commands, Item vanillaItem) {
-        return Registry.register(Registries.ITEM, id, new SimpleModuleItem(codeBlocks, commands, new Item.Settings().registryKey(RegistryKey.of(RegistryKeys.ITEM, id)), vanillaItem));
+        return MinionItems.registerItem(id, settings -> new SimpleModuleItem(codeBlocks, commands, settings, vanillaItem));
     }
 }

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

@@ -42,5 +42,7 @@
   "minions.generic.name.invalid_char": "Name contains invalid character",
   "minions.generic.name.too_long": "Name is too long",
   "minions.generic.name.invalid": "Name is invalid",
-  "minions.generic.name.taken": "This name is already used"
+  "minions.generic.name.taken": "This name is already used",
+  "minions.generic.mod_name": "Minions",
+  "minions.command.minion.not_present": "This minion does not exist"
 }

src/main/resources/fabric.mod.json

@@ -23,7 +23,7 @@
   "depends": {
     "fabricloader": "*",
     "fabric": "*",
-    "minecraft": "~1.21.3",
+    "minecraft": "~1.21.5",
     "polymer-core": "*"
   }
 }

src/main/resources/minions.accesswidener

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

src/main/resources/minions.mixins.json

@@ -18,8 +18,8 @@
     "SleepManagerMixin",
     "SpawnHelperMixin",
     "antimobcap.ChunkPosDistanceLevelPropagatorMixin",
-    "antimobcap.ChunkTicketManager$DistanceFromNearestPlayerTrackerMixin",
+    "antimobcap.ChunkLevelManager$DistanceFromNearestPlayerTrackerMixin",
-    "antimobcap.ChunkTicketManagerMixin",
+    "antimobcap.ChunkLevelManagerMixin",
     "antimobcap.ServerChunkManagerAccessor",
     "antimobcap.ServerChunkManagerMixin"
   ],