Added moving to spawn after player respawn.

Added checking on correct world spawnpoint.

Author: MairwunNx

src/main/kotlin/com/mairwunnx/projectessentials/projectessentialsspawn/EntryPoint.kt

@@ -6,15 +6,18 @@ import com.mairwunnx.projectessentials.projectessentialsspawn.helpers.validateFo
 import com.mairwunnx.projectessentials.projectessentialsspawn.models.SpawnModelBase
 import com.mojang.brigadier.CommandDispatcher
 import net.minecraft.command.CommandSource
-import net.minecraft.util.math.BlockPos
+import net.minecraft.entity.player.ServerPlayerEntity
+import net.minecraft.world.dimension.DimensionType
 import net.minecraftforge.common.MinecraftForge
+import net.minecraftforge.event.entity.player.PlayerEvent
 import net.minecraftforge.eventbus.api.EventPriority
 import net.minecraftforge.eventbus.api.SubscribeEvent
 import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent
 import net.minecraftforge.fml.event.server.FMLServerStoppingEvent
 import org.apache.logging.log4j.LogManager
 
+// todo: move to core project as abstract class
 const val MOD_ID = "project_essentials_spawn"
 const val MOD_NAME = "Project Essentials Spawn"
 const val PART_OF_MOD = "Project Essentials"
@@ -40,6 +43,7 @@ class EntryPoint {
         SpawnModelBase.loadData()
     }
 
+    // todo: Move to core project
     private fun logBaseInfo() {
         logger.info("$MOD_NAME starting initializing ...")
         logger.info("    - Mod Id: $MOD_ID")
@@ -55,9 +59,32 @@ class EntryPoint {
     fun onServerStarting(event: FMLServerStartingEvent) {
         logger.info("$MOD_NAME starting mod loading ...")
         registerCommands(event.server.commandManager.dispatcher)
+        processFirstSession(event)
         SpawnModelBase.assignSpawn(event)
     }
 
+    private fun processFirstSession(event: FMLServerStartingEvent) {
+        var equals = true
+        val world = event.server.getWorld(DimensionType.OVERWORLD)
+
+        if (SpawnModelBase.spawnModel.xPos.toInt() != world.spawnPoint.x) {
+            equals = false
+        }
+        if (SpawnModelBase.spawnModel.yPos.toInt() != world.spawnPoint.y) {
+            equals = false
+        }
+        if (SpawnModelBase.spawnModel.zPos.toInt() != world.spawnPoint.z) {
+            equals = false
+        }
+
+        if (!equals) {
+            SpawnModelBase.spawnModel.xPos = world.spawnPoint.x.toDouble()
+            SpawnModelBase.spawnModel.yPos = world.spawnPoint.y.toDouble()
+            SpawnModelBase.spawnModel.zPos = world.spawnPoint.z.toDouble()
+        }
+        // if (world.firstSession()) { get world spawn and set it in config ; return }
+    }
+
     private fun registerCommands(
         cmdDispatcher: CommandDispatcher<CommandSource>
     ) {
@@ -73,4 +100,11 @@ class EntryPoint {
         logger.info("    - Saving world spawn data ...")
         SpawnModelBase.saveData()
     }
+
+    @SubscribeEvent(priority = EventPriority.HIGHEST)
+    fun onPlayerRespawn(event: PlayerEvent.PlayerRespawnEvent) {
+        if (!event.player.bedPosition.isPresent) {
+            SpawnCommand.moveToSpawn(event.player as ServerPlayerEntity)
+        }
+    }
 }

src/main/kotlin/com/mairwunnx/projectessentials/projectessentialsspawn/commands/SetSpawnCommand.kt

@@ -8,10 +8,11 @@ import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.builder.LiteralArgumentBuilder
 import com.mojang.brigadier.context.CommandContext
 import net.minecraft.command.CommandSource
+import net.minecraft.util.math.BlockPos
 import org.apache.logging.log4j.LogManager
 
 object SetSpawnCommand {
-    private val aliases = arrayOf("setspawn", "esetspawn")
+    private val aliases = arrayOf("setspawn", "esetspawn", "spawnpoint", "setworldspawn")
     private val logger = LogManager.getLogger()
 
     fun register(dispatcher: CommandDispatcher<CommandSource>) {
@@ -35,6 +36,7 @@ object SetSpawnCommand {
                 SpawnModelBase.spawnModel.yaw = player.rotationYaw
                 SpawnModelBase.spawnModel.pitch = player.rotationPitch
                 SpawnModelBase.spawnModel.worldId = player.serverWorld.worldType.id
+                player.world.spawnPoint = BlockPos(player.posX,  player.posY, player.posZ)
                 sendMsg(c.source, "spawn.set.success")
                 logger.info("New spawn point installed by ${player.name.string} with data: ")
                 logger.info("    - xpos: ${player.posX}")

src/main/kotlin/com/mairwunnx/projectessentials/projectessentialsspawn/commands/SpawnCommand.kt

@@ -8,6 +8,7 @@ import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.builder.LiteralArgumentBuilder.literal
 import com.mojang.brigadier.context.CommandContext
 import net.minecraft.command.CommandSource
+import net.minecraft.entity.player.ServerPlayerEntity
 import net.minecraft.world.dimension.DimensionType
 import org.apache.logging.log4j.LogManager
 
@@ -30,16 +31,7 @@ object SpawnCommand {
         if (c.isPlayerSender()) {
             val playerName = c.source.asPlayer().name.string
             if (PermissionsAPI.hasPermission(playerName, "ess.spawn")) {
-                val xPos = SpawnModelBase.spawnModel.xPos
-                val yPos = SpawnModelBase.spawnModel.yPos
-                val zPos = SpawnModelBase.spawnModel.zPos
-                val yaw = SpawnModelBase.spawnModel.yaw
-                val pitch = SpawnModelBase.spawnModel.pitch
-                val dimId = SpawnModelBase.spawnModel.worldId
-                val targetWorld = c.source.server.getWorld(
-                    DimensionType.getById(dimId) ?: DimensionType.OVERWORLD
-                )
-                c.source.asPlayer().teleport(targetWorld, xPos, yPos, zPos, yaw, pitch)
+                moveToSpawn(c.source.asPlayer())
                 logger.info("Executed command \"/${c.input}\" from $playerName")
                 sendMsg(c.source, "spawn.success")
             } else {
@@ -51,4 +43,17 @@ object SpawnCommand {
         }
         return 0
     }
+
+    fun moveToSpawn(player: ServerPlayerEntity) {
+        val xPos = SpawnModelBase.spawnModel.xPos
+        val yPos = SpawnModelBase.spawnModel.yPos
+        val zPos = SpawnModelBase.spawnModel.zPos
+        val yaw = SpawnModelBase.spawnModel.yaw
+        val pitch = SpawnModelBase.spawnModel.pitch
+        val dimId = SpawnModelBase.spawnModel.worldId
+        val targetWorld = player.server.getWorld(
+            DimensionType.getById(dimId) ?: DimensionType.OVERWORLD
+        )
+        player.teleport(targetWorld, xPos, yPos, zPos, yaw, pitch)
+    }
 }

src/main/kotlin/com/mairwunnx/projectessentials/projectessentialsspawn/models/SpawnModelBase.kt

@@ -43,14 +43,12 @@ object SpawnModelBase {
     }
 
     fun assignSpawn(event: FMLServerStartingEvent) {
-        event.server.worlds.forEach {
-            val dim = it.dimension.type.id
-            event.server.getWorld()
-            if (dim == 0) {
-                val pos = spawnModel
-                it.spawnPoint = BlockPos(pos.x, pos.y, pos.z)
-            }
-        }
+        val xPos = spawnModel.xPos
+        val yPos = spawnModel.yPos
+        val zPos = spawnModel.zPos
+        event.server.getWorld(DimensionType.OVERWORLD).spawnPoint = BlockPos(
+            xPos, yPos, zPos
+        )
     }
 
     fun saveData() {