Listening in both directions

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

@@ -16,7 +16,7 @@ public class ListSubcommand {
             .executes(ListSubcommand::list);
 
     public static int list(CommandContext<ServerCommandSource> context) {
-        Collection<MinionData> minions = MinionPersistentState.INSTANCE.getMinionData().values();
+        Collection<MinionData> minions = MinionPersistentState.get(context.getSource().getServer()).getMinionData().values();
         for (MinionData minion : minions) {
             context.getSource().sendFeedback(() -> Text.literal(minion.name() + "(" + minion.uuid() + "):" + minion.isSpawned()), false);
         }

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

@@ -9,6 +9,7 @@ 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.MinecraftServer;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.Text;
 
@@ -21,13 +22,13 @@ public class MinionArgument {
 
     public static final MinionSuggestionProvider SUGGESTION_PROVIDER = new MinionSuggestionProvider();
 
-    public static MinionData parse(String argument) throws CommandSyntaxException {
+    public static MinionData parse(MinecraftServer server, String argument) throws CommandSyntaxException {
         Optional<MinionData> data = Optional.empty();
         if(argument.startsWith(MinionProfileUtils.PREFIX)) {
-            data = MinionPersistentState.INSTANCE.getMinionWithName(argument);
+            data = MinionPersistentState.get(server).getMinionWithName(argument);
         } else {
             try {
-                data = Optional.ofNullable(MinionPersistentState.INSTANCE.getMinionData(UUID.fromString(argument)));
+                data = Optional.ofNullable(MinionPersistentState.get(server).getMinionData(UUID.fromString(argument)));
             } catch (IllegalArgumentException ignored) {}
         }
 
@@ -40,7 +41,7 @@ public class MinionArgument {
     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()) {
+            for (MinionData data : MinionPersistentState.get(context.getSource().getServer()).getMinionDataList()) {
                 builder.suggest(data.name());
             }
 

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

@@ -48,7 +48,7 @@ public class SpawnSubcommand {
             );
 
     public static int spawnCommand(ServerCommandSource source, String minion, PosArgument pos, boolean force) throws CommandSyntaxException {
-        MinionData data = MinionArgument.parse(minion);
+        MinionData data = MinionArgument.parse(source.getServer(), minion);
         MinionFakePlayer.spawnMinion(data, source.getWorld(), pos != null ? pos.getPos(source) : null, pos != null ? pos.getRotation(source) : null, force);
         return 0;
     }