Skip to content

Commit 72216f5

Browse files
committed
Compatibility with new messaging added.
Signed-off-by: Pavel Erokhin (MairwunNx) <MairwunNx@gmail.com>
1 parent 497afc7 commit 72216f5

1 file changed

Lines changed: 9 additions & 13 deletions

File tree

  • src/main/kotlin/com/mairwunnx/projectessentials/warps/commands

src/main/kotlin/com/mairwunnx/projectessentials/warps/commands/WarpCommand.kt

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package com.mairwunnx.projectessentials.warps.commands
22

33
import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
44
import com.mairwunnx.projectessentials.core.extensions.isPlayerSender
5-
import com.mairwunnx.projectessentials.core.extensions.sendMsg
6-
import com.mairwunnx.projectessentials.core.helpers.ONLY_PLAYER_CAN
7-
import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
5+
import com.mairwunnx.projectessentials.core.helpers.throwOnlyPlayerCan
6+
import com.mairwunnx.projectessentials.core.helpers.throwPermissionLevel
87
import com.mairwunnx.projectessentials.warps.EntryPoint
98
import com.mairwunnx.projectessentials.warps.EntryPoint.Companion.hasPermission
109
import com.mairwunnx.projectessentials.warps.models.WarpModel
1110
import com.mairwunnx.projectessentials.warps.models.WarpModelUtils
11+
import com.mairwunnx.projectessentials.warps.sendMessage
1212
import com.mojang.brigadier.CommandDispatcher
1313
import com.mojang.brigadier.arguments.StringArgumentType
1414
import com.mojang.brigadier.builder.LiteralArgumentBuilder.literal
@@ -68,17 +68,13 @@ object WarpCommand {
6868
logger.info("Executed command \"/warp\" from ${player.name.string}")
6969
return 0
7070
}
71-
sendMsg("warps", c.source, "warp.not_found", warpName)
71+
sendMessage(c.source, "not_found", warpName)
7272
} else {
73-
sendMsg("warps", c.source, "warp.restricted")
74-
logger.info(
75-
PERMISSION_LEVEL
76-
.replace("%0", player.name.string)
77-
.replace("%1", "warp")
78-
)
73+
sendMessage(c.source, "restricted")
74+
throwPermissionLevel(player.name.string, "warp")
7975
}
8076
} else {
81-
logger.info(ONLY_PLAYER_CAN.replace("%0", "warp"))
77+
throwOnlyPlayerCan("warp")
8278
}
8379
return 0
8480
}
@@ -96,9 +92,9 @@ object WarpCommand {
9692
)
9793
if (player.world.worldInfo.worldName == clientWorld) {
9894
player.teleport(targetWorld, xPos, yPos, zPos, yaw, pitch)
99-
sendMsg("warps", player.commandSource, "warp.success", warp.name)
95+
sendMessage(player.commandSource, "success", warp.name)
10096
} else {
101-
sendMsg("warps", player.commandSource, "warp.not_found", warp.name)
97+
sendMessage(player.commandSource, "not_found", warp.name)
10298
logger.info("Player ${player.name.string} try teleport to not exist warp ${warp.name}")
10399
}
104100
val effectEnabled = WarpModelUtils.warpModel.addResistanceEffect

0 commit comments

Comments
 (0)