(b3c71807f) Updated to the latest version of GameAnalytics

Barotrauma/BarotraumaServer/Server.csproj

@@ -149,7 +149,13 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="GameAnalytics.Mono, Version=1.0.7018.15293, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\Libraries\NuGet\GameAnalytics.Mono.SDK.2.1.6\lib\net45\GameAnalytics.Mono.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Data.SQLite, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\..\Libraries\NuGet\GameAnalytics.Mono.SDK.2.1.6\lib\net45\System.Data.SQLite.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
@@ -163,12 +169,6 @@
     <Reference Include="NLog">
       <HintPath>..\..\Libraries\NuGet\NLog.4.3.8\lib\net45\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="GameAnalytics.Mono">
-      <HintPath>..\..\Libraries\NuGet\GameAnalytics.Mono.SDK.1.1.12\lib\net45\GameAnalytics.Mono.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.SQLite">
-      <HintPath>..\..\Libraries\NuGet\GameAnalytics.Mono.SDK.1.1.12\lib\net45\System.Data.SQLite.dll</HintPath>
-    </Reference>
     <Reference Include="RestSharp">
       <HintPath>..\..\Libraries\NuGet\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
     </Reference>
@@ -293,5 +293,11 @@
   <Import Project="..\BarotraumaShared\SharedCode.projitems" Label="Shared" />
   <Import Project="..\BarotraumaShared\SharedContent.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\Libraries\NuGet\GameAnalytics.Mono.SDK.1.1.12\build\net45\GameAnalytics.Mono.SDK.targets" Condition="Exists('..\..\Libraries\NuGet\GameAnalytics.Mono.SDK.1.1.12\build\net45\GameAnalytics.Mono.SDK.targets')" />
+  <Import Project="..\..\Libraries\NuGet\GameAnalytics.Mono.SDK.2.1.6\build\net45\GameAnalytics.Mono.SDK.targets" Condition="Exists('..\..\Libraries\NuGet\GameAnalytics.Mono.SDK.2.1.6\build\net45\GameAnalytics.Mono.SDK.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\Libraries\NuGet\GameAnalytics.Mono.SDK.2.1.6\build\net45\GameAnalytics.Mono.SDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Libraries\NuGet\GameAnalytics.Mono.SDK.2.1.6\build\net45\GameAnalytics.Mono.SDK.targets'))" />
+  </Target>
 </Project>

Barotrauma/BarotraumaServer/Source/GameMain.cs

@@ -298,7 +298,7 @@ namespace Barotrauma
             CloseServer();
 
             SteamManager.ShutDown();
-            if (GameSettings.SendUserStatistics) GameAnalytics.OnStop();
+            if (GameSettings.SendUserStatistics) GameAnalytics.OnQuit();
         }
 
         public static void ResetFrameTime()

Barotrauma/BarotraumaServer/Source/GameSession/GameModes/TraitorManager.cs

@@ -16,9 +16,10 @@ namespace Barotrauma
 
         public void Greet(GameServer server, string codeWords, string codeResponse)
         {
-            string greetingMessage = TextManager.GetWithVariable("TraitorStartMessage", "[targetname]", TargetCharacter.Name);
-            string moreAgentsMessage = TextManager.GetWithVariables("TraitorMoreAgentsMessage",
-                new string[2] { "[codewords]", "[coderesponse]" }, new string[2] { codeWords, codeResponse });
+            string greetingMessage = TextManager.Get("TraitorStartMessage").Replace("[targetname]", TargetCharacter.Name);
+            string moreAgentsMessage = TextManager.Get("TraitorMoreAgentsMessage")
+                .Replace("[codewords]", codeWords)
+                .Replace("[coderesponse]", codeResponse);
             
             var greetingChatMsg = ChatMessage.Create(null, greetingMessage, ChatMessageType.Server, null);
             var moreAgentsChatMsg = ChatMessage.Create(null, moreAgentsMessage, ChatMessageType.Server, null);
@@ -37,7 +38,7 @@ namespace Barotrauma
             {
                 var ownerMsg = ChatMessage.Create(
                     null,//TextManager.Get("NewTraitor"),
-                    TextManager.GetWithVariables("TraitorStartMessageServer", new string[2] { "[targetname]", "[traitorname]" }, new string[2] { TargetCharacter.Name, Character.Name }),
+                    TextManager.Get("TraitorStartMessageServer").Replace("[targetname]", TargetCharacter.Name).Replace("[traitorname]", Character.Name),
                     ChatMessageType.MessageBox,
                     null
                 );

Barotrauma/BarotraumaServer/Source/Networking/GameServer.cs

@@ -415,7 +415,7 @@ namespace Barotrauma.Networking
                 {
                     if (endRoundTimer <= 0.0f)
                     {
-                        SendChatMessage(TextManager.GetWithVariable("CrewDeadNoRespawns", "[time]", "60"), ChatMessageType.Server);
+                        SendChatMessage(TextManager.Get("CrewDeadNoRespawns").Replace("[time]", "60"), ChatMessageType.Server);
                     }
                     endRoundTimer += deltaTime;
                 }
@@ -728,7 +728,7 @@ namespace Barotrauma.Networking
                         if (matchingSub == null)
                         {
                             SendDirectChatMessage(
-                                TextManager.GetWithVariable("CampaignStartFailedSubNotFound", "[subname]", subName), 
+                                TextManager.Get("CampaignStartFailedSubNotFound").Replace("[subname]", subName), 
                                 connectedClient, ChatMessageType.MessageBox);
                         }
                         else

Barotrauma/BarotraumaServer/Source/Program.cs

@@ -35,7 +35,7 @@ namespace Barotrauma
                 inputThread.Start();
                 game.Run();
                 inputThread.Abort(); inputThread.Join();
-                if (GameSettings.SendUserStatistics) GameAnalytics.OnStop();
+                if (GameSettings.SendUserStatistics) GameAnalytics.OnQuit();
                 SteamManager.ShutDown();
 #if !DEBUG
             }
@@ -105,7 +105,7 @@ namespace Barotrauma
             if (GameSettings.SendUserStatistics)
             {
                 GameAnalytics.AddErrorEvent(EGAErrorSeverity.Error, crashReport);
-                GameAnalytics.OnStop();
+                GameAnalytics.OnQuit();
                 Console.Write("A crash report (\"crashreport.log\") was saved in the root folder of the game and sent to the developers.");
             }
             else

Barotrauma/BarotraumaServer/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GameAnalytics.Mono.SDK" version="1.1.12" targetFramework="net45" />
+  <package id="GameAnalytics.Mono.SDK" version="2.1.6" targetFramework="net45" />
   <package id="NLog" version="4.3.8" targetFramework="net45" />
   <package id="RestSharp" version="105.2.3" targetFramework="net45" />
 </packages>