chore - Cleanup an empty issues (#93)

* Remove empty RsaUtils

* Move Lidgren-specific code into isolated namespace

* Cleaned up empty de/constructors, catch clauses, statements

Intersect (Core)/GameObjects/Events/EventMoveRoute.cs

@@ -8,11 +8,6 @@ namespace Intersect.GameObjects.Events
 
     public class EventMoveRoute
     {
-
-        public EventMoveRoute()
-        {
-        }
-
         public List<MoveRouteAction> Actions { get; set; } = new List<MoveRouteAction>();
 
         public bool IgnoreIfBlocked { get; set; }

Intersect (Core)/GameObjects/Maps/MapAttribute.cs

@@ -9,11 +9,6 @@ namespace Intersect.GameObjects.Maps
 
     public abstract class MapAttribute
     {
-
-        public MapAttribute()
-        {
-        }
-
         public abstract MapAttributes Type { get; }
 
         public static MapAttribute CreateAttribute(MapAttributes type)

Intersect (Core)/Intersect (Core).csproj

@@ -220,7 +220,6 @@
     <Compile Include="Config\Passability.cs" />
     <Compile Include="Console.cs" />
     <Compile Include="Config\SmtpSettings.cs" />
-    <Compile Include="Crypto\RsaUtils.cs" />
     <Compile Include="CustomColors.cs" />
     <Compile Include="ErrorHandling\ExceptionInfo.cs" />
     <Compile Include="Extensions\ArrayExtensions.cs" />

Intersect (Core)/Logging/Formatting/DefaultFormatter.cs

@@ -120,7 +120,6 @@ private string FormatPrefix([NotNull] LogConfiguration configuration, LogLevel l
             }
 
             var innerException = exception;
-            ;
             while ((innerException = innerException.InnerException) != null)
             {
                 builder.AppendLine(@"Caused By");

Intersect (Core)/Network/CerasPacket.cs

@@ -10,13 +10,8 @@ namespace Intersect.Network
 
     public abstract class CerasPacket : IPacket
     {
-
         [NotNull] private static readonly Ceras sCerasInstance = new Ceras(true);
 
-        protected CerasPacket()
-        {
-        }
-
         /// <inheritdoc />
         public virtual void Dispose()
         {

Intersect.Client.Framework/File Management/GameContentManager.cs

@@ -5,6 +5,7 @@
 
 using Intersect.Client.Framework.Audio;
 using Intersect.Client.Framework.Graphics;
+using Intersect.Logging;
 
 namespace Intersect.Client.Framework.File_Management
 {
@@ -400,8 +401,9 @@ public virtual void SaveUIJson(UI stage, string name, string json, string resolu
                     {
                         File.WriteAllText(path, json);
                     }
-                    catch (Exception)
+                    catch (Exception exception)
                     {
+                        Log.Debug(exception);
                     }
 
                     return;
@@ -413,8 +415,9 @@ public virtual void SaveUIJson(UI stage, string name, string json, string resolu
             {
                 File.WriteAllText(path, json);
             }
-            catch (Exception)
+            catch (Exception exception)
             {
+                Log.Debug(exception);
             }
         }
 

Intersect.Client.Framework/GenericClasses/OpenFileDialog.cs

@@ -10,11 +10,6 @@ public enum DialogResult
 
     public class OpenFileDialog
     {
-
-        public OpenFileDialog()
-        {
-        }
-
         public string Title { get; set; }
 
         public string InitialDirectory { get; set; }

Intersect.Client.Framework/GenericClasses/SaveFileDialog.cs

@@ -3,11 +3,6 @@
 
     public class SaveFileDialog
     {
-
-        public SaveFileDialog()
-        {
-        }
-
         public string Title { get; set; }
 
         public string InitialDirectory { get; set; }

Intersect.Client.Framework/Gwen/Control/Base.cs

@@ -11,6 +11,9 @@
 using Intersect.Client.Framework.Gwen.ControlInternal;
 using Intersect.Client.Framework.Gwen.DragDrop;
 using Intersect.Client.Framework.Gwen.Input;
+#if DEBUG
+using Intersect.Logging;
+#endif
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -1097,8 +1100,7 @@ private bool HasNamedChildren()
 #if DEBUG
         ~Base()
         {
-            //throw new InvalidOperationException(String.Format("IDisposable object finalized [{1:X}]: {0}", this, GetHashCode()));
-            ////debug.print(String.Format("IDisposable object finalized: {0}", GetType()));
+            Log.Debug($"IDisposable object finalized: {GetType()}");
         }
 #endif
 

Intersect.Client.Framework/Gwen/Renderer/Base.cs

@@ -1,7 +1,10 @@
-using System;
-
-using Intersect.Client.Framework.GenericClasses;
+using Intersect.Client.Framework.GenericClasses;
 using Intersect.Client.Framework.Graphics;
+#if DEBUG
+using Intersect.Logging;
+#endif
+
+using System;
 
 namespace Intersect.Client.Framework.Gwen.Renderer
 {
@@ -96,8 +99,7 @@ public virtual void Dispose()
 #if DEBUG
         ~Base()
         {
-            //throw new InvalidOperationException(String.Format("IDisposable object finalized: {0}", GetType()));
-            ////debug.print(String.Format("IDisposable object finalized: {0}", GetType()));
+            Log.Debug($"IDisposable object finalized: {GetType()}");
         }
 #endif
 

Intersect.Client.Framework/Gwen/Skin/Base.cs

@@ -1,8 +1,12 @@
-using System;
-
-using Intersect.Client.Framework.GenericClasses;
+using Intersect.Client.Framework.GenericClasses;
 using Intersect.Client.Framework.Graphics;
 
+using System;
+
+#if DEBUG
+using Intersect.Logging;
+#endif
+
 namespace Intersect.Client.Framework.Gwen.Skin
 {
 
@@ -56,8 +60,7 @@ public virtual void Dispose()
 #if DEBUG
         ~Base()
         {
-            //throw new InvalidOperationException(String.Format("IDisposable object finalized: {0}", GetType()));
-            ////debug.print(String.Format("IDisposable object finalized: {0}", GetType()));
+            Log.Debug($"IDisposable object finalized: {GetType()}");
         }
 #endif
 

Intersect.Client/Interface/Game/Draggable.cs

@@ -61,7 +61,6 @@ public void Dispose()
                 Active = null;
             }
 
-            ;
             Interface.GameUi.GameCanvas.RemoveChild(mPnl, false);
         }
 

Intersect.Client/Items/Item.cs

@@ -17,10 +17,6 @@ public class Item
 
         public int[] StatBuffs = new int[(int) Stats.StatCount];
 
-        public Item()
-        {
-        }
-
         public ItemBase Base => ItemBase.Get(ItemId);
 
         public void Load(Guid id, int quantity, Guid? bagId, int[] statBuffs)

Intersect.Client/MonoGame/Graphics/MonoTileBuffer.cs

@@ -176,16 +176,11 @@ public override bool SetData()
 
         public override void Dispose()
         {
-            if (vertexBuffer != null)
-            {
-                ;
-            }
-
-            vertexBuffer.Dispose();
+            vertexBuffer?.Dispose();
             vertexBuffer = null;
-            indexBuffer.Dispose();
-            TileBufferCount--;
+            indexBuffer?.Dispose();
             indexBuffer = null;
+            TileBufferCount--;
             disposed = true;
         }
 

Intersect.Client/MonoGame/Network/MonoSocket.cs

@@ -21,10 +21,6 @@ public class MonoSocket : GameSocket
         public static ConcurrentQueue<KeyValuePair<IConnection, IPacket>> PacketQueue =
             new ConcurrentQueue<KeyValuePair<IConnection, IPacket>>();
 
-        public MonoSocket()
-        {
-        }
-
         public override void Connect(string host, int port)
         {
             if (ClientLidgrenNetwork != null)

Intersect.Network/ClientNetwork.cs

@@ -5,6 +5,7 @@
 
 using Intersect.Logging;
 using Intersect.Network.Events;
+using Intersect.Network.Lidgren;
 
 using JetBrains.Annotations;
 

Intersect.Network/Intersect.Network.csproj

@@ -73,9 +73,9 @@
     <Compile Include="Crypto\IKeyEncoder.cs" />
     <Compile Include="IServer.cs" />
     <Compile Include="KeyFactory.cs" />
-    <Compile Include="LidgrenConnection.cs" />
-    <Compile Include="LidgrenBuffer.cs" />
-    <Compile Include="LidgrenInterface.cs" />
+    <Compile Include="Lidgren\LidgrenConnection.cs" />
+    <Compile Include="Lidgren\LidgrenBuffer.cs" />
+    <Compile Include="Lidgren\LidgrenInterface.cs" />
     <Compile Include="NetworkMetaStatus.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -89,5 +89,6 @@
       <Name>Intersect %28Core%29</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Intersect.Network/LidgrenBuffer.cs → Intersect.Network/Lidgren/LidgrenBuffer.cs

@@ -5,7 +5,7 @@
 
 using Lidgren.Network;
 
-namespace Intersect.Network
+namespace Intersect.Network.Lidgren
 {
 
     public class LidgrenBuffer : IBuffer

Intersect.Network/LidgrenConnection.cs → Intersect.Network/Lidgren/LidgrenConnection.cs

@@ -7,7 +7,7 @@
 
 using Lidgren.Network;
 
-namespace Intersect.Network
+namespace Intersect.Network.Lidgren
 {
 
     public sealed class LidgrenConnection : AbstractConnection

Intersect.Network/LidgrenInterface.cs → Intersect.Network/Lidgren/LidgrenInterface.cs

@@ -15,7 +15,7 @@
 
 using Lidgren.Network;
 
-namespace Intersect.Network
+namespace Intersect.Network.Lidgren
 {
 
     public sealed class LidgrenInterface : INetworkLayerInterface

Intersect.Server/Database/GameData/Migrations/Beta6Migration.cs

@@ -204,11 +204,12 @@ private static void ParseJson(JToken obj)
                     {
                         try
                         {
-                            var newJson = FixJson(property.Value.ToString());
+                            var newJson = FixJson(property.Value?.ToString());
                             property.Value = newJson;
                         }
-                        catch (Exception ex)
+                        catch
                         {
+                            // Not important to abort or log
                         }
                     }
                 }
@@ -695,7 +696,6 @@ private static byte[] ReencodeTileData(byte[] tileData)
             }
 
             return mCeras.Compress(Layers);
-            ;
         }
 
         private static byte[] Decompress(byte[] data)

Intersect.Server/Entities/Player.cs

@@ -59,8 +59,6 @@ public partial class Player : Entity
 
         #endregion
 
-        public Player() { }
-
         public static int OnlineCount => OnlinePlayers.Count;
 
         [JsonProperty("MaxVitals"), NotMapped]

Intersect.Server/Networking/Helpers/PortChecker.cs

@@ -2,6 +2,8 @@
 using System.Linq;
 using System.Net;
 
+using Intersect.Logging;
+
 using WebSocketSharp;
 
 namespace Intersect.Server.Networking.Helpers
@@ -41,8 +43,9 @@ public static bool CanYouSeeMe(int port, out string externalIp)
                     }
                 }
             }
-            catch (Exception ex)
+            catch (Exception exception)
             {
+                Log.Debug(exception);
             }
 
             return false;

Intersect.Server/Networking/Lidgren/ServerNetwork.cs

@@ -6,6 +6,7 @@
 using Intersect.Logging;
 using Intersect.Network;
 using Intersect.Network.Events;
+using Intersect.Network.Lidgren;
 using Intersect.Server.Entities;
 
 using JetBrains.Annotations;

Intersect.Server/Web/RestApi/Attributes/ConfigurableAuthorizeAttribute.cs

@@ -18,11 +18,6 @@ namespace Intersect.Server.Web.RestApi.Attributes
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = false)]
     internal class ConfigurableAuthorizeAttribute : AuthorizeAttribute
     {
-
-        public ConfigurableAuthorizeAttribute() : base()
-        {
-        }
-
         [NotNull]
         protected IEnumerable<string> InternalRoles =>
             Roles?.Split(',').Where(role => !string.IsNullOrWhiteSpace(role)).Select(role => role.Trim()) ??