Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: splits Client into Client.Core #2399

Merged
merged 10 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
21 changes: 21 additions & 0 deletions Intersect.Client.Core/GlobalSuppressions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[assembly:
System.Diagnostics.CodeAnalysis.SuppressMessage(
"Style", "IDE1005:Delegate invocation can be simplified.",
Justification = "if-null is more readable for newer programmers.", Scope = "member",
Target =
"~M:Intersect_Client.Classes.UI.Game.BanMuteBox.okayBtn_Clicked(IntersectClientExtras.Gwen.Control.Base,IntersectClientExtras.Gwen.Control.EventArguments.ClickedEventArgs)"
)]
[assembly:
System.Diagnostics.CodeAnalysis.SuppressMessage(
"Style", "IDE1005:Delegate invocation can be simplified.",
Justification = "if-null is more readable for newer programmers.", Scope = "member",
Target =
"~M:Intersect_Client.Classes.UI.Game.InputBox.cancelBtn_Clicked(IntersectClientExtras.Gwen.Control.Base,IntersectClientExtras.Gwen.Control.EventArguments.ClickedEventArgs)"
)]
[assembly:
System.Diagnostics.CodeAnalysis.SuppressMessage(
"Style", "IDE1005:Delegate invocation can be simplified.",
Justification = "if-null is more readable for newer programmers.", Scope = "member",
Target =
"~M:Intersect_Client.Classes.UI.Game.InputBox.okayBtn_Clicked(IntersectClientExtras.Gwen.Control.Base,IntersectClientExtras.Gwen.Control.EventArguments.ClickedEventArgs)"
)]
95 changes: 95 additions & 0 deletions Intersect.Client.Core/Intersect.Client.Core.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputType>Library</OutputType>
</PropertyGroup>

<PropertyGroup>
<PackageId>AscensionGameDev.Intersect.Client.Core</PackageId>
<Description>Game Client Core - Part of the Intersect 2D Game Creation Suite</Description>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<RootNamespace>Intersect.Client</RootNamespace>
<AssemblyName>Intersect Client Core</AssemblyName>
<AppDesignerFolder>Properties</AppDesignerFolder>
<FileAlignment>512</FileAlignment>
</PropertyGroup>

<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Intersect.Tests.Client</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Intersect.SinglePlayer</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Intersect Client</_Parameter1>
</AssemblyAttribute>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Intersect (Core)\Intersect.Core.csproj" />
<ProjectReference Include="..\Intersect.Client.Framework\Intersect.Client.Framework.csproj" />
<ProjectReference Include="..\Intersect.Network\Intersect.Network.csproj" />
</ItemGroup>

<ItemGroup Label="Project Embedded Resources">
<EmbeddedResource Include="$(NetworkHandshakePublicKey)" />
<EmbeddedResource Include="Resources\MonoGame.Framework.dll.config" />
<EmbeddedResource Include="Resources\openal32.dll" />
<EmbeddedResource Include="Resources\Shaders\radialgradient.xnb" />
</ItemGroup>

<ItemGroup Label="Package Embedded Resources">
<EmbeddedResource Include="$(PkgMonoGame_Framework_DesktopGL)\lib\net6.0\MonoGame.Framework.dll">
<Link>Resources\MonoGame.Framework.dll</Link>
</EmbeddedResource>
<EmbeddedResource Include="$(PkgMonoGame_Framework_DesktopGL)\runtimes\linux-x64\native\libopenal.so.1" WithCulture="false">
<Link>Resources\libopenal.so.1</Link>
</EmbeddedResource>
<EmbeddedResource Include="$(PkgMonoGame_Framework_DesktopGL)\runtimes\osx\native\libopenal.1.dylib">
<Link>Resources\libopenal.1.dylib</Link>
</EmbeddedResource>
<EmbeddedResource Include="$(PkgMonoGame_Framework_DesktopGL)\runtimes\win-x64\native\soft_oal.dll">
<Link>Resources\x64\soft_oal.dll</Link>
</EmbeddedResource>
<EmbeddedResource Include="$(PkgMonoGame_Library_SDL)\runtimes\linux-x64\native\libSDL2-2.0.so.0" WithCulture="false">
<Link>Resources\libSDL2-2.0.so.0</Link>
</EmbeddedResource>
<EmbeddedResource Include="$(PkgMonoGame_Library_SDL)\runtimes\osx\native\libSDL2.dylib">
<Link>Resources\libSDL2.dylib</Link>
</EmbeddedResource>
<EmbeddedResource Include="$(PkgMonoGame_Library_SDL)\runtimes\win-x64\native\SDL2.dll">
<Link>Resources\x64\SDL2.dll</Link>
</EmbeddedResource>
</ItemGroup>

<ItemGroup Label="Steam Resources" Condition="'$(INTERSECT_STEAMWORKS)' != ''">
<AssemblyAttribute Include="Intersect.Client.Core.ThirdParty.Steam.Supported" />
<Content Include="steam_appid.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<EmbeddedResource Include="Resources\runtimes\linux-x64\native\libsdkencryptedappticket.so" />
<EmbeddedResource Include="Resources\runtimes\linux-x64\native\libsteam_api.so" />
<EmbeddedResource Include="Resources\runtimes\osx\native\libsdkencryptedappticket.dylib" />
<EmbeddedResource Include="Resources\runtimes\osx\native\libsteam_api.dylib" />
<EmbeddedResource Include="Resources\runtimes\win-x64\native\sdkencryptedappticket64.dll" />
<EmbeddedResource Include="Resources\runtimes\win-x64\native\steam_api64.dll" />
</ItemGroup>

<ItemGroup Label="Steam Resources (Exclusion)" Condition="'$(INTERSECT_STEAMWORKS)' == ''">
<None Include="Resources\runtimes\linux-x64\native\libsdkencryptedappticket.so" />
<None Include="Resources\runtimes\linux-x64\native\libsteam_api.so" />
<None Include="Resources\runtimes\osx\native\libsdkencryptedappticket.dylib" />
<None Include="Resources\runtimes\osx\native\libsteam_api.dylib" />
<None Include="Resources\runtimes\win-x64\native\sdkencryptedappticket64.dll" />
<None Include="Resources\runtimes\win-x64\native\steam_api64.dll" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" GeneratePathProperty="True" />
<PackageReference Include="MonoGame.Library.SDL" Version="2.26.5.5" GeneratePathProperty="True" />
<PackageReference Include="Steamworks.NET" Version="20.1.0" />
</ItemGroup>

</Project>
File renamed without changes.
21 changes: 21 additions & 0 deletions Intersect.Client.Core/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020 Ascension Game Dev

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ private static void SynchronizeConfigurableStrings()
private static void PostLoad()
{

Program.OpenGLLink = Errors.OpenGlLink.ToString();
Program.OpenALLink = Errors.OpenAllLink.ToString();
Intersect.Client.Core.Program.OpenGLLink = Errors.OpenGlLink.ToString();
Intersect.Client.Core.Program.OpenALLink = Errors.OpenAllLink.ToString();
}

public static void Load()
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Diagnostics;
using System.Diagnostics;
using System.Collections.Concurrent;

using Intersect.Client.Core;
Expand Down Expand Up @@ -801,7 +801,7 @@ public void DrawItemNames()
var rarity = itemBase.Rarity;
if (tileItems[index].Quantity > 1)
{
name = Localization.Strings.General.MapItemStackable.ToString(name, Strings.FormatQuantityAbbreviated(quantity));
name = Strings.General.MapItemStackable.ToString(name, Strings.FormatQuantityAbbreviated(quantity));
}
var color = CustomColors.Items.MapRarities.ContainsKey(rarity)
? CustomColors.Items.MapRarities[rarity]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Collections.Concurrent;
using System.Collections.Concurrent;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Net;
Expand Down
Loading
Loading