TrueCraft.Client.Linux -> TrueCraft.Client

TrueCraft.Client/BMFont.cs

@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 using System.Collections.Generic;
 using Microsoft.Xna.Framework;
 
-namespace TrueCraft.Client.Linux
+namespace TrueCraft.Client
 {
     [Serializable]
     [XmlRoot ( "font" )]

TrueCraft.Client/ChunkConverter.cs

@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using System.Threading;
 using System.Linq;
-using TrueCraft.Client.Linux.Rendering;
+using TrueCraft.Client.Rendering;
 using TrueCraft.Core.World;
 using TrueCraft.API;
 using System.Collections.Generic;
@@ -12,7 +12,7 @@ using Vector2 = Microsoft.Xna.Framework.Vector2;
 using Vector3 = Microsoft.Xna.Framework.Vector3;
 using TrueCraft.API.Logic;
 
-namespace TrueCraft.Client.Linux
+namespace TrueCraft.Client
 {
     /// <summary>
     /// A daemon of sorts that creates meshes from chunks.

TrueCraft.Client/Events/ChatMessageEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TrueCraft.Client.Linux.Events
+namespace TrueCraft.Client.Events
 {
     public class ChatMessageEventArgs : EventArgs
     {

TrueCraft.Client/Events/ChunkEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TrueCraft.Client.Linux.Events
+namespace TrueCraft.Client.Events
 {
     public class ChunkEventArgs
     {

TrueCraft.Client/FontRenderer.cs

@@ -2,7 +2,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework;
 
-namespace TrueCraft.Client.Linux
+namespace TrueCraft.Client
 {
     public class FontRenderer
     {

TrueCraft.Client/Handlers/ChunkHandler.cs

@@ -4,9 +4,9 @@ using TrueCraft.Core.Networking.Packets;
 using TrueCraft.API;
 using TrueCraft.Core.World;
 using MonoGame.Utilities;
-using TrueCraft.Client.Linux.Events;
+using TrueCraft.Client.Events;
 
-namespace TrueCraft.Client.Linux.Handlers
+namespace TrueCraft.Client.Handlers
 {
     internal static class ChunkHandler
     {

TrueCraft.Client/Handlers/PacketHandlers.cs

@@ -2,10 +2,10 @@
 using TrueCraft.API.Networking;
 using TrueCraft.Core.Networking.Packets;
 using TrueCraft.Core.Networking;
-using TrueCraft.Client.Linux.Events;
+using TrueCraft.Client.Events;
 using TrueCraft.API;
 
-namespace TrueCraft.Client.Linux.Handlers
+namespace TrueCraft.Client.Handlers
 {
     internal static class PacketHandlers
     {

TrueCraft.Client/Interface/ChatInterface.cs

@@ -1,10 +1,10 @@
 using System;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using TrueCraft.Client.Linux.Events;
+using TrueCraft.Client.Events;
 using System.Collections.Generic;
 
-namespace TrueCraft.Client.Linux.Interface
+namespace TrueCraft.Client.Interface
 {
     public class ChatInterface : IGameInterface
     {

TrueCraft.Client/Interface/IGameInterface.cs

@@ -2,7 +2,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 
-namespace TrueCraft.Client.Linux.Interface
+namespace TrueCraft.Client.Interface
 {
     public interface IGameInterface
     {

TrueCraft.Client/MultiplayerClient.cs

@@ -7,13 +7,13 @@ using System.Threading;
 using TrueCraft.Core.Networking;
 using System.Linq;
 using TrueCraft.Core.Networking.Packets;
-using TrueCraft.Client.Linux.Events;
+using TrueCraft.Client.Events;
 using TrueCraft.Core.Logic;
 using TrueCraft.API.Entities;
 using TrueCraft.API;
 using System.ComponentModel;
 
-namespace TrueCraft.Client.Linux
+namespace TrueCraft.Client
 {
     public delegate void PacketHandler(IPacket packet, MultiplayerClient client);
 

TrueCraft.Client/PhysicsEngine.cs

@@ -6,9 +6,8 @@ using TrueCraft.Core.World;
 using TrueCraft.API.Entities;
 using TrueCraft.API.World;
 using TrueCraft.API;
-using TrueCraft.Client.Linux;
 
-namespace TrueCraft
+namespace TrueCraft.Client
 {
     // This is a stripped down version of the physics engine that the server uses
     // The only thing we use it for is our own movement

TrueCraft.Client/Program.cs

@@ -3,7 +3,7 @@ using System.Net;
 using System.Linq;
 using System.Net.Sockets;
 
-namespace TrueCraft.Client.Linux
+namespace TrueCraft.Client
 {
     public static class Program
     {

TrueCraft.Client/Properties/AssemblyInfo.cs

@@ -4,7 +4,7 @@ using System.Runtime.CompilerServices;
 // Information about this assembly is defined by the following attributes.
 // Change them to the values specific to your project.
 
-[assembly: AssemblyTitle("TrueCraft.Client.Linux")]
+[assembly: AssemblyTitle("TrueCraft.Client")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]

TrueCraft.Client/ReadOnlyWorld.cs

@@ -7,7 +7,7 @@ using TrueCraft.API.World;
 using TrueCraft.Core.World;
 using TrueCraft.API;
 
-namespace TrueCraft.Client.Linux
+namespace TrueCraft.Client
 {
     public class ReadOnlyWorld
     {

TrueCraft.Client/Rendering/BlockRenderer.cs

@@ -5,7 +5,7 @@ using TrueCraft.Core.Logic;
 using TrueCraft.API.Logic;
 using System.Linq;
 
-namespace TrueCraft.Client.Linux.Rendering
+namespace TrueCraft.Client.Rendering
 {
     public class BlockRenderer
     {

TrueCraft.Client/Rendering/Blocks/CraftingTableRenderer.cs

@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using TrueCraft.API.Logic;
 
-namespace TrueCraft.Client.Linux.Rendering.Blocks
+namespace TrueCraft.Client.Rendering.Blocks
 {
     public class CraftingTableRenderer : BlockRenderer
     {

TrueCraft.Client/Rendering/Blocks/GrassRenderer.cs

@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework;
 using TrueCraft.Core.Logic.Blocks;
 using TrueCraft.API.Logic;
 
-namespace TrueCraft.Client.Linux.Rendering.Blocks
+namespace TrueCraft.Client.Rendering.Blocks
 {
     public class GrassRenderer : BlockRenderer
     {

TrueCraft.Client/Rendering/Blocks/SnowRenderer.cs

@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework;
 using TrueCraft.Core.Logic.Blocks;
 using TrueCraft.API.Logic;
 
-namespace TrueCraft.Client.Linux.Rendering.Blocks
+namespace TrueCraft.Client.Rendering.Blocks
 {
     public class SnowRenderer : BlockRenderer
     {

TrueCraft.Client/Rendering/Blocks/TNTRenderer.cs

@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using TrueCraft.API.Logic;
 
-namespace TrueCraft.Client.Linux.Rendering.Blocks
+namespace TrueCraft.Client.Rendering.Blocks
 {
     public class TNTRenderer : BlockRenderer
     {

TrueCraft.Client/Rendering/Blocks/TorchRenderer.cs

@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework;
 using TrueCraft.Core.Logic.Blocks;
 using TrueCraft.API.Logic;
 
-namespace TrueCraft.Client.Linux.Rendering.Blocks
+namespace TrueCraft.Client.Rendering.Blocks
 {
     public class TorchRenderer : BlockRenderer
     {

TrueCraft.Client/Rendering/Mesh.cs

@@ -3,7 +3,7 @@ using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework;
 using System.Linq;
 
-namespace TrueCraft.Client.Linux.Rendering
+namespace TrueCraft.Client.Rendering
 {
     public class Mesh
     {

TrueCraft.Client/TrueCraft.Client.csproj

@@ -7,8 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A6516869-A2FB-4E31-85C8-2285490CB32C}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>TrueCraft.Client.Linux</RootNamespace>
+    <RootNamespace>TrueCraft.Client</RootNamespace>
-    <AssemblyName>TrueCraft.Client.Linux</AssemblyName>
+    <AssemblyName>TrueCraft.Client</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

TrueCraft.Client/TrueCraftGame.cs

@@ -3,15 +3,15 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
 using Microsoft.Xna.Framework.Graphics;
 using System.Collections.Generic;
-using TrueCraft.Client.Linux.Interface;
+using TrueCraft.Client.Interface;
 using System.IO;
 using System.Net;
 using TrueCraft.API;
-using TrueCraft.Client.Linux.Rendering;
+using TrueCraft.Client.Rendering;
 using System.Linq;
 using System.ComponentModel;
 
-namespace TrueCraft.Client.Linux
+namespace TrueCraft.Client
 {
     public class TrueCraftGame : Game
     {

TrueCraft.Launcher/LauncherWindow.cs

@@ -47,9 +47,9 @@ namespace TrueCraft.Launcher
         {
             var process = new Process();
             if (RuntimeInfo.IsMono)
-                process.StartInfo = new ProcessStartInfo("mono", "TrueCraft.Client.Linux.exe " + ServerIPText.Text);
+                process.StartInfo = new ProcessStartInfo("mono", "TrueCraft.Client.exe " + ServerIPText.Text);
             else
-                process.StartInfo = new ProcessStartInfo("TrueCraft.Client.Linux.exe", ServerIPText.Text);
+                process.StartInfo = new ProcessStartInfo("TrueCraft.Client.exe", ServerIPText.Text);
             process.EnableRaisingEvents = true;
             process.Exited += (s, a) => Application.Invoke(ClientExited);
             process.Start();

TrueCraft.Launcher/TrueCraft.Launcher.csproj

@@ -58,10 +58,6 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\TrueCraft.Client.Linux\TrueCraft.Client.Linux.csproj">
-      <Project>{A6516869-A2FB-4E31-85C8-2285490CB32C}</Project>
-      <Name>TrueCraft.Client.Linux</Name>
-    </ProjectReference>
     <ProjectReference Include="..\TrueCraft.API\TrueCraft.API.csproj">
       <Project>{FEE55B54-91B0-4325-A2C3-D576C0B7A81F}</Project>
       <Name>TrueCraft.API</Name>
@@ -78,6 +74,10 @@
       <Project>{4488498D-976D-4DA3-BF72-109531AF0488}</Project>
       <Name>fNbt</Name>
     </ProjectReference>
+    <ProjectReference Include="..\TrueCraft.Client\TrueCraft.Client.csproj">
+      <Project>{A6516869-A2FB-4E31-85C8-2285490CB32C}</Project>
+      <Name>TrueCraft.Client</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Content\" />

TrueCraft.sln

@@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrueCraft.Core", "TrueCraft
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fNbt", "externals\fNbt\fNbt\fNbt.csproj", "{4488498D-976D-4DA3-BF72-109531AF0488}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrueCraft.Client.Linux", "TrueCraft.Client.Linux\TrueCraft.Client.Linux.csproj", "{A6516869-A2FB-4E31-85C8-2285490CB32C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrueCraft.Client", "TrueCraft.Client\TrueCraft.Client.csproj", "{A6516869-A2FB-4E31-85C8-2285490CB32C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrueCraft.Launcher", "TrueCraft.Launcher\TrueCraft.Launcher.csproj", "{6604F17A-552E-405D-B327-37C8B1648C86}"
 EndProject