Skip to content

Commit d4f863d

Browse files
committed
CooldownCommand.kt cleanup. Now usings new messaging API.
Signed-off-by: Pavel Erokhin (MairwunNx) <[email protected]>
1 parent 624f3c9 commit d4f863d

File tree

1 file changed

+11
-24
lines changed

1 file changed

+11
-24
lines changed

src/main/kotlin/com/mairwunnx/projectessentials/cooldown/commands/CooldownCommand.kt

+11-24
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package com.mairwunnx.projectessentials.cooldown.commands
33
import com.mairwunnx.projectessentials.cooldown.CooldownConfig
44
import com.mairwunnx.projectessentials.cooldown.EntryPoint
55
import com.mairwunnx.projectessentials.cooldown.EntryPoint.Companion.hasPermission
6+
import com.mairwunnx.projectessentials.cooldown.sendMessage
67
import com.mairwunnx.projectessentials.core.extensions.isPlayerSender
7-
import com.mairwunnx.projectessentials.core.extensions.sendMsg
8-
import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
8+
import com.mairwunnx.projectessentials.core.helpers.throwPermissionLevel
99
import com.mojang.brigadier.CommandDispatcher
1010
import com.mojang.brigadier.builder.LiteralArgumentBuilder.literal
1111
import com.mojang.brigadier.context.CommandContext
@@ -56,8 +56,7 @@ object CooldownCommand {
5656
logger.info("Telegram chat: ${EntryPoint.modInstance.modTelegram}")
5757
logger.info("CurseForge: ${EntryPoint.modInstance.modCurseForge}")
5858
} else {
59-
sendMsg(
60-
"cooldown",
59+
sendMessage(
6160
commandSender,
6261
"version.success",
6362
EntryPoint.modInstance.modName,
@@ -72,12 +71,8 @@ object CooldownCommand {
7271
}
7372
return 0
7473
} else {
75-
logger.warn(
76-
PERMISSION_LEVEL
77-
.replace("%0", commandSenderPlayer!!.name.string)
78-
.replace("%1", "/cooldown")
79-
)
80-
sendMsg("cooldown", commandSender, "version.restricted")
74+
throwPermissionLevel(commandSenderPlayer!!.name.string, "cooldown")
75+
sendMessage(commandSender, "version.restricted")
8176
return 0
8277
}
8378
}
@@ -99,16 +94,12 @@ object CooldownCommand {
9994
if (isServerSender) {
10095
logger.info("Successfully reloaded Cooldown configuration")
10196
} else {
102-
sendMsg("cooldown", commandSender, "reload.success")
97+
sendMessage(commandSender, "reload.success")
10398
}
10499
return 0
105100
} else {
106-
logger.warn(
107-
PERMISSION_LEVEL
108-
.replace("%0", commandSenderPlayer!!.name.string)
109-
.replace("%1", "/cooldown reload")
110-
)
111-
sendMsg("cooldown", commandSender, "reload.restricted")
101+
throwPermissionLevel(commandSenderPlayer!!.name.string, "cooldown reload")
102+
sendMessage(commandSender, "reload.restricted")
112103
return 0
113104
}
114105
}
@@ -130,16 +121,12 @@ object CooldownCommand {
130121
if (isServerSender) {
131122
logger.info("Successfully saved Cooldown configuration")
132123
} else {
133-
sendMsg("cooldown", commandSender, "save.success")
124+
sendMessage(commandSender, "save.success")
134125
}
135126
return 0
136127
} else {
137-
logger.warn(
138-
PERMISSION_LEVEL
139-
.replace("%0", commandSenderPlayer!!.name.string)
140-
.replace("%1", "/cooldown save")
141-
)
142-
sendMsg("cooldown", commandSender, "save.restricted")
128+
throwPermissionLevel(commandSenderPlayer!!.name.string, "cooldown save")
129+
sendMessage(commandSender, "save.restricted")
143130
return 0
144131
}
145132
}

0 commit comments

Comments
 (0)