From ae4bdbe88fedc05c7c63c0819a8240e9cd02d5a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?MC=7E=E8=9B=9F=E9=BE=99?= <1610105206@qq.com>
Date: Fri, 30 Jun 2023 20:03:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildSrc/src/main/kotlin/CompiledOutputer.kt | 5 +++--
 settings.gradle.kts                          | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/CompiledOutputer.kt b/buildSrc/src/main/kotlin/CompiledOutputer.kt
index d2ab860d..d6a8de73 100644
--- a/buildSrc/src/main/kotlin/CompiledOutputer.kt
+++ b/buildSrc/src/main/kotlin/CompiledOutputer.kt
@@ -11,9 +11,10 @@ fun Project.output() {
         rootProject
             .childProjects["plugin"]!!.childProjects.values
             .forEach {
-                val target = "$rootName-${it.name.split('-')[1].capitalized()}.jar"
+                val platformStr =
+                    if (it.name.equals("all")) "" else "-${it.name.split('-')[1].capitalized()}"
                 it.outCopy(
-                    File(outDir, target)
+                    File(outDir, "$rootName$platformStr-${it.version}.jar")
                 )
             }
     }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 61089a52..2579fe9b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,14 +1,15 @@
 rootProject.name = "FDUtilities"
 
-//Bukkit实现
-include("plugin:platform-bukkit")
-include("plugin:all")
-
 //所有字项目的加载(懒得自己一个一个打)
 File("${rootDir}\\project").listFiles()?.filter { it.isDirectory }?.forEach {
     include("project:${it.name}")
 }
 
+//Bukkit实现
+include("plugin:platform-bukkit")
+//全部聚合版
+include("plugin:all")
+
 
 //包含所有模块 TODO 应该重命名为脚本系统(FScript-抽象)
 //File("${rootDir}\\module").listFiles()?.filter { it.isDirectory }?.forEach {