Remove spritesAreAngy, handle exceptions in git processes.

Signed-off-by: TechnikTil <techniktil@tilnotdrip.org>

Author: TechnikTil

Project.hxp

@@ -220,63 +220,87 @@ class Project extends HXProject
 
 	function isGitInitialized():Bool
 	{
-		var gitProcess:Process = new Process('git', ['status']);
+		try
+		{
+			var gitProcess:Process = new Process('git', ['status']);
 
-		var exitCode:Int = gitProcess.exitCode();
-		gitProcess.close();
+			var exitCode:Int = gitProcess.exitCode();
+			gitProcess.close();
+
+			return exitCode == 0;
+		}
+		catch(e:Exception)
+		{
+			return false;
+		}
 
-		return exitCode == 0;
 	}
 
 	function getGitHash():String
 	{
-		var gitProcess:Process = new Process('git', ['rev-parse', 'HEAD']);
+		try
+		{
+			var gitProcess:Process = new Process('git', ['rev-parse', 'HEAD']);
 
-		var gitHash:String = gitProcess.stdout.readLine().trim();
-		var exitCode:Int = gitProcess.exitCode();
-		gitProcess.close();
+			var gitHash:String = gitProcess.stdout.readLine().trim();
+			var exitCode:Int = gitProcess.exitCode();
+			gitProcess.close();
 
-		if (exitCode != 0)
+			if (exitCode != 0)
+				throw new Exception("Non-Zero Exit Code");
+
+			return gitHash;
+		}
+		catch(e:Exception)
 		{
 			trace('[WARNING] Unable to get current git repository hash.');
 			return null;
 		}
-
-		return gitHash;
 	}
 
 	function getGitBranch():String
 	{
-		var gitProcess:Process = new Process('git', ['rev-parse', '--abbrev-ref', 'HEAD']);
+		try
+		{
+			var gitProcess:Process = new Process('git', ['rev-parse', '--abbrev-ref', 'HEAD']);
 
-		var gitBranch:String = gitProcess.stdout.readLine().trim();
-		var exitCode:Int = gitProcess.exitCode();
-		gitProcess.close();
+			var gitBranch:String = gitProcess.stdout.readLine().trim();
+			var exitCode:Int = gitProcess.exitCode();
+			gitProcess.close();
 
-		if (exitCode != 0)
+			if (exitCode != 0)
+				throw new Exception("Non-Zero Exit Code");
+
+			return gitBranch;
+		}
+		catch(e:Exception)
 		{
 			trace('[WARNING] Unable to get current git repository branch.');
 			return null;
 		}
-
-		return gitBranch;
 	}
 
 	function getGitModified():Bool
 	{
-		var gitProcess:Process = new Process('git', ['status', '--porcelain']);
+		try
+		{
+			var gitProcess:Process = new Process('git', ['status', '--porcelain']);
 
-		var gitModifiedFiles:String = gitProcess.stdout.readLine().trim();
-		var exitCode:Int = gitProcess.exitCode();
-		gitProcess.close();
+			var gitModifiedFiles:String = gitProcess.stdout.readLine().trim();
+			var exitCode:Int = gitProcess.exitCode();
+			gitProcess.close();
 
-		if (exitCode != 0)
+			if (exitCode != 0)
+				throw new Exception("Non-Zero Exit Code");
+
+			return gitModifiedFiles.length > 0;
+		}
+		catch(e:Exception)
 		{
 			trace('[WARNING] Unable to get current git repository status.');
 			return false;
 		}
 
-		return gitModifiedFiles.length > 0;
 	}
 }
 

src/funkin/objects/FunkinSprite.hx

@@ -1,8 +1,6 @@
 package funkin.objects;
 
-import flixel.FlxCamera;
 import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
-import flixel.math.FlxPoint;
 import flixel.util.FlxSignal.FlxTypedSignal;
 import flxanimate.FlxAnimate;
 import funkin.structures.ObjectStructure;
@@ -12,12 +10,6 @@ import funkin.structures.ObjectStructure;
  */
 class FunkinSprite extends FlxSprite
 {
-	/**
-	 * uh oh! the letters are ANGRY!!
-	 * wont work on animate atlases :(
-	 */
-	static var spritesAreAngy:Bool = FlxG.random.bool(0.9125);
-
 	/**
 	 * Draws this `FunkinSprite`, but invisible.
 	 * This is basically visible/alpha, but it doesn't lag when you make it visible again.
@@ -161,17 +153,6 @@ class FunkinSprite extends FlxSprite
 		atlas.colorTransform = colorTransform;
 	}
 
-	// crusher, do you FUCKING dare import these.
-	override public function getScreenPosition(?result:FlxPoint, ?camera:FlxCamera):FlxPoint
-	{
-		var point:FlxPoint = super.getScreenPosition(result, camera);
-
-		if (spritesAreAngy)
-			point.add(FlxG.random.float(-2, 2), FlxG.random.float(-2, 2));
-
-		return point;
-	}
-
 	// ANIMATION BINDINGS
 
 	/**