TimeCommand.kt re-written.

Signed-off-by: Pavel Erokhin (MairwunNx) <MairwunNx@gmail.com>

Author: MairwunNx

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

@@ -1,5 +1,5 @@
 /**
- * ! This command implementation by Mojang Game Studios!
+ * ! This command implementation by Mojang Studios!
  *
  * Decompiled with idea source code was converted to kotlin code.
  * But with additions such as permissions checking and etc.
@@ -9,24 +9,16 @@
  */
 package com.mairwunnx.projectessentials.core.impl.vanilla.commands
 
-import com.mairwunnx.projectessentials.core.api.v1.SETTING_LOC_ENABLED
 import com.mairwunnx.projectessentials.core.api.v1.commands.CommandAPI.getDispatcher
 import com.mairwunnx.projectessentials.core.api.v1.commands.CommandAliases
-import com.mairwunnx.projectessentials.core.api.v1.extensions.hoverEventFrom
-import com.mairwunnx.projectessentials.core.api.v1.extensions.textComponentFrom
-import com.mairwunnx.projectessentials.core.api.v1.permissions.hasPermission
-import com.mairwunnx.projectessentials.core.impl.generalConfiguration
 import com.mairwunnx.projectessentials.core.impl.nativeMappingsConfiguration
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.arguments.IntegerArgumentType
-import net.minecraft.command.CommandException
 import net.minecraft.command.CommandSource
 import net.minecraft.command.Commands
 import net.minecraft.command.Commands.literal
 import net.minecraft.command.arguments.TimeArgument
 import net.minecraft.command.impl.TimeCommand
-import net.minecraft.entity.player.ServerPlayerEntity
-import net.minecraft.util.text.Style
 
 internal object TimeCommand : VanillaCommandBase("time") {
     override fun register(dispatcher: CommandDispatcher<CommandSource>) {
@@ -42,53 +34,65 @@ internal object TimeCommand : VanillaCommandBase("time") {
         dispatcher.register(
             literal("time").then(
                 literal("set").then(
-                    literal("day").executes { TimeCommand.setTime(it.source, 1000) }
+                    literal("day").requires { permission(it, "set") }.executes {
+                        TimeCommand.setTime(it.source, 1000)
+                    }
                 ).then(
-                    literal("noon").executes { TimeCommand.setTime(it.source, 6000) }
+                    literal("noon").requires { permission(it, "set") }.executes {
+                        TimeCommand.setTime(it.source, 6000)
+                    }
                 ).then(
-                    literal("sunset").executes { TimeCommand.setTime(it.source, 12000) }
+                    literal("sunset").requires { permission(it, "set") }.executes {
+                        TimeCommand.setTime(it.source, 12000)
+                    }
                 ).then(
-                    literal("night").executes { TimeCommand.setTime(it.source, 13000) }
+                    literal("night").requires { permission(it, "set") }.executes {
+                        TimeCommand.setTime(it.source, 13000)
+                    }
                 ).then(
-                    literal("midnight").executes { TimeCommand.setTime(it.source, 18000) }
+                    literal("midnight").requires { permission(it, "set") }.executes {
+                        TimeCommand.setTime(it.source, 18000)
+                    }
                 ).then(
-                    literal("sunrise").executes { TimeCommand.setTime(it.source, 23000) }
+                    literal("sunrise").requires { permission(it, "set") }.executes {
+                        TimeCommand.setTime(it.source, 23000)
+                    }
                 ).then(
                     Commands.argument(
                         "time", TimeArgument.func_218091_a()
-                    ).executes {
-                        permission(it.source, "set")
+                    ).requires { permission(it, "set") }.executes {
                         TimeCommand.setTime(it.source, IntegerArgumentType.getInteger(it, "time"))
                     }
                 )
             ).then(
                 literal("add").then(
                     Commands.argument(
                         "time", TimeArgument.func_218091_a()
-                    ).executes {
-                        permission(it.source, "add")
+                    ).requires { permission(it, "add") }.executes {
                         TimeCommand.addTime(it.source, IntegerArgumentType.getInteger(it, "time"))
                     }
                 )
             ).then(
                 literal("query").then(
-                    literal("daytime").executes {
-                        permission(it.source, "query")
+                    literal("daytime").requires {
+                        permission(it, "query")
+                    }.executes {
                         TimeCommand.sendQueryResults(
-                            it.source,
-                            TimeCommand.getDayTime(it.source.world)
+                            it.source, TimeCommand.getDayTime(it.source.world)
                         )
                     }
                 ).then(
-                    literal("gametime").executes {
-                        permission(it.source, "query")
+                    literal("gametime").requires {
+                        permission(it, "query")
+                    }.executes {
                         TimeCommand.sendQueryResults(
                             it.source, (it.source.world.gameTime % 2147483647L).toInt()
                         )
                     }
                 ).then(
-                    literal("day").executes {
-                        permission(it.source, "query")
+                    literal("day").requires {
+                        permission(it, "query")
+                    }.executes {
                         TimeCommand.sendQueryResults(
                             it.source, (it.source.world.dayTime / 24000L % 2147483647L).toInt()
                         )
@@ -98,35 +102,17 @@ internal object TimeCommand : VanillaCommandBase("time") {
         )
     }
 
-    private fun permission(source: CommandSource, type: String) {
-        val node =
-            if (type == "add" || type == "set") "native.time.change.$type" else "native.time.query"
-        if (source.entity is ServerPlayerEntity && !hasPermission(source.asPlayer(), node, 2)) {
-            throw CommandException(
-                textComponentFrom(
-                    source.asPlayer(),
-                    generalConfiguration.getBool(SETTING_LOC_ENABLED),
-                    "native.command.restricted"
-                ).setStyle(
-                    Style().setHoverEvent(
-                        hoverEventFrom(
-                            source.asPlayer(),
-                            generalConfiguration.getBool(SETTING_LOC_ENABLED),
-                            "native.command.restricted_hover",
-                            node, "2"
-                        )
-                    )
-                )
-            )
-        }
+    private fun permission(source: CommandSource, type: String): Boolean {
+        val node = if (type == "add" || type == "set") {
+            "time.change.$type"
+        } else "time.query"
+        return isAllowed(source, node, 2)
     }
 
     fun short(name: String, time: Int) {
         aliasesOf(name).forEach { command ->
             getDispatcher().register(literal(command).requires {
-                if (it.entity is ServerPlayerEntity) {
-                    hasPermission(it.entity as ServerPlayerEntity, "native.time.change.set", 2)
-                } else true
+                permission(it, "set")
             }.executes { TimeCommand.setTime(it.source, time) })
         }
     }