Add player setup functions

Author: DrexHD

src/main/java/io/github/mattidragon/demobox/DemoBoxCommand.java

@@ -73,12 +73,16 @@ public static void register() {
     private static RequiredArgumentBuilder<ServerCommandSource, Identifier> buildArgTree(CommandHandler handler) {
         return argument("template", IdentifierArgumentType.identifier())
                 .suggests(STRUCTURE_SUGGESTION_PROVIDER)
-                .executes(context -> handler.execute(context, IdentifierArgumentType.getIdentifier(context, "template"), new Vec3d(0.5, 2, 0.5), List.of()))
+                .executes(context -> handler.execute(context, IdentifierArgumentType.getIdentifier(context, "template"), new Vec3d(0.5, 2, 0.5), List.of(), List.of()))
                 .then(argument("pos", Vec3ArgumentType.vec3())
-                        .executes(context -> handler.execute(context, IdentifierArgumentType.getIdentifier(context, "template"), Vec3ArgumentType.getVec3(context, "pos"), List.of()))
+                        .executes(context -> handler.execute(context, IdentifierArgumentType.getIdentifier(context, "template"), Vec3ArgumentType.getVec3(context, "pos"), List.of(), List.of()))
                         .then(argument("setupFunction", CommandFunctionArgumentType.commandFunction())
                                 .suggests(FunctionCommand.SUGGESTION_PROVIDER)
-                                .executes(context -> handler.execute(context, IdentifierArgumentType.getIdentifier(context, "template"), Vec3ArgumentType.getVec3(context, "pos"), CommandFunctionArgumentType.getFunctions(context, "setupFunction")))));
+                                .executes(context -> handler.execute(context, IdentifierArgumentType.getIdentifier(context, "template"), Vec3ArgumentType.getVec3(context, "pos"), CommandFunctionArgumentType.getFunctions(context, "setupFunction"), List.of()))
+                            .then(
+                                argument("playerFunction", CommandFunctionArgumentType.commandFunction())
+                                    .suggests(FunctionCommand.SUGGESTION_PROVIDER)
+                                    .executes(context -> handler.execute(context, IdentifierArgumentType.getIdentifier(context, "template"), Vec3ArgumentType.getVec3(context, "pos"), CommandFunctionArgumentType.getFunctions(context, "setupFunction"), CommandFunctionArgumentType.getFunctions(context, "playerFunction"))))));
     }
 
     // Joinked from GameCommand because brigadier can't deal with childless redirects
@@ -98,7 +102,7 @@ private static int executeLeave(CommandContext<ServerCommandSource> context) thr
         return Command.SINGLE_SUCCESS;
     }
 
-    private static int executeSign(CommandContext<ServerCommandSource> context, Identifier structure, Vec3d pos, Collection<CommandFunction<ServerCommandSource>> functions) throws CommandSyntaxException {
+    private static int executeSign(CommandContext<ServerCommandSource> context, Identifier structure, Vec3d pos, Collection<CommandFunction<ServerCommandSource>> functions,  Collection<CommandFunction<ServerCommandSource>> playerFunctions) throws CommandSyntaxException {
         var signPos = BlockPosArgumentType.getLoadedBlockPos(context, "signPos");
         var source = context.getSource();
         var block = source.getWorld().getBlockState(signPos).getBlock();
@@ -163,11 +167,11 @@ private static String getCommandEnd(CommandContext<ServerCommandSource> context)
         return context.getInput().substring(mainNode.getRange().getStart());
     }
 
-    private static int executeOpen(CommandContext<ServerCommandSource> context, Identifier structure, Vec3d pos, Collection<CommandFunction<ServerCommandSource>> functions) throws CommandSyntaxException {
+    private static int executeOpen(CommandContext<ServerCommandSource> context, Identifier structure, Vec3d pos, Collection<CommandFunction<ServerCommandSource>> functions, Collection<CommandFunction<ServerCommandSource>> playerFunctions) throws CommandSyntaxException {
         var source = context.getSource();
         var player = source.getPlayerOrThrow();
 
-        DemoBoxGame.open(new DemoBoxGame.Settings(structure, pos, functions.stream().map(CommandFunction::id).toList()))
+        DemoBoxGame.open(new DemoBoxGame.Settings(structure, pos, functions.stream().map(CommandFunction::id).toList(), playerFunctions.stream().map(CommandFunction::id).toList()))
                 .thenAcceptAsync(gameSpace -> {
                     var space = GameSpaceManager.get().byPlayer(player);
                     if (space != null) space.getPlayers().kick(player);
@@ -182,6 +186,6 @@ private static int executeOpen(CommandContext<ServerCommandSource> context, Iden
 
     @FunctionalInterface
     private interface CommandHandler {
-        int execute(CommandContext<ServerCommandSource> context, Identifier structure, Vec3d pos, Collection<CommandFunction<ServerCommandSource>> functions) throws CommandSyntaxException;
+        int execute(CommandContext<ServerCommandSource> context, Identifier structure, Vec3d pos, Collection<CommandFunction<ServerCommandSource>> functions, Collection<CommandFunction<ServerCommandSource>> playerFunctions) throws CommandSyntaxException;
     }
 }

src/main/java/io/github/mattidragon/demobox/DemoBoxGame.java

@@ -3,6 +3,7 @@
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.block.Blocks;
+import net.minecraft.entity.Entity;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.registry.entry.RegistryEntryList;
@@ -84,17 +85,7 @@ private void setup() {
                     var pos = new BlockPos(size.getX() / -2, 1, size.getZ() / -2);
                     template.place(world, pos, pos, new StructurePlacementData(), world.random, 0);
                 });
-        var server = world.getServer();
-        var manager = server.getCommandFunctionManager();
-        for (var id : settings.functions) {
-            manager.getFunction(id).ifPresentOrElse(
-                    function -> manager.execute(
-                            function,
-                            new ServerCommandSource(server, Vec3d.ZERO, Vec2f.ZERO, world, 2, "DemoBox Setup", Text.literal("DemoBox Setup"), server, null).withSilent()
-                    ),
-                    () -> DemoBox.LOGGER.warn("Missing function: {}", id)
-            );
-        }
+        executeFunctions(settings.functions, null);
     }
 
     private void onPlayerLeave(ServerPlayerEntity player) {
@@ -108,6 +99,7 @@ private void onPlayerJoin(ServerPlayerEntity player) {
         player.sendMessage(Text.translatable("demobox.info.2").formatted(Formatting.WHITE));
         player.sendMessage(Text.translatable("demobox.info.3").formatted(Formatting.WHITE));
         player.sendMessage(Text.translatable("demobox.info.4").formatted(Formatting.WHITE));
+        executeFunctions(settings.playerFunctions, player);
     }
 
     private Text onJoinMessage(ServerPlayerEntity player, @Nullable Text currentText, Text defaultText) {
@@ -126,6 +118,20 @@ private JoinAcceptorResult onPlayerAccepted(JoinAcceptor joinAcceptor) {
         return joinAcceptor.teleport(world, settings.playerPos);
     }
 
+    private void executeFunctions(List<Identifier> functions, Entity entity) {
+        var server = world.getServer();
+        var manager = server.getCommandFunctionManager();
+        for (var id : functions) {
+            manager.getFunction(id).ifPresentOrElse(
+                function -> manager.execute(
+                    function,
+                    new ServerCommandSource(server, Vec3d.ZERO, Vec2f.ZERO, world, 2, "DemoBox Setup", Text.literal("DemoBox Setup"), server, entity).withSilent()
+                ),
+                () -> DemoBox.LOGGER.warn("Missing function: {}", id)
+            );
+        }
+    }
+
     @NotNull
     private static RuntimeWorldConfig createWorldConfig(DynamicRegistryManager registryManager) {
         var worldConfig = new RuntimeWorldConfig();
@@ -143,11 +149,12 @@ private static RuntimeWorldConfig createWorldConfig(DynamicRegistryManager regis
         return worldConfig;
     }
 
-    public record Settings(Identifier structureId, Vec3d playerPos, List<Identifier> functions) {
+    public record Settings(Identifier structureId, Vec3d playerPos, List<Identifier> functions, List<Identifier> playerFunctions) {
         public static final MapCodec<Settings> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
                 Identifier.CODEC.fieldOf("structureId").forGetter(Settings::structureId),
                 Vec3d.CODEC.fieldOf("playerPos").forGetter(Settings::playerPos),
-                Identifier.CODEC.listOf().fieldOf("functions").forGetter(Settings::functions)
+                Identifier.CODEC.listOf().fieldOf("functions").forGetter(Settings::functions),
+                Identifier.CODEC.listOf().fieldOf("playerFunctions").forGetter(Settings::playerFunctions)
         ).apply(instance, Settings::new));
     }
 }