Skip to content

Commit eabcb77

Browse files
committed
Suppress("DuplicatedCode") annotation for SetHomeCommand class removed.
Compatibility with core 1.1.0.0 and permissions 1.1.0.0 added. Signed-off-by: Pavel Erokhin (MairwunNx) <MairwunNx@gmail.com>
1 parent c5a0f92 commit eabcb77

File tree

1 file changed

+13
-19
lines changed
  • src/main/kotlin/com/mairwunnx/projectessentials/projectessentialshome/commands

1 file changed

+13
-19
lines changed

src/main/kotlin/com/mairwunnx/projectessentials/projectessentialshome/commands/SetHomeCommand.kt

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package com.mairwunnx.projectessentials.projectessentialshome.commands
22

3+
import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
4+
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
8+
import com.mairwunnx.projectessentials.projectessentialshome.EntryPoint
9+
import com.mairwunnx.projectessentials.projectessentialshome.EntryPoint.Companion.hasPermission
310
import com.mairwunnx.projectessentials.projectessentialshome.models.HomeModel
411
import com.mairwunnx.projectessentials.projectessentialshome.storage.StorageBase
5-
import com.mairwunnx.projectessentialscooldown.essentials.CommandsAliases
6-
import com.mairwunnx.projectessentialscore.extensions.isPlayerSender
7-
import com.mairwunnx.projectessentialscore.extensions.sendMsg
8-
import com.mairwunnx.projectessentialscore.helpers.ONLY_PLAYER_CAN
9-
import com.mairwunnx.projectessentialscore.helpers.PERMISSION_LEVEL
10-
import com.mairwunnx.projectessentialspermissions.permissions.PermissionsAPI
1112
import com.mojang.brigadier.CommandDispatcher
1213
import com.mojang.brigadier.arguments.StringArgumentType
1314
import com.mojang.brigadier.builder.LiteralArgumentBuilder.literal
@@ -16,13 +17,14 @@ import net.minecraft.command.CommandSource
1617
import net.minecraft.command.Commands
1718
import org.apache.logging.log4j.LogManager
1819

19-
@Suppress("DuplicatedCode")
2020
object SetHomeCommand {
2121
private val aliases = arrayOf("sethome", "esethome")
2222
private val logger = LogManager.getLogger()
2323

2424
fun register(dispatcher: CommandDispatcher<CommandSource>) {
25-
logger.info(" - register \"/sethome\" command ...")
25+
logger.info("Register \"/sethome\" command")
26+
applyCommandAliases()
27+
2628
aliases.forEach { command ->
2729
dispatcher.register(
2830
literal<CommandSource>(command).executes {
@@ -36,25 +38,17 @@ object SetHomeCommand {
3638
)
3739
)
3840
}
39-
applyCommandAliases()
4041
}
4142

4243
private fun applyCommandAliases() {
43-
try {
44-
Class.forName(
45-
"com.mairwunnx.projectessentialscooldown.essentials.CommandsAliases"
46-
)
47-
CommandsAliases.aliases["sethome"] = aliases.toMutableList()
48-
logger.info(" - applying aliases: $aliases")
49-
} catch (_: ClassNotFoundException) {
50-
// ignored
51-
}
44+
if (!EntryPoint.cooldownsInstalled) return
45+
CommandsAliases.aliases["sethome"] = aliases.toMutableList()
5246
}
5347

5448
private fun execute(c: CommandContext<CommandSource>): Int {
5549
if (c.isPlayerSender()) {
5650
val player = c.source.asPlayer()
57-
if (PermissionsAPI.hasPermission(player.name.string, "ess.home.set")) {
51+
if (hasPermission(player, "ess.home.set")) {
5852
val playerUUID = player.uniqueID.toString()
5953
val homeName: String = try {
6054
StringArgumentType.getString(c, "home name")

0 commit comments

Comments
 (0)