clean code

RiversideValley · Nov 7, 2021 · ee9e794 · ee9e794
1 parent 73c440f
commit ee9e794
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/CmlLib/Core/Auth/Microsoft/XboxMinecraftLogin.cs b/CmlLib/Core/Auth/Microsoft/XboxMinecraftLogin.cs
@@ -38,7 +38,8 @@ public AuthenticationResponse LoginWithXbox(string uhs, string xstsToken)
             var res = req.GetResponse();
             var resBody = readRes(res);
 
-            var obj = JsonConvert.DeserializeObject<AuthenticationResponse>(resBody);
+            var obj = JsonConvert.DeserializeObject<AuthenticationResponse>(resBody)
+                ?? new AuthenticationResponse();
             obj.ExpiresOn = DateTime.Now.AddSeconds(obj.ExpiresIn);
             return obj;
         }

diff --git a/CmlLib/Core/Launcher/MLaunch.cs b/CmlLib/Core/Launcher/MLaunch.cs
@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using CmlLib.Core.Auth;
 using CmlLib.Core.Version;
 
 namespace CmlLib.Core

diff --git a/CmlLib/Core/Launcher/MNative.cs b/CmlLib/Core/Launcher/MNative.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Diagnostics;
-using CmlLib.Core.Version;
+using CmlLib.Core.Version;
 using CmlLib.Utils;
 using System.IO;
 

diff --git a/CmlLib/Core/MojangLauncher/MojangLauncherAccounts.cs b/CmlLib/Core/MojangLauncher/MojangLauncherAccounts.cs
@@ -49,7 +49,7 @@ public static MojangLauncherAccounts FromFile(string path)
             return FromJSON(content);
         }
 
-        public static MojangLauncherAccounts FromJSON(string json)
+        public static MojangLauncherAccounts? FromJSON(string json)
         {
             return JsonConvert.DeserializeObject<MojangLauncherAccounts>(json);
         }