From af1fdf5a25faed57ac72865205f57df325016d0d Mon Sep 17 00:00:00 2001
From: Daniel Brunner <0xFEEDC0DE64@gmail.com>
Date: Tue, 1 Nov 2016 22:31:04 +0100
Subject: [PATCH] Added config file to client

---
 .../FluckyGame.Client/ClientSettings.cs       | 23 +++++++++++++++++++
 .../FluckyGame.Client.csproj                  | 11 +++++++++
 .../FluckyGame.Client/Game1.cs                |  9 ++++----
 .../FluckyGame.Client/Program.cs              | 13 +++++++----
 .../FluckyGame.Client/client.json             | 11 +++++++++
 .../FluckyGame.Client/packages.config         |  4 ++++
 6 files changed, 63 insertions(+), 8 deletions(-)
 create mode 100644 src/FluckyGame.Client/FluckyGame.Client/ClientSettings.cs
 create mode 100644 src/FluckyGame.Client/FluckyGame.Client/client.json
 create mode 100644 src/FluckyGame.Client/FluckyGame.Client/packages.config

diff --git a/src/FluckyGame.Client/FluckyGame.Client/ClientSettings.cs b/src/FluckyGame.Client/FluckyGame.Client/ClientSettings.cs
new file mode 100644
index 0000000..a95f438
--- /dev/null
+++ b/src/FluckyGame.Client/FluckyGame.Client/ClientSettings.cs
@@ -0,0 +1,23 @@
+using System;
+
+namespace FluckyGame.Client
+{
+    internal class ClientSettings
+    {
+        public Resolution resolution;
+        public Server server;
+
+        public struct Resolution
+        {
+            public int width;
+            public int height;
+            public bool fullscreen;
+        }
+
+        public struct Server
+        {
+            public string hostname;
+            public int port;
+        }
+    }
+}
diff --git a/src/FluckyGame.Client/FluckyGame.Client/FluckyGame.Client.csproj b/src/FluckyGame.Client/FluckyGame.Client/FluckyGame.Client.csproj
index b43225c..2851362 100644
--- a/src/FluckyGame.Client/FluckyGame.Client/FluckyGame.Client.csproj
+++ b/src/FluckyGame.Client/FluckyGame.Client/FluckyGame.Client.csproj
@@ -64,6 +64,10 @@
     <Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
     <Reference Include="Microsoft.Xna.Framework.GamerServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
     <Reference Include="mscorlib" />
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
@@ -73,6 +77,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bone.cs" />
+    <Compile Include="ClientSettings.cs" />
     <Compile Include="Entities\BouncingEntity.cs" />
     <Compile Include="Entities\Entity.cs" />
     <Compile Include="Entities\TerrainEntity.cs" />
@@ -119,6 +124,12 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="client.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\Microsoft.Xna.GameStudio.targets" />
   <!--
diff --git a/src/FluckyGame.Client/FluckyGame.Client/Game1.cs b/src/FluckyGame.Client/FluckyGame.Client/Game1.cs
index c45dce8..c0a05e7 100644
--- a/src/FluckyGame.Client/FluckyGame.Client/Game1.cs
+++ b/src/FluckyGame.Client/FluckyGame.Client/Game1.cs
@@ -14,7 +14,7 @@ using FluckyGame.Library;
 
 namespace FluckyGame.Client
 {
-    public class Game1 : Microsoft.Xna.Framework.Game
+    internal class Game1 : Microsoft.Xna.Framework.Game
     {
         public static Game1 currentInstance;
         public static Random random;
@@ -47,7 +47,7 @@ namespace FluckyGame.Client
             random = new Random();
         }
 
-        public Game1(TcpClient tcpClient)
+        public Game1(TcpClient tcpClient, ClientSettings clientSettings)
         {
             this.tcpClient = tcpClient;
 
@@ -55,8 +55,9 @@ namespace FluckyGame.Client
 
             graphicsDeviceManager = new GraphicsDeviceManager(this)
             {
-                PreferredBackBufferWidth = 1920 / 2,
-                PreferredBackBufferHeight = 1080 / 2
+                PreferredBackBufferWidth = clientSettings.resolution.width,
+                PreferredBackBufferHeight = clientSettings.resolution.height,
+                IsFullScreen = clientSettings.resolution.fullscreen
             };
             Content.RootDirectory = "Content";
             
diff --git a/src/FluckyGame.Client/FluckyGame.Client/Program.cs b/src/FluckyGame.Client/FluckyGame.Client/Program.cs
index 6a342df..ea04826 100644
--- a/src/FluckyGame.Client/FluckyGame.Client/Program.cs
+++ b/src/FluckyGame.Client/FluckyGame.Client/Program.cs
@@ -1,18 +1,23 @@
 using System;
 using System.Net.Sockets;
 using System.Windows.Forms;
+using Newtonsoft.Json;
+using System.IO;
 
 namespace FluckyGame.Client
 {
-    static class Program
+    internal static class Program
     {
-        static void Main(string[] args)
+        private static void Main(string[] args)
         {
+            //TODO: error handling !!!
+            var settings = JsonConvert.DeserializeObject<ClientSettings>(File.ReadAllText("client.json"));
+
             TcpClient tcpClient;
 
             try
             {
-                tcpClient = new TcpClient("home.brunner.ninja", 8001);
+                tcpClient = new TcpClient(settings.server.hostname, settings.server.port);
             }
             catch (Exception ex)
             {
@@ -20,7 +25,7 @@ namespace FluckyGame.Client
                 return;
             }
 
-            using (Game1 game = new Game1(tcpClient))
+            using (Game1 game = new Game1(tcpClient, settings))
                 game.Run();
         }
     }
diff --git a/src/FluckyGame.Client/FluckyGame.Client/client.json b/src/FluckyGame.Client/FluckyGame.Client/client.json
new file mode 100644
index 0000000..222963b
--- /dev/null
+++ b/src/FluckyGame.Client/FluckyGame.Client/client.json
@@ -0,0 +1,11 @@
+{
+  "resolution": {
+    "width": 3840,
+    "height": 2160,
+    "fullscreen": true
+  },
+  "server": {
+    "hostname": "localhost",
+    "port": 8001
+  }
+}
diff --git a/src/FluckyGame.Client/FluckyGame.Client/packages.config b/src/FluckyGame.Client/FluckyGame.Client/packages.config
new file mode 100644
index 0000000..7ee8c10
--- /dev/null
+++ b/src/FluckyGame.Client/FluckyGame.Client/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
+</packages>
\ No newline at end of file