use gradle ext apply to version.

Score2 · Score2 · commit 25f244314dfa · 2021-01-22T22:15:56.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,6 +14,10 @@ description = "FastScript is a Spigot plugin, which can run JavaScript-based scr
 
 defaultTasks = mutableListOf("publishToMavenLocal")
 
+extra.apply {
+    set("commonsVersion", "2.0.3-SNAPSHOT")
+}
+
 subprojects {
     group = rootProject.group
     version = rootProject.version
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -17,10 +17,10 @@ dependencies {
     compileOnly("com.google.code.gson:gson:2.8.6")
     compileOnly("org.slf4j:slf4j-log4j12:1.7.30")
     implementation("commons-io:commons-io:2.7")
-    implementation("me.scoretwo:commons-syntaxes:2.0.3-SNAPSHOT")
-    implementation("me.scoretwo:commons-command:2.0.3-SNAPSHOT")
-    implementation("me.scoretwo:commons-server:2.0.3-SNAPSHOT")
-    implementation("me.scoretwo:commons-bukkit-configuration:2.0.3-SNAPSHOT")
+    implementation("me.scoretwo:commons-syntaxes:${rootProject.extra.get("commonsVersion")}")
+    implementation("me.scoretwo:commons-command:${rootProject.extra.get("commonsVersion")}")
+    implementation("me.scoretwo:commons-server:${rootProject.extra.get("commonsVersion")}")
+    implementation("me.scoretwo:commons-bukkit-configuration:${rootProject.extra.get("commonsVersion")}")
 }
 
 configure<PublishingExtension> {
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/api/script/Script.kt b/common/src/main/kotlin/me/scoretwo/fastscript/api/script/Script.kt
@@ -4,7 +4,7 @@ import me.scoretwo.fastscript.FastScript
 import me.scoretwo.utils.sender.GlobalSender
 import java.io.File
 
-abstract class Script(
+open class Script(
     val description: ScriptDescription,
     val options: ScriptOptions,
     val scriptFiles: MutableList<File> = mutableListOf()
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/api/script/ScriptDescription.kt b/common/src/main/kotlin/me/scoretwo/fastscript/api/script/ScriptDescription.kt
@@ -1,5 +1,7 @@
 package me.scoretwo.fastscript.api.script
 
+import me.scoretwo.utils.bukkit.configuration.yaml.ConfigurationSection
+import me.scoretwo.utils.bukkit.configuration.yaml.patchs.getLowerCaseNode
 import javax.security.auth.login.Configuration
 
 interface ScriptDescription {
@@ -14,6 +16,26 @@ interface ScriptDescription {
     val authors: Array<String>
 
     companion object {
+
+        fun fromSection(section: ConfigurationSection) = parseDescription(
+            section.getString(section.getLowerCaseNode("name")),
+            section.getString(section.getLowerCaseNode("main")),
+            section.getString(section.getLowerCaseNode("version")),
+            section.getString(section.getLowerCaseNode("description")),
+            if (section.isList(section.getLowerCaseNode("authors")))
+                section.getStringList(section.getLowerCaseNode("authors"))!!
+            else
+                mutableListOf(section[section.getLowerCaseNode("authors")])
+        )
+
+        fun parseDescription(
+            name: String,
+            main: String,
+            version: String? = null,
+            description: String? = null,
+            authors: MutableList<String> = mutableListOf()
+        ) = parseDescription(name, main, version, description, *authors.toTypedArray())
+
         fun parseDescription(
             name: String,
             main: String,
@@ -28,5 +50,7 @@ interface ScriptDescription {
             override val authors: Array<String> = arrayOf(*authors)
 
         }
+
+
     }
 }
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/api/script/ScriptManager.kt b/common/src/main/kotlin/me/scoretwo/fastscript/api/script/ScriptManager.kt
@@ -12,11 +12,12 @@ class ScriptManager {
 
     val scripts = mutableMapOf<String, Script>()
 
-    fun getScript(name: String) = if (scripts.containsKey(name)) scripts[name] else null
+    fun getScript(name: String) = scripts[name]
 
     fun loadScript(file: File) {
         FastScript.instance.expansionManager.expansions.forEach {
 
+            // 載入脚本
             scripts[file.name.substringBeforeLast(".")]
         }
 
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/api/script/ScriptOptions.kt b/common/src/main/kotlin/me/scoretwo/fastscript/api/script/ScriptOptions.kt
@@ -5,15 +5,15 @@ import me.scoretwo.utils.bukkit.configuration.yaml.file.YamlConfiguration
 import me.scoretwo.utils.bukkit.configuration.yaml.patchs.getLowerCaseNode
 import java.io.File
 
-abstract class ScriptOptions(val file: File, val config: YamlConfiguration) {
+open class ScriptOptions(val file: File, val config: YamlConfiguration) {
     val main: String = config.getString(config.getLowerCaseNode("main"))
-    val meta = mutableMapOf<String, String>().also { map ->
+    open val meta = mutableMapOf<String, String>().also { map ->
         config.getStringList(config.getLowerCaseNode("meta")).forEach {
             map[it.substringBefore(":")] = it.substringAfter(":")
         }
     }
 
-    val otherSection = mutableMapOf<String, ConfigurationSection>().also { sections ->
+    open val otherSection = mutableMapOf<String, ConfigurationSection>().also { sections ->
         config.getKeys(false).forEach {
             if (!arrayOf("main", "meta").contains(it.toLowerCase()))
                 sections[it] = config.getConfigurationSection(it)
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/api/script/ScriptProcessor.kt b/common/src/main/kotlin/me/scoretwo/fastscript/api/script/ScriptProcessor.kt
@@ -5,6 +5,7 @@ import me.scoretwo.utils.sender.GlobalSender
 
 abstract class ScriptProcessor(val script: Script, val expansion: FastScriptExpansion) {
 
+    abstract val needEval: Boolean
     abstract fun eval(sender: GlobalSender): Any?
     abstract fun execute(sender: GlobalSender, main: String = script.options.main, args: Array<Any?> = arrayOf()): Any?
 
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/expansion/typeengine/TypeEngineScriptProcessor.kt b/common/src/main/kotlin/me/scoretwo/fastscript/expansion/typeengine/TypeEngineScriptProcessor.kt
@@ -15,6 +15,7 @@ import javax.script.ScriptException
 class TypeEngineScriptProcessor(script: TypeEngineScript, expansion: TypeEngineExpansion): ScriptProcessor(script, expansion) {
 
     val engine: ScriptEngine
+    override val needEval = true
 
     init {
         engine = ScriptEngineManager(plugin.pluginClassLoader).getEngineByName(script.engineOption.engine)
diff --git a/version-control/bukkit/build.gradle.kts b/version-control/bukkit/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
     compileOnly("org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT")
     compileOnly("me.clip:placeholderapi:2.10.9")
     implementation("org.bstats:bstats-bukkit:1.7")
-    implementation("me.scoretwo:commons-bukkit-plugin:2.0.3-SNAPSHOT")
+    implementation("me.scoretwo:commons-bukkit-plugin:${rootProject.extra.get("commonsVersion")}")
 }
 
 configure<PublishingExtension> {
diff --git a/version-control/bungee/build.gradle.kts b/version-control/bungee/build.gradle.kts
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
     implementation(project(":common"))
-    implementation("me.scoretwo:commons-bungee-plugin:2.0.3-SNAPSHOT")
+    implementation("me.scoretwo:commons-bungee-plugin:${rootProject.extra.get("commonsVersion")}")
 
     compileOnly("net.md-5:bungeecord-api:1.16-R0.4-SNAPSHOT")
 }
diff --git a/version-control/sponge/build.gradle.kts b/version-control/sponge/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
     compileOnly("org.spongepowered:spongeapi:7.3.0")
     compileOnly("com.github.rojo8399:PlaceholderAPI:master-SNAPSHOT")
     implementation("net.md-5:bungeecord-chat:1.16-R0.4-SNAPSHOT")
-    implementation("me.scoretwo:commons-sponge-plugin:2.0.3-SNAPSHOT")
+    implementation("me.scoretwo:commons-sponge-plugin:${rootProject.extra.get("commonsVersion")}")
 }
 
 configure<PublishingExtension> {
diff --git a/version-control/velocity/build.gradle.kts b/version-control/velocity/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
 
     compileOnly("com.velocitypowered:velocity-api:1.0.11-SNAPSHOT")
     implementation("net.md-5:bungeecord-chat:1.16-R0.4-SNAPSHOT")
-    implementation("me.scoretwo:commons-velocity-plugin:2.0.3-SNAPSHOT")
+    implementation("me.scoretwo:commons-velocity-plugin:${rootProject.extra.get("commonsVersion")}")
 }
 
 configure<PublishingExtension> {

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,12 @@ class ScriptManager {`
`12`	`12`
`13`	`13`	`val scripts = mutableMapOf<String, Script>()`
`14`	`14`
`15`		`- fun getScript(name: String) = if (scripts.containsKey(name)) scripts[name] else null`
	`15`	`+ fun getScript(name: String) = scripts[name]`
`16`	`16`
`17`	`17`	`fun loadScript(file: File) {`
`18`	`18`	`FastScript.instance.expansionManager.expansions.forEach {`
`19`	`19`
	`20`	`+ // 載入脚本`
`20`	`21`	`scripts[file.name.substringBeforeLast(".")]`
`21`	`22`	`}`
`22`	`23`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ dependencies {`
`17`	`17`	`compileOnly("org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT")`
`18`	`18`	`compileOnly("me.clip:placeholderapi:2.10.9")`
`19`	`19`	`implementation("org.bstats:bstats-bukkit:1.7")`
`20`		`- implementation("me.scoretwo:commons-bukkit-plugin:2.0.3-SNAPSHOT")`
	`20`	`+ implementation("me.scoretwo:commons-bukkit-plugin:${rootProject.extra.get("commonsVersion")}")`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`configure<PublishingExtension> {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ repositories {`
`15`	`15`
`16`	`16`	`dependencies {`
`17`	`17`	`implementation(project(":common"))`
`18`		`- implementation("me.scoretwo:commons-bungee-plugin:2.0.3-SNAPSHOT")`
	`18`	`+ implementation("me.scoretwo:commons-bungee-plugin:${rootProject.extra.get("commonsVersion")}")`
`19`	`19`
`20`	`20`	`compileOnly("net.md-5:bungeecord-api:1.16-R0.4-SNAPSHOT")`
`21`	`21`	`}`