Added "/spawn reload" and "/spawn save" commands.

Author: MairwunNx

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

@@ -60,10 +60,11 @@ class EntryPoint {
         logger.info("$MOD_NAME starting mod loading ...")
         registerCommands(event.server.commandManager.dispatcher)
         processFirstSession(event)
-        SpawnModelBase.assignSpawn(event)
+        SpawnModelBase.assignSpawn(event.server)
     }
 
     private fun processFirstSession(event: FMLServerStartingEvent) {
+        logger.info("Processing first session for loaded world")
         var equals = true
         val world = event.server.getWorld(DimensionType.OVERWORLD)
 
@@ -82,7 +83,6 @@ class EntryPoint {
             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(

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

@@ -12,7 +12,9 @@ import net.minecraft.util.math.BlockPos
 import org.apache.logging.log4j.LogManager
 
 object SetSpawnCommand {
-    private val aliases = arrayOf("setspawn", "esetspawn", "spawnpoint", "setworldspawn")
+    private val aliases = arrayOf(
+        "setspawn", "esetspawn", "spawnpoint", "setworldspawn"
+    )
     private val logger = LogManager.getLogger()
 
     fun register(dispatcher: CommandDispatcher<CommandSource>) {
@@ -36,7 +38,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)
+                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.command.Commands
 import net.minecraft.entity.player.ServerPlayerEntity
 import net.minecraft.world.dimension.DimensionType
 import org.apache.logging.log4j.LogManager
@@ -22,7 +23,15 @@ object SpawnCommand {
             dispatcher.register(
                 literal<CommandSource>(command).executes {
                     return@executes execute(it)
-                }
+                }.then(
+                    Commands.literal("reload").executes {
+                        return@executes reload(it)
+                    }
+                ).then(
+                    Commands.literal("save").executes {
+                        return@executes save(it)
+                    }
+                )
             )
         }
     }
@@ -56,4 +65,43 @@ object SpawnCommand {
         )
         player.teleport(targetWorld, xPos, yPos, zPos, yaw, pitch)
     }
+
+    private fun reload(c: CommandContext<CommandSource>): Int {
+        if (c.isPlayerSender()) {
+            val playerName = c.source.asPlayer().name.string
+            if (!PermissionsAPI.hasPermission(playerName, "ess.spawn.reload")) {
+                sendMsg(c.source, "spawn.reload.restricted")
+                return 0
+            }
+        }
+        SpawnModelBase.loadData()
+        SpawnModelBase.assignSpawn(c.source.server)
+        if (c.isPlayerSender()) {
+            val playerName = c.source.asPlayer().name.string
+            logger.info("Executed command \"/${c.input}\" from $playerName")
+            sendMsg(c.source, "spawn.reload.success")
+        } else {
+            logger.info("World spawn configuration reloaded.")
+        }
+        return 0
+    }
+
+    private fun save(c: CommandContext<CommandSource>): Int {
+        if (c.isPlayerSender()) {
+            val playerName = c.source.asPlayer().name.string
+            if (!PermissionsAPI.hasPermission(playerName, "ess.spawn.reload")) {
+                sendMsg(c.source, "spawn.reload.restricted")
+                return 0
+            }
+        }
+        SpawnModelBase.saveData()
+        if (c.isPlayerSender()) {
+            val playerName = c.source.asPlayer().name.string
+            logger.info("Executed command \"/${c.input}\" from $playerName")
+            sendMsg(c.source, "spawn.reload.success")
+        } else {
+            logger.info("World spawn configuration saved.")
+        }
+        return 0
+    }
 }

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

@@ -4,7 +4,6 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class SpawnModel(
-    var firstSession: Boolean = false,
     var worldId: Int = 0,
     var xPos: Double = 0.5,
     var yPos: Double = 100.0,

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

@@ -5,9 +5,9 @@ import com.mairwunnx.projectessentials.projectessentialsspawn.helpers.SPAWN_CONF
 import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
+import net.minecraft.server.MinecraftServer
 import net.minecraft.util.math.BlockPos
 import net.minecraft.world.dimension.DimensionType
-import net.minecraftforge.fml.event.server.FMLServerStartingEvent
 import org.apache.logging.log4j.LogManager
 import java.io.File
 
@@ -42,11 +42,11 @@ object SpawnModelBase {
         spawnModel = Json.parse(SpawnModel.serializer(), spawnConfigRaw)
     }
 
-    fun assignSpawn(event: FMLServerStartingEvent) {
+    fun assignSpawn(server: MinecraftServer) {
         val xPos = spawnModel.xPos
         val yPos = spawnModel.yPos
         val zPos = spawnModel.zPos
-        event.server.getWorld(DimensionType.OVERWORLD).spawnPoint = BlockPos(
+        server.getWorld(DimensionType.OVERWORLD).spawnPoint = BlockPos(
             xPos, yPos, zPos
         )
     }