Bump MockSkript (Skript 2.9.0)

SkEditorTeam · Jul 29, 2024 · 9d6ce93 · 9d6ce93
1 parent 0c1c978
commit 9d6ce93
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/MockSkript b/MockSkript
diff --git 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
@@ -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" }
+                }
             }
         }
     }