Skip to content

Commit 3d9eee2

Browse files
committed
Change framework strategy.
1 parent 591e7aa commit 3d9eee2

File tree

52 files changed

+350
-374
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+350
-374
lines changed

build.gradle

Lines changed: 0 additions & 131 deletions
This file was deleted.

build.gradle.kts

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
plugins {
2+
kotlin("jvm") version "1.4.21" apply false
3+
id("org.jetbrains.dokka") version "1.4.10.2" apply false
4+
id("org.jlleitschuh.gradle.ktlint") version "9.4.1" apply false
5+
id("com.github.johnrengelman.shadow") version "6.1.0" apply false
6+
id("maven")
7+
id("maven-publish")
8+
}
9+
10+
group = "me.scoretwo"
11+
version = "1.0.1-SNAPSHOT"
12+
description = "FastScript is a Spigot plugin, which can run JavaScript-based scripts more efficiently."
13+
14+
defaultTasks = mutableListOf("shadowJar")
15+
16+
subprojects {
17+
group = rootProject.group
18+
version = rootProject.version
19+
description = rootProject.description
20+
21+
repositories {
22+
jcenter()
23+
mavenCentral()
24+
mavenLocal()
25+
}
26+
}
27+
28+
/*
29+
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
30+
dependencies {
31+
include(dependency("me.scoretwo:commons-syntaxes:1.2-SNAPSHOT"))
32+
include(dependency("me.scoretwo:commons-configuration:1.2-SNAPSHOT"))
33+
include(dependency("org.bstats:bstats-bukkit:1.7"))
34+
include(dependency("commons-io:commons-io:2.7"))
35+
include(dependency("net.md-5:bungeecord-chat:1.16-R0.4-SNAPSHOT"))
36+
include(dependency("org.jetbrains.kotlin:kotlin-stdlib"))
37+
include(dependency(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))))
38+
}
39+
relocate("org.bstats", "me.scoretwo.utils.libs.bstats")
40+
relocate("org.apache.commons.io", "me.scoretwo.utils.libs.apache.commons.io")
41+
}

common/build.gradle.kts

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
plugins {
2+
kotlin("jvm")
3+
id("org.jetbrains.dokka")
4+
id("org.jlleitschuh.gradle.ktlint")
5+
id("com.github.johnrengelman.shadow")
6+
id("maven")
7+
id("maven-publish")
8+
}
9+
10+
repositories {
11+
maven("http://repo.iroselle.com/snapshots/")
12+
}
13+
14+
dependencies {
15+
implementation(project(":common"))
16+
17+
compileOnly("org.apache.commons:commons-lang3:3.10")
18+
compileOnly("com.google.code.gson:gson:2.8.6")
19+
implementation("commons-io:commons-io:2.7")
20+
implementation("me.scoretwo:commons-syntaxes:2.0-SNAPSHOT")
21+
implementation("me.scoretwo:commons-bukkit-configuration:2.0-SNAPSHOT")
22+
}
23+
24+
configure<PublishingExtension> {
25+
publications {
26+
create<MavenPublication>("shadow") {
27+
shadow.component(this)
28+
}
29+
}
30+
}

src/main/kotlin/me/scoretwo/fastscript/FastScript.kt renamed to common/src/main/kotlin/me/scoretwo/fastscript/FastScript.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package me.scoretwo.fastscript
22

33
import me.scoretwo.fastscript.api.plugin.FastScriptMain
4-
import me.scoretwo.fastscript.api.script.ScriptManager
4+
import me.scoretwo.fastscript.script.ScriptManager
55
import me.scoretwo.fastscript.commands.CommandManager
66
import me.scoretwo.fastscript.config.SettingConfig
77
import me.scoretwo.fastscript.utils.Utils
8+
import me.scoretwo.utils.bukkit.configuration.yaml.patchs.getLowerCaseNode
89
import java.io.File
910
import java.io.IOException
1011
import java.io.InputStream
@@ -27,7 +28,7 @@ class FastScript(main: FastScriptMain) {
2728

2829
init {
2930
instance = this
30-
CONSOLE = main.CONSOLE
31+
console = main.console
3132
printLogo()
3233
println("[FastScript | INIT] 正在初始化...")
3334

@@ -103,12 +104,12 @@ class FastScript(main: FastScriptMain) {
103104
it[index] = String(line).replaceFirst(replace, "§${arrayOf('a', 'b', '2').random()}$replace§8")
104105
}
105106
}
106-
CONSOLE.sendMessage(it)
107+
console.sendMessage(it)
107108
}
108109

109110
companion object {
110111
lateinit var instance: FastScript
111-
var CONSOLE = Any()
112+
var console = Any()
112113

113114
fun setBootstrap(main: FastScriptMain) {
114115
/*if (initialized) {
@@ -121,7 +122,7 @@ class FastScript(main: FastScriptMain) {
121122
fun main(args: Array<out String>) {
122123
123124
val main = object : FastScriptMain {
124-
override val CONSOLE: Any = this
125+
override val console: Any = this
125126
126127
override fun getDataFolder(): File {
127128
return File("FastScript")

src/main/kotlin/me/scoretwo/fastscript/config/Config.kt renamed to common/src/main/kotlin/me/scoretwo/fastscript/api/config/Config.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package me.scoretwo.fastscript.config
22

3-
import me.scoretwo.utils.configuration.file.YamlConfiguration
3+
import me.scoretwo.utils.bukkit.configuration.yaml.file.YamlConfiguration
44
import java.io.File
55

66
abstract class Config: YamlConfiguration {

src/main/kotlin/me/scoretwo/fastscript/config/MessageConfig.kt renamed to common/src/main/kotlin/me/scoretwo/fastscript/api/config/MessageConfig.kt

File renamed without changes.

src/main/kotlin/me/scoretwo/fastscript/config/SettingConfig.kt renamed to common/src/main/kotlin/me/scoretwo/fastscript/api/config/SettingConfig.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package me.scoretwo.fastscript.config
22

33
import me.scoretwo.fastscript.FastScript
4-
import me.scoretwo.fastscript.api.script.options.ScriptOption
4+
import me.scoretwo.fastscript.script.options.ScriptOption
55
import me.scoretwo.fastscript.utils.Utils
6-
import me.scoretwo.utils.configuration.patchs.getLowerCaseNode
6+
import me.scoretwo.utils.bukkit.configuration.yaml.patchs.getLowerCaseNode
77
import java.io.File
88

99
class SettingConfig(file: File): Config(file) {

src/main/kotlin/me/scoretwo/fastscript/api/exception/ScriptException.kt renamed to common/src/main/kotlin/me/scoretwo/fastscript/api/exception/ScriptException.kt

File renamed without changes.

src/main/kotlin/me/scoretwo/fastscript/api/exception/ScriptNotFound.kt renamed to common/src/main/kotlin/me/scoretwo/fastscript/api/exception/ScriptNotFound.kt

File renamed without changes.

src/main/kotlin/me/scoretwo/fastscript/api/placeholder/Placeholders.kt renamed to common/src/main/kotlin/me/scoretwo/fastscript/api/placeholder/Placeholders.kt

File renamed without changes.

0 commit comments

Comments
 (0)