diff --git a/build.gradle.kts b/build.gradle.kts index 5415671e..3f828a1d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,6 +17,7 @@ subprojects { dependencies { compileOnly(kotlin("stdlib")) + //项目一般依赖 if (parent?.name == "project") { compileCore(11903) compileTabooLib() @@ -24,7 +25,12 @@ subprojects { adventure() } - //Runtimeʵֵģ + //模块一般依赖——所有 + if (parent?.name == "script") { + compileAll() + } + + //Runtime实现的模块依赖 if (name.contains("runtime")) parent!!.childProjects.forEach { if (it.value.name.contains("module")) @@ -46,8 +52,8 @@ subprojects { } tasks { - withType { options.encoding = "UTF-8" } - //һ + withType { options.encoding = "UTF-8" } //UTF-8 编码 + //一般配置 withType { // Options archiveAppendix.set("") @@ -57,7 +63,7 @@ subprojects { // Exclude exclude("META-INF/**") exclude("com/**", "org/**") - // Adventure (Ҫ,ΪǶ̬) + // Adventure (不需要,因为是动态加载) //relocate("net.kyori", "$rootGroup.common.adventure") // Taboolib relocate("taboolib", "$rootGroup.taboolib") @@ -73,4 +79,5 @@ subprojects { buildDirClean() +//工件输出 output() \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index a84e8bff..b22ed732 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -4,6 +4,4 @@ plugins { repositories { mavenCentral() -} - -gradle.buildFinished { buildDir.deleteRecursively() } \ No newline at end of file +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index b874dde9..a6a80e9d 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,4 +1,3 @@ - import org.gradle.api.Project import org.gradle.api.artifacts.dsl.DependencyHandler import org.gradle.api.artifacts.dsl.RepositoryHandler @@ -14,10 +13,12 @@ fun PluginAware.applyPlugins() { } fun Project.buildDirClean() { - @Suppress("DEPRECATION") - gradle.buildFinished { buildDir.deleteRecursively() } + @Suppress("DEPRECATION") gradle.buildFinished { buildDir.deleteRecursively() } } +/** + * 项目通用储存库 + */ fun RepositoryHandler.projectRepositories() { maven(repoTabooProject) { isAllowInsecureProtocol = true @@ -25,10 +26,17 @@ fun RepositoryHandler.projectRepositories() { mavenCentral() } +/** + * NMS依赖 + */ fun DependencyHandler.compileNMS() { add("compileOnly", "ink.ptms:nms-all:1.0.0") } +/** + * 核心依赖 + * @param version 核心版本号 + */ fun DependencyHandler.compileCore( version: Int, minimize: Boolean = true, @@ -40,17 +48,24 @@ fun DependencyHandler.compileCore( add("compileOnly", notation) } - +/** + * Adventure依赖 + */ fun DependencyHandler.adventure() { - adventureModules.forEach { - add("compileOnly", it) - } + adventureModules.forEach { add("compileOnly", it) } } +/** + * Taboolib通用依赖 + */ fun DependencyHandler.compileTabooLib() { taboolibModules.forEach { installTaboo(it) } } +/** + * 依赖项目——仅编译时 + * @param name 项目名称 + */ fun DependencyHandler.compileModule(name: String) { add("compileOnly", project(":project:$name")) } @@ -59,10 +74,25 @@ fun DependencyHandler.installModule(name: String) { add("implementation", project(":project:$name")) } +/** + * 依赖所有项目——仅编译时 + */ +fun DependencyHandler.compileAll() { + project(":project").dependencyProject.childProjects.forEach { add("compileOnly", it.value) } +} + +/** + * 依赖Taboolib模块——仅编译时 + * @param module Taboolib模块名称 + * @param version Taboolib模块版本,默认为Taboolib班恩 + */ fun DependencyHandler.installTaboo(vararg module: String, version: String = taboolibVersion) = module.forEach { add("compileOnly", "io.izzel.taboolib:$it:$version") } +/** + * 依赖Taboolib模块 + */ fun DependencyHandler.shadowTaboo(vararg module: String, version: String = taboolibVersion) = module.forEach { add("implementation", "io.izzel.taboolib:$it:$version") } \ No newline at end of file diff --git a/project/module-common/src/main/kotlin/cn/fd/utilities/common/loader/WorkSpaceLoader.kt b/project/module-common/src/main/kotlin/cn/fd/utilities/common/loader/WorkSpaceLoader.kt index 8beccc70..a35b025e 100644 --- a/project/module-common/src/main/kotlin/cn/fd/utilities/common/loader/WorkSpaceLoader.kt +++ b/project/module-common/src/main/kotlin/cn/fd/utilities/common/loader/WorkSpaceLoader.kt @@ -6,8 +6,8 @@ import java.io.File object WorkSpaceLoader { /** - * ȡռ - * @param paths ռ·ַ + * 获取工作空间 + * @param paths 工作空间路径的字符串表现 */ fun getWorkSpaces(paths: Iterable): List { return paths.map { WorkSpace(File(it)) } diff --git a/project/module-common/src/main/resources/lang/en_US.yml b/project/module-common/src/main/resources/lang/en_US.yml index b2533690..5ef44387 100644 --- a/project/module-common/src/main/resources/lang/en_US.yml +++ b/project/module-common/src/main/resources/lang/en_US.yml @@ -1,5 +1,5 @@ # Language file - Translated by Youdao Translator -# Last updated: 2023/6/18 ͣ +# Last updated: 2023/6/18 暂停更新 # Due to force majeure,Bukkit and Bungee have the same configuration file diff --git a/project/module-core/src/main/kotlin/cn/fd/utilities/core/api/WorkSpace.kt b/project/module-core/src/main/kotlin/cn/fd/utilities/core/api/WorkSpace.kt index 09129f01..b3bf86c8 100644 --- a/project/module-core/src/main/kotlin/cn/fd/utilities/core/api/WorkSpace.kt +++ b/project/module-core/src/main/kotlin/cn/fd/utilities/core/api/WorkSpace.kt @@ -5,13 +5,13 @@ import java.io.File class WorkSpace( /** - * ռ· + * 工作空间路径 */ val path: File ) { /** - * ȡռеļ + * 获取工作空间中的文件 */ fun getFiles(): Iterator { return path.listFilesDeep() diff --git a/project/module-core/src/main/kotlin/cn/fd/utilities/util/FileUtils.kt b/project/module-core/src/main/kotlin/cn/fd/utilities/util/FileUtils.kt index 09f854ed..1f7e466a 100644 --- a/project/module-core/src/main/kotlin/cn/fd/utilities/util/FileUtils.kt +++ b/project/module-core/src/main/kotlin/cn/fd/utilities/util/FileUtils.kt @@ -3,7 +3,7 @@ package cn.fd.utilities.util import java.io.File /** - * ļȡ + * 深度文件获取 */ fun File.listFilesDeep(): Iterator { return this.walk().filter { it.isFile }.iterator() diff --git a/project/module-script/src/main/kotlin/cn/fd/utilities/script/ScriptF.kt b/project/module-script/src/main/kotlin/cn/fd/utilities/script/ScriptF.kt index 401baf0e..c2c1befc 100644 --- a/project/module-script/src/main/kotlin/cn/fd/utilities/script/ScriptF.kt +++ b/project/module-script/src/main/kotlin/cn/fd/utilities/script/ScriptF.kt @@ -3,22 +3,22 @@ package cn.fd.utilities.script abstract class ScriptF { /** - * űʶ() + * 脚本标识符(名称) */ val name: String = this.javaClass.name /** - * űʱ + * 脚本被加载时触发 */ abstract fun init() /** - * űʱ + * 脚本启用时触发 */ abstract fun enable() /** - * űʱ + * 脚本禁用时触发 */ abstract fun disable() diff --git a/project/module-script/src/main/kotlin/cn/fd/utilities/script/api/RuntimeClassLoader.kt b/project/module-script/src/main/kotlin/cn/fd/utilities/script/api/RuntimeClassLoader.kt index 5fcb022d..3d48ebdb 100644 --- a/project/module-script/src/main/kotlin/cn/fd/utilities/script/api/RuntimeClassLoader.kt +++ b/project/module-script/src/main/kotlin/cn/fd/utilities/script/api/RuntimeClassLoader.kt @@ -1,20 +1,20 @@ package cn.fd.utilities.script.api /** - * п + * 运行库加载器 * - * @author + * @author 坏黑 * @since 2022/5/16 01:01 */ interface RuntimeClassLoader { /** - * ȡѼص + * 获取所有已加载的类 */ fun runningClasses(): Map> /** - * ȡ + * 获取类 */ fun findClass(name: String): Class<*> } \ No newline at end of file diff --git a/project/module-script/src/main/kotlin/cn/fd/utilities/script/api/ScriptMeta.kt b/project/module-script/src/main/kotlin/cn/fd/utilities/script/api/ScriptMeta.kt index f29d8efd..d2ef96ea 100644 --- a/project/module-script/src/main/kotlin/cn/fd/utilities/script/api/ScriptMeta.kt +++ b/project/module-script/src/main/kotlin/cn/fd/utilities/script/api/ScriptMeta.kt @@ -5,17 +5,17 @@ import java.io.File interface ScriptMeta { /** - * ű + * 脚本名称 */ fun name(): String /** - * űԴļ + * 脚本源文件 */ fun source(file: File) /** - * űĻļ + * 脚本编译后的缓存文件 */ fun compiled(file: File) diff --git a/project/runtime-bukkit/src/main/kotlin/cn/fd/utilities/bukkit/command/TestOne.kt b/project/runtime-bukkit/src/main/kotlin/cn/fd/utilities/bukkit/command/TestCommand.kt similarity index 94% rename from project/runtime-bukkit/src/main/kotlin/cn/fd/utilities/bukkit/command/TestOne.kt rename to project/runtime-bukkit/src/main/kotlin/cn/fd/utilities/bukkit/command/TestCommand.kt index 02fb1f03..165a2bcd 100644 --- a/project/runtime-bukkit/src/main/kotlin/cn/fd/utilities/bukkit/command/TestOne.kt +++ b/project/runtime-bukkit/src/main/kotlin/cn/fd/utilities/bukkit/command/TestCommand.kt @@ -12,11 +12,8 @@ import taboolib.common.platform.command.subCommand @PlatformSide([Platform.BUKKIT]) @CommandHeader(name = "fdutilities") -object MainCommand { +object TestCommand { - /** - * ز - */ @CommandBody val main = mainCommand { execute { sender, _, _ -> diff --git a/project/runtime-bukkit/src/main/kotlin/cn/fd/utilities/bukkit/loader/DependenciesLoader.kt b/project/runtime-bukkit/src/main/kotlin/cn/fd/utilities/bukkit/loader/DependenciesLoader.kt index 52c1d810..21b1cf1b 100644 --- a/project/runtime-bukkit/src/main/kotlin/cn/fd/utilities/bukkit/loader/DependenciesLoader.kt +++ b/project/runtime-bukkit/src/main/kotlin/cn/fd/utilities/bukkit/loader/DependenciesLoader.kt @@ -5,11 +5,11 @@ import cn.fd.utilities.env.CommonEnv import taboolib.common.env.RuntimeEnv import taboolib.common.platform.Awake -//оеС +//感觉有点小题大做 object DependenciesLoader { /** - * + * 加载依赖项 */ @Awake fun loadDependency() { diff --git a/script/test01/build.gradle.kts b/script/test01/build.gradle.kts index a19122e6..571b4175 100644 --- a/script/test01/build.gradle.kts +++ b/script/test01/build.gradle.kts @@ -1,7 +1,2 @@ dependencies { - rootProject.allprojects.forEach { - if (it.parent?.name == "project" || it.parent?.name == "plugin") { - implementation(it) - } - } } \ No newline at end of file