toolbox/robust-toolbox-template
toolbox/robust-toolbox-template
Template
2
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolboxTemplate.git synced 2026-02-10 16:24:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update RT to 268.0.0

Browse source
This commit is contained in:
PJB3005 2025-11-16 20:34:33 +01:00
parent 6347ddffb8
commit ca2bb9dcff
No known key found for this signature in database
14 changed files with 44 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Content.Client/Content.Client.csproj
View file

@ -1,21 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" /> <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
<PropertyGroup> <PropertyGroup>
<!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
<TargetFramework>$(TargetFramework)</TargetFramework>
<LangVersion>11</LangVersion>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>..\bin\Content.Client\</OutputPath> <OutputPath>..\bin\Content.Client\</OutputPath>
<OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType> <OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
<WarningsAsErrors>nullable</WarningsAsErrors> <WarningsAsErrors>nullable</WarningsAsErrors>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Configurations>Debug;Release;Tools;DebugOpt</Configurations>
<Platforms>AnyCPU</Platforms>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Nett" Version="0.15.0" /> <PackageReference Include="Nett" />
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" /> <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj" /> <ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj" />

8
Content.Client/EntryPoint.cs
View file

@ -15,8 +15,8 @@ public sealed class EntryPoint : GameClient
{ {
public override void Init() public override void Init()
{ {
var factory = IoCManager.Resolve<IComponentFactory>(); var factory = Dependencies.Resolve<IComponentFactory>();
var prototypes = IoCManager.Resolve<IPrototypeManager>(); var prototypes = Dependencies.Resolve<IPrototypeManager>();
factory.DoAutoRegistrations(); factory.DoAutoRegistrations();
@ -44,9 +44,9 @@ public sealed class EntryPoint : GameClient
base.PostInit(); base.PostInit();
// DEVNOTE: The line below will disable lighting, so you can see in-game sprites without the need for lights // DEVNOTE: The line below will disable lighting, so you can see in-game sprites without the need for lights
IoCManager.Resolve<ILightManager>().Enabled = false; Dependencies.Resolve<ILightManager>().Enabled = false;
var stateManager = IoCManager.Resolve<IStateManager>(); var stateManager = Dependencies.Resolve<IStateManager>();
// DEVNOTE: It's recommended to look at how this works! It's for debug purposes and you probably want something prettier for the final game. // DEVNOTE: It's recommended to look at how this works! It's for debug purposes and you probably want something prettier for the final game.
// Additionally, state manager is the primary way you'll be changing between UIScreen instances. // Additionally, state manager is the primary way you'll be changing between UIScreen instances.

1
Content.Client/Program.cs
View file

@ -5,6 +5,7 @@ namespace Content.Client;
internal static class Program internal static class Program
{ {
[STAThread]
public static void Main(string[] args) public static void Main(string[] args)
{ {
ContentStart.Start(args); ContentStart.Start(args);

15
Content.Client/app.config
View file

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.86.0.518" newVersion="0.86.0.518" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

6
Content.Server/Content.Server.csproj
View file

@ -1,17 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" /> <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
<PropertyGroup> <PropertyGroup>
<!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
<TargetFramework>$(TargetFramework)</TargetFramework>
<LangVersion>latest</LangVersion>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>..\bin\Content.Server\</OutputPath> <OutputPath>..\bin\Content.Server\</OutputPath>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType> <OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" /> <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Content.Packaging\Content.Packaging.csproj" /> <ProjectReference Include="..\Content.Packaging\Content.Packaging.csproj" />

4
Content.Server/EntryPoint.cs
View file

@ -13,7 +13,7 @@ public sealed class EntryPoint : GameServer
{ {
base.Init(); base.Init();
var factory = IoCManager.Resolve<IComponentFactory>(); var factory = Dependencies.Resolve<IComponentFactory>();
factory.DoAutoRegistrations(); factory.DoAutoRegistrations();
@ -22,7 +22,7 @@ public sealed class EntryPoint : GameServer
factory.RegisterIgnore(ignoreName); factory.RegisterIgnore(ignoreName);
} }
ServerContentIoC.Register(); ServerContentIoC.Register(Dependencies);
IoCManager.BuildGraph(); IoCManager.BuildGraph();

8
Content.Server/LocalHostConGroup.cs
View file

@ -2,7 +2,6 @@
using System.Net; using System.Net;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Server.Console; using Robust.Server.Console;
using Robust.Server.Player;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Toolshed; using Robust.Shared.Toolshed;
using Robust.Shared.Toolshed.Errors; using Robust.Shared.Toolshed.Errors;
@ -14,7 +13,10 @@ namespace Content.Server;
/// Debug/example ConGroup controller implementation that gives any client connected through localhost every permission. /// Debug/example ConGroup controller implementation that gives any client connected through localhost every permission.
/// </summary> /// </summary>
[UsedImplicitly] [UsedImplicitly]
public sealed class LocalHostConGroup : IConGroupControllerImplementation, IPostInjectInit { public sealed class LocalHostConGroup : IConGroupControllerImplementation, IPostInjectInit
{
[Dependency] private readonly IConGroupController _controller = null!;
public bool CanCommand(ICommonSession session, string cmdName) { public bool CanCommand(ICommonSession session, string cmdName) {
return IsLocal(session); return IsLocal(session);
} }
@ -50,7 +52,7 @@ public sealed class LocalHostConGroup : IConGroupControllerImplementation, IPost
} }
void IPostInjectInit.PostInject() { void IPostInjectInit.PostInject() {
IoCManager.Resolve<IConGroupController>().Implementation = this; _controller.Implementation = this;
} }
private record NotLocalError : IConError private record NotLocalError : IConError

4
Content.Server/ServerContentIoC.cs
View file

@ -2,9 +2,9 @@ namespace Content.Server;
internal static class ServerContentIoC internal static class ServerContentIoC
{ {
public static void Register() public static void Register(IDependencyCollection dependencies)
{ {
// DEVNOTE: IoCManager registrations for the server go here and only here. // DEVNOTE: IoCManager registrations for the server go here and only here.
IoCManager.Register<LocalHostConGroup>(); dependencies.Register<LocalHostConGroup>();
} }
} }

15
Content.Server/app.config
View file

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.86.0.518" newVersion="0.86.0.518" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

8
Content.Shared/Content.Shared.csproj
View file

@ -1,16 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
<PropertyGroup> <PropertyGroup>
<!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
<TargetFramework>$(TargetFramework)</TargetFramework>
<LangVersion>11</LangVersion>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<WarningsAsErrors>nullable</WarningsAsErrors> <WarningsAsErrors>nullable</WarningsAsErrors>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" /> <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj"> <ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj">
@ -24,5 +19,6 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
<Import Project="..\RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets" /> <Import Project="..\RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets" />
</Project> </Project>

4
Content.Shared/EntryPoint.cs
View file

@ -18,12 +18,12 @@ public sealed class EntryPoint : GameShared
public override void PreInit() public override void PreInit()
{ {
IoCManager.InjectDependencies(this); Dependencies.InjectDependencies(this);
// Default to en-US. // Default to en-US.
// DEVNOTE: If you want your game to be multiregional at runtime, you'll need to // DEVNOTE: If you want your game to be multiregional at runtime, you'll need to
// do something more complicated here. // do something more complicated here.
IoCManager.Resolve<ILocalizationManager>().LoadCulture(new CultureInfo(Culture)); Dependencies.Resolve<ILocalizationManager>().LoadCulture(new CultureInfo(Culture));
// TODO: Document what else you might want to put here // TODO: Document what else you might want to put here
} }

15
Content.Shared/app.config
View file

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.86.0.518" newVersion="0.86.0.518" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

6
Directory.Packages.props Normal file
View file

@ -0,0 +1,6 @@
<Project>
<Import Project="RobustToolbox/Directory.Packages.props" />
<ItemGroup>
<!-- Put versions for any additional NuGet packages you might want to use here. -->
</ItemGroup>
</Project>

16
RobustTemplate.sln
View file

@ -61,6 +61,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Packaging", "Conten
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Serialization.Generator", "RobustToolbox\Robust.Serialization.Generator\Robust.Serialization.Generator.csproj", "{066A19F7-7D5B-4C2B-BFC5-DE8C6FD3E186}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Serialization.Generator", "RobustToolbox\Robust.Serialization.Generator\Robust.Serialization.Generator.csproj", "{066A19F7-7D5B-4C2B-BFC5-DE8C6FD3E186}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Xaml", "RobustToolbox\Robust.Xaml\Robust.Xaml.csproj", "{DBF1DF9E-6359-4179-9AB9-F38E5A348ABB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Files", "Project Files", "{2B295911-706F-447E-892B-7B7CF13FC30E}"
ProjectSection(SolutionItems) = preProject
Directory.Packages.props = Directory.Packages.props
EndProjectSection
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -264,6 +271,14 @@ Global
{066A19F7-7D5B-4C2B-BFC5-DE8C6FD3E186}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU {066A19F7-7D5B-4C2B-BFC5-DE8C6FD3E186}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
{066A19F7-7D5B-4C2B-BFC5-DE8C6FD3E186}.Tools|Any CPU.ActiveCfg = Debug|Any CPU {066A19F7-7D5B-4C2B-BFC5-DE8C6FD3E186}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
{066A19F7-7D5B-4C2B-BFC5-DE8C6FD3E186}.Tools|Any CPU.Build.0 = Debug|Any CPU {066A19F7-7D5B-4C2B-BFC5-DE8C6FD3E186}.Tools|Any CPU.Build.0 = Debug|Any CPU
{DBF1DF9E-6359-4179-9AB9-F38E5A348ABB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DBF1DF9E-6359-4179-9AB9-F38E5A348ABB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DBF1DF9E-6359-4179-9AB9-F38E5A348ABB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DBF1DF9E-6359-4179-9AB9-F38E5A348ABB}.Release|Any CPU.Build.0 = Release|Any CPU
{DBF1DF9E-6359-4179-9AB9-F38E5A348ABB}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
{DBF1DF9E-6359-4179-9AB9-F38E5A348ABB}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
{DBF1DF9E-6359-4179-9AB9-F38E5A348ABB}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
{DBF1DF9E-6359-4179-9AB9-F38E5A348ABB}.Tools|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{2A829DE3-FCB2-4FEA-A6F3-B85122C8D11E} = {F5F87A9D-C304-4833-B107-D666317F6931} {2A829DE3-FCB2-4FEA-A6F3-B85122C8D11E} = {F5F87A9D-C304-4833-B107-D666317F6931}
@ -290,5 +305,6 @@ Global
{81E28D82-BB23-44C7-AFFC-6CC1BB04CDF5} = {F5F87A9D-C304-4833-B107-D666317F6931} {81E28D82-BB23-44C7-AFFC-6CC1BB04CDF5} = {F5F87A9D-C304-4833-B107-D666317F6931}
{D7F76B45-DAF9-49E1-A910-632DB0BDF471} = {F5F87A9D-C304-4833-B107-D666317F6931} {D7F76B45-DAF9-49E1-A910-632DB0BDF471} = {F5F87A9D-C304-4833-B107-D666317F6931}
{066A19F7-7D5B-4C2B-BFC5-DE8C6FD3E186} = {F5F87A9D-C304-4833-B107-D666317F6931} {066A19F7-7D5B-4C2B-BFC5-DE8C6FD3E186} = {F5F87A9D-C304-4833-B107-D666317F6931}
{DBF1DF9E-6359-4179-9AB9-F38E5A348ABB} = {F5F87A9D-C304-4833-B107-D666317F6931}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal