Merge pull request #3 from FTBTeam/dev

Dev

Author: desht

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [21.1.2]
+
+### Added
+* Added `/ftbteambases setlobbypos <pos>` command to updated lobby spawn position
+
 ## [21.1.1]
 
 ### Added

common/src/main/java/dev/ftb/mods/ftbteambases/command/CommandUtils.java

@@ -56,6 +56,7 @@ public static void registerCommands(CommandDispatcher<CommandSourceStack> dispat
                 .then(VisitCommand.registerNether())
                 .then(ArchiveCommand.register())
                 .then(PurgeCommand.register())
+                .then(SetLobbyPosCommand.register())
         );
     }
 

common/src/main/java/dev/ftb/mods/ftbteambases/command/SetLobbyPosCommand.java

@@ -0,0 +1,41 @@
+package dev.ftb.mods.ftbteambases.command;
+
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import dev.ftb.mods.ftbteambases.config.ServerConfig;
+import dev.ftb.mods.ftbteambases.data.bases.BaseInstanceManager;
+import dev.ftb.mods.ftbteambases.util.MiscUtil;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.commands.arguments.coordinates.BlockPosArgument;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerLevel;
+
+import static net.minecraft.commands.Commands.argument;
+import static net.minecraft.commands.Commands.literal;
+
+public class SetLobbyPosCommand {
+    public static LiteralArgumentBuilder<CommandSourceStack> register() {
+        return literal("setlobbypos")
+                .requires(ctx -> ctx.hasPermission(Commands.LEVEL_GAMEMASTERS))
+                .then(argument("pos", BlockPosArgument.blockPos())
+                        .executes(ctx -> setLobbyPos(ctx.getSource(), BlockPosArgument.getBlockPos(ctx, "pos")))
+                );
+    }
+
+    private static int setLobbyPos(CommandSourceStack source, BlockPos pos) {
+        BaseInstanceManager.get(source.getServer()).setLobbySpawnPos(pos);
+
+        source.sendSuccess(() -> Component.literal("lobby pos updated to " + MiscUtil.blockPosStr(pos)), false);
+
+        ServerConfig.lobbyDimension().ifPresent(dim -> {
+            ServerLevel level = source.getServer().getLevel(dim);
+            if (level != null) {
+                level.setDefaultSpawnPos(pos, ServerConfig.LOBBY_PLAYER_YAW.get().floatValue());
+            }
+        });
+
+        return Command.SINGLE_SUCCESS;
+    }
+}

gradle.properties

@@ -4,7 +4,7 @@ minecraft_version=1.21.1
 enabled_platforms=fabric,neoforge
 
 archives_base_name=ftb-team-bases
-mod_version=21.1.1
+mod_version=21.1.2
 maven_group=dev.ftb.mods
 mod_author=FTB Team
 readable_name=FTB Team Bases