changed some traces to use colored logs

Author: VideoBotYT

source/FreeplayState.hx

@@ -723,7 +723,7 @@ class FreeplayState extends MusicBeatState
 					}
 					catch (e:Dynamic)
 					{
-						trace('Error loading/playing file! $e');
+						Logs.traceNew('Error loading/playing file! $e', ERROR);
 						FlxG.sound.play(Paths.sound('cancelMenu'));
 					}
 					#end
@@ -753,7 +753,7 @@ class FreeplayState extends MusicBeatState
 						curDifficulty = 1;
 						trace('Couldnt find file');
 				}*/
-				trace(poop);
+				Logs.traceNew(poop, ERROR);
 
 				PlayState.isStoryMode = false;
 				PlayState.storyDifficulty = curDifficulty;

source/Paths.hx

@@ -95,14 +95,14 @@ class Paths
 	// Function that initializes the first note. This way, we can recycle the notes
 	public static function initDefaultSkin(?noteSkin:String, ?inEditor:Bool = false)
 	{
-		trace(noteSkin);
+		Logs.traceNew(noteSkin, WARNING);
 		if (noteSkin.length > 0)
 			defaultSkin = noteSkin;
 		else if (!PlayState.isPixelStage)
 			defaultSkin = 'NOTE_assets' + Note.getNoteSkinPostfix();
 		else
 			defaultSkin = 'NOTE_assets';
-		trace(defaultSkin);
+		Logs.traceNew(defaultSkin, WARNING);
 	}
 
 	public static function initNote(keys:Int = 4, ?noteSkin:String)
@@ -271,7 +271,7 @@ class Paths
 
 	inline static public function shaderFragment(key:String, ?library:String)
 	{
-		trace(cne_getPath('shaders/$key.frag', library));
+		Logs.traceNew(cne_getPath('shaders/$key.frag', library), INFO);
 		return cne_getPath('shaders/$key.frag', library);
 	}
 
@@ -652,7 +652,7 @@ class Paths
 						}
 						catch (e:Dynamic)
 						{
-							trace(e);
+							Logs.traceNew(e, ERROR);
 						}
 					}
 				}

source/ResetScoreSubState.hx

@@ -123,7 +123,7 @@ class ResetScoreSubState extends MusicBeatSubstate
 			}
 			catch (e:Dynamic)
 			{
-				trace('Icon does not have an XML!');
+				Logs.traceNew('Icon does not have an XML!', ERROR);
 
 				@:privateAccess {
 					leHealthIcon.char = '';

source/Snd.hx

@@ -1113,7 +1113,7 @@ class Snd {
 		mode |= FmodMode.FMOD_2D;
 
 
-		if( DEBUG_TRACK) trace("Snd:loading " + path);
+		if( DEBUG_TRACK) Logs.traceNew("Snd:loading " + path, INFO);
 
 		var snd : cpp.RawPointer<faxe.Faxe.FmodSound> = cast  null;
 		var sndR :  cpp.RawPointer<cpp.RawPointer<faxe.Faxe.FmodSound>> = cpp.RawPointer.addressOf(snd);

source/codename/backend/Script.hx

@@ -17,79 +17,80 @@ import openfl.utils.Assets;
 /**
  * Class used for scripting.
  */
-class Script extends FlxBasic implements IFlxDestroyable {
+class Script extends FlxBasic implements IFlxDestroyable
+{
 	/**
 	 * Use "static var thing = true;" in hscript to use those!!
 	 * are reset every mod switch so once you're done with them make sure to make them null!!
 	 */
 	public static var staticVariables:Map<String, Dynamic> = [];
 
-	public static function getDefaultVariables(?script:Script):Map<String, Dynamic> {
+	public static function getDefaultVariables(?script:Script):Map<String, Dynamic>
+	{
 		return [
 			// Haxe related stuff
-			"Std"			   => Std,
-			"Math"			  => Math,
-			"Reflect"			  => Reflect,
-			"StringTools"	   => StringTools,
-			"Json"			  => haxe.Json,
+			"Std" => Std,
+			"Math" => Math,
+			"Reflect" => Reflect,
+			"StringTools" => StringTools,
+			"Json" => haxe.Json,
 
 			// OpenFL & Lime related stuff
-			"Assets"			=> openfl.utils.Assets,
-			"Application"	   => lime.app.Application,
-			"window"			=> lime.app.Application.current.window,
+			"Assets" => openfl.utils.Assets,
+			"Application" => lime.app.Application,
+			"window" => lime.app.Application.current.window,
 
 			// Flixel related stuff
-			"FlxG"			  => flixel.FlxG,
-			"FlxSprite"		 => flixel.FlxSprite,
-			"FlxBasic"		  => flixel.FlxBasic,
-			"FlxCamera"		 => flixel.FlxCamera,
-			"state"			 => flixel.FlxG.state,
-			"FlxEase"		   => flixel.tweens.FlxEase,
-			"FlxTween"		  => flixel.tweens.FlxTween,
-			"FlxSound"		  => flixel.sound.FlxSound,
-			"FlxAssets"		 => flixel.system.FlxAssets,
-			"FlxMath"		   => flixel.math.FlxMath,
-			"FlxGroup"		  => flixel.group.FlxGroup,
-			"FlxTypedGroup"	 => flixel.group.FlxGroup.FlxTypedGroup,
-			"FlxSpriteGroup"	=> flixel.group.FlxSpriteGroup,
-			"FlxTypeText"	   => flixel.addons.text.FlxTypeText,
-			"FlxText"		   => flixel.text.FlxText,
-			"FlxTimer"		  => flixel.util.FlxTimer,
-			"FlxPoint"		  => ScriptUtils.getMacroAbstractClass("flixel.math.FlxPoint"),
-			"FlxAxes"		   => ScriptUtils.getMacroAbstractClass("flixel.util.FlxAxes"),
-			"FlxColor"		  => ScriptUtils.getMacroAbstractClass("flixel.util.FlxColor"),
-
-			"ModState"		  => codename.scripting.ModState,
-			"ModSubState"	   => codename.scripting.ModSubState,
-			"PlayState"		 => PlayState,
-			"GameOverSubstate"  => GameOverSubstate,
-			"HealthIcon"		=> HealthIcon,
-			"Note"			  => Note,
-			"StrumNote"			 => StrumNote,
-			"Character"		 => Character,
-			"Boyfriend"		 => Boyfriend, // for compatibility
-			"PauseSubstate"	 => PauseSubState,
-			"FreeplayState"	 => FreeplayState,
-			"MainMenuState"	 => MainMenuState,
-			"PauseSubState"	 => PauseSubState,
-			"StoryMenuState"	=> StoryMenuState,
-			"TitleState"		=> TitleState,
+			"FlxG" => flixel.FlxG,
+			"FlxSprite" => flixel.FlxSprite,
+			"FlxBasic" => flixel.FlxBasic,
+			"FlxCamera" => flixel.FlxCamera,
+			"state" => flixel.FlxG.state,
+			"FlxEase" => flixel.tweens.FlxEase,
+			"FlxTween" => flixel.tweens.FlxTween,
+			"FlxSound" => flixel.sound.FlxSound,
+			"FlxAssets" => flixel.system.FlxAssets,
+			"FlxMath" => flixel.math.FlxMath,
+			"FlxGroup" => flixel.group.FlxGroup,
+			"FlxTypedGroup" => flixel.group.FlxGroup.FlxTypedGroup,
+			"FlxSpriteGroup" => flixel.group.FlxSpriteGroup,
+			"FlxTypeText" => flixel.addons.text.FlxTypeText,
+			"FlxText" => flixel.text.FlxText,
+			"FlxTimer" => flixel.util.FlxTimer,
+			"FlxPoint" => ScriptUtils.getMacroAbstractClass("flixel.math.FlxPoint"),
+			"FlxAxes" => ScriptUtils.getMacroAbstractClass("flixel.util.FlxAxes"),
+			"FlxColor" => ScriptUtils.getMacroAbstractClass("flixel.util.FlxColor"),
+
+			"ModState" => codename.scripting.ModState,
+			"ModSubState" => codename.scripting.ModSubState,
+			"PlayState" => PlayState,
+			"GameOverSubstate" => GameOverSubstate,
+			"HealthIcon" => HealthIcon,
+			"Note" => Note,
+			"StrumNote" => StrumNote,
+			"Character" => Character,
+			"Boyfriend" => Boyfriend, // for compatibility
+			"PauseSubstate" => PauseSubState,
+			"FreeplayState" => FreeplayState,
+			"MainMenuState" => MainMenuState,
+			"PauseSubState" => PauseSubState,
+			"StoryMenuState" => StoryMenuState,
+			"TitleState" => TitleState,
 			// "Options"		   => options.SelectThing,
-			"Paths"			 => Paths,
-			"Conductor"		 => Conductor,
-			"FunkinShader"	  => codename.backend.shaders.FunkinShader,
-			"CustomShader"	  => codename.backend.shaders.CustomShader,
-			"Alphabet"		  => Alphabet,
+			"Paths" => Paths,
+			"Conductor" => Conductor,
+			"FunkinShader" => codename.backend.shaders.FunkinShader,
+			"CustomShader" => codename.backend.shaders.CustomShader,
+			"Alphabet" => Alphabet,
 
-			"CoolUtil"		  => CoolUtil,
+			"CoolUtil" => CoolUtil,
 		];
 	}
+
 	/**
 	 * All available script extensions
 	 */
-	public static var scriptExtensions:Array<String> = [
-		"hx", "hscript"
-	];
+	public static var scriptExtensions:Array<String> = ["hx", "hscript"];
 
 	/**
 	 * Currently executing script.
@@ -121,9 +122,12 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 * Creates a script from the specified asset path. The language is automatically determined.
 	 * @param path Path in assets
 	 */
-	public static function create(path:String):Script {
-		if (Assets.exists(path)) {
-			return switch(Path.extension(path).toLowerCase()) {
+	public static function create(path:String):Script
+	{
+		if (Assets.exists(path))
+		{
+			return switch (Path.extension(path).toLowerCase())
+			{
 				case "hx" | "hscript":
 					new HScript(path);
 				default:
@@ -138,8 +142,10 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 * @param code code
 	 * @param path filename
 	 */
-	public static function fromString(code:String, path:String):Script {
-		return switch(Path.extension(path).toLowerCase()) {
+	public static function fromString(code:String, path:String):Script
+	{
+		return switch (Path.extension(path).toLowerCase())
+		{
 			case "hx" | "hscript":
 				new HScript(path).loadFromString(code);
 			default:
@@ -151,7 +157,8 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 * Creates a new instance of the script class.
 	 * @param path
 	 */
-	public function new(path:String) {
+	public function new(path:String)
+	{
 		super();
 
 		rawPath = path;
@@ -161,21 +168,24 @@ class Script extends FlxBasic implements IFlxDestroyable {
 		extension = Path.extension(path);
 		this.path = path;
 		onCreate(path);
-		for(k=>e in getDefaultVariables(this)) {
+		for (k => e in getDefaultVariables(this))
+		{
 			set(k, e);
 		}
-		set("disableScript", () -> {
+		set("disableScript", () ->
+		{
 			active = false;
 		});
 		set("__script__", this);
 	}
 
-
 	/**
 	 * Loads the script
 	 */
-	public function load() {
-		if(didLoad) return;
+	public function load()
+	{
+		if (didLoad)
+			return;
 
 		var oldScript = curScript;
 		curScript = this;
@@ -189,38 +199,36 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 * HSCRIPT ONLY FOR NOW
 	 * Sets the "public" variables map for ScriptPack
 	 */
-	public function setPublicMap(map:Map<String, Dynamic>) {
-
+	public function setPublicMap(map:Map<String, Dynamic>)
+	{
 	}
 
 	/**
 	 * Hot-reloads the script, if possible
 	 */
-	public function reload() {
-
+	public function reload()
+	{
 	}
 
 	/**
 	 * Traces something as this script.
 	 */
-	public function trace(v:Dynamic) {
+	public function trace(v:Dynamic)
+	{
 		var fileName = this.fileName;
-		if(remappedNames.exists(fileName))
+		if (remappedNames.exists(fileName))
 			fileName = remappedNames.get(fileName);
-		// Logs.traceColored([
-		// 	Logs.logText('${fileName}: ', GREEN),
-		// 	Logs.logText(Std.string(v))
-		// ], TRACE);
+		Logs.traceNew('${fileName}: '+Std.string(v), MISC);
 	}
 
-
 	/**
 	 * Calls the function `func` defined in the script.
 	 * @param func Name of the function
 	 * @param parameters (Optional) Parameters of the function.
 	 * @return Result (if void, then null)
 	 */
-	public function call(func:String, ?parameters:Array<Dynamic>):Dynamic {
+	public function call(func:String, ?parameters:Array<Dynamic>):Dynamic
+	{
 		var oldScript = curScript;
 		curScript = this;
 
@@ -234,38 +242,47 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 * Loads the code from a string, doesnt really work after the script has been loaded
 	 * @param code The code.
 	 */
-	public function loadFromString(code:String) {
+	public function loadFromString(code:String)
+	{
 		return this;
 	}
 
 	/**
 	 * Sets a script's parent object so that its properties can be accessed easily. Ex: Passing `PlayState.instance` will allow `boyfriend` to be typed instead of `PlayState.instance.boyfriend`.
 	 * @param variable Parent variable.
 	 */
-	public function setParent(variable:Dynamic) {}
+	public function setParent(variable:Dynamic)
+	{
+	}
 
 	/**
 	 * Gets the variable `variable` from the script's variables.
 	 * @param variable Name of the variable.
 	 * @return Variable (or null if it doesn't exists)
 	 */
-	public function get(variable:String):Dynamic {return null;}
+	public function get(variable:String):Dynamic
+	{
+		return null;
+	}
 
 	/**
 	 * Sets the variable `variable` from the script's variables.
 	 * @param variable Name of the variable.
 	 * @return Variable (or null if it doesn't exists)
 	 */
-	public function set(variable:String, value:Dynamic):Void {}
+	public function set(variable:String, value:Dynamic):Void
+	{
+	}
 
 	/**
 	 * Shows an error from this script.
 	 * @param text Text of the error (ex: Null Object Reference).
 	 * @param additionalInfo Additional information you could provide.
 	 */
-	public function error(text:String, ?additionalInfo:Dynamic):Void {
+	public function error(text:String, ?additionalInfo:Dynamic):Void
+	{
 		var fileName = this.fileName;
-		if(remappedNames.exists(fileName))
+		if (remappedNames.exists(fileName))
 			fileName = remappedNames.get(fileName);
 		// Logs.traceColored([
 		// 	Logs.logText(fileName, RED),
@@ -287,10 +304,16 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	/**
 	 * PRIVATE HANDLERS - DO NOT TOUCH
 	 */
-	private function onCall(func:String, parameters:Array<Dynamic>):Dynamic {
+	private function onCall(func:String, parameters:Array<Dynamic>):Dynamic
+	{
 		return null;
 	}
-	public function onCreate(path:String) {}
 
-	public function onLoad() {}
-}
+	public function onCreate(path:String)
+	{
+	}
+
+	public function onLoad()
+	{
+	}
+}