From 7078ecfed4db007885fca1c060dd3c4bad8fcb84 Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Wed, 14 Dec 2016 12:40:53 +0900 Subject: [PATCH] Echo().execute(message) is now just Echo(message) Former-commit-id: 851e141fc91b170190d6027f42f59906dda0f31f Former-commit-id: 03dbb9da1788e1c50e84ae33d95f76194ad9a08d --- .../torvald/terrarum/console/Authenticator.kt | 2 +- src/net/torvald/terrarum/console/Batch.kt | 2 +- src/net/torvald/terrarum/console/CatStdout.kt | 6 ++-- .../torvald/terrarum/console/CodexEdictis.kt | 12 ++++---- .../torvald/terrarum/console/CommandDict.kt | 2 +- .../terrarum/console/CommandInterpreter.kt | 6 ++-- src/net/torvald/terrarum/console/Echo.kt | 3 ++ .../console/{Error.kt => EchoError.kt} | 5 +++- src/net/torvald/terrarum/console/ExportAV.kt | 10 +++---- src/net/torvald/terrarum/console/ExportMap.kt | 10 +++---- src/net/torvald/terrarum/console/ForceGC.kt | 4 +-- src/net/torvald/terrarum/console/GetAV.kt | 26 ++++++++-------- .../torvald/terrarum/console/GetFactioning.kt | 30 +++++++++---------- src/net/torvald/terrarum/console/GetLocale.kt | 6 ++-- src/net/torvald/terrarum/console/GetTime.kt | 4 +-- src/net/torvald/terrarum/console/GsonTest.kt | 6 ++-- src/net/torvald/terrarum/console/Help.kt | 8 ++--- src/net/torvald/terrarum/console/Inventory.kt | 14 ++++----- src/net/torvald/terrarum/console/LangTest.kt | 4 +-- src/net/torvald/terrarum/console/MusicTest.kt | 4 +-- .../terrarum/console/PrintRandomTips.kt | 4 +-- src/net/torvald/terrarum/console/Seed.kt | 4 +-- src/net/torvald/terrarum/console/SetAV.kt | 22 +++++++------- .../console/SetGlobalLightOverride.kt | 10 +++---- src/net/torvald/terrarum/console/SetLocale.kt | 10 +++---- src/net/torvald/terrarum/console/SetTime.kt | 4 +-- .../torvald/terrarum/console/SetTimeDelta.kt | 8 ++--- .../terrarum/console/SpawnPhysTestBall.kt | 2 +- .../terrarum/console/TeleportPlayer.kt | 4 +-- .../torvald/terrarum/console/ToggleNoClip.kt | 4 +-- src/net/torvald/terrarum/console/Version.kt | 6 ++-- src/net/torvald/terrarum/console/Zoom.kt | 6 ++-- 32 files changed, 127 insertions(+), 121 deletions(-) rename src/net/torvald/terrarum/console/{Error.kt => EchoError.kt} (77%) diff --git a/src/net/torvald/terrarum/console/Authenticator.kt b/src/net/torvald/terrarum/console/Authenticator.kt index b9c37d8db..5f3057239 100644 --- a/src/net/torvald/terrarum/console/Authenticator.kt +++ b/src/net/torvald/terrarum/console/Authenticator.kt @@ -19,7 +19,7 @@ internal object Authenticator : ConsoleCommand { if ("65b9aa150332ed7096134efb20220e5ebec04d4dbe1c537ff3816f68c2391c1c".equals(hashedPwd, ignoreCase = true)) { // aryll val msg = if (a) "Locked" else "Authenticated" - Echo.execute(msg) + Echo(msg) println("[Authenticator] " + msg) a = !a (Terrarum.ingame.consoleHandler.UI as ConsoleWindow).reset() diff --git a/src/net/torvald/terrarum/console/Batch.kt b/src/net/torvald/terrarum/console/Batch.kt index e7b476213..796660e49 100644 --- a/src/net/torvald/terrarum/console/Batch.kt +++ b/src/net/torvald/terrarum/console/Batch.kt @@ -19,6 +19,6 @@ internal object Batch : ConsoleCommand { } override fun printUsage() { - Echo.execute("Usage: batch path/to/batch.txt") + Echo("Usage: batch path/to/batch.txt") } } diff --git a/src/net/torvald/terrarum/console/CatStdout.kt b/src/net/torvald/terrarum/console/CatStdout.kt index b1d7cbc50..befee74e9 100644 --- a/src/net/torvald/terrarum/console/CatStdout.kt +++ b/src/net/torvald/terrarum/console/CatStdout.kt @@ -16,15 +16,15 @@ internal object CatStdout : ConsoleCommand { } try { - Files.lines(FileSystems.getDefault().getPath(args[1])).forEach({ Echo.execute(it) }) + Files.lines(FileSystems.getDefault().getPath(args[1])).forEach({ Echo(it) }) } catch (e: IOException) { - Echo.execute("CatStdout: could not read file -- IOException") + Echo("CatStdout: could not read file -- IOException") } } override fun printUsage() { - Echo.execute("usage: cat 'path/to/text/file") + Echo("usage: cat 'path/to/text/file") } } diff --git a/src/net/torvald/terrarum/console/CodexEdictis.kt b/src/net/torvald/terrarum/console/CodexEdictis.kt index 8048a19f8..e3c4a7c39 100644 --- a/src/net/torvald/terrarum/console/CodexEdictis.kt +++ b/src/net/torvald/terrarum/console/CodexEdictis.kt @@ -25,22 +25,22 @@ internal object CodexEdictis : ConsoleCommand { val sb = StringBuilder() val formatter = Formatter(sb) - Echo.execute("Codex: " + formatter.format(Lang["DEV_MESSAGE_CONSOLE_COMMAND_UNKNOWN"], args[1]).toString()) + Echo("Codex: " + formatter.format(Lang["DEV_MESSAGE_CONSOLE_COMMAND_UNKNOWN"], args[1]).toString()) } } } override fun printUsage() { - Echo.execute("Usage: codex (command)") - Echo.execute("shows how to use 'command'") - Echo.execute("leave blank to get list of available commands") + Echo("Usage: codex (command)") + Echo("shows how to use 'command'") + Echo("leave blank to get list of available commands") } private fun printList() { - Echo.execute(Lang["DEV_MESSAGE_CONSOLE_AVAILABLE_COMMANDS"]) + Echo(Lang["DEV_MESSAGE_CONSOLE_AVAILABLE_COMMANDS"]) CommandDict.dict.forEach { name, cmd -> - Echo.execute("$ccW• " + name) + Echo("$ccW• " + name) cmd.printUsage() } } diff --git a/src/net/torvald/terrarum/console/CommandDict.kt b/src/net/torvald/terrarum/console/CommandDict.kt index 12bc3558e..858ec436d 100644 --- a/src/net/torvald/terrarum/console/CommandDict.kt +++ b/src/net/torvald/terrarum/console/CommandDict.kt @@ -11,7 +11,7 @@ object CommandDict { internal var dict: HashMap = hashMapOf( Pair("echo", Echo), - Pair("error", Error), + Pair("error", EchoError), Pair("setav", SetAV), Pair("qqq", QuitApp), Pair("codex", CodexEdictis), diff --git a/src/net/torvald/terrarum/console/CommandInterpreter.kt b/src/net/torvald/terrarum/console/CommandInterpreter.kt index 4ea7beea9..d0ae08740 100644 --- a/src/net/torvald/terrarum/console/CommandInterpreter.kt +++ b/src/net/torvald/terrarum/console/CommandInterpreter.kt @@ -59,7 +59,7 @@ object CommandInterpreter { } finally { - Echo.execute("$ccW> $single_command") // prints out the input + Echo("$ccW> $single_command") // prints out the input println("${ZonedDateTime.now()} [CommandInterpreter] issuing command '$single_command'") try { if (commandObj != null) { @@ -73,7 +73,7 @@ object CommandInterpreter { catch (e: Exception) { System.err.print("[CommandInterpreter] ") e.printStackTrace() - Error.execute(Lang["ERROR_GENERIC_TEXT"]) + EchoError(Lang["ERROR_GENERIC_TEXT"]) } } @@ -115,7 +115,7 @@ object CommandInterpreter { val sb = StringBuilder() val formatter = Formatter(sb) - Error.execute( + EchoError( formatter.format(Lang["DEV_MESSAGE_CONSOLE_COMMAND_UNKNOWN"], cmdname).toString()) } diff --git a/src/net/torvald/terrarum/console/Echo.kt b/src/net/torvald/terrarum/console/Echo.kt index 1639e0567..53c4ff458 100644 --- a/src/net/torvald/terrarum/console/Echo.kt +++ b/src/net/torvald/terrarum/console/Echo.kt @@ -28,6 +28,9 @@ internal object Echo : ConsoleCommand { (Terrarum.ingame.consoleHandler.UI as ConsoleWindow).sendMessage(sb.toString()) } + operator fun invoke(args: Array) = execute(args) + operator fun invoke(single_line: String) = execute(single_line) + override fun printUsage() { } diff --git a/src/net/torvald/terrarum/console/Error.kt b/src/net/torvald/terrarum/console/EchoError.kt similarity index 77% rename from src/net/torvald/terrarum/console/Error.kt rename to src/net/torvald/terrarum/console/EchoError.kt index 552b8f925..ab8bb682c 100644 --- a/src/net/torvald/terrarum/console/Error.kt +++ b/src/net/torvald/terrarum/console/EchoError.kt @@ -7,7 +7,7 @@ import net.torvald.terrarum.ui.ConsoleWindow /** * Created by minjaesong on 16-04-25. */ -internal object Error : ConsoleCommand { +internal object EchoError : ConsoleCommand { override fun execute(args: Array) { val argsWoHeader = Array(args.size - 1, {it -> args[it + 1]}) argsWoHeader.forEach { execute(it) } @@ -17,6 +17,9 @@ internal object Error : ConsoleCommand { (Terrarum.ingame.consoleHandler.UI as ConsoleWindow).sendMessage("${GameFontBase.colToCode["r"]}$single_line") } + operator fun invoke(args: Array) = execute(args) + operator fun invoke(single_line: String) = execute(single_line) + override fun printUsage() { } diff --git a/src/net/torvald/terrarum/console/ExportAV.kt b/src/net/torvald/terrarum/console/ExportAV.kt index a7394ad1a..b02e80e64 100644 --- a/src/net/torvald/terrarum/console/ExportAV.kt +++ b/src/net/torvald/terrarum/console/ExportAV.kt @@ -16,10 +16,10 @@ internal object ExportAV : ConsoleCommand { Terrarum.ingame.player.actorValue, Terrarum.defaultDir + "/Exports/" + args[1] + ".json") - Echo.execute("ExportAV: exported to " + args[1] + ".json") + Echo("ExportAV: exported to " + args[1] + ".json") } catch (e: IOException) { - Echo.execute("ExportAV: IOException raised.") + Echo("ExportAV: IOException raised.") e.printStackTrace() } @@ -30,8 +30,8 @@ internal object ExportAV : ConsoleCommand { } override fun printUsage() { - Echo.execute("Export ActorValue as JSON format.") - Echo.execute("Usage: exportav (id) filename-without-extension") - Echo.execute("blank ID for player") + Echo("Export ActorValue as JSON format.") + Echo("Usage: exportav (id) filename-without-extension") + Echo("blank ID for player") } } diff --git a/src/net/torvald/terrarum/console/ExportMap.kt b/src/net/torvald/terrarum/console/ExportMap.kt index 8de5a8c5c..8c1f8d3d1 100644 --- a/src/net/torvald/terrarum/console/ExportMap.kt +++ b/src/net/torvald/terrarum/console/ExportMap.kt @@ -45,11 +45,11 @@ internal object ExportMap : ConsoleCommand { try { RasterWriter.writePNG_RGB( Terrarum.ingame.world.width, Terrarum.ingame.world.height, mapData, dir + args[1] + ".png") - Echo.execute("ExportMap: exported to " + args[1] + ".png") + Echo("ExportMap: exported to " + args[1] + ".png") } catch (e: IOException) { - Echo.execute("ExportMap: IOException raised.") + Echo("ExportMap: IOException raised.") e.printStackTrace() } @@ -66,9 +66,9 @@ internal object ExportMap : ConsoleCommand { override fun printUsage() { - Echo.execute("Usage: export ") - Echo.execute("Exports current map into echo image.") - Echo.execute("The image can be found at %adddata%/terrarum/Exports") + Echo("Usage: export ") + Echo("Exports current map into echo image.") + Echo("The image can be found at %adddata%/terrarum/Exports") } private fun buildColorTable() { diff --git a/src/net/torvald/terrarum/console/ForceGC.kt b/src/net/torvald/terrarum/console/ForceGC.kt index 2d4df3f51..7b2f15272 100644 --- a/src/net/torvald/terrarum/console/ForceGC.kt +++ b/src/net/torvald/terrarum/console/ForceGC.kt @@ -6,10 +6,10 @@ package net.torvald.terrarum.console internal object ForceGC : ConsoleCommand { override fun execute(args: Array) { System.gc() - Echo.execute("Invoked System.gc") + Echo("Invoked System.gc") } override fun printUsage() { - Echo.execute("Invoke garbage collection of JVM.") + Echo("Invoke garbage collection of JVM.") } } diff --git a/src/net/torvald/terrarum/console/GetAV.kt b/src/net/torvald/terrarum/console/GetAV.kt index 2d65f1727..4e3e3a671 100644 --- a/src/net/torvald/terrarum/console/GetAV.kt +++ b/src/net/torvald/terrarum/console/GetAV.kt @@ -22,10 +22,10 @@ internal object GetAV : ConsoleCommand { val av = Terrarum.ingame.player.actorValue val keyset = av.keySet - Echo.execute("$ccW== ActorValue list for ${ccY}player $ccW==") + Echo("$ccW== ActorValue list for ${ccY}player $ccW==") println("[GetAV] == ActorValue list for 'player' ==") keyset.forEach { elem -> - Echo.execute("$ccM$elem $ccW= $ccG${av[elem as String]}") + Echo("$ccM$elem $ccW= $ccG${av[elem as String]}") println("[GetAV] $elem = ${av[elem]}") } } @@ -35,7 +35,7 @@ internal object GetAV : ConsoleCommand { else if (args.size == 2) { // check if args[1] is number or not if (!args[1].isNum()) { // args[1] is ActorValue name - Echo.execute("${ccW}player.$ccM${args[1]} $ccW= " + + Echo("${ccW}player.$ccM${args[1]} $ccW= " + ccG + Terrarum.ingame.player.actorValue[args[1]] + " $ccO" + @@ -53,15 +53,15 @@ internal object GetAV : ConsoleCommand { val av = actor.actorValue val keyset = av.keySet - Echo.execute("$ccW== ActorValue list for $ccY$actor $ccW==") + Echo("$ccW== ActorValue list for $ccY$actor $ccW==") println("[GetAV] == ActorValue list for '$actor' ==") if (keyset.size == 0) { - Echo.execute("$ccK(nothing)") + Echo("$ccK(nothing)") println("[GetAV] (nothing)") } else { keyset.forEach { elem -> - Echo.execute("$ccM$elem $ccW= $ccG${av[elem as String]}") + Echo("$ccM$elem $ccW= $ccG${av[elem as String]}") println("[GetAV] $elem = ${av[elem]}") } } @@ -70,7 +70,7 @@ internal object GetAV : ConsoleCommand { else if (args.size == 3) { val id = args[1].toInt() val av = args[2] - Echo.execute("$ccW$id.$ccM$av $ccW= $ccG" + + Echo("$ccW$id.$ccM$av $ccW= $ccG" + Terrarum.ingame.getActorByID(id).actorValue[av] + " $ccO" + Terrarum.ingame.getActorByID(id).actorValue[av]!!.javaClass.simpleName @@ -84,11 +84,11 @@ internal object GetAV : ConsoleCommand { } catch (e: NullPointerException) { if (args.size == 2) { - Error.execute(args[1] + ": actor value does not exist.") + EchoError(args[1] + ": actor value does not exist.") System.err.println("[GetAV] ${args[1]}: actor value does not exist.") } else if (args.size == 3) { - Error.execute(args[2] + ": actor value does not exist.") + EchoError(args[2] + ": actor value does not exist.") System.err.println("[GetAV] ${args[2]}: actor value does not exist.") } else { @@ -96,7 +96,7 @@ internal object GetAV : ConsoleCommand { } } catch (e1: IllegalArgumentException) { - Error.execute("${args[1]}: no actor with this ID.") + EchoError("${args[1]}: no actor with this ID.") System.err.println("[GetAV] ${args[1]}: no actor with this ID.") } @@ -113,8 +113,8 @@ internal object GetAV : ConsoleCommand { } override fun printUsage() { - Echo.execute("${ccW}Get desired ActorValue of specific target.") - Echo.execute("${ccW}Usage: ${ccY}getav ${ccG}(id) ") - Echo.execute("${ccW}blank ID for player") + Echo("${ccW}Get desired ActorValue of specific target.") + Echo("${ccW}Usage: ${ccY}getav ${ccG}(id) ") + Echo("${ccW}blank ID for player") } } diff --git a/src/net/torvald/terrarum/console/GetFactioning.kt b/src/net/torvald/terrarum/console/GetFactioning.kt index f746be785..fe2079580 100644 --- a/src/net/torvald/terrarum/console/GetFactioning.kt +++ b/src/net/torvald/terrarum/console/GetFactioning.kt @@ -27,56 +27,56 @@ internal object GetFactioning : ConsoleCommand { fun printOutFactioning(id: Int) { val a = Terrarum.ingame.getActorByID(id) if (a is Factionable) { - Echo.execute("$ccW== Faction assignment for $ccY${if (id == Player.PLAYER_REF_ID) "player" else id.toString()} $ccW==") + Echo("$ccW== Faction assignment for $ccY${if (id == Player.PLAYER_REF_ID) "player" else id.toString()} $ccW==") println("[GetFactioning] == Faction assignment for '${if (id == Player.PLAYER_REF_ID) "player" else id.toString()}' ==") // get all factioning data of player val factionSet = a.faction if (factionSet.isEmpty()) { - Echo.execute("The actor has empty faction set.") + Echo("The actor has empty faction set.") println("[GetFactioning] The actor has empty faction set.") return } val count = factionSet.size - Echo.execute("$ccG${count.toString()} $ccW${Lang.pluralise(" faction", count)} assigned.") + Echo("$ccG${count.toString()} $ccW${Lang.pluralise(" faction", count)} assigned.") println("[GetFactioning] ${count.toString()} ${Lang.pluralise(" faction", count)} assigned.") for (faction in factionSet) { - Echo.execute("${ccW}faction $ccM${faction.factionName}") + Echo("${ccW}faction $ccM${faction.factionName}") println("[GetFactioning] faction '${faction.factionName}'") - Echo.execute("$ccY Amicable") + Echo("$ccY Amicable") println("[GetFactioning] Amicable") faction.factionAmicable.forEach { s -> - Echo.execute(PRINT_INDENTATION + s) + Echo(PRINT_INDENTATION + s) println("[GetFactioning] --> $s") } - Echo.execute("$ccY Explicit neutral") + Echo("$ccY Explicit neutral") println("[GetFactioning] Explicit neutral") faction.factionNeutral.forEach { s -> - Echo.execute(PRINT_INDENTATION + s) + Echo(PRINT_INDENTATION + s) println("[GetFactioning] --> $s") } - Echo.execute("$ccY Hostile") + Echo("$ccY Hostile") println("[GetFactioning] Hostile") faction.factionHostile.forEach { s -> - Echo.execute(PRINT_INDENTATION + s) + Echo(PRINT_INDENTATION + s) println("[GetFactioning] --> $s") } - Echo.execute("$ccY Fearful") + Echo("$ccY Fearful") println("[GetFactioning] Fearful") faction.factionFearful.forEach { s -> - Echo.execute(PRINT_INDENTATION + s) + Echo(PRINT_INDENTATION + s) println("[GetFactioning] --> $s") } } } else { - Error.execute("The actor is not factionable.") + EchoError("The actor is not factionable.") System.err.println("[GetFactioning] The actor is not factionable.") } } @@ -86,7 +86,7 @@ internal object GetFactioning : ConsoleCommand { } else { if (!args[1].isNum()) { - Error.execute("Invalid actor ID input.") + EchoError("Invalid actor ID input.") System.err.println("[GetFactioning] Invalid actor ID input.") return } @@ -95,7 +95,7 @@ internal object GetFactioning : ConsoleCommand { printOutFactioning(actorID) } catch (e: IllegalArgumentException) { - Error.execute("${args[1]}: no actor with this ID.") + EchoError("${args[1]}: no actor with this ID.") System.err.println("[GetFactioning] ${args[1]}: no actor with this ID.") } } diff --git a/src/net/torvald/terrarum/console/GetLocale.kt b/src/net/torvald/terrarum/console/GetLocale.kt index 2dfeb6813..2afe7359a 100644 --- a/src/net/torvald/terrarum/console/GetLocale.kt +++ b/src/net/torvald/terrarum/console/GetLocale.kt @@ -8,7 +8,7 @@ import net.torvald.terrarum.Terrarum */ internal object GetLocale : ConsoleCommand { override fun execute(args: Array) { - Echo.execute( + Echo( "Locale: " + Lang["MENU_LANGUAGE_THIS"] + " (" @@ -18,7 +18,7 @@ internal object GetLocale : ConsoleCommand { override fun printUsage() { - Echo.execute("Usage: getlocale") - Echo.execute("Get name of locale currently using.") + Echo("Usage: getlocale") + Echo("Get name of locale currently using.") } } diff --git a/src/net/torvald/terrarum/console/GetTime.kt b/src/net/torvald/terrarum/console/GetTime.kt index b70f4b7d8..1f4555fab 100644 --- a/src/net/torvald/terrarum/console/GetTime.kt +++ b/src/net/torvald/terrarum/console/GetTime.kt @@ -9,10 +9,10 @@ internal object GetTime : ConsoleCommand { override fun execute(args: Array) { val worldTime = Terrarum.ingame.world.time - Echo.execute(worldTime.getFormattedTime()) + Echo(worldTime.getFormattedTime()) } override fun printUsage() { - Echo.execute("Print current world time in convenient form") + Echo("Print current world time in convenient form") } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/console/GsonTest.kt b/src/net/torvald/terrarum/console/GsonTest.kt index 665bc6a94..87365fa28 100644 --- a/src/net/torvald/terrarum/console/GsonTest.kt +++ b/src/net/torvald/terrarum/console/GsonTest.kt @@ -27,10 +27,10 @@ internal object GsonTest : ConsoleCommand { bufferedWriter.write(jsonString) bufferedWriter.close() - Echo.execute("GsonTest: exported to " + args[1] + ".json") + Echo("GsonTest: exported to " + args[1] + ".json") } catch (e: IOException) { - Echo.execute("GsonTest: IOException raised.") + Echo("GsonTest: IOException raised.") e.printStackTrace() } @@ -42,6 +42,6 @@ internal object GsonTest : ConsoleCommand { override fun printUsage() { - Echo.execute("Usage: gsontest filename-without-extension") + Echo("Usage: gsontest filename-without-extension") } } diff --git a/src/net/torvald/terrarum/console/Help.kt b/src/net/torvald/terrarum/console/Help.kt index 2182246df..75d4f684c 100644 --- a/src/net/torvald/terrarum/console/Help.kt +++ b/src/net/torvald/terrarum/console/Help.kt @@ -10,17 +10,17 @@ internal object Help : ConsoleCommand { override fun execute(args: Array) { if (args.size == 1) { - for (i in 1..6) Echo.execute(Lang["HELP_OTF_MAIN_$i"]) + for (i in 1..6) Echo(Lang["HELP_OTF_MAIN_$i"]) } else if (args[1].toLowerCase() == "slow") { - for (i in 1..4) Echo.execute(Lang["HELP_OTF_SLOW_$i"]) + for (i in 1..4) Echo(Lang["HELP_OTF_SLOW_$i"]) } else { - for (i in 1..6) Echo.execute(Lang["HELP_OTF_MAIN_$i"]) + for (i in 1..6) Echo(Lang["HELP_OTF_MAIN_$i"]) } } override fun printUsage() { - Echo.execute("Prints some utility functions assigned to function row of the keyboard.") + Echo("Prints some utility functions assigned to function row of the keyboard.") } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/console/Inventory.kt b/src/net/torvald/terrarum/console/Inventory.kt index daecefb20..fd54cddef 100644 --- a/src/net/torvald/terrarum/console/Inventory.kt +++ b/src/net/torvald/terrarum/console/Inventory.kt @@ -29,13 +29,13 @@ internal object Inventory : ConsoleCommand { private fun listInventory() { if (target.getTotalUniqueCount() == 0) { - Echo.execute("(inventory empty)") + Echo("(inventory empty)") } else { target.forEach { refId, amount -> if (amount == 0) { - Error.execute("Unexpected zero-amounted item: ID $refId") + EchoError("Unexpected zero-amounted item: ID $refId") } - Echo.execute("ID $refId${if (amount > 1) " ($amount)" else ""}") + Echo("ID $refId${if (amount > 1) " ($amount)" else ""}") } } } @@ -43,7 +43,7 @@ internal object Inventory : ConsoleCommand { private fun setTarget(actorRefId: Int = Player.PLAYER_REF_ID) { val actor = Terrarum.ingame.getActorByID(actorRefId) if (actor !is Pocketed) { - Error.execute("Cannot edit inventory of incompatible actor: $actor") + EchoError("Cannot edit inventory of incompatible actor: $actor") } else { target = actor.inventory } @@ -58,8 +58,8 @@ internal object Inventory : ConsoleCommand { } override fun printUsage() { - Echo.execute("Usage: inventory command arguments") - Echo.execute("Available commands:") - Echo.execute("list | assign slot | add itemid [amount] | target [actorid]") + Echo("Usage: inventory command arguments") + Echo("Available commands:") + Echo("list | assign slot | add itemid [amount] | target [actorid]") } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/console/LangTest.kt b/src/net/torvald/terrarum/console/LangTest.kt index 27661231b..b1f08cf73 100644 --- a/src/net/torvald/terrarum/console/LangTest.kt +++ b/src/net/torvald/terrarum/console/LangTest.kt @@ -7,13 +7,13 @@ import net.torvald.terrarum.langpack.Lang */ internal object LangTest : ConsoleCommand { override fun printUsage() { - Echo.execute("Prints out string in the current lang pack by STRING_ID provided") + Echo("Prints out string in the current lang pack by STRING_ID provided") } override fun execute(args: Array) { if (args.size < 2) printUsage() else - Echo.execute(Lang[args[1].toUpperCase()]) + Echo(Lang[args[1].toUpperCase()]) } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/console/MusicTest.kt b/src/net/torvald/terrarum/console/MusicTest.kt index 873cf9446..3ab386591 100644 --- a/src/net/torvald/terrarum/console/MusicTest.kt +++ b/src/net/torvald/terrarum/console/MusicTest.kt @@ -39,7 +39,7 @@ internal object MusicTest : ConsoleCommand { } override fun printUsage() { - Echo.execute("Usage: musictest filename/in/res/sounds/test") - Echo.execute("musictest stop to stop playback") + Echo("Usage: musictest filename/in/res/sounds/test") + Echo("musictest stop to stop playback") } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/console/PrintRandomTips.kt b/src/net/torvald/terrarum/console/PrintRandomTips.kt index e4a969081..392b75f9b 100644 --- a/src/net/torvald/terrarum/console/PrintRandomTips.kt +++ b/src/net/torvald/terrarum/console/PrintRandomTips.kt @@ -8,10 +8,10 @@ import java.util.* */ internal object PrintRandomTips : ConsoleCommand { override fun execute(args: Array) { - Echo.execute(Lang["GAME_TIPS_${Random().nextInt(Lang.TIPS_COUNT) + 1}"]) + Echo(Lang["GAME_TIPS_${Random().nextInt(Lang.TIPS_COUNT) + 1}"]) } override fun printUsage() { - Echo.execute("Prints random tips for game.") + Echo("Prints random tips for game.") } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/console/Seed.kt b/src/net/torvald/terrarum/console/Seed.kt index 2498ef5ca..545f04fbc 100644 --- a/src/net/torvald/terrarum/console/Seed.kt +++ b/src/net/torvald/terrarum/console/Seed.kt @@ -13,11 +13,11 @@ internal object Seed : ConsoleCommand { // tsalagi override fun execute(args: Array) { - Echo.execute("Map$ccW: $ccG${Terrarum.ingame.world.generatorSeed}") + Echo("Map$ccW: $ccG${Terrarum.ingame.world.generatorSeed}") // TODO display randomiser seed } override fun printUsage() { - Echo.execute("prints out the generator seed of the current game.") + Echo("prints out the generator seed of the current game.") } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/console/SetAV.kt b/src/net/torvald/terrarum/console/SetAV.kt index 0e31bbe9c..b30d1f1a0 100644 --- a/src/net/torvald/terrarum/console/SetAV.kt +++ b/src/net/torvald/terrarum/console/SetAV.kt @@ -17,12 +17,12 @@ internal object SetAV : ConsoleCommand { override fun printUsage() { - Echo.execute("${ccW}Set actor value of specific target to desired value.") - Echo.execute("${ccW}Usage: ${ccY}setav ${ccG}(id) ") - Echo.execute("${ccW}blank ID for player. Data type will be inferred automatically.") - Echo.execute("${ccR}Contaminated (e.g. double -> string) ActorValue will crash the game,") - Echo.execute("${ccR}so make sure it will not happen before you issue the command!") - Echo.execute("${ccW}Use ${ccG}__true ${ccW}and ${ccG}__false ${ccW}for boolean value.") + Echo("${ccW}Set actor value of specific target to desired value.") + Echo("${ccW}Usage: ${ccY}setav ${ccG}(id) ") + Echo("${ccW}blank ID for player. Data type will be inferred automatically.") + Echo("${ccR}Contaminated (e.g. double -> string) ActorValue will crash the game,") + Echo("${ccR}so make sure it will not happen before you issue the command!") + Echo("${ccW}Use ${ccG}__true ${ccW}and ${ccG}__false ${ccW}for boolean value.") } override fun execute(args: Array) { @@ -65,13 +65,13 @@ internal object SetAV : ConsoleCommand { // check if av is number if (args[1].isNum()) { - Error.execute("Illegal ActorValue ${args[1]}: ActorValue cannot be a number.") + EchoError("Illegal ActorValue ${args[1]}: ActorValue cannot be a number.") System.err.println("[SetAV] Illegal ActorValue ${args[1]}: ActorValue cannot be a number.") return } Terrarum.ingame.player.actorValue[args[1]] = `val` - Echo.execute("${ccW}Set $ccM${args[1]} ${ccW}for ${ccY}player ${ccW}to $ccG$`val`") + Echo("${ccW}Set $ccM${args[1]} ${ccW}for ${ccY}player ${ccW}to $ccG$`val`") println("[SetAV] set ActorValue '${args[1]}' for player to '$`val`'.") } else if (args.size == 4) { @@ -82,18 +82,18 @@ internal object SetAV : ConsoleCommand { // check if av is number if (args[2].isNum()) { - Error.execute("Illegal ActorValue ${args[2]}: ActorValue cannot be a number.") + EchoError("Illegal ActorValue ${args[2]}: ActorValue cannot be a number.") System.err.println("[SetAV] Illegal ActorValue ${args[2]}: ActorValue cannot be a number.") return } actor.actorValue[args[2]] = `val` - Echo.execute("${ccW}Set $ccM${args[2]} ${ccW}for $ccY$id ${ccW}to $ccG$`val`") + Echo("${ccW}Set $ccM${args[2]} ${ccW}for $ccY$id ${ccW}to $ccG$`val`") println("[SetAV] set ActorValue '${args[2]}' for $actor to '$`val`'.") } catch (e: IllegalArgumentException) { if (args.size == 4) { - Error.execute("${args[1]}: no actor with this ID.") + EchoError("${args[1]}: no actor with this ID.") System.err.println("[SetAV] ${args[1]}: no actor with this ID.") } } diff --git a/src/net/torvald/terrarum/console/SetGlobalLightOverride.kt b/src/net/torvald/terrarum/console/SetGlobalLightOverride.kt index 44f277d10..d3c39a4ed 100644 --- a/src/net/torvald/terrarum/console/SetGlobalLightOverride.kt +++ b/src/net/torvald/terrarum/console/SetGlobalLightOverride.kt @@ -23,10 +23,10 @@ internal object SetGlobalLightOverride : ConsoleCommand { Terrarum.ingame.world.globalLight = GL } catch (e: NumberFormatException) { - Echo.execute("Wrong number input.") + Echo("Wrong number input.") } catch (e1: IllegalArgumentException) { - Echo.execute("Range: 0-" + LightmapRenderer.CHANNEL_MAX + " per channel") + Echo("Range: 0-" + LightmapRenderer.CHANNEL_MAX + " per channel") } } @@ -35,7 +35,7 @@ internal object SetGlobalLightOverride : ConsoleCommand { val GL = args[1].toInt() if (GL.toInt() < 0 || GL.toInt() >= LightmapRenderer.COLOUR_RANGE_SIZE) { - Echo.execute("Range: 0-" + (LightmapRenderer.COLOUR_RANGE_SIZE - 1)) + Echo("Range: 0-" + (LightmapRenderer.COLOUR_RANGE_SIZE - 1)) } else { Terrarum.ingame.world.globalLight = GL @@ -45,7 +45,7 @@ internal object SetGlobalLightOverride : ConsoleCommand { if (args[1].toLowerCase() == "none") lightOverride = false else - Echo.execute("Wrong number input.") + Echo("Wrong number input.") } } @@ -55,6 +55,6 @@ internal object SetGlobalLightOverride : ConsoleCommand { } override fun printUsage() { - Echo.execute("Usage: setgl [raw_value|r g b|“none”]") + Echo("Usage: setgl [raw_value|r g b|“none”]") } } diff --git a/src/net/torvald/terrarum/console/SetLocale.kt b/src/net/torvald/terrarum/console/SetLocale.kt index 6e3992fd4..34a627c38 100644 --- a/src/net/torvald/terrarum/console/SetLocale.kt +++ b/src/net/torvald/terrarum/console/SetLocale.kt @@ -17,19 +17,19 @@ internal object SetLocale : ConsoleCommand { val prevLocale = Terrarum.gameLocale Terrarum.gameLocale = args[1] try { - Echo.execute("Set locale to '" + Terrarum.gameLocale + "'.") + Echo("Set locale to '" + Terrarum.gameLocale + "'.") } catch (e: IOException) { - Echo.execute("could not read lang file.") + Echo("could not read lang file.") Terrarum.gameLocale = prevLocale } } else if (args.size == 1) { - Echo.execute("Locales:") + Echo("Locales:") - Lang.languageList.forEach { Echo.execute("--> $it") } + Lang.languageList.forEach { Echo("--> $it") } } else { printUsage() @@ -37,6 +37,6 @@ internal object SetLocale : ConsoleCommand { } override fun printUsage() { - Echo.execute("Usage: setlocale [locale]") + Echo("Usage: setlocale [locale]") } } diff --git a/src/net/torvald/terrarum/console/SetTime.kt b/src/net/torvald/terrarum/console/SetTime.kt index 855130b06..672c5ddec 100644 --- a/src/net/torvald/terrarum/console/SetTime.kt +++ b/src/net/torvald/terrarum/console/SetTime.kt @@ -13,7 +13,7 @@ internal object SetTime : ConsoleCommand { Terrarum.ingame.world.time.setTime(timeToSet) - Echo.execute("Set time to ${Terrarum.ingame.world.time.elapsedSeconds} " + + Echo("Set time to ${Terrarum.ingame.world.time.elapsedSeconds} " + "(${Terrarum.ingame.world.time.hours}h${formatMin(Terrarum.ingame.world.time.minutes)})") } else { @@ -26,6 +26,6 @@ internal object SetTime : ConsoleCommand { } override fun printUsage() { - Echo.execute("usage: settime <39201-in sec or 13h32-in hour>") + Echo("usage: settime <39201-in sec or 13h32-in hour>") } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/console/SetTimeDelta.kt b/src/net/torvald/terrarum/console/SetTimeDelta.kt index 2c6a52f8b..e5551e0f9 100644 --- a/src/net/torvald/terrarum/console/SetTimeDelta.kt +++ b/src/net/torvald/terrarum/console/SetTimeDelta.kt @@ -12,13 +12,13 @@ internal object SetTimeDelta : ConsoleCommand { override fun execute(args: Array) { if (args.size == 2) { if (args[1].toInt() > HARD_LIMIT) - Error.execute("Delta too large -- acceptable delta is 0-60.") + EchoError("Delta too large -- acceptable delta is 0-60.") Terrarum.ingame.world.time.setTimeDelta(args[1].toInt()) if (Terrarum.ingame.world.time.timeDelta == 0) - Echo.execute("時間よ止まれ！ザ・ワルド！！") + Echo("時間よ止まれ！ザ・ワルド！！") else - Echo.execute("Set time delta to ${Terrarum.ingame.world.time.timeDelta}") + Echo("Set time delta to ${Terrarum.ingame.world.time.timeDelta}") } else { printUsage() @@ -26,6 +26,6 @@ internal object SetTimeDelta : ConsoleCommand { } override fun printUsage() { - Echo.execute("usage: settimedelta ") + Echo("usage: settimedelta ") } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/console/SpawnPhysTestBall.kt b/src/net/torvald/terrarum/console/SpawnPhysTestBall.kt index bd29a7948..706f13ad6 100644 --- a/src/net/torvald/terrarum/console/SpawnPhysTestBall.kt +++ b/src/net/torvald/terrarum/console/SpawnPhysTestBall.kt @@ -33,6 +33,6 @@ internal object SpawnPhysTestBall : ConsoleCommand { } override fun printUsage() { - Echo.execute("usage: spawnball [elasticity]") + Echo("usage: spawnball [elasticity]") } } diff --git a/src/net/torvald/terrarum/console/TeleportPlayer.kt b/src/net/torvald/terrarum/console/TeleportPlayer.kt index 81d8861e6..c19d0e1af 100644 --- a/src/net/torvald/terrarum/console/TeleportPlayer.kt +++ b/src/net/torvald/terrarum/console/TeleportPlayer.kt @@ -22,7 +22,7 @@ internal object TeleportPlayer : ConsoleCommand { y = args[2].toInt() * MapDrawer.TILE_SIZE + MapDrawer.TILE_SIZE / 2 } catch (e: NumberFormatException) { - Echo.execute("Wrong number input.") + Echo("Wrong number input.") return } @@ -31,6 +31,6 @@ internal object TeleportPlayer : ConsoleCommand { } override fun printUsage() { - Echo.execute("Usage: teleport [x-tile] [y-tile]") + Echo("Usage: teleport [x-tile] [y-tile]") } } diff --git a/src/net/torvald/terrarum/console/ToggleNoClip.kt b/src/net/torvald/terrarum/console/ToggleNoClip.kt index 7bead3a3c..24c71d844 100644 --- a/src/net/torvald/terrarum/console/ToggleNoClip.kt +++ b/src/net/torvald/terrarum/console/ToggleNoClip.kt @@ -11,10 +11,10 @@ internal object ToggleNoClip : ConsoleCommand { val status = Terrarum.ingame.player.isNoClip() Terrarum.ingame.player.setNoClip(!status) - Echo.execute("Set no-clip status to " + (!status).toString()) + Echo("Set no-clip status to " + (!status).toString()) } override fun printUsage() { - Echo.execute("toggle no-clip status of player") + Echo("toggle no-clip status of player") } } diff --git a/src/net/torvald/terrarum/console/Version.kt b/src/net/torvald/terrarum/console/Version.kt index 292d779dd..ed2cbba33 100644 --- a/src/net/torvald/terrarum/console/Version.kt +++ b/src/net/torvald/terrarum/console/Version.kt @@ -9,11 +9,11 @@ import net.torvald.terrarum.langpack.Lang internal object Version : ConsoleCommand { override fun execute(args: Array) { - Echo.execute("${Terrarum.NAME} ${Terrarum.VERSION_STRING}") - Echo.execute("Polyglot language pack version ${Lang.POLYGLOT_VERSION}") + Echo("${Terrarum.NAME} ${Terrarum.VERSION_STRING}") + Echo("Polyglot language pack version ${Lang.POLYGLOT_VERSION}") } override fun printUsage() { - Echo.execute("Prints out current version of the application") + Echo("Prints out current version of the application") } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/console/Zoom.kt b/src/net/torvald/terrarum/console/Zoom.kt index 1981d19de..6356ca93f 100644 --- a/src/net/torvald/terrarum/console/Zoom.kt +++ b/src/net/torvald/terrarum/console/Zoom.kt @@ -14,7 +14,7 @@ internal object Zoom : ConsoleCommand { zoom = args[1].toFloat() } catch (e: NumberFormatException) { - Echo.execute("Wrong number input.") + Echo("Wrong number input.") return } @@ -29,7 +29,7 @@ internal object Zoom : ConsoleCommand { System.gc() - Echo.execute("Set screen zoom to " + zoom.toString()) + Echo("Set screen zoom to " + zoom.toString()) } else { printUsage() @@ -37,6 +37,6 @@ internal object Zoom : ConsoleCommand { } override fun printUsage() { - Echo.execute("Usage: zoom [zoom]") + Echo("Usage: zoom [zoom]") } }