Skip to content

Commit 9e51f90

Browse files
committed
Fixed some errors.
1 parent e36287f commit 9e51f90

File tree

26 files changed

+134
-142
lines changed

26 files changed

+134
-142
lines changed

common/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ dependencies {
1717
compileOnly("com.google.code.gson:gson:2.8.6")
1818
compileOnly("org.slf4j:slf4j-log4j12:1.7.30")
1919
implementation("commons-io:commons-io:2.7")
20-
implementation("me.scoretwo:commons-syntaxes:2.0.2-SNAPSHOT")
21-
implementation("me.scoretwo:commons-command:2.0.2-SNAPSHOT")
22-
implementation("me.scoretwo:commons-server:2.0.2-SNAPSHOT")
23-
implementation("me.scoretwo:commons-bukkit-configuration:2.0.2-SNAPSHOT")
20+
implementation("me.scoretwo:commons-syntaxes:2.0.3-SNAPSHOT")
21+
implementation("me.scoretwo:commons-command:2.0.3-SNAPSHOT")
22+
implementation("me.scoretwo:commons-server:2.0.3-SNAPSHOT")
23+
implementation("me.scoretwo:commons-bukkit-configuration:2.0.3-SNAPSHOT")
2424
}
2525

2626
configure<PublishingExtension> {

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

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

3-
import me.scoretwo.fastscript.api.addon.AddonManager
3+
import me.scoretwo.fastscript.api.expansion.ExpansionManager
44
import me.scoretwo.fastscript.api.format.FormatHeader
55
import me.scoretwo.fastscript.api.plugin.ScriptPlugin
66
import me.scoretwo.fastscript.api.script.AbstractScript
@@ -9,7 +9,6 @@ import me.scoretwo.fastscript.config.SettingConfig
99
import me.scoretwo.fastscript.script.ScriptManager
1010
import me.scoretwo.fastscript.utils.Utils
1111
import me.scoretwo.utils.bukkit.configuration.yaml.patchs.getLowerCaseNode
12-
import me.scoretwo.utils.plugin.GlobalPlugin
1312
import me.scoretwo.utils.sender.GlobalPlayer
1413
import me.scoretwo.utils.sender.GlobalSender
1514
import me.scoretwo.utils.syntaxes.StreamUtils
@@ -20,7 +19,7 @@ class FastScript(val plugin: ScriptPlugin) {
2019

2120
val commandNexus: ScriptCommandNexus
2221
val scriptManager: ScriptManager
23-
val addonManager: AddonManager
22+
val expansionManager: ExpansionManager
2423

2524
fun setPlaceholder(player: GlobalPlayer, string: String) = plugin.setPlaceholder(player, string)
2625

@@ -34,7 +33,7 @@ class FastScript(val plugin: ScriptPlugin) {
3433

3534
commandNexus = ScriptCommandNexus()
3635
scriptManager = ScriptManager()
37-
addonManager = AddonManager()
36+
expansionManager = ExpansionManager()
3837

3938
if (!plugin.dataFolder.exists()) {
4039
plugin.dataFolder.mkdirs()

common/src/main/kotlin/me/scoretwo/fastscript/addon/javascript/exception/IncludeFormatException.kt

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

common/src/main/kotlin/me/scoretwo/fastscript/api/addon/Addon.kt

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

common/src/main/kotlin/me/scoretwo/fastscript/api/addon/AddonManager.kt

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

common/src/main/kotlin/me/scoretwo/fastscript/api/addon/AddonPlugin.kt

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package me.scoretwo.fastscript.api.expansion
2+
3+
class ExpansionManager {
4+
5+
val expansions = mutableSetOf<FastScriptExpansion>()
6+
7+
init {
8+
9+
}
10+
11+
fun register(expansion: FastScriptExpansion) {
12+
expansions.add(expansion)
13+
}
14+
15+
fun unregister(expansion: FastScriptExpansion) {
16+
expansions.remove(expansion)
17+
}
18+
19+
fun unregister(name: String) = expansions.forEach {
20+
if (it.name == name) {
21+
expansions.remove(it)
22+
return@forEach
23+
}
24+
}
25+
26+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package me.scoretwo.fastscript.api.expansion
2+
3+
import me.scoretwo.fastscript.api.script.AbstractScript
4+
import me.scoretwo.fastscript.api.script.FileScript
5+
import me.scoretwo.utils.sender.GlobalSender
6+
7+
abstract class FastScriptExpansion {
8+
9+
abstract val name: String
10+
abstract val sign: String
11+
12+
abstract fun processScripts(scripts: MutableList<FileScript>)
13+
14+
abstract fun executeScript(sender: GlobalSender, script: FileScript, function: String, args: Array<Any?>)
15+
}

common/src/main/kotlin/me/scoretwo/fastscript/api/plugin/ScriptPlugin.kt

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

3-
import me.scoretwo.fastscript.api.utils.AbstractScriptUtils
43
import me.scoretwo.utils.plugin.GlobalPlugin
54
import me.scoretwo.utils.plugin.PluginDescription
65
import me.scoretwo.utils.plugin.logging.GlobalLogger

common/src/main/kotlin/me/scoretwo/fastscript/api/script/AbstractScript.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package me.scoretwo.fastscript.api.script
22

3+
import me.scoretwo.fastscript.api.expansion.FastScriptExpansion
34
import java.io.File
45

56
abstract class AbstractScript (
7+
val expansion: FastScriptExpansion,
68
val description: ScriptDescription,
7-
options: ScriptOptions,
9+
val options: ScriptOptions,
810
val textScripts: MutableList<String> = mutableListOf("")
911

1012
) {

0 commit comments

Comments
 (0)