Skip to content

Commit 3eedbc1

Browse files
Score2Score2
committed
Fixed bugs.
1 parent aa37124 commit 3eedbc1

File tree

6 files changed

+34
-35
lines changed

6 files changed

+34
-35
lines changed

‎common/src/main/kotlin/me/scoretwo/fastscript/api/language/Language.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Language(val version: String, val name: String = "en_US") {
2525
it["SUBSTANTIVE"] = YamlConfiguration().also {
2626
it["ARGS"] = "args"
2727
it["USAGE"] = "usage"
28-
it["EVALUATED"] = "EVALUATED"
28+
it["EVALUATED"] = "evaluated"
2929
}
3030
it["COMMAND-NEXUS"] = YamlConfiguration().also {
3131
it["TIPS"] = YamlConfiguration().also {
@@ -72,12 +72,12 @@ class Language(val version: String, val name: String = "en_US") {
7272
it["EXECUTE"] = YamlConfiguration().also {
7373
it["DESCRIPTION"] = "Execute the specified content to get the return value (':s' added at the end does not return a message)"
7474

75-
it["EXECUTE-RESULT"] = "Execute script &b{script_name} &7used expansion &6{expansion_name} to return result: {result}"
75+
it["EXECUTE-RESULT"] = "Execute script &b{script_name} &7used expansion &6{expansion_name} &7to return result: {result}"
7676
}
7777
it["EVALUATE"] = YamlConfiguration().also {
7878
it["DESCRIPTION"] = "Evaluate the specified content to get the return value (':s' added at the end does not return a message)"
7979

80-
it["EXECUTE-RESULT"] = "Evaluate script &b{script_name} &7used expansion &6{expansion_name} to return result: {result}"
80+
it["EXECUTE-RESULT"] = "Evaluate script &b{script_name} &7used expansion &6{expansion_name} &7to return result: {result}"
8181
}
8282
it["RELOAD"] = YamlConfiguration().also {
8383
it["DESCRIPTION"] = "Reload this script."

‎common/src/main/kotlin/me/scoretwo/fastscript/command/commands/ReloadCommand.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ class ReloadCommand: SimpleCommand(arrayOf("reload")) {
4545
return true
4646
}
4747

48-
override fun tabComplete(sender: GlobalSender, parents: Array<String>, args: Array<String>) = mutableListOf("config", "script", "plugin", "all")
48+
override fun tabComplete(sender: GlobalSender, parents: Array<String>, args: Array<String>) =
49+
if (args.size < 2) mutableListOf("config", "script", "plugin", "all") else null
4950

5051

5152
}

‎common/src/main/kotlin/me/scoretwo/fastscript/command/commands/ScriptCommand.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ class ScriptCommand: SimpleCommand(arrayOf("script")) {
7575
override fun tabComplete(sender: GlobalSender, parents: Array<String>, args: Array<String>): MutableList<String> {
7676
val scriptName = parents[parents.size - 2]
7777
if (args.size < 2) {
78-
return findKeywordIndex(args[args.size - 1], mutableListOf<String>().also { list -> FastScript.instance.expansionManager.expansions.forEach { list.add(it.sign) } })
78+
return mutableListOf<String>().also { list -> FastScript.instance.expansionManager.expansions.forEach { list.add(it.sign) } }
7979
} else if (args.size < 3) {
80-
val script = FastScript.instance.scriptManager.getScript(scriptName) ?: return findKeywordIndex(args[args.size - 1], mutableListOf(":s"))
81-
return findKeywordIndex(args[args.size - 1], mutableListOf(script.option.main))
80+
val script = FastScript.instance.scriptManager.getScript(scriptName) ?: return mutableListOf(":s")
81+
return mutableListOf(script.option.main)
8282
}
83-
return findKeywordIndex(args[args.size - 1], mutableListOf(":s"))
83+
return mutableListOf(":s")
8484
}
8585
})
8686
.build()
@@ -134,9 +134,9 @@ class ScriptCommand: SimpleCommand(arrayOf("script")) {
134134

135135
override fun tabComplete(sender: GlobalSender, parents: Array<String>, args: Array<String>): MutableList<String> {
136136
if (args.size < 2) {
137-
return findKeywordIndex(args[0], mutableListOf<String>().also { list -> FastScript.instance.expansionManager.expansions.forEach { list.add(it.sign) } })
137+
return mutableListOf<String>().also { list -> FastScript.instance.expansionManager.expansions.forEach { list.add(it.sign) } }
138138
}
139-
return findKeywordIndex(args[args.size - 1], mutableListOf(":s"))
139+
return mutableListOf(":s")
140140
}
141141
})
142142
.build()

‎common/src/main/kotlin/me/scoretwo/fastscript/command/commands/ToolsCommand.kt‎

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

3+
import me.scoretwo.fastscript.api.format.FormatHeader
34
import me.scoretwo.fastscript.command.SimpleCommand
45
import me.scoretwo.fastscript.languages
6+
import me.scoretwo.fastscript.sendMessage
57
import me.scoretwo.fastscript.setPlaceholder
68
import me.scoretwo.utils.command.SubCommand
79
import me.scoretwo.utils.command.executor.Executors
@@ -29,7 +31,7 @@ class ToolsCommand: SimpleCommand(arrayOf("tools", "tool", "utils", "util")) {
2931
if (it.isPresent) {
3032
it.get()
3133
} else {
32-
sender.sendMessage(languages["COMMAND-NEXUS.HELPER.PLAYER-IS-OFFLINE"].setPlaceholder("player_name" to args[0]))
34+
sender.sendMessage(FormatHeader.ERROR, languages["COMMAND-NEXUS.HELPER.PLAYER-IS-OFFLINE"].setPlaceholder("player_name" to args[0]))
3335
return true
3436
}
3537
}
@@ -39,7 +41,7 @@ class ToolsCommand: SimpleCommand(arrayOf("tools", "tool", "utils", "util")) {
3941
}
4042

4143
override fun tabComplete(sender: GlobalSender, parents: Array<String>, args: Array<String>) =
42-
findKeywordIndex(args[args.size - 1], mutableListOf("@CONSOLE").also { list -> plugin.server.getOnlinePlayers().forEach { list.add(it.name) } })
44+
mutableListOf("@CONSOLE").also { list -> plugin.server.getOnlinePlayers().forEach { list.add(it.name) } }
4345
})
4446
.build()
4547
)

‎common/src/main/kotlin/me/scoretwo/fastscript/expansion/typeengine/TypeEngineExpansion.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ abstract class TypeEngineExpansion: FastScriptExpansion() {
4343
return let {
4444
try {
4545
engine.eval(script.texts[sign]).also {
46-
if (script.texts[sign]?.contains(it?.toString() ?: "") == true) return@let "EVALUATED"
46+
if (script.texts[sign]?.contains(it?.toString() ?: "") == true) return@let languages["SUBSTANTIVE.EVALUATED"].toUpperCase()
4747
}
4848
} catch (e: ScriptException) {
4949
plugin.server.console.sendMessage(FormatHeader.ERROR, languages["EXPANSION.TYPE-ENGINE.EVALUATE-SCRIPT-ERROR"].setPlaceholder(
@@ -75,7 +75,7 @@ abstract class TypeEngineExpansion: FastScriptExpansion() {
7575
return let {
7676
try {
7777
engine.eval(text).also {
78-
if (text.contains(it?.toString() ?: "")) return@let "EVALUATED"
78+
if (text.contains(it?.toString() ?: "")) return@let languages["SUBSTANTIVE.EVALUATED"].toUpperCase()
7979
}
8080
} catch (e: ScriptException) {
8181
plugin.server.console.sendMessage(FormatHeader.ERROR, languages["EXPANSION.TYPE-ENGINE.EVALUATE-TEMP-SCRIPT-ERROR"].setPlaceholder(

‎version-control/FastScript-bukkit/src/main/kotlin/me/scoretwo/fastscript/bukkit/BukkitPlugin.kt‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,45 +30,41 @@ class BukkitPlugin(val plugin: GlobalPlugin): ScriptPlugin(plugin) {
3030
toolsCommand.register(
3131
toolsCommand.nextBuilder().alias("sounds", "sound")
3232
.description(languages["COMMAND-NEXUS.COMMANDS.TOOLS.BUKKIT.SOUNDS.DESCRIPTION"])
33-
.customCommand("sound", arrayOf("volume", "pitch", "player"), "Not more...")
33+
.customCommand("<player>", arrayOf("[sound]", "[volume]", "[pitch]"), languages["COMMAND-NEXUS.COMMANDS.TOOLS.BUKKIT.SOUNDS.DESCRIPTION"])
3434
.executor(object : Executors {
3535
override fun execute(sender: GlobalSender, parents: Array<String>, args: Array<String>): Boolean {
3636
if (args.size < 3) {
3737
return false
3838
}
39-
val target = if (args.size < 4) {
40-
plugin.server.getPlayer(args[3]).let {
41-
if (it.isPresent)
42-
return@let it.get()
43-
else {
44-
sender.sendMessage(languages["COMMAND-NEXUS.HELPER.PLAYER-IS-OFFLINE"].setPlaceholder("player_name" to args[3]))
45-
return true
46-
}
39+
val target = plugin.server.getPlayer(args[0]).let {
40+
if (it.isPresent) {
41+
it.get()
42+
} else {
43+
sender.sendMessage(FormatHeader.ERROR, languages["COMMAND-NEXUS.HELPER.PLAYER-IS-OFFLINE"].setPlaceholder("player_name" to args[0]))
44+
return true
4745
}
48-
} else {
49-
if (sender.isPlayer())
50-
sender.toPlayer()
51-
else
52-
return false
5346
}
54-
val sound = Sound.valueOf(args[0])
55-
val volume: Float = if (StringUtils.isNumeric(args[1])) args[1].toFloat() else 1.0F
56-
val pitch: Float = if (StringUtils.isNumeric(args[2])) args[2].toFloat() else 1.0F
47+
val sound = Sound.valueOf(args[1])
48+
val volume: Float = if (StringUtils.isNumeric(args[2])) args[2].toFloat() else 1.0F
49+
val pitch: Float = if (StringUtils.isNumeric(args[3])) args[3].toFloat() else 1.0F
5750

58-
target?.toBukkitPlayer().also { it?.playSound(it.location, sound, volume, pitch) }
51+
target.toBukkitPlayer().also { it.playSound(it.location, sound, volume, pitch) }
5952
return true
6053
}
6154

6255
override fun tabComplete(sender: GlobalSender, parents: Array<String>, args: Array<String>): MutableList<String>? {
6356
when {
6457
args.size < 2 -> {
65-
return toolsCommand.findKeywordIndex(args[0], mutableListOf<String>().also { list -> Sound.values().forEach { list.add(it.name) } })
58+
return mutableListOf<String>().also { list -> plugin.server.getOnlinePlayers().forEach { list.add(it.name) } }
6659
}
6760
args.size < 3 -> {
68-
return toolsCommand.findKeywordIndex(args[1], mutableListOf("1.0"))
61+
return mutableListOf<String>().also { list -> Sound.values().forEach { list.add(it.name) } }
6962
}
7063
args.size < 4 -> {
71-
return toolsCommand.findKeywordIndex(args[2], mutableListOf("1.0"))
64+
return mutableListOf("1.0")
65+
}
66+
args.size < 5 -> {
67+
return mutableListOf("1.0")
7268
}
7369
}
7470

0 commit comments

Comments
 (0)