Moved new UserSettings to TrueCraft.Core

TrueCraft.Core/TrueCraft.Core.csproj

@@ -30,6 +30,9 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="Ionic.Zip.Reduced">
       <HintPath>..\lib\Ionic.Zip.Reduced.dll</HintPath>
@@ -205,6 +208,7 @@
     <Compile Include="TerrainGen\Noise\ScaleNoise.cs" />
     <Compile Include="TerrainGen\Noise\CellNoise.cs" />
     <Compile Include="TexturePack.cs" />
+    <Compile Include="UserSettings.cs" />
     <Compile Include="World\BiomeMap.cs" />
     <Compile Include="World\Chunk.cs" />
     <Compile Include="World\Region.cs" />
@@ -325,7 +329,9 @@
       <Name>fNbt</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>

TrueCraft.Core/UserSettings.cs

@@ -2,7 +2,7 @@
 using Newtonsoft.Json;
 using System.IO;
 
-namespace TrueCraft.Launcher
+namespace TrueCraft.Core
 {
     public class UserSettings
     {
@@ -21,6 +21,7 @@ namespace TrueCraft.Launcher
         public string Username { get; set; }
         public string Password { get; set; }
         public string LastIP { get; set; }
+        public string SelectedTexturePack { get; set; }
         public FavoriteServer[] FavoriteServers { get; set; }
 
         public UserSettings()
@@ -29,6 +30,7 @@ namespace TrueCraft.Launcher
             Username = "";
             Password = "";
             LastIP = "";
+            SelectedTexturePack = "Default.zip";
             FavoriteServers = new FavoriteServer[0];
         }
 

TrueCraft.Core/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net40" />
+</packages>

TrueCraft.Launcher/TrueCraft.Launcher.csproj

@@ -46,7 +46,6 @@
     <Compile Include="Views\LoginView.cs" />
     <Compile Include="Views\MainMenuView.cs" />
     <Compile Include="Views\MultiplayerView.cs" />
-    <Compile Include="UserSettings.cs" />
     <Compile Include="Views\OptionView.cs" />
     <Compile Include="Views\SingleplayerView.cs" />
     <Compile Include="Singleplayer\Worlds.cs" />

TrueCraft.Launcher/Views/MultiplayerView.cs

@@ -5,6 +5,7 @@ using System.Diagnostics;
 using Xwt.Drawing;
 using System.Reflection;
 using System.Linq;
+using TrueCraft.Core;
 
 namespace TrueCraft.Launcher.Views
 {