Fixes

# Conflicts:
#	gradle.properties

build.gradle

@@ -1,11 +1,15 @@
 plugins {
-    id 'fabric-loom' version '1.8-SNAPSHOT'
+    id 'fabric-loom' version '1.10-SNAPSHOT'
     id 'maven-publish'
 }
 
 version = project.mod_version
 group = project.maven_group
 
+loom {
+    accessWidenerPath = file("src/main/resources/minions.accesswidener")
+}
+
 base {
     archivesName = project.archives_base_name
 }
@@ -21,6 +25,18 @@ repositories {
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html
     // for more information about repositories.
     maven { url 'https://maven.nucleoid.xyz' }
+
+    exclusiveContent {
+        forRepository {
+            maven {
+                name = "Modrinth"
+                url = "https://api.modrinth.com/maven"
+            }
+        }
+        filter {
+            includeGroup "maven.modrinth"
+        }
+    }
 }
 
 dependencies {
@@ -34,6 +50,8 @@ dependencies {
     modImplementation "eu.pb4:polymer-core:${project.polymer_version}"
     modImplementation include("eu.pb4:sgui:${project.sgui_version}")
     modImplementation include("xyz.nucleoid:server-translations-api:${project.server_translations_version}")
+
+    modCompileOnly "maven.modrinth:universal-graves:${project.universal_graves_version}"
 }
 
 processResources {

gradle.properties

@@ -3,19 +3,21 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://modmuss50.me/fabric.html
-	minecraft_version=1.21.3
+	minecraft_version=1.21.7
-	loader_version=0.16.13
+	loader_version=0.16.14
-	yarn_mappings=1.21.3+build.2
+	yarn_mappings=1.21.7+build.2
 
 # Mod Properties
-	mod_version = 0.1.2-SNAPSHOT
+	mod_version = 0.2.1-SNAPSHOT
 	maven_group = io.github.skippyall
 	archives_base_name = Minions
 
 # Dependencies
 	# check this on https://modmuss50.me/fabric.html
-	fabric_version=0.107.0+1.21.3
+	fabric_version=0.128.1+1.21.7
 
-	polymer_version=0.10.0+1.21.2
+	polymer_version=0.13.3+1.21.6
-	sgui_version=1.7.1+1.21.2
+	sgui_version=1.10.0+1.21.6
-	server_translations_version=2.4.0+1.21.2-rc1
+	server_translations_version=2.5.1+1.21.5
+
+	universal_graves_version=3.8.0+1.21.6

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,40 +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.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);
 
@@ -43,22 +21,20 @@ public class Minions implements ModInitializer {
         MinionData.register();
         PolymerEntityUtils.registerType();
         ServerLifecycleEvents.SERVER_STARTED.register(server -> {
+            LOGGER.error("Initializing Minion data");
             MinionPersistentState.create(server);
             MinionPersistentState.INSTANCE.getMinionData().forEach((uuid, data) -> {
                 if(data.isSpawned()) {
-                    MinionFakePlayer.spawnMinion(data, server.getOverworld(), null, null);
+                    MinionFakePlayer.spawnMinion(data, server.getOverworld(), null, null, true);
                 }
             });
         });
 
-        Modules.register();
+        CommandRegistrationCallback.EVENT.register((commandDispatcher, commandRegistryAccess, registrationEnvironment) -> {
-    }
+            MinionsCommand.register(commandDispatcher);
+        });
 
-    private static <T extends Item> T registerItem(Identifier identifier, Function<Item.Settings, T> constructor, Item.Settings settings) {
+        MinionItems.register();
-        return Registry.register(Registries.ITEM, identifier, constructor.apply(settings.registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier))));
+        MinionCreativeTab.registerGroup();
-    }
-
-    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/MinionsTickExecutor.java

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

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

@@ -0,0 +1,25 @@
+package io.github.skippyall.minions.command;
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import io.github.skippyall.minions.minion.MinionData;
+import io.github.skippyall.minions.minion.MinionPersistentState;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.text.Text;
+
+import java.util.Collection;
+
+import static net.minecraft.server.command.CommandManager.literal;
+
+public class ListSubcommand {
+    public static final LiteralArgumentBuilder<ServerCommandSource> LIST = literal("list")
+            .executes(ListSubcommand::list);
+
+    public static int list(CommandContext<ServerCommandSource> context) {
+        Collection<MinionData> minions = MinionPersistentState.INSTANCE.getMinionData().values();
+        for (MinionData minion : minions) {
+            context.getSource().sendFeedback(() -> Text.literal(minion.name() + "(" + minion.uuid() + "):" + minion.isSpawned()), false);
+        }
+        return 0;
+    }
+}

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

@@ -0,0 +1,50 @@
+package io.github.skippyall.minions.command;
+
+import com.mojang.brigadier.context.CommandContext;
+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,19 @@
+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)
+                        .then(ListSubcommand.LIST)
+        );
+    }
+
+
+}

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

@@ -9,19 +9,19 @@ import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 
+import java.util.Collection;
 import java.util.List;
 
 public class CommandsGui {
     public static void openServerModuleCommandGui(ServerPlayerEntity player, MinionFakePlayer minion) {
-        List<ModuleItem> modules = minion.getModuleInventory().getModuleItems();
+        Collection<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++) {
+        for (ModuleItem module : modules) {
-            ModuleItem module = modules.get(i);
+            gui.addSlot(new GuiElementBuilder()
-            gui.setSlot(i, new GuiElementBuilder()
                     .setItem(module.asItem())
                     .setCallback(() -> openServerCommandGui(player, minion, module))
             );

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"))
@@ -52,7 +43,7 @@ public class MinionGui {
                 .setItem(Items.BARRIER)
                 .setName(Text.translatable("minions.gui.main.pickup"))
                 .setCallback(() -> {
-                    minion.kill(minion.getServerWorld());
+                    minion.kill(minion.getWorld());
                 })
         );
         gui.open();

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

@@ -7,16 +7,20 @@ 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.storage.ReadView;
+import net.minecraft.storage.WriteView;
 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,30 +39,35 @@ public class ModuleInventory extends SimpleInventory {
         return (stack.getCount() <= getMaxCountPerStack()) && stack.getItem() instanceof ModuleItem;
     }
 
-    public void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup lookup) {
+    @Override
-        Inventories.readNbt(nbt, heldStacks, lookup);
+    public void markDirty() {
+        super.markDirty();
+        updateModules();
     }
 
-    public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup lookup) {
+    public void updateModules() {
-        return Inventories.writeNbt(nbt, heldStacks, lookup);
+        modules.clear();
+        for (ItemStack heldStack : heldStacks) {
+            if(heldStack.getItem() instanceof ModuleItem moduleItem) {
+                modules.add(moduleItem);
+            }
+        }
+    }
+
+    public void readData(ReadView view) {
+        Inventories.readData(view, heldStacks);
+        updateModules();
+    }
+
+    public void writeData(WriteView view) {
+        Inventories.writeData(view, heldStacks);
     }
 
     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,36 @@
 package io.github.skippyall.minions.minion;
 
-import net.minecraft.nbt.NbtCompound;
+import com.mojang.serialization.Codec;
-import net.minecraft.nbt.NbtElement;
+import io.github.skippyall.minions.Minions;
-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.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 +40,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 +54,17 @@ 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");
+        Minions.LOGGER.error("Creating Minion Persistent state");
+        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));
     }
 
@@ -317,11 +317,11 @@ public class EntityPlayerActionPack
                                 case BLOCK:
                                 {
                                     player.updateLastActionTime();
-                                    ServerWorld world = player.getServerWorld();
+                                    ServerWorld world = player.getWorld();
                                     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.getWorld().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,16 +12,15 @@ 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;
 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;
@@ -34,6 +32,8 @@ import net.minecraft.server.ServerTask;
 import net.minecraft.server.network.ConnectedClientData;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
+import net.minecraft.storage.ReadView;
+import net.minecraft.storage.WriteView;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableTextContent;
 import net.minecraft.util.ActionResult;
@@ -46,7 +46,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 +53,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);
+            server.send(server.createTask(() -> 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 +108,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;
     }
@@ -158,7 +152,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
         if (reason.getContent() instanceof TranslatableTextContent text && text.getKey().equals("multiplayer.disconnect.duplicate_login")) {
             this.networkHandler.onDisconnected(new DisconnectionInfo(reason));
         } else {
-            this.server.send(new ServerTask(this.server.getTicks(), () -> {
+            this.getServer().send(new ServerTask(this.getServer().getTicks(), () -> {
                 this.networkHandler.onDisconnected(new DisconnectionInfo(reason));
             }));
         }
@@ -172,7 +166,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
         if (this.getServer().getTicks() % 10 == 0)
         {
             this.networkHandler.syncWithPlayerPosition();
-            this.getServerWorld().getChunkManager().updatePosition(this);
+            this.getWorld().getChunkManager().updatePosition(this);
         }
         try
         {
@@ -281,11 +275,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;
     }
@@ -295,16 +292,14 @@ public class MinionFakePlayer extends ServerPlayerEntity {
     }
 
     @Override
-    public void writeCustomDataToNbt(NbtCompound nbt) {
+    public void writeCustomData(WriteView view) {
-        super.writeCustomDataToNbt(nbt);
+        super.writeCustomData(view);
-        nbt.put("modules", moduleInventory.writeNbt(new NbtCompound(), getRegistryManager()));
+        moduleInventory.writeData(view.get("modules"));
-        nbt.putBoolean("programmable", programmable);
     }
 
     @Override
-    public void readCustomDataFromNbt(NbtCompound nbt) {
+    public void readCustomData(ReadView view) {
-        super.readCustomDataFromNbt(nbt);
+        super.readCustomData(view);
-        moduleInventory.readNbt(nbt.getCompound("modules"), getRegistryManager());
+        moduleInventory.readData(view.getReadView("modules"));
-        programmable = nbt.getBoolean("programmable");
     }
 }

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

@@ -38,9 +38,9 @@ public class NetHandlerPlayServerFake extends ServerPlayNetworkHandler
     public void requestTeleport(PlayerPosition pos, Set<PositionFlag> set)
     {
         super.requestTeleport(pos, set);
-        if (player.getServerWorld().getPlayerByUuid(player.getUuid()) != null) {
+        if (player.getWorld().getPlayerByUuid(player.getUuid()) != null) {
             syncWithPlayerPosition();
-            player.getServerWorld().getChunkManager().updatePosition(player);
+            player.getWorld().getChunkManager().updatePosition(player);
         }
     }
 

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

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

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

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

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

@@ -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/GraveCompatMixin.java

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

src/main/java/io/github/skippyall/minions/mixins/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/PlayerListEntryS2CPacket$EntryMixin.java

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

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

@@ -17,7 +17,9 @@ 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.storage.ReadView;
 import net.minecraft.text.Text;
+import net.minecraft.util.ErrorReporter;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -25,17 +27,18 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Mixin(PlayerManager.class)
 public class PlayerListMixin {
 
     @Inject(method = "loadPlayerData", at = @At(value = "RETURN", shift = At.Shift.BEFORE))
-    private void fixStartingPos(ServerPlayerEntity serverPlayerEntity_1, CallbackInfoReturnable<NbtCompound> cir)
+    private void fixStartingPos(ServerPlayerEntity player, ErrorReporter errorReporter, CallbackInfoReturnable<Optional<ReadView>> cir)
     {
-        if (serverPlayerEntity_1 instanceof MinionFakePlayer)
+        if (player instanceof MinionFakePlayer)
         {
-            ((MinionFakePlayer) serverPlayerEntity_1).fixStartingPosition.run();
+            ((MinionFakePlayer) player).fixStartingPosition.run();
         }
     }
 

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

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

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

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

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

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

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

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

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

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

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

@@ -19,10 +19,11 @@
   "mixins": [
     "minions.mixins.json"
   ],
+  "accessWidener" : "minions.accesswidener",
   "depends": {
     "fabricloader": "*",
     "fabric": "*",
-    "minecraft": "~1.21.3",
+    "minecraft": "~1.21.5",
     "polymer-core": "*"
   }
 }

src/main/resources/minions.accesswidener

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

src/main/resources/minions.mixins.json

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