build: bump hylib to 2.0.0

xhyrom-archive · May 28, 2023 · cf9fb3f · cf9fb3f
1 parent 95c4db3
commit cf9fb3f
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 12 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/modules/HyX.main.iml b/.idea/modules/HyX.main.iml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "me.xhyrom.hyx"
-version = "1.1.0"
+version = "2.0.0"
 description = "A powerful and lightweight plugin"
 
 repositories {
@@ -24,11 +24,11 @@ repositories {
 
 dependencies {
     compileOnly("io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT")
-    compileOnly("me.xhyrom.hylib:hylib-bukkit:1.2.3")
+    compileOnly("me.xhyrom.hylib:hylib-bukkit:2.0.0")
     compileOnly("com.github.MilkBowl:VaultAPI:1.7")
 
-    compileOnly("dev.jorel:commandapi-annotations:8.8.0")
-    annotationProcessor("dev.jorel:commandapi-annotations:8.8.0")
+    compileOnly("dev.jorel:commandapi-annotations:9.0.1")
+    annotationProcessor("dev.jorel:commandapi-annotations:9.0.1")
 }
 
 tasks.processResources {

diff --git a/src/main/kotlin/me/xhyrom/hyx/HyX.kt b/src/main/kotlin/me/xhyrom/hyx/HyX.kt
@@ -8,6 +8,7 @@ import me.xhyrom.hylib.common.api.structs.Language
 import me.xhyrom.hylib.libs.commandapi.CommandAPI
 import me.xhyrom.hylib.libs.commandapi.arguments.ArgumentSuggestions
 import me.xhyrom.hylib.libs.commandapi.arguments.StringArgument
+import me.xhyrom.hylib.libs.commandapi.executors.CommandArguments
 import me.xhyrom.hylib.libs.commandapi.executors.CommandExecutor
 import me.xhyrom.hyx.commands.gamemodes.*
 import me.xhyrom.hyx.commands.virtual.*
@@ -132,9 +133,9 @@ class HyX : JavaPlugin() {
                                     )
                                 )
                                 .executes(
-                                    CommandExecutor { sender: CommandSender, args: Array<Any?> ->
+                                    CommandExecutor { sender: CommandSender, args: CommandArguments ->
                                         run {
-                                            when (args[0]) {
+                                            when (args.get("type") as String) {
                                                 "addAllOnline" -> {
                                                     server.onlinePlayers.forEach { player ->
                                                         player.isWhitelisted = true
@@ -176,9 +177,9 @@ class HyX : JavaPlugin() {
                             )
                         )
                         .executes(
-                            CommandExecutor { sender: CommandSender, args: Array<Any?> ->
+                            CommandExecutor { sender: CommandSender, args: CommandArguments ->
                                 run {
-                                    when (args[0] as String) {
+                                    when (args.get("type") as String) {
                                         "config" -> {
                                             if (!xConfig().reload()) {
                                                 sender.sendMessage(

diff --git a/src/main/kotlin/me/xhyrom/hyx/commands/Repair.kt b/src/main/kotlin/me/xhyrom/hyx/commands/Repair.kt
@@ -1,5 +1,6 @@
 package me.xhyrom.hyx.commands
 
+import me.xhyrom.hylib.libs.commandapi.executors.CommandArguments
 import me.xhyrom.hylib.libs.commandapi.executors.PlayerCommandExecutor
 import me.xhyrom.hyx.HyX.Companion.getInstanceUnsafe
 import me.xhyrom.hyx.structs.Command
@@ -16,7 +17,7 @@ class Repair : Command("repair") {
             })
     }
 
-    private fun onDefault(player: Player, args: Array<Any>) {
+    private fun onDefault(player: Player, args: CommandArguments) {
         val item = player.inventory.itemInMainHand
         val meta = item.itemMeta
         (meta as Damageable).damage = 0