diff --git a/source/funkin/backend/system/Logs.hx b/source/funkin/backend/system/Logs.hx index 4c8223a4..cefe6b93 100644 --- a/source/funkin/backend/system/Logs.hx +++ b/source/funkin/backend/system/Logs.hx @@ -24,7 +24,7 @@ class Logs { ); } } - __showInConsole(prepareColoredTrace(data, TRACE)); + traceColored(data, TRACE); }; LogFrontEnd.onLogs = function(data, style, fireOnce) { @@ -134,16 +134,33 @@ class Logs { #end } - public static function traceColored(text:Array, level:Level = INFO) + public inline static function traceColored(text:Array, level:Level = INFO) __showInConsole(prepareColoredTrace(text, level)); - public static function trace(text:String, level:Level = INFO, color:ConsoleColor = LIGHTGRAY) { - traceColored([ - { - text: text, - color: color - } - ], level); + public static function trace(text:String, level:Level = INFO, color:ConsoleColor = LIGHTGRAY, ?prefix:String) { + var text = [logText(text, color)]; + if(prefix != null) text.insert(0, getPrefix(prefix)); + traceColored(text, level); + } + + public inline static function getPrefix(prefix:String) { + return logText('[${prefix}] ', BLUE); + } + + public inline static function infos(text:String, color:ConsoleColor = LIGHTGRAY, ?prefix:String) { + Logs.trace(text, INFO, color, prefix); + } + + public inline static function verbose(text:String, color:ConsoleColor = LIGHTGRAY, ?prefix:String) { + Logs.trace(text, VERBOSE, color, prefix); + } + + public inline static function warn(text:String, color:ConsoleColor = YELLOW, ?prefix:String) { + Logs.trace(text, WARNING, color, prefix); + } + + public inline static function error(text:String, color:ConsoleColor = RED, ?prefix:String) { + Logs.trace(text, ERROR, color, prefix); } } diff --git a/source/funkin/backend/utils/DiscordUtil.hx b/source/funkin/backend/utils/DiscordUtil.hx index 7a7bc549..39a92e49 100644 --- a/source/funkin/backend/utils/DiscordUtil.hx +++ b/source/funkin/backend/utils/DiscordUtil.hx @@ -305,7 +305,7 @@ class DiscordUtil user = DUser.initRaw(request); Logs.traceColored([ - Logs.logText("[Discord] ", BLUE), + Logs.getPrefix("Discord"), Logs.logText("Connected to User " + user.globalName + " ("), Logs.logText(user.handle, GRAY), Logs.logText(")") @@ -321,7 +321,7 @@ class DiscordUtil var finalMsg:String = cast(message, String); Logs.traceColored([ - Logs.logText("[Discord] ", BLUE), + Logs.getPrefix("Discord"), Logs.logText("Disconnected ("), Logs.logText('$errorCode: $finalMsg', RED), Logs.logText(")") @@ -335,7 +335,7 @@ class DiscordUtil var finalMsg:String = cast(message, String); Logs.traceColored([ - Logs.logText("[Discord] ", BLUE), + Logs.getPrefix("Discord"), Logs.logText('Error ($errorCode: $finalMsg)', RED) ], ERROR); @@ -344,7 +344,7 @@ class DiscordUtil private static function onJoin(joinSecret:cpp.ConstCharStar):Void { - Logs.traceColored([Logs.logText("[Discord] ", BLUE), Logs.logText("Someone has just joined", GREEN)], INFO); + Logs.traceColored([Logs.getPrefix("Discord"), Logs.logText("Someone has just joined", GREEN)], INFO); call("onJoinGame", [cast(joinSecret, String)]); } @@ -352,7 +352,7 @@ class DiscordUtil private static function onSpectate(spectateSecret:cpp.ConstCharStar):Void { Logs.traceColored([ - Logs.logText("[Discord] ", BLUE), + Logs.getPrefix("Discord"), Logs.logText("Someone started spectating your game", YELLOW) ], INFO); @@ -362,7 +362,7 @@ class DiscordUtil private static function onJoinReq(request:cpp.RawConstPointer):Void { Logs.traceColored([ - Logs.logText("[Discord] ", BLUE), + Logs.getPrefix("Discord"), Logs.logText("Someone has just requested to join", YELLOW) ], WARNING); diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 7157f55c..884b8433 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -642,7 +642,7 @@ class PlayState extends MusicBeatState for(folder in scriptsFolders) { for(file in Paths.getFolderContent(folder, true, fromMods ? MODS : BOTH)) { if (folder == 'data/charts/') - Logs.trace('[PlayState] data/charts/ is deprecated and will be removed in the future. Please move script $file to songs/', WARNING, DARKYELLOW); + Logs.warn('data/charts/ is deprecated and will be removed in the future. Please move script $file to songs/', DARKYELLOW, "PlayState"); addScript(file); } @@ -1302,9 +1302,9 @@ class PlayState extends MusicBeatState FlxG.switchState(new funkin.editors.charter.Charter(SONG.meta.name, difficulty, false)); } /*if (FlxG.keys.justPressed.F5) { - Logs.trace('[PlayState] Reloading scripts...', WARNING, YELLOW); + Logs.warn('Reloading scripts...', "PlayState"); scripts.reload(); - Logs.trace('[PlayState] Song scripts successfully reloaded.', WARNING, GREEN); + Logs.warn('Song scripts successfully reloaded.', GREEN, "PlayState"); }*/ } @@ -1571,8 +1571,7 @@ class PlayState extends MusicBeatState } else { - // TODO: make this colored - Logs.trace('[PlayState] Loading next song (${storyPlaylist[0].toLowerCase()}/$difficulty)', VERBOSE); + Logs.infos('Loading next song (${storyPlaylist[0].toLowerCase()}/$difficulty)', "PlayState"); registerSmoothTransition();