fix warnings

Author: cgytrus

.editorconfig

@@ -222,7 +222,7 @@ resharper_redundant_explicit_array_creation_highlighting=none
 resharper_redundant_name_qualifier_highlighting=none
 resharper_redundant_readonly_modifier_highlighting=warning
 resharper_redundant_using_directive_highlighting=suggestion
-resharper_remove_redundant_braces_highlighting=warning
+resharper_remove_redundant_braces_highlighting=hint
 resharper_static_member_in_generic_type_highlighting=suggestion
 resharper_string_ends_with_is_culture_specific_highlighting=warning
 resharper_string_starts_with_is_culture_specific_highlighting=warning

CGSrl.Client/src/Networking/GameClient.cs

@@ -89,7 +89,7 @@ public void SetUi(Text loadingText, string loadingTextFormat, ProgressBar loadin
         if(players is null || level is null)
             return;
         players.Clear();
-        foreach(PlayerObject player in level.objects.OfType<PlayerObject>())
+        foreach(PlayerObject player in level.objects.Values.OfType<PlayerObject>())
             players.Add(player);
     }
 
@@ -204,7 +204,7 @@ private void ProcessMessages(TimeSpan maxTime) {
             return;
         }
         TimeSpan start = _timer.time;
-        while(peer.ReadMessage(out NetIncomingMessage msg)) {
+        while(peer.ReadMessage(out NetIncomingMessage? msg)) {
             ProcessMessage(msg);
             if(_timer.time - start > maxTime)
                 break;

CGSrl.Server/src/Networking/GameServer.cs

@@ -84,7 +84,7 @@ public void Finish() {
 
     public void ProcessMessages() {
         ProcessObjectUpdates();
-        while(_peer.ReadMessage(out NetIncomingMessage msg)) {
+        while(_peer.ReadMessage(out NetIncomingMessage? msg)) {
             switch(msg.MessageType) {
                 case NetIncomingMessageType.WarningMessage:
                     logger.Warn(msg.ReadString);
@@ -142,7 +142,7 @@ private void ProcessObjectUpdates() {
     }
 
     private void ProcessConnectionApproval(NetIncomingMessage msg) {
-        NetConnection connection = msg.SenderConnection;
+        NetConnection connection = msg.SenderConnection!;
         string username = msg.ReadString();
         string displayName = msg.ReadString();
         if(string.IsNullOrEmpty(username)) {
@@ -171,10 +171,10 @@ private void ProcessConnectionApproval(NetIncomingMessage msg) {
         SendChatMessage(null, null, $"\f1{displayName} is joining the game");
     }
 
-    private void ProcessStatusChanged(NetConnectionStatus status, string reason, NetConnection connection) {
+    private void ProcessStatusChanged(NetConnectionStatus status, string reason, NetConnection? connection) {
         switch(status) {
             case NetConnectionStatus.Connected: {
-                if(connection.Tag is not PlayerObject player) {
+                if(connection?.Tag is not PlayerObject player) {
                     logger.Warn("Tag was not player, ignoring connect!");
                     return;
                 }
@@ -196,7 +196,7 @@ private void ProcessStatusChanged(NetConnectionStatus status, string reason, Net
                 break;
             }
             case NetConnectionStatus.Disconnected: {
-                if(connection.Tag is not PlayerObject player) {
+                if(connection?.Tag is not PlayerObject player) {
                     logger.Warn("Tag was not player, ignoring disconnect!");
                     return;
                 }
@@ -208,8 +208,8 @@ private void ProcessStatusChanged(NetConnectionStatus status, string reason, Net
         }
     }
 
-    private static void ProcessConnectionLatencyUpdated(NetConnection connection, float roundTripTime) {
-        if(connection.Tag is not PlayerObject player) {
+    private static void ProcessConnectionLatencyUpdated(NetConnection? connection, float roundTripTime) {
+        if(connection?.Tag is not PlayerObject player) {
             logger.Warn("Tag was not player, ignoring ping update!");
             return;
         }
@@ -270,15 +270,15 @@ private void ProcessRemoveObject(NetBuffer msg) {
     }
 
     private static void ProcessPlayerMove(NetIncomingMessage msg) {
-        if(msg.SenderConnection.Tag is not PlayerObject player) {
+        if(msg.SenderConnection?.Tag is not PlayerObject player) {
             logger.Warn("Tag was not player, ignoring player move!");
             return;
         }
         player.move = msg.ReadVector2Int();
     }
 
     private void ProcessPlayerInteract(NetIncomingMessage msg) {
-        if(msg.SenderConnection.Tag is not PlayerObject player) {
+        if(msg.SenderConnection?.Tag is not PlayerObject player) {
             logger.Warn("Tag was not player, ignoring player interact!");
             return;
         }
@@ -295,7 +295,7 @@ private void ProcessPlayerInteract(NetIncomingMessage msg) {
     }
 
     private void ProcessChatMessage(NetIncomingMessage msg) {
-        if(msg.SenderConnection.Tag is not PlayerObject player) {
+        if(msg.SenderConnection?.Tag is not PlayerObject player) {
             logger.Warn("Tag was not player, ignoring chat message!");
             return;
         }

CGSrl.Shared/src/Environment/BoxObject.cs

@@ -6,7 +6,7 @@ namespace CGSrl.Shared.Environment;
 public class BoxObject : MovableObject {
     public class Broken : MovableObject {
         public override int layer => -2;
-        public override RenderCharacter character { get; } = new('%', Color.transparent, new Color(0.5f, 0.5f, 0f, 1f));
+        public override RenderCharacter character { get; } = new('%', Color.transparent, new Color(0.5f, 0.5f, 0f));
         public override bool blocksLight => false;
         protected override bool canPush => true;
         protected override float mass => 1f;
@@ -18,6 +18,6 @@ public class Broken : MovableObject {
     protected override float strength => 4f;
     protected override MovableObject CreateBroken() => new Broken { position = position };
     public override int layer => 0;
-    public override RenderCharacter character { get; } = new('&', Color.transparent, new Color(1f, 1f, 0f, 1f));
+    public override RenderCharacter character { get; } = new('&', Color.transparent, new Color(1f, 1f, 0f));
     public override bool blocksLight => true;
 }

CGSrl.Shared/src/Environment/CorruptedObject.cs

@@ -9,6 +9,6 @@ namespace CGSrl.Shared.Environment;
 public class CorruptedObject : SyncedLevelObject {
     public override int layer => int.MaxValue;
     public override RenderCharacter character { get; } = new('\0', Color.white, Color.transparent);
-    public override IEffect? effect => renderer.formattingEffects["glitch"];
+    public override IEffect? effect => renderer?.formattingEffects["glitch"];
     public override bool blocksLight => false;
 }

CGSrl.Shared/src/Environment/FloorObject.cs

@@ -25,6 +25,6 @@ public void Added() {
         if(!level.isClient)
             return;
         float p = noise.GetNoise(MathF.Abs(position.x), MathF.Abs(position.y)) * PerlinValue;
-        _character = new RenderCharacter('.', Color.transparent, new Color(0.1f + p, 0.1f + p, 0.1f + p, 1f));
+        _character = new RenderCharacter('.', Color.transparent, new Color(0.1f + p, 0.1f + p, 0.1f + p));
     }
 }

CGSrl.Shared/src/Environment/GrassObject.cs

@@ -11,7 +11,7 @@ public class GrassObject : InteractableObject {
     public override string prompt => "touch";
 
     public override int layer => -1;
-    public override RenderCharacter character { get; } = new('"', Color.transparent, new Color(0f, 0.4f, 0f, 1f));
+    public override RenderCharacter character { get; } = new('"', Color.transparent, new Color(0f, 0.4f, 0f));
     public override bool blocksLight => false;
 
     protected override void OnInteract(PlayerObject player) {

CGSrl.Shared/src/Environment/IceObject.cs

@@ -8,6 +8,6 @@ namespace CGSrl.Shared.Environment;
 public class IceObject : SyncedLevelObject {
     public override int layer => -3;
     public override RenderCharacter character { get; } =
-        new('~', Color.transparent, new Color(0f, 0.2f, 0.2f, 1f));
+        new('~', Color.transparent, new Color(0f, 0.2f, 0.2f));
     public override bool blocksLight => false;
 }

CGSrl.Shared/src/Environment/PlayerObject.cs

@@ -15,7 +15,7 @@ namespace CGSrl.Shared.Environment;
 public class PlayerObject : MovableObject, IUpdatable, IMovable, ILight {
     public override int layer => 0;
     public override RenderCharacter character => new('@',
-        highlighted ? new Color(1f, 1f, 0f, 0.2f) : Color.transparent, new Color(0, 255, 255, 255));
+        highlighted ? new Color(1f, 1f, 0f, 0.2f) : Color.transparent, new Color(0, 255, 255));
     public override bool blocksLight => false;
 
     protected override bool canPush => true;
@@ -86,6 +86,7 @@ public void Update(TimeSpan time) {
     }
 
     private void UpdateInteraction() {
+        RequireClient();
         Vector2Int mouse = level.ScreenToLevelPosition(input.mousePosition);
         Vector2Int relativeMouse = mouse - position;
         float mouseDistSqr = new Vector2(relativeMouse.x, relativeMouse.y).LengthSquared();
@@ -105,6 +106,7 @@ private void UpdateInteraction() {
     private void UpdateMovement() {
         if(connection is null)
             return;
+        RequireClient();
         int moveX = 0;
         int moveY = 0;
         if(input.KeyPressed(KeyCode.D))

CGSrl.Shared/src/Environment/WallObject.cs

@@ -7,7 +7,7 @@ public class WallObject : MovableObject {
     public class Broken : MovableObject {
         public override int layer => -2;
         public override RenderCharacter character { get; } =
-            new('%', Color.transparent, new Color(0.5f, 0.5f, 0.5f, 1f));
+            new('%', Color.transparent, new Color(0.5f, 0.5f, 0.5f));
         public override bool blocksLight => false;
         protected override bool canPush => true;
         protected override float mass => 8f;

CGSrl.Shared/src/Networking/SyncedGameMode.cs

@@ -2,4 +2,4 @@
 
 namespace CGSrl.Shared.Networking;
 
-public abstract class SyncedGameMode : GameMode<SyncedLevel, SyncedChunk, SyncedLevelObject> { }
+public abstract class SyncedGameMode : GameMode<SyncedLevel, SyncedChunk, SyncedLevelObject>;