From 9d6ce9320358ee473869394f7abc6e2167e6a355 Mon Sep 17 00:00:00 2001
From: GliczDev <67753196+GliczDev@users.noreply.github.com>
Date: Mon, 29 Jul 2024 21:43:58 +0200
Subject: [PATCH] Bump MockSkript (Skript 2.9.0)

---
 MockSkript                                        |  2 +-
 .../skanalyzer/bridge/MockSkriptBridgeImpl.java   |  2 +-
 api/build.gradle.kts                              | 15 ++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/MockSkript b/MockSkript
index 2409974..c924c9f 160000
--- a/MockSkript
+++ b/MockSkript
@@ -1 +1 @@
-Subproject commit 24099747a3fe90b56a623866e7f1cd12c68b5575
+Subproject commit c924c9f3ade05aa4452f8b053948957aa66ae498
diff --git a/MockSkriptBridge/src/main/java/me/glicz/skanalyzer/bridge/MockSkriptBridgeImpl.java b/MockSkriptBridge/src/main/java/me/glicz/skanalyzer/bridge/MockSkriptBridgeImpl.java
index 9a15e0d..d41e9c0 100644
--- a/MockSkriptBridge/src/main/java/me/glicz/skanalyzer/bridge/MockSkriptBridgeImpl.java
+++ b/MockSkriptBridge/src/main/java/me/glicz/skanalyzer/bridge/MockSkriptBridgeImpl.java
@@ -179,7 +179,7 @@ private CommandData handleCommand(StructCommand command, ScriptCommand scriptCom
                 StringUtils.defaultIfEmpty(scriptCommand.permission, null),
                 StringUtils.defaultIfEmpty(scriptCommand.description, null),
                 scriptCommand.getPrefix(),
-                StringUtils.defaultIfEmpty(scriptCommand.usage, null),
+                StringUtils.defaultIfEmpty(scriptCommand.usage.getUsage(), null),
                 scriptCommand.getArguments().stream()
                         .map(argument -> argument.type.getCodeName())
                         .toList()
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index 998d028..eed2e4e 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -20,13 +20,14 @@ java {
 tasks {
     jar {
         listOf(project(":MockSkript"), project(":MockSkriptBridge")).forEach { addon ->
-            dependsOn(addon.tasks.clean)
-            val jarTask: DefaultTask =
-                addon.tasks.findByName("shadowJar") as DefaultTask? ?: addon.tasks.jar.get()
-            dependsOn(jarTask)
-            from(jarTask.outputs.files.singleFile) {
-                include("*.jar")
-                rename { "${addon.name}.jar.embedded" }
+            addon.tasks.apply {
+                dependsOn(clean)
+                dependsOn(jar)
+
+                from(jar.get().outputs.files.singleFile) {
+                    include("*.jar")
+                    rename { "${addon.name}.jar.embedded" }
+                }
             }
         }
     }