[bfops/run-dotnet-format]: revert

Author: bfops

demo/Blackholio/client-unity/Assets/Scripts/BugFixKludge.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-#if !NET5_0_OR_GREATER
+#if !NET5_0_OR_GREATER
 namespace System.Runtime.CompilerServices
-{
-    internal static class IsExternalInit { } // https://stackoverflow.com/a/64749403/1484415
+{    
+  internal static class IsExternalInit { } // https://stackoverflow.com/a/64749403/1484415
 }
 #endif

demo/Blackholio/client-unity/Assets/Scripts/CameraController.cs

@@ -7,7 +7,7 @@ public class CameraController : MonoBehaviour
 {
     public static float WorldSize = 0.0f;
 
-    private void LateUpdate()
+	private void LateUpdate()
     {
         var arenaCenterTransform = new Vector3(WorldSize / 2, WorldSize / 2, -10.0f);
         if (PlayerController.Local == null || !GameManager.IsConnected() || PlayerController.Local.NumberOfOwnedCircles == 0)
@@ -29,20 +29,18 @@ private void LateUpdate()
                 y = centerOfMass.Value.y,
                 z = transform.position.z
             };
-        }
-        else
-        {
+        } else {
             transform.position = arenaCenterTransform;
         }
 
-        float targetCameraSize = CalculateCameraSize(PlayerController.Local);
-        Camera.main.orthographicSize = Mathf.Lerp(Camera.main.orthographicSize, targetCameraSize, Time.deltaTime * 2);
-    }
+		float targetCameraSize = CalculateCameraSize(PlayerController.Local);
+		Camera.main.orthographicSize = Mathf.Lerp(Camera.main.orthographicSize, targetCameraSize, Time.deltaTime * 2);
+	}
 
-    private float CalculateCameraSize(PlayerController player)
-    {
-        return 50f + //Base size
+	private float CalculateCameraSize(PlayerController player)
+	{
+		return 50f + //Base size
             Mathf.Min(50, player.TotalMass() / 5) + //Increase camera size with mass
             Mathf.Min(player.NumberOfOwnedCircles - 1, 1) * 30; //Zoom out when player splits
-    }
+	}
 }

demo/Blackholio/client-unity/Assets/Scripts/CircleController.cs

@@ -6,41 +6,41 @@
 
 public class CircleController : EntityController
 {
-    public static Color[] ColorPalette = new[]
-    {
+	public static Color[] ColorPalette = new[]
+	{
         //Yellow
 		(Color)new Color32(175, 159, 49, 255),
-        (Color)new Color32(175, 116, 49, 255),
+		(Color)new Color32(175, 116, 49, 255),
 
         //Purple
         (Color)new Color32(112, 47, 252, 255),
-        (Color)new Color32(51, 91, 252, 255),
+		(Color)new Color32(51, 91, 252, 255),
 
         //Red
         (Color)new Color32(176, 54, 54, 255),
-        (Color)new Color32(176, 109, 54, 255),
-        (Color)new Color32(141, 43, 99, 255),
+		(Color)new Color32(176, 109, 54, 255),
+		(Color)new Color32(141, 43, 99, 255),
 
         //Blue
         (Color)new Color32(2, 188, 250, 255),
-        (Color)new Color32(7, 50, 251, 255),
-        (Color)new Color32(2, 28, 146, 255),
-    };
+		(Color)new Color32(7, 50, 251, 255),
+		(Color)new Color32(2, 28, 146, 255),
+	};
 
     private PlayerController Owner;
 
     public void Spawn(Circle circle, PlayerController owner)
     {
         base.Spawn(circle.EntityId);
-        SetColor(ColorPalette[circle.PlayerId % ColorPalette.Length]);
+		SetColor(ColorPalette[circle.PlayerId % ColorPalette.Length]);
 
         this.Owner = owner;
         GetComponentInChildren<TMPro.TextMeshProUGUI>().text = owner.Username;
     }
 
-    public override void OnDelete(EventContext context)
-    {
-        base.OnDelete(context);
+	public override void OnDelete(EventContext context)
+	{
+		base.OnDelete(context);
         Owner.OnCircleDeleted(this);
-    }
+	}
 }

demo/Blackholio/client-unity/Assets/Scripts/DeathScreen.cs

@@ -5,16 +5,16 @@
 
 public class DeathScreen : MonoBehaviour
 {
-    public Button RespawnButton;
+	public Button RespawnButton;
 
-    public void SetVisible(bool visible)
-    {
-        gameObject.SetActive(visible);
-    }
+	public void SetVisible(bool visible)
+	{
+		gameObject.SetActive(visible);
+	}
 
-    public void Respawn()
-    {
-        GameManager.Conn.Reducers.Respawn();
-        SetVisible(false);
-    }
+	public void Respawn()
+	{
+		GameManager.Conn.Reducers.Respawn();
+		SetVisible(false);
+	}
 }

demo/Blackholio/client-unity/Assets/Scripts/EntityController.cs

@@ -8,86 +8,86 @@
 
 public abstract class EntityController : MonoBehaviour
 {
-    const float LERP_DURATION_SEC = 0.1f;
+	const float LERP_DURATION_SEC = 0.1f;
 
-    private static readonly int ShaderColorProperty = Shader.PropertyToID("_Color");
+	private static readonly int ShaderColorProperty = Shader.PropertyToID("_Color");
 
-    [DoNotSerialize] public int EntityId;
+	[DoNotSerialize] public int EntityId;
 
-    protected float LerpTime;
-    protected Vector3 LerpStartPosition;
-    protected Vector3 LerpTargetPosition;
-    protected Vector3 TargetScale;
+	protected float LerpTime;
+	protected Vector3 LerpStartPosition;
+	protected Vector3 LerpTargetPosition;
+	protected Vector3 TargetScale;
 
-    protected virtual void Spawn(int entityId)
-    {
-        EntityId = entityId;
+	protected virtual void Spawn(int entityId)
+	{
+		EntityId = entityId;
 
-        var entity = GameManager.Conn.Db.Entity.EntityId.Find(entityId);
-        LerpStartPosition = LerpTargetPosition = transform.position = (Vector2)entity.Position;
-        transform.localScale = Vector3.one;
-        TargetScale = MassToScale(entity.Mass);
-    }
+		var entity = GameManager.Conn.Db.Entity.EntityId.Find(entityId);
+		LerpStartPosition = LerpTargetPosition = transform.position = (Vector2)entity.Position;
+		transform.localScale = Vector3.one;
+		TargetScale = MassToScale(entity.Mass);
+	}
 
-    public void SetColor(Color color)
-    {
-        GetComponent<SpriteRenderer>().material.SetColor(ShaderColorProperty, color);
-    }
+	public void SetColor(Color color)
+	{
+		GetComponent<SpriteRenderer>().material.SetColor(ShaderColorProperty, color);
+	}
 
-    public virtual void OnEntityUpdated(Entity newVal)
-    {
-        LerpTime = 0.0f;
-        LerpStartPosition = transform.position;
-        LerpTargetPosition = (Vector2)newVal.Position;
-        TargetScale = MassToScale(newVal.Mass);
-    }
+	public virtual void OnEntityUpdated(Entity newVal)
+	{
+		LerpTime = 0.0f;
+		LerpStartPosition = transform.position;
+		LerpTargetPosition = (Vector2)newVal.Position;
+		TargetScale = MassToScale(newVal.Mass);
+	}
 
-    public virtual void OnDelete(EventContext context)
-    {
-        if (context.Event is SpacetimeDB.Event<Reducer>.Reducer reducer &&
-            reducer.ReducerEvent.Reducer is Reducer.ConsumeEntity consume)
-        {
-            var consumerId = consume.Request.ConsumerEntityId;
-            if (GameManager.Entities.TryGetValue(consumerId, out var consumerEntity))
-            {
-                StartCoroutine(DespawnCoroutine(consumerEntity.transform));
-                return;
-            }
-        }
+	public virtual void OnDelete(EventContext context)
+	{
+		if (context.Event is SpacetimeDB.Event<Reducer>.Reducer reducer &&
+			reducer.ReducerEvent.Reducer is Reducer.ConsumeEntity consume)
+		{
+			var consumerId = consume.Request.ConsumerEntityId;
+			if (GameManager.Entities.TryGetValue(consumerId, out var consumerEntity))
+			{
+				StartCoroutine(DespawnCoroutine(consumerEntity.transform));
+				return;
+			}
+		}
 
-        Destroy(gameObject);
-    }
+		Destroy(gameObject);
+	}
 
-    public IEnumerator DespawnCoroutine(Transform targetTransform)
-    {
-        const float DESPAWN_TIME = 0.2f;
-        var startPosition = transform.position;
-        var startScale = transform.localScale;
-        GetComponent<SpriteRenderer>().sortingOrder++; //Render consumed food above the circle that's consuming it
-        for (float time = Time.deltaTime; time < DESPAWN_TIME; time += Time.deltaTime)
-        {
-            float t = time / DESPAWN_TIME;
-            transform.position = Vector3.Lerp(startPosition, targetTransform.position, t);
-            transform.localScale = Vector3.Lerp(startScale, Vector3.zero, t);
-            yield return null;
-        }
-        Destroy(gameObject);
-    }
+	public IEnumerator DespawnCoroutine(Transform targetTransform)
+	{
+		const float DESPAWN_TIME = 0.2f;
+		var startPosition = transform.position;
+		var startScale = transform.localScale;
+		GetComponent<SpriteRenderer>().sortingOrder++; //Render consumed food above the circle that's consuming it
+		for (float time = Time.deltaTime; time < DESPAWN_TIME; time += Time.deltaTime)
+		{
+			float t = time / DESPAWN_TIME;
+			transform.position = Vector3.Lerp(startPosition, targetTransform.position, t);
+			transform.localScale = Vector3.Lerp(startScale, Vector3.zero, t);
+			yield return null;
+		}
+		Destroy(gameObject);
+	}
 
-    public virtual void Update()
-    {
-        //Interpolate position and scale
-        LerpTime = Mathf.Min(LerpTime + Time.deltaTime, LERP_DURATION_SEC);
-        transform.position = Vector3.Lerp(LerpStartPosition, LerpTargetPosition, LerpTime / LERP_DURATION_SEC);
-        transform.localScale = Vector3.Lerp(transform.localScale, TargetScale, Time.deltaTime * 8);
-    }
+	public virtual void Update()
+	{
+		//Interpolate position and scale
+		LerpTime = Mathf.Min(LerpTime + Time.deltaTime, LERP_DURATION_SEC);
+		transform.position = Vector3.Lerp(LerpStartPosition, LerpTargetPosition, LerpTime / LERP_DURATION_SEC);
+		transform.localScale = Vector3.Lerp(transform.localScale, TargetScale, Time.deltaTime * 8);
+	}
 
-    public static Vector3 MassToScale(int mass)
-    {
-        var diameter = MassToDiameter(mass);
-        return new Vector3(diameter, diameter, 1);
-    }
+	public static Vector3 MassToScale(int mass)
+	{
+		var diameter = MassToDiameter(mass);
+		return new Vector3(diameter, diameter, 1);
+	}
 
-    public static float MassToRadius(int mass) => Mathf.Sqrt(mass);
-    public static float MassToDiameter(int mass) => MassToRadius(mass) * 2;
+	public static float MassToRadius(int mass) => Mathf.Sqrt(mass);
+	public static float MassToDiameter(int mass) => MassToRadius(mass) * 2;
 }

demo/Blackholio/client-unity/Assets/Scripts/Extensions.cs

@@ -3,16 +3,16 @@
 
 namespace SpacetimeDB.Types
 {
-    public partial class DbVector2
-    {
-        public static implicit operator Vector2(DbVector2 vec)
-        {
-            return new Vector2(vec.X, vec.Y);
-        }
+	public partial class DbVector2
+	{
+		public static implicit operator Vector2(DbVector2 vec)
+		{
+			return new Vector2(vec.X, vec.Y);
+		}
 
-        public static implicit operator DbVector2(Vector2 vec)
-        {
-            return new DbVector2(vec.x, vec.y);
-        }
-    }
+		public static implicit operator DbVector2(Vector2 vec)
+		{
+			return new DbVector2(vec.x, vec.y);
+		}
+	}
 }

demo/Blackholio/client-unity/Assets/Scripts/FoodController.cs

@@ -4,20 +4,20 @@
 
 public class FoodController : EntityController
 {
-    public static Color[] ColorPalette = new[]
-    {
-        (Color)new Color32(119, 252, 173, 255),
-        (Color)new Color32(76, 250, 146, 255),
-        (Color)new Color32(35, 246, 120, 255),
+	public static Color[] ColorPalette = new[]
+	{
+		(Color)new Color32(119, 252, 173, 255),
+		(Color)new Color32(76, 250, 146, 255),
+		(Color)new Color32(35, 246, 120, 255),
 
-        (Color)new Color32(119, 251, 201, 255),
-        (Color)new Color32(76, 249, 184, 255),
-        (Color)new Color32(35, 245, 165, 255),
-    };
+		(Color)new Color32(119, 251, 201, 255),
+		(Color)new Color32(76, 249, 184, 255),
+		(Color)new Color32(35, 245, 165, 255),
+	};
 
     public void Spawn(Food food)
     {
         base.Spawn(food.EntityId);
-        SetColor(ColorPalette[EntityId % ColorPalette.Length]);
+		SetColor(ColorPalette[EntityId % ColorPalette.Length]);
     }
 }

demo/Blackholio/client-unity/Assets/Scripts/LeaderboardController.cs

@@ -20,7 +20,7 @@ private void Start()
             Rows[i] = go;
         }
     }
-
+    
     private void Update()
     {
         var players = GameManager.Players.Values
@@ -30,22 +30,22 @@ private void Update()
             .Take(10)
             .ToList();
         var localPlayer = PlayerController.Local;
-        if (localPlayer != null && !players.Any(p => p.player == localPlayer) && localPlayer.NumberOfOwnedCircles > 0)
+		if (localPlayer != null && !players.Any(p => p.player == localPlayer) && localPlayer.NumberOfOwnedCircles > 0)
         {
             players.Add((localPlayer, localPlayer.TotalMass()));
-        }
+		}
 
         int i;
         for (i = 0; i < players.Count; i++)
-        {
+		{
             var player = players[i];
-            var row = Rows[i];
+			var row = Rows[i];
             row.SetData(player.player.Username, player.mass);
             row.gameObject.SetActive(true);
-        }
+		}
         for (; i < MAX_ROW_COUNT; i++)
-        {
-            Rows[i].gameObject.SetActive(false);
-        }
+		{
+			Rows[i].gameObject.SetActive(false);
+		}
     }
 }