@@ -3,13 +3,13 @@ package com.mairwunnx.projectessentials.spawn.commands
33import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
44import com.mairwunnx.projectessentials.core.backlocation.BackLocationProvider
55import com.mairwunnx.projectessentials.core.extensions.isPlayerSender
6- import com.mairwunnx.projectessentials.core.extensions.sendMsg
7- import com.mairwunnx.projectessentials.core.helpers.ONLY_PLAYER_CAN
8- import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
6+ import com.mairwunnx.projectessentials.core.helpers.throwOnlyPlayerCan
7+ import com.mairwunnx.projectessentials.core.helpers.throwPermissionLevel
98import com.mairwunnx.projectessentials.spawn.EntryPoint
109import com.mairwunnx.projectessentials.spawn.EntryPoint.Companion.hasPermission
1110import com.mairwunnx.projectessentials.spawn.EntryPoint.Companion.modInstance
1211import com.mairwunnx.projectessentials.spawn.models.SpawnModelBase
12+ import com.mairwunnx.projectessentials.spawn.sendMessage
1313import com.mojang.brigadier.CommandDispatcher
1414import com.mojang.brigadier.builder.LiteralArgumentBuilder.literal
1515import com.mojang.brigadier.context.CommandContext
@@ -51,17 +51,13 @@ object SpawnCommand {
5151 if (hasPermission(c.source.asPlayer(), " ess.spawn" , 0 )) {
5252 moveToSpawn(c.source.asPlayer())
5353 logger.info(" Executed command \" ${c.input} \" from $playerName " )
54- sendMsg( " spawn " , c.source, " spawn. success" )
54+ sendMessage( c.source, " success" )
5555 } else {
56- sendMsg(" spawn" , c.source, " spawn.restricted" )
57- logger.info(
58- PERMISSION_LEVEL
59- .replace(" %0" , playerName)
60- .replace(" %1" , " spawn" )
61- )
56+ sendMessage(c.source, " restricted" )
57+ throwPermissionLevel(playerName, " spawn" )
6258 }
6359 } else {
64- logger.info( ONLY_PLAYER_CAN .replace( " %0 " , " spawn" ) )
60+ throwOnlyPlayerCan( " spawn" )
6561 }
6662 return 0
6763 }
@@ -85,12 +81,8 @@ object SpawnCommand {
8581 if (c.isPlayerSender()) {
8682 val playerName = c.source.asPlayer().name.string
8783 if (! hasPermission(c.source.asPlayer(), " ess.spawn.reload" )) {
88- sendMsg(" spawn" , c.source, " spawn.reload.restricted" )
89- logger.info(
90- PERMISSION_LEVEL
91- .replace(" %0" , playerName)
92- .replace(" %1" , " spawn reload" )
93- )
84+ sendMessage(c.source, " reload.restricted" )
85+ throwPermissionLevel(playerName, " spawn reload" )
9486 return 0
9587 }
9688 }
@@ -99,7 +91,7 @@ object SpawnCommand {
9991 if (c.isPlayerSender()) {
10092 val playerName = c.source.asPlayer().name.string
10193 logger.info(" Executed command \" ${c.input} \" from $playerName " )
102- sendMsg( " spawn " , c.source, " spawn. reload.success" )
94+ sendMessage( c.source, " reload.success" )
10395 } else {
10496 logger.info(" World spawn configuration reloaded." )
10597 }
@@ -110,20 +102,16 @@ object SpawnCommand {
110102 if (c.isPlayerSender()) {
111103 val playerName = c.source.asPlayer().name.string
112104 if (! hasPermission(c.source.asPlayer(), " ess.spawn.save" )) {
113- sendMsg(" spawn" , c.source, " spawn.save.restricted" )
114- logger.info(
115- PERMISSION_LEVEL
116- .replace(" %0" , playerName)
117- .replace(" %1" , " spawn save" )
118- )
105+ sendMessage(c.source, " save.restricted" )
106+ throwPermissionLevel(playerName, " spawn save" )
119107 return 0
120108 }
121109 }
122110 SpawnModelBase .saveData()
123111 if (c.isPlayerSender()) {
124112 val playerName = c.source.asPlayer().name.string
125113 logger.info(" Executed command \" ${c.input} \" from $playerName " )
126- sendMsg( " spawn " , c.source, " spawn. save.success" )
114+ sendMessage( c.source, " save.success" )
127115 } else {
128116 logger.info(" World spawn configuration saved." )
129117 }
@@ -134,21 +122,16 @@ object SpawnCommand {
134122 if (c.isPlayerSender()) {
135123 val playerName = c.source.asPlayer().name.string
136124 if (! hasPermission(c.source.asPlayer(), " ess.spawn.version" , 3 )) {
137- sendMsg(" spawn" , c.source, " spawn.version.restricted" )
138- logger.info(
139- PERMISSION_LEVEL
140- .replace(" %0" , playerName)
141- .replace(" %1" , " spawn version" )
142- )
125+ sendMessage(c.source, " version.restricted" )
126+ throwPermissionLevel(playerName, " spawn version" )
143127 return 0
144128 }
145129 }
146130 if (c.isPlayerSender()) {
147131 val playerName = c.source.asPlayer().name.string
148- sendMsg(
149- " spawn" ,
132+ sendMessage(
150133 c.source,
151- " spawn. version.success" ,
134+ " version.success" ,
152135 modInstance.modName,
153136 modInstance.modVersion,
154137 modInstance.modMaintainer,
0 commit comments