Skip to content

Commit 0b431f4

Browse files
committed
Small code cleanup.
Signed-off-by: Pavel Erokhin (MairwunNx) <MairwunNx@gmail.com>
1 parent 274b585 commit 0b431f4

File tree

2 files changed

+14
-33
lines changed

2 files changed

+14
-33
lines changed

src/main/kotlin/com/mairwunnx/projectessentials/core/impl/commands/BackLocationCommand.kt

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
11
package com.mairwunnx.projectessentials.core.impl.commands
22

33
import com.mairwunnx.projectessentials.core.api.v1.MESSAGE_CORE_PREFIX
4-
import com.mairwunnx.projectessentials.core.api.v1.SETTING_LOC_ENABLED
54
import com.mairwunnx.projectessentials.core.api.v1.commands.Command
65
import com.mairwunnx.projectessentials.core.api.v1.commands.CommandBase
76
import com.mairwunnx.projectessentials.core.api.v1.commands.back.BackLocationAPI
8-
import com.mairwunnx.projectessentials.core.api.v1.configuration.ConfigurationAPI
97
import com.mairwunnx.projectessentials.core.api.v1.extensions.getPlayer
108
import com.mairwunnx.projectessentials.core.api.v1.extensions.isPlayerSender
11-
import com.mairwunnx.projectessentials.core.api.v1.extensions.sendMessage
9+
import com.mairwunnx.projectessentials.core.api.v1.messaging.MessagingAPI
1210
import com.mairwunnx.projectessentials.core.api.v1.messaging.ServerMessagingAPI
1311
import com.mairwunnx.projectessentials.core.api.v1.permissions.hasPermission
14-
import com.mairwunnx.projectessentials.core.impl.configurations.GeneralConfiguration
1512
import com.mojang.brigadier.builder.LiteralArgumentBuilder.literal
1613
import com.mojang.brigadier.context.CommandContext
1714
import net.minecraft.command.CommandSource
1815

1916
@Command("back")
2017
internal object BackLocationCommand : CommandBase(literal("back")) {
21-
private val generalConfiguration by lazy {
22-
ConfigurationAPI.getConfigurationByName<GeneralConfiguration>("general")
23-
}
24-
2518
init {
2619
data = getData(this.javaClass)
2720
}
@@ -45,24 +38,13 @@ internal object BackLocationCommand : CommandBase(literal("back")) {
4538
)
4639

4740
BackLocationAPI.revoke(player)
48-
49-
player.sendMessage(
50-
"$MESSAGE_CORE_PREFIX.back.success",
51-
generalConfiguration.getBoolOrDefault(SETTING_LOC_ENABLED, false)
52-
)
41+
MessagingAPI.sendMessage(player, "$MESSAGE_CORE_PREFIX.back.success")
5342
} else {
54-
player.sendMessage(
55-
"$MESSAGE_CORE_PREFIX.back.tickets_not_exists",
56-
generalConfiguration.getBoolOrDefault(SETTING_LOC_ENABLED, false)
57-
)
43+
MessagingAPI.sendMessage(player, "$MESSAGE_CORE_PREFIX.back.tickets_not_exists")
5844
}
59-
6045
super.process(context)
6146
} else {
62-
player.sendMessage(
63-
"$MESSAGE_CORE_PREFIX.back.restricted",
64-
generalConfiguration.getBoolOrDefault(SETTING_LOC_ENABLED, false)
65-
)
47+
MessagingAPI.sendMessage(player, "$MESSAGE_CORE_PREFIX.back.restricted")
6648
}
6749
} else {
6850
ServerMessagingAPI.throwOnlyPlayerCan()

src/main/kotlin/com/mairwunnx/projectessentials/core/impl/commands/ConfigureEssentialsCommand.kt

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.mairwunnx.projectessentials.core.impl.commands
22

33
import com.mairwunnx.projectessentials.core.api.v1.MESSAGE_CORE_PREFIX
4-
import com.mairwunnx.projectessentials.core.api.v1.SETTING_LOC_ENABLED
54
import com.mairwunnx.projectessentials.core.api.v1.commands.Command
65
import com.mairwunnx.projectessentials.core.api.v1.commands.CommandAPI
76
import com.mairwunnx.projectessentials.core.api.v1.commands.CommandBase
@@ -10,7 +9,7 @@ import com.mairwunnx.projectessentials.core.api.v1.configuration.ConfigurationAP
109
import com.mairwunnx.projectessentials.core.api.v1.extensions.getPlayer
1110
import com.mairwunnx.projectessentials.core.api.v1.extensions.isPlayerSender
1211
import com.mairwunnx.projectessentials.core.api.v1.extensions.playerName
13-
import com.mairwunnx.projectessentials.core.api.v1.extensions.sendMessage
12+
import com.mairwunnx.projectessentials.core.api.v1.messaging.MessagingAPI
1413
import com.mairwunnx.projectessentials.core.api.v1.messaging.ServerMessagingAPI
1514
import com.mairwunnx.projectessentials.core.api.v1.permissions.hasPermission
1615
import com.mairwunnx.projectessentials.core.impl.commands.ConfigureEssentialsCommandAPI.requiredServerRestart
@@ -90,28 +89,28 @@ internal object ConfigureEssentialsCommand : CommandBase(
9089
LogManager.getLogger().info(
9190
"Setting name `$setting` value changed by ${context.playerName()} from `$oldValue` to $value, but restart required for applying changes."
9291
)
93-
context.getPlayer()!!.sendMessage(
92+
MessagingAPI.sendMessage(
93+
context.getPlayer()!!,
9494
"$MESSAGE_CORE_PREFIX.configure.successfully_required_restart",
95-
generalConfiguration.getBoolOrDefault(SETTING_LOC_ENABLED, false),
96-
setting, oldValue, value
95+
args = *arrayOf(setting, oldValue, value)
9796
)
9897
} else {
9998
LogManager.getLogger().info(
10099
"Setting name `$setting` value changed by ${context.playerName()} from `$oldValue` to $value"
101100
)
102-
context.getPlayer()!!.sendMessage(
101+
MessagingAPI.sendMessage(
102+
context.getPlayer()!!,
103103
"$MESSAGE_CORE_PREFIX.configure.successfully",
104-
generalConfiguration.getBoolOrDefault(SETTING_LOC_ENABLED, false),
105-
setting, oldValue, value
104+
args = *arrayOf(setting, oldValue, value)
106105
)
107106
}
108107
generalConfiguration.put(setting, value)
109108
super.process(context)
110109
} else {
111-
context.getPlayer()!!.sendMessage(
110+
MessagingAPI.sendMessage(
111+
context.getPlayer()!!,
112112
"$MESSAGE_CORE_PREFIX.configure.restricted",
113-
generalConfiguration.getBoolOrDefault(SETTING_LOC_ENABLED, false),
114-
setting
113+
args = *arrayOf(setting)
115114
)
116115
}
117116
} else {

0 commit comments

Comments
 (0)