GameModeCommand.kt generic permission added.

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

Author: MairwunNx

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

@@ -31,7 +31,16 @@ internal object GameModeCommand : VanillaCommandBase("gamemode") {
         val literal = Commands.literal(name)
         GameType.values().forEach { type ->
             if (type != GameType.NOT_SET) {
-                literal.then(
+                literal.requires {
+                    isAllowedAny(it) {
+                        listOf(
+                            "native.gamemode.survival" to 2,
+                            "native.gamemode.creative" to 2,
+                            "native.gamemode.adventure" to 2,
+                            "native.gamemode.spectator" to 2
+                        )
+                    }
+                }.then(
                     Commands.literal(type.getName()).requires {
                         isAllowed(it, "gamemode.${type.getName()}", 2)
                     }.executes {

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

@@ -32,67 +32,65 @@ internal object TimeCommand : VanillaCommandBase("time") {
         aliases()
 
         dispatcher.register(
-            literal("time").then(
-                literal("set").then(
-                    literal("day").requires { permission(it, "set") }.executes {
+            literal("time").requires {
+                isAllowedAny(it) {
+                    listOf("time.change.set" to 2, "time.change.add" to 2, "time.query" to 2)
+                }
+            }.then(
+                literal("set").requires { permission(it, "set") }.then(
+                    literal("day").executes {
                         TimeCommand.setTime(it.source, 1000)
                     }
                 ).then(
-                    literal("noon").requires { permission(it, "set") }.executes {
+                    literal("noon").executes {
                         TimeCommand.setTime(it.source, 6000)
                     }
                 ).then(
-                    literal("sunset").requires { permission(it, "set") }.executes {
+                    literal("sunset").executes {
                         TimeCommand.setTime(it.source, 12000)
                     }
                 ).then(
-                    literal("night").requires { permission(it, "set") }.executes {
+                    literal("night").executes {
                         TimeCommand.setTime(it.source, 13000)
                     }
                 ).then(
-                    literal("midnight").requires { permission(it, "set") }.executes {
+                    literal("midnight").executes {
                         TimeCommand.setTime(it.source, 18000)
                     }
                 ).then(
-                    literal("sunrise").requires { permission(it, "set") }.executes {
+                    literal("sunrise").executes {
                         TimeCommand.setTime(it.source, 23000)
                     }
                 ).then(
                     Commands.argument(
                         "time", TimeArgument.func_218091_a()
-                    ).requires { permission(it, "set") }.executes {
+                    ).executes {
                         TimeCommand.setTime(it.source, IntegerArgumentType.getInteger(it, "time"))
                     }
                 )
             ).then(
-                literal("add").then(
+                literal("add").requires { permission(it, "add") }.then(
                     Commands.argument(
                         "time", TimeArgument.func_218091_a()
-                    ).requires { permission(it, "add") }.executes {
+                    ).executes {
                         TimeCommand.addTime(it.source, IntegerArgumentType.getInteger(it, "time"))
                     }
                 )
             ).then(
-                literal("query").then(
-                    literal("daytime").requires {
-                        permission(it, "query")
-                    }.executes {
+                literal("query").requires { permission(it, "query") }.then(
+                    literal("daytime").executes {
                         TimeCommand.sendQueryResults(
                             it.source, TimeCommand.getDayTime(it.source.world)
                         )
                     }
                 ).then(
-                    literal("gametime").requires {
-                        permission(it, "query")
-                    }.executes {
+                    literal("gametime").executes {
                         TimeCommand.sendQueryResults(
                             it.source, (it.source.world.gameTime % 2147483647L).toInt()
                         )
                     }
                 ).then(
-                    literal("day").requires {
-                        permission(it, "query")
-                    }.executes {
+                    literal("day").executes {
                         TimeCommand.sendQueryResults(
                             it.source, (it.source.world.dayTime / 24000L % 2147483647L).toInt()
                         )

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

@@ -19,5 +19,13 @@ abstract class VanillaCommandBase(val name: String) {
             if (source.entity is ServerPlayerEntity) {
                 hasPermission(source.asPlayer(), "native.$node", opLevel)
             } else true
+
+        @JvmStatic
+        fun isAllowedAny(source: CommandSource, notation: () -> List<Pair<String, Int>>) =
+            if (source.entity is ServerPlayerEntity) {
+                notation().forEach {
+                    if (hasPermission(source.asPlayer(), it.first, it.second)) return true
+                }.let { false }
+            } else true
     }
 }

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

@@ -28,7 +28,11 @@ internal object WeatherCommand : VanillaCommandBase("weather") {
         super.register(dispatcher)
         short("sun").also { short("rain") }.also { short("thunder") }.also { aliases() }
         dispatcher.register(
-            Commands.literal(name).then(
+            Commands.literal(name).requires {
+                isAllowedAny(it) {
+                    listOf("weather.sun" to 2, "weather.rain" to 2, "weather.thunder" to 2)
+                }
+            }.then(
                 Commands.literal("clear").requires {
                     isAllowed(it, "weather.sun", 2)
                 }.executes {