Adjust the project framework.

Score2 · Score2 · commit 83a3a93bb030 · 2021-01-10T11:46:03.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("org.jetbrains.dokka") version "1.4.10.2" apply false
     id("org.jlleitschuh.gradle.ktlint") version "9.4.1" apply false
     id("com.github.johnrengelman.shadow") version "6.1.0" apply false
+    id("net.kyori.blossom") version "1.1.0" apply false
     id("maven")
     id("maven-publish")
 }
@@ -11,7 +12,7 @@ group = "me.scoretwo"
 version = "1.0.1-SNAPSHOT"
 description = "FastScript is a Spigot plugin, which can run JavaScript-based scripts more efficiently."
 
-defaultTasks = mutableListOf("shadowJar")
+defaultTasks = mutableListOf("publishToMavenLocal")
 
 subprojects {
     group = rootProject.group
@@ -22,6 +23,8 @@ subprojects {
         jcenter()
         mavenCentral()
         mavenLocal()
+        maven("https://repo.lucko.me/")
+        maven("http://repo.iroselle.com/snapshots/")
     }
 }
 
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -8,16 +8,17 @@ plugins {
 }
 
 repositories {
-    maven("http://repo.iroselle.com/snapshots/")
 }
 
 dependencies {
     implementation(project(":common"))
 
     compileOnly("org.apache.commons:commons-lang3:3.10")
     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-SNAPSHOT")
+    implementation("me.scoretwo:commons-command:2.0-SNAPSHOT")
     implementation("me.scoretwo:commons-bukkit-configuration:2.0-SNAPSHOT")
 }
 
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/FastScript.kt b/common/src/main/kotlin/me/scoretwo/fastscript/FastScript.kt
@@ -1,39 +1,38 @@
 package me.scoretwo.fastscript
 
-import me.scoretwo.fastscript.api.plugin.FastScriptMain
+import me.scoretwo.fastscript.api.plugin.FastScriptPlugin
 import me.scoretwo.fastscript.script.ScriptManager
 import me.scoretwo.fastscript.commands.CommandManager
 import me.scoretwo.fastscript.config.SettingConfig
 import me.scoretwo.fastscript.utils.Utils
 import me.scoretwo.utils.bukkit.configuration.yaml.patchs.getLowerCaseNode
+import me.scoretwo.utils.command.GlobalSender
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
 import java.net.URL
 
-class FastScript(main: FastScriptMain) {
+class FastScript(plugin: FastScriptPlugin) {
 
-    private val main: FastScriptMain = main
+    private val plugin: FastScriptPlugin = plugin
 
     val dataFolder: File
     val classLoader: ClassLoader
 
     val scriptManager: ScriptManager
     val commandManager: CommandManager
 
-    fun hasPermission(sender: Any, string: String) = main.hasPermission(sender, string)
-    fun setPlaceholder(player: Any, string: String) = main.setPlaceholder(player, string)
-    fun sendMessage(sender: Any, string: String, colorIndex: Boolean) = main.sendMessage(sender, string, colorIndex)
-    fun translateStringColors(string: String): String = main.translateStringColors(string)
+    fun setPlaceholder(player: Any, string: String) = plugin.setPlaceholder(player, string)
+    fun translateStringColors(string: String): String = plugin.translateStringColors(string)
 
     init {
         instance = this
-        console = main.console
+        console = plugin.console
         printLogo()
         println("[FastScript | INIT] 正在初始化...")
 
-        dataFolder = main.getDataFolder()
-        classLoader = main.getPluginClassLoader()
+        dataFolder = plugin.getDataFolder()
+        classLoader = plugin.getPluginClassLoader()
         scriptManager = ScriptManager()
         commandManager = CommandManager()
 
@@ -72,7 +71,7 @@ class FastScript(main: FastScriptMain) {
         if (!dataFolder.exists()) {
             dataFolder.mkdirs()
         }
-        main.onReload()
+        plugin.onReload()
         initLanguageFiles()
         initInternalScripts()
         scriptManager.loadScripts()
@@ -109,13 +108,18 @@ class FastScript(main: FastScriptMain) {
 
     companion object {
         lateinit var instance: FastScript
-        var console = Any()
+        var console = object : GlobalSender {
+            override val name = "console"
+            override fun hasPermission(name: String) = true
+            override fun sendMessage(messages: Array<String>) = println(messages)
+            override fun sendMessage(message: String) = println(message)
+        }
 
-        fun setBootstrap(main: FastScriptMain) {
+        fun setBootstrap(plugin: FastScriptPlugin) {
             /*if (initialized) {
                 throw UnsupportedOperationException("Cannot redefine instance")
             }*/
-            FastScript(main)
+            FastScript(plugin)
         }
 /*
         @JvmStatic
@@ -187,31 +191,17 @@ class FastScript(main: FastScriptMain) {
 
 enum class FormatHeader { INFO, WARN, ERROR, TIPS, HOOKED, DEBUG }
 
-fun Any.hasPermission(string: String): Boolean {
-    return FastScript.instance.hasPermission(this, string)
-}
-
-
-fun Any.sendMessage(formatHeader: FormatHeader, strings: Array<String>, colorIndex: Boolean = true) {
+fun GlobalSender.sendMessage(formatHeader: FormatHeader, strings: Array<String>, colorIndex: Boolean = true) {
     strings.forEach {
         this.sendMessage(formatHeader, it, colorIndex)
     }
 }
 
-fun Any.sendMessage(formatHeader: FormatHeader, string: String, colorIndex: Boolean = true) {
-    this.sendMessage(
-        "${SettingConfig.instance.defaultLanguage.getString(SettingConfig.instance.defaultLanguage.getLowerCaseNode("format-header.${formatHeader.name.toLowerCase()}"))}${string}", colorIndex
-    )
-}
-
-fun Any.sendMessage(string: String, colorIndex: Boolean = true) {
-    FastScript.instance.sendMessage(this, string, colorIndex)
-}
-
-fun Any.sendMessage(strings: Array<String>, colorIndex: Boolean = true) {
-    strings.forEach {
-        this.sendMessage(it, colorIndex)
-    }
+fun GlobalSender.sendMessage(formatHeader: FormatHeader, string: String, colorIndex: Boolean = true) {
+    if (colorIndex)
+        this.sendMessage("${SettingConfig.instance.defaultLanguage.getString(SettingConfig.instance.defaultLanguage.getLowerCaseNode("format-header.${formatHeader.name.toLowerCase()}"))}${string}")
+    else
+        this.sendMessage(FastScript.instance.translateStringColors("${SettingConfig.instance.defaultLanguage.getString(SettingConfig.instance.defaultLanguage.getLowerCaseNode("format-header.${formatHeader.name.toLowerCase()}"))}${string}"))
 }
 
 fun String.setPlaceholder(sender: Any): String {
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/api/plugin/FastScriptMain.kt b/common/src/main/kotlin/me/scoretwo/fastscript/api/plugin/FastScriptMain.kt
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/api/plugin/FastScriptPlugin.kt b/common/src/main/kotlin/me/scoretwo/fastscript/api/plugin/FastScriptPlugin.kt
@@ -0,0 +1,19 @@
+package me.scoretwo.fastscript.api.plugin
+
+import me.scoretwo.fastscript.api.plugin.logging.ScriptLogger
+import me.scoretwo.utils.command.GlobalSender
+import java.io.File
+
+interface FastScriptPlugin {
+
+    val console: GlobalSender
+    val dataFolder: File
+    val pluginClassLoader: ClassLoader
+    val scriptLogger: ScriptLogger
+
+    fun setPlaceholder(player: Any, string: String): String
+    fun translateStringColors(string: String): String
+
+    fun onReload()
+
+}
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/api/plugin/logging/JavaLogger.kt b/common/src/main/kotlin/me/scoretwo/fastscript/api/plugin/logging/JavaLogger.kt
@@ -0,0 +1,18 @@
+package me.scoretwo.fastscript.api.plugin.logging
+
+import java.util.logging.Level
+import java.util.logging.Logger
+
+class JavaLogger(val logger: Logger): ScriptLogger {
+
+    override fun info(msg: String) = logger.info(msg)
+
+    override fun warn(msg: String) = logger.warning(msg)
+
+    override fun warn(msg: String, t: Throwable) = logger.log(Level.WARNING, msg, t)
+
+    override fun error(msg: String) = logger.log(Level.SEVERE, msg)
+
+    override fun error(msg: String, t: Throwable) = logger.log(Level.SEVERE, msg, t)
+
+}
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/api/plugin/logging/ScriptLogger.kt b/common/src/main/kotlin/me/scoretwo/fastscript/api/plugin/logging/ScriptLogger.kt
@@ -0,0 +1,13 @@
+package me.scoretwo.fastscript.api.plugin.logging
+
+interface ScriptLogger {
+
+    fun info(msg: String)
+
+    fun warn(msg: String)
+    fun warn(msg: String, t: Throwable)
+
+    fun error(msg: String)
+    fun error(msg: String, t: Throwable)
+
+}
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/api/plugin/logging/Slf4jLogger.kt b/common/src/main/kotlin/me/scoretwo/fastscript/api/plugin/logging/Slf4jLogger.kt
@@ -0,0 +1,17 @@
+package me.scoretwo.fastscript.api.plugin.logging
+
+import org.slf4j.Logger
+
+class Slf4jLogger(val logger: Logger): ScriptLogger {
+
+    override fun info(msg: String) = logger.info(msg)
+
+    override fun warn(msg: String) = logger.warn(msg)
+
+    override fun warn(msg: String, t: Throwable) = logger.warn(msg, t)
+
+    override fun error(msg: String) = logger.error(msg)
+
+    override fun error(msg: String, t: Throwable) = logger.error(msg, t)
+
+}
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/placeholder/Placeholders.kt b/common/src/main/kotlin/me/scoretwo/fastscript/placeholder/Placeholders.kt
@@ -1,4 +1,4 @@
-package me.scoretwo.fastscript.api.placeholder
+package me.scoretwo.fastscript.placeholder
 
 object Placeholders {
 
diff --git a/version-control/bukkit/build.gradle.kts b/version-control/bukkit/build.gradle.kts
@@ -14,7 +14,7 @@ repositories {
 
 dependencies {
     implementation(project(":common"))
-
+    implementation("me.scoretwo:commons-bukkit-command:2.0-SNAPSHOT")
 
     compileOnly("org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT")
     compileOnly("me.clip:placeholderapi:2.10.9")
diff --git a/version-control/bukkit/src/main/kotlin/me/scoretwo/fastscript/bukkit/BukkitPlugin.kt b/version-control/bukkit/src/main/kotlin/me/scoretwo/fastscript/bukkit/BukkitPlugin.kt
@@ -2,9 +2,14 @@ package me.scoretwo.fastscript.bukkit
 
 import me.scoretwo.fastscript.FastScript
 import me.scoretwo.fastscript.FormatHeader
-import me.scoretwo.fastscript.api.plugin.FastScriptMain
+import me.scoretwo.fastscript.api.plugin.FastScriptPlugin
+import me.scoretwo.fastscript.api.plugin.logging.JavaLogger
+import me.scoretwo.fastscript.api.plugin.logging.ScriptLogger
 import me.scoretwo.fastscript.bukkit.hook.PlaceholderAPIHook
 import me.scoretwo.fastscript.sendMessage
+import me.scoretwo.utils.bukkit.command.patchs.toBukkitSender
+import me.scoretwo.utils.bukkit.command.patchs.toGlobalSender
+import me.scoretwo.utils.command.GlobalSender
 import net.md_5.bungee.api.ChatColor
 import org.bstats.bukkit.Metrics
 import org.bukkit.Bukkit
@@ -15,7 +20,7 @@ import org.bukkit.command.SimpleCommandMap
 import org.bukkit.entity.Player
 import org.bukkit.plugin.java.JavaPlugin
 
-class BukkitPlugin: JavaPlugin(), FastScriptMain {
+class BukkitPlugin: JavaPlugin(), FastScriptPlugin {
 
     override fun onLoad() {
     }
@@ -39,38 +44,32 @@ class BukkitPlugin: JavaPlugin(), FastScriptMain {
         })
     }
 
-    override val console: Any = Bukkit.getConsoleSender()
+    override val console = Bukkit.getConsoleSender().toGlobalSender()
+    override val scriptLogger = JavaLogger(logger)
+    override val pluginClassLoader = super.getClassLoader()
 
-    override fun getPluginClassLoader(): ClassLoader {
-        return super.getClassLoader()
-    }
-
-    override fun setPlaceholder(player: Any, string: String): String {
+    override fun setPlaceholder(player: GlobalSender, string: String): String {
         var text: String = string
         if (PAPIHook != null) {
-            text = PlaceholderAPIHook.setPlaceholder(player as? Player, string)
+            text = PlaceholderAPIHook.setPlaceholder(player.toBukkitSender() as? Player, string)
         }
 
         return text
     }
 
-    override fun translateStringColors(string: String): String {
-        return ChatColor.translateAlternateColorCodes('&', string)
-    }
+    override fun translateStringColors(string: String): String = ChatColor.translateAlternateColorCodes('&', string)
 
     override fun onReload() {
         if (PAPIHook == null) {
             if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
                 PAPIHook = PlaceholderAPIHook(this)
-                FastScript.console.sendMessage(FormatHeader.HOOKED,"成功挂钩 §ePlaceholderAPI!")
+                FastScript.console.sendMessage(FormatHeader.HOOKED, "成功挂钩 §ePlaceholderAPI!")
             }
         }
     }
 
     companion object {
         private var PAPIHook: PlaceholderAPIHook? = null
-
-        val commandMap: CommandMap = Bukkit.getServer().javaClass.getDeclaredMethod("getCommandMap").invoke(Bukkit.getServer()) as SimpleCommandMap
     }
 
 }
diff --git a/version-control/bukkit/src/main/kotlin/me/scoretwo/fastscript/bukkit/hook/PlaceholderAPIHook.kt b/version-control/bukkit/src/main/kotlin/me/scoretwo/fastscript/bukkit/hook/PlaceholderAPIHook.kt
@@ -2,7 +2,7 @@ package me.scoretwo.fastscript.bukkit.hook
 
 import me.clip.placeholderapi.PlaceholderAPI
 import me.clip.placeholderapi.expansion.PlaceholderExpansion
-import me.scoretwo.fastscript.api.placeholder.Placeholders
+import me.scoretwo.fastscript.placeholder.Placeholders
 import org.bukkit.entity.Player
 import org.bukkit.plugin.java.JavaPlugin
 
diff --git a/version-control/bukkit/src/main/resources/plugin.yml b/version-control/bukkit/src/main/resources/plugin.yml
@@ -0,0 +1,6 @@
+name: ${name}
+version: ${version}
+main: ${main}
+authors:
+  - Score2
+api-version: 1.13
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-command:2.0-SNAPSHOT")
 
     compileOnly("net.md-5:bungeecord-api:1.16-R0.4-SNAPSHOT")
 }
diff --git a/version-control/bungee/src/main/kotlin/me/scoretwo/fastscript/bungee/BungeePlugin.kt b/version-control/bungee/src/main/kotlin/me/scoretwo/fastscript/bungee/BungeePlugin.kt
@@ -1,16 +1,15 @@
 package me.scoretwo.fastscript.bungee
 
 import me.scoretwo.fastscript.FastScript
-import me.scoretwo.fastscript.api.plugin.FastScriptMain
+import me.scoretwo.fastscript.api.plugin.FastScriptPlugin
 import net.md_5.bungee.api.ChatColor
 import net.md_5.bungee.api.CommandSender
 import net.md_5.bungee.api.ProxyServer
-import net.md_5.bungee.api.chat.TextComponent
 import net.md_5.bungee.api.plugin.Command
 import net.md_5.bungee.api.plugin.Plugin
 import net.md_5.bungee.api.plugin.TabExecutor
 
-class BungeePlugin: Plugin(), FastScriptMain {
+class BungeePlugin: Plugin(), FastScriptPlugin {
 
     override fun onLoad() {
     }
diff --git a/version-control/bungee/src/main/resources/bungee.yml b/version-control/bungee/src/main/resources/bungee.yml
@@ -0,0 +1,5 @@
+name: ${name}
+version: ${version}
+main: ${main}
+authors:
+  - Score2
diff --git a/version-control/sponge/build.gradle.kts b/version-control/sponge/build.gradle.kts
diff --git a/version-control/sponge/src/main/kotlin/me/scoretwo/fastscript/sponge/SpongePlugin.kt b/version-control/sponge/src/main/kotlin/me/scoretwo/fastscript/sponge/SpongePlugin.kt
diff --git a/version-control/sponge/src/main/kotlin/me/scoretwo/fastscript/sponge/hook/PlaceholderAPIHook.kt b/version-control/sponge/src/main/kotlin/me/scoretwo/fastscript/sponge/hook/PlaceholderAPIHook.kt
diff --git a/version-control/velocity/build.gradle.kts b/version-control/velocity/build.gradle.kts
diff --git a/version-control/velocity/src/main/kotlin/me/scoretwo/fastscript/velocity/VelocityPlugin.kt b/version-control/velocity/src/main/kotlin/me/scoretwo/fastscript/velocity/VelocityPlugin.kt

Original file line number	Diff line number	Diff line change
`@@ -8,16 +8,17 @@ plugins {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`repositories {`
`11`		`- maven("http://repo.iroselle.com/snapshots/")`
`12`	`11`	`}`
`13`	`12`
`14`	`13`	`dependencies {`
`15`	`14`	`implementation(project(":common"))`
`16`	`15`
`17`	`16`	`compileOnly("org.apache.commons:commons-lang3:3.10")`
`18`	`17`	`compileOnly("com.google.code.gson:gson:2.8.6")`
	`18`	`+ compileOnly("org.slf4j:slf4j-log4j12:1.7.30")`
`19`	`19`	`implementation("commons-io:commons-io:2.7")`
`20`	`20`	`implementation("me.scoretwo:commons-syntaxes:2.0-SNAPSHOT")`
	`21`	`+ implementation("me.scoretwo:commons-command:2.0-SNAPSHOT")`
`21`	`22`	`implementation("me.scoretwo:commons-bukkit-configuration:2.0-SNAPSHOT")`
`22`	`23`	`}`
`23`	`24`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package me.scoretwo.fastscript.api.placeholder`
	`1`	`+package me.scoretwo.fastscript.placeholder`
`2`	`2`
`3`	`3`	`object Placeholders {`
`4`	`4`