feat: set login spawn point

This commit is contained in:
2026-09-29 22:45:56 +07:00
parent b1fc12f1d9
commit 0a95b289dd
4 changed files with 91 additions and 11 deletions
+2
View File
@@ -17,6 +17,8 @@ The mod uses Cloth Config AutoConfig and creates `config/oauth.json` on first se
`ws://` URLs are also accepted for local development. They do not encrypt the connection, so use `wss://` for production.
If the file was incomplete when the server started, `/login` reloads it and queues the request while the WebSocket connects. Check the server log for the exact config path and any missing fields.
Operators can stand at the desired waiting location and run `/setloginspawn`. The location, dimension, and view direction are saved to `config/oauth.json`. Players who join before linking are sent there and kept in place. After login succeeds, each player returns to the position and dimension where they joined.
## Setup
For setup instructions, please see the [Fabric Documentation page](https://docs.fabricmc.net/develop/getting-started/creating-a-project#setting-up) related to the IDE that you are using.
@@ -271,8 +271,8 @@ final class AuthServiceClient {
pendingLogins.remove(playerId, pending);
server.execute(() -> {
if (server.getPlayerList().getPlayer(playerId) != null) {
LoginGate.approve(playerId);
ServerPlayer player = server.getPlayerList().getPlayer(playerId);
LoginGate.approve(player);
player.sendSystemMessage(Component.literal("Login successful. You can now play."));
}
});
@@ -10,12 +10,26 @@ import me.shedaniel.autoconfig.ConfigData;
import me.shedaniel.autoconfig.annotation.Config;
import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.core.registries.Registries;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.Identifier;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.Vec3;
@Config(name = OAuth.MOD_ID)
public final class AuthServiceConfig implements ConfigData {
public String websocketUrl = "wss://minecraft.csui.dev/api/v1/minecraft/ws";
public String serverId = "";
public String serverCredential = "";
public boolean loginSpawnSet = false;
public String loginSpawnDimension = "minecraft:overworld";
public double loginSpawnX = 0.5;
public double loginSpawnY = 80.0;
public double loginSpawnZ = 0.5;
public float loginSpawnYaw = 0.0f;
public float loginSpawnPitch = 0.0f;
static void register() {
AutoConfig.register(AuthServiceConfig.class, GsonConfigSerializer::new);
@@ -34,6 +48,35 @@ public final class AuthServiceConfig implements ConfigData {
return load();
}
void setLoginSpawn(ServerLevel level, Vec3 position, float yaw, float pitch) {
loginSpawnSet = true;
loginSpawnDimension = level.dimension().identifier().toString();
loginSpawnX = position.x;
loginSpawnY = position.y;
loginSpawnZ = position.z;
loginSpawnYaw = yaw;
loginSpawnPitch = pitch;
AutoConfig.getConfigHolder(AuthServiceConfig.class).save();
}
ServerLevel getLoginSpawnLevel(MinecraftServer server) {
if (!loginSpawnSet) return server.overworld();
try {
ResourceKey<Level> key = ResourceKey.create(Registries.DIMENSION, Identifier.parse(loginSpawnDimension));
ServerLevel level = server.getLevel(key);
return level == null ? server.overworld() : level;
} catch (RuntimeException exception) {
OAuth.LOGGER.warn("Invalid login spawn dimension in config; using the overworld spawn");
return server.overworld();
}
}
Vec3 getLoginSpawnPosition(MinecraftServer server) {
if (loginSpawnSet) return new Vec3(loginSpawnX, loginSpawnY, loginSpawnZ);
var spawn = server.overworld().getRespawnData().pos();
return new Vec3(spawn.getX() + 0.5, spawn.getY(), spawn.getZ() + 0.5);
}
boolean isConfigured() {
return websocketUrl != null && isValidWebSocketUrl()
&& serverId != null && !serverId.isBlank()
+45 -10
View File
@@ -17,12 +17,14 @@ import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
import net.minecraft.commands.Commands;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.permissions.Permissions;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.level.portal.TeleportTransition;
import net.minecraft.world.phys.Vec3;
final class LoginGate {
private static final Map<UUID, Vec3> LOCKED_POSITIONS = new HashMap<>();
private static final Map<UUID, LockedPlayer> LOCKED_PLAYERS = new HashMap<>();
private LoginGate() {}
@@ -31,20 +33,35 @@ final class LoginGate {
ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> {
ServerPlayer player = handler.player;
LOCKED_POSITIONS.put(player.getUUID(), player.position());
ServerLevel returnLevel = player.level();
Vec3 returnPosition = player.position();
float returnYaw = player.getYRot();
float returnPitch = player.getXRot();
AuthServiceConfig config = AuthServiceConfig.load();
ServerLevel loginSpawnLevel = config.getLoginSpawnLevel(server);
Vec3 loginSpawnPosition = config.getLoginSpawnPosition(server);
float loginSpawnYaw = config.loginSpawnSet ? config.loginSpawnYaw : 0.0f;
float loginSpawnPitch = config.loginSpawnSet ? config.loginSpawnPitch : 0.0f;
LOCKED_PLAYERS.put(player.getUUID(), new LockedPlayer(returnLevel, returnPosition, returnYaw, returnPitch,
loginSpawnLevel, loginSpawnPosition, loginSpawnYaw, loginSpawnPitch));
player.teleport(new TeleportTransition(loginSpawnLevel, loginSpawnPosition, Vec3.ZERO,
loginSpawnYaw, loginSpawnPitch, TeleportTransition.DO_NOTHING));
player.setDeltaMovement(Vec3.ZERO);
player.sendSystemMessage(Component.literal("You must run /login and complete login to play."));
});
ServerPlayConnectionEvents.DISCONNECT.register((handler, server) -> {
LOCKED_POSITIONS.remove(handler.player.getUUID());
LOCKED_PLAYERS.remove(handler.player.getUUID());
AuthServiceClient.cancelPlayerLogin(handler.player.getUUID());
});
ServerTickEvents.END_SERVER_TICK.register(server -> {
for (ServerPlayer player : server.getPlayerList().getPlayers()) {
Vec3 lockedPosition = LOCKED_POSITIONS.get(player.getUUID());
if (lockedPosition != null && !player.position().equals(lockedPosition)) {
player.teleportTo(lockedPosition.x, lockedPosition.y, lockedPosition.z);
LockedPlayer locked = LOCKED_PLAYERS.get(player.getUUID());
if (locked != null && (player.level() != locked.loginSpawnLevel
|| !player.position().equals(locked.loginSpawnPosition))) {
player.teleport(new TeleportTransition(locked.loginSpawnLevel, locked.loginSpawnPosition, Vec3.ZERO,
locked.loginSpawnYaw, locked.loginSpawnPitch, TeleportTransition.DO_NOTHING));
player.setDeltaMovement(Vec3.ZERO);
}
}
@@ -75,14 +92,32 @@ final class LoginGate {
AuthServiceClient.requestUnlink(player);
return 1;
}));
dispatcher.register(Commands.literal("setloginspawn")
.requires(source -> source.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
.executes(context -> {
ServerPlayer player = context.getSource().getPlayerOrException();
AuthServiceConfig config = AuthServiceConfig.load();
config.setLoginSpawn(player.level(), player.position(), player.getYRot(), player.getXRot());
context.getSource().sendSuccess(() -> Component.literal("Login spawn set to your current position in "
+ player.level().dimension().identifier() + "."), true);
return 1;
}));
});
}
static void approve(UUID playerId) {
LOCKED_POSITIONS.remove(playerId);
static void approve(ServerPlayer player) {
LockedPlayer locked = LOCKED_PLAYERS.remove(player.getUUID());
if (locked == null) return;
player.teleport(new TeleportTransition(locked.returnLevel, locked.returnPosition, Vec3.ZERO,
locked.returnYaw, locked.returnPitch, TeleportTransition.DO_NOTHING));
player.setDeltaMovement(Vec3.ZERO);
}
private static boolean isLocked(net.minecraft.world.entity.player.Player player) {
return player instanceof ServerPlayer serverPlayer && LOCKED_POSITIONS.containsKey(serverPlayer.getUUID());
return player instanceof ServerPlayer serverPlayer && LOCKED_PLAYERS.containsKey(serverPlayer.getUUID());
}
private record LockedPlayer(ServerLevel returnLevel, Vec3 returnPosition, float returnYaw, float returnPitch,
ServerLevel loginSpawnLevel, Vec3 loginSpawnPosition, float loginSpawnYaw,
float loginSpawnPitch) { }
}