client started

AscensionGameDev · Nov 26, 2024 · e8448b6 · e8448b6
1 parent 755cc51
commit e8448b6
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 32 deletions.
diff --git a/Intersect.Client.Core/Intersect.Client.Core.csproj b/Intersect.Client.Core/Intersect.Client.Core.csproj
@@ -33,21 +33,6 @@
     <ProjectReference Include="..\Intersect.Network\Intersect.Network.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
   <ItemGroup Label="Project Embedded Resources">
     <EmbeddedResource Include="$(NetworkHandshakePublicKey)" />
     <EmbeddedResource Include="$(IntersectRepoPath)\assets\intersect-logo-qu.bmp">

diff --git a/Intersect.Client.Core/MonoGame/Network/MonoSocket.cs b/Intersect.Client.Core/MonoGame/Network/MonoSocket.cs
@@ -1,4 +1,4 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
@@ -45,7 +45,7 @@ internal partial class MonoSocket : GameSocket
     private const long ServerStatusPingInterval = 15_000;
 #endif
 
-    private const string AsymmetricKeyManifestResourceName = "Intersect.Client.network.handshake.bkey.pub";
+    private const string AsymmetricKeyManifestResourceName = "Intersect.Client.Core.network.handshake.bkey.pub";
 
     private IClient? _network;
 

diff --git a/Intersect.Client.Core/Program.cs b/Intersect.Client.Core/Program.cs
@@ -239,7 +239,7 @@ private static void ExportDependency(string filename, string? folder = default,
         {
             cleanFolder += '.';
         }
-        var resourceName = $"Intersect.Client.Resources.{cleanFolder}{filename}";
+        var resourceName = $"Intersect.Client.Core.Resources.{cleanFolder}{filename}";
 
         if (assembly.GetManifestResourceNames().Contains(resourceName))
         {

diff --git a/Intersect.Client/Intersect.Client.csproj b/Intersect.Client/Intersect.Client.csproj
@@ -28,4 +28,19 @@
 	  <ProjectReference Include="..\Intersect.Client.Core\Intersect.Client.Core.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Compile Update="Properties\Resources.Designer.cs">
+	    <DependentUpon>Resources.resx</DependentUpon>
+	    <DesignTime>True</DesignTime>
+	    <AutoGen>True</AutoGen>
+	  </Compile>
+	</ItemGroup>
+
+	<ItemGroup>
+	  <EmbeddedResource Update="Properties\Resources.resx">
+	    <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+	    <Generator>ResXFileCodeGenerator</Generator>
+	  </EmbeddedResource>
+	</ItemGroup>
+
 </Project>
diff --git a/...ent.Core/Properties/Resources.Designer.cs → ...t.Client/Properties/Resources.Designer.cs b/...ent.Core/Properties/Resources.Designer.cs → ...t.Client/Properties/Resources.Designer.cs
diff --git a/...ect.Client.Core/Properties/Resources.resx → Intersect.Client/Properties/Resources.resx b/...ect.Client.Core/Properties/Resources.resx → Intersect.Client/Properties/Resources.resx
diff --git a/...lient.Core/Properties/launchSettings.json → ...ect.Client/Properties/launchSettings.json b/...lient.Core/Properties/launchSettings.json → ...ect.Client/Properties/launchSettings.json