From e8448b6b396a4d77711b09f251a4b89f4869d6c1 Mon Sep 17 00:00:00 2001 From: WeylonSantana Date: Tue, 26 Nov 2024 17:44:47 -0300 Subject: [PATCH] client started --- .../Intersect.Client.Core.csproj | 15 ---------- .../MonoGame/Network/MonoSocket.cs | 4 +-- Intersect.Client.Core/Program.cs | 2 +- Intersect.Client/Intersect.Client.csproj | 15 ++++++++++ .../Properties/Resources.Designer.cs | 28 +++++++++---------- .../Properties/Resources.resx | 0 .../Properties/launchSettings.json | 0 7 files changed, 32 insertions(+), 32 deletions(-) rename {Intersect.Client.Core => Intersect.Client}/Properties/Resources.Designer.cs (65%) rename {Intersect.Client.Core => Intersect.Client}/Properties/Resources.resx (100%) rename {Intersect.Client.Core => Intersect.Client}/Properties/launchSettings.json (100%) diff --git a/Intersect.Client.Core/Intersect.Client.Core.csproj b/Intersect.Client.Core/Intersect.Client.Core.csproj index 7e033bd9e2..8565c5a56f 100644 --- a/Intersect.Client.Core/Intersect.Client.Core.csproj +++ b/Intersect.Client.Core/Intersect.Client.Core.csproj @@ -33,21 +33,6 @@ - - - True - True - Resources.resx - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - diff --git a/Intersect.Client.Core/MonoGame/Network/MonoSocket.cs b/Intersect.Client.Core/MonoGame/Network/MonoSocket.cs index 5f0dacd555..b5435430af 100644 --- 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 index b079836ca9..94c6501773 100644 --- 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 index 5c93d486e3..c0ed4bd37d 100644 --- a/Intersect.Client/Intersect.Client.csproj +++ b/Intersect.Client/Intersect.Client.csproj @@ -28,4 +28,19 @@ + + + Resources.resx + True + True + + + + + + Resources.Designer.cs + ResXFileCodeGenerator + + + diff --git a/Intersect.Client.Core/Properties/Resources.Designer.cs b/Intersect.Client/Properties/Resources.Designer.cs similarity index 65% rename from Intersect.Client.Core/Properties/Resources.Designer.cs rename to Intersect.Client/Properties/Resources.Designer.cs index 8ff7bf1234..e2d351a74a 100644 --- a/Intersect.Client.Core/Properties/Resources.Designer.cs +++ b/Intersect.Client/Properties/Resources.Designer.cs @@ -1,24 +1,24 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// O código foi gerado por uma ferramenta. +// Versão de Tempo de Execução:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// As alterações ao arquivo poderão causar comportamento incorreto e serão perdidas se +// o código for gerado novamente. // //------------------------------------------------------------------------------ -namespace Intersect.Client.Core.Properties { +namespace Intersect.Client.Properties { using System; /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// Uma classe de recurso de tipo de alta segurança, para pesquisar cadeias de caracteres localizadas etc. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. + // Essa classe foi gerada automaticamente pela classe StronglyTypedResourceBuilder + // através de uma ferramenta como ResGen ou Visual Studio. + // Para adicionar ou remover um associado, edite o arquivo .ResX e execute ResGen novamente + // com a opção /str, ou recrie o projeto do VS. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,13 +33,13 @@ internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Retorna a instância de ResourceManager armazenada em cache usada por essa classe. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Intersect.Client.Core.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Intersect.Client.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Substitui a propriedade CurrentUICulture do thread atual para todas as + /// pesquisas de recursos que usam essa classe de recurso de tipo de alta segurança. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/Intersect.Client.Core/Properties/Resources.resx b/Intersect.Client/Properties/Resources.resx similarity index 100% rename from Intersect.Client.Core/Properties/Resources.resx rename to Intersect.Client/Properties/Resources.resx diff --git a/Intersect.Client.Core/Properties/launchSettings.json b/Intersect.Client/Properties/launchSettings.json similarity index 100% rename from Intersect.Client.Core/Properties/launchSettings.json rename to Intersect.Client/Properties/launchSettings.json