From 107d0ac16bc2960e4c3f49235e187473c969f414 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Fri, 23 Apr 2021 20:40:47 +0200 Subject: [PATCH] Update template to use the latest RobustToolbox version. --- Content.Client/EntryPoint.cs | 1 + Content.Client/Program.cs | 16 +++++++++++++++- Content.Server/EntryPoint.cs | 1 + Content.Server/Program.cs | 10 +++++++++- Content.Shared/EntryPoint.cs | 1 + RobustTemplate.sln | 15 +++++++++++++++ RobustToolbox | 2 +- 7 files changed, 43 insertions(+), 3 deletions(-) diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs index 91ebb9c..267e3a8 100644 --- a/Content.Client/EntryPoint.cs +++ b/Content.Client/EntryPoint.cs @@ -5,6 +5,7 @@ using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Timing; +// DEVNOTE: Games that want to be on the hub are FORCED use the "Content." prefix for assemblies they want to load. namespace Content.Client { public class EntryPoint : GameClient diff --git a/Content.Client/Program.cs b/Content.Client/Program.cs index 6074217..ad7f607 100644 --- a/Content.Client/Program.cs +++ b/Content.Client/Program.cs @@ -4,6 +4,20 @@ namespace Content.Client { internal static class Program { - public static void Main(string[] args) => ContentStart.Start(args); + public static void Main(string[] args) + { + ContentStart.Start(args); + + /* + // DEVNOTE: If you want to use RobustToolbox as a library, use the method below instead. + // Keep in mind, this will make your game ineligible from appearing on the SS14 hub, specially if you + // disable sandboxing. + ContentStart.StartLibrary(args, new GameControllerOptions() + { + // DEVNOTE: Your options here. + Sandboxing = false, + }); + */ + } } } \ No newline at end of file diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs index cbcb3e3..bf7d17e 100644 --- a/Content.Server/EntryPoint.cs +++ b/Content.Server/EntryPoint.cs @@ -3,6 +3,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Timing; +// DEVNOTE: Games that want to be on the hub are FORCED use the "Content." prefix for assemblies they want to load. namespace Content.Server { public class EntryPoint : GameServer diff --git a/Content.Server/Program.cs b/Content.Server/Program.cs index b46cefc..acc6979 100644 --- a/Content.Server/Program.cs +++ b/Content.Server/Program.cs @@ -4,6 +4,14 @@ namespace Content.Server { internal static class Program { - public static void Main(string[] args) => ContentStart.Start(args); + public static void Main(string[] args) + { + ContentStart.Start(args); + + /* + // DEVNOTE: If you want to use RobustToolbox as a library, use the method below instead. + ContentStart.StartLibrary(args); + */ + } } } \ No newline at end of file diff --git a/Content.Shared/EntryPoint.cs b/Content.Shared/EntryPoint.cs index 9056cb8..2edb41f 100644 --- a/Content.Shared/EntryPoint.cs +++ b/Content.Shared/EntryPoint.cs @@ -3,6 +3,7 @@ using Robust.Shared.ContentPack; using Robust.Shared.IoC; using Robust.Shared.Localization; +// DEVNOTE: Games that want to be on the hub are FORCED use the "Content." prefix for assemblies they want to load. namespace Content.Shared { public class EntryPoint : GameShared diff --git a/RobustTemplate.sln b/RobustTemplate.sln index 118b25c..c901af8 100644 --- a/RobustTemplate.sln +++ b/RobustTemplate.sln @@ -57,6 +57,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Analyzers", "RobustT EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Generators", "RobustToolbox\Robust.Generators\Robust.Generators.csproj", "{62452255-1DE7-4D37-BB01-A690EC7E3156}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "RobustToolbox\Avalonia.Base\Avalonia.Base.csproj", "{BDF16A97-6269-4CA1-8D67-785DDD357B30}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -322,6 +324,18 @@ Global {62452255-1DE7-4D37-BB01-A690EC7E3156}.Release|x64.Build.0 = Release|Any CPU {62452255-1DE7-4D37-BB01-A690EC7E3156}.Release|x86.ActiveCfg = Release|Any CPU {62452255-1DE7-4D37-BB01-A690EC7E3156}.Release|x86.Build.0 = Release|Any CPU + {BDF16A97-6269-4CA1-8D67-785DDD357B30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BDF16A97-6269-4CA1-8D67-785DDD357B30}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BDF16A97-6269-4CA1-8D67-785DDD357B30}.Debug|x64.ActiveCfg = Debug|Any CPU + {BDF16A97-6269-4CA1-8D67-785DDD357B30}.Debug|x64.Build.0 = Debug|Any CPU + {BDF16A97-6269-4CA1-8D67-785DDD357B30}.Debug|x86.ActiveCfg = Debug|Any CPU + {BDF16A97-6269-4CA1-8D67-785DDD357B30}.Debug|x86.Build.0 = Debug|Any CPU + {BDF16A97-6269-4CA1-8D67-785DDD357B30}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BDF16A97-6269-4CA1-8D67-785DDD357B30}.Release|Any CPU.Build.0 = Release|Any CPU + {BDF16A97-6269-4CA1-8D67-785DDD357B30}.Release|x64.ActiveCfg = Release|Any CPU + {BDF16A97-6269-4CA1-8D67-785DDD357B30}.Release|x64.Build.0 = Release|Any CPU + {BDF16A97-6269-4CA1-8D67-785DDD357B30}.Release|x86.ActiveCfg = Release|Any CPU + {BDF16A97-6269-4CA1-8D67-785DDD357B30}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {2A829DE3-FCB2-4FEA-A6F3-B85122C8D11E} = {F5F87A9D-C304-4833-B107-D666317F6931} @@ -347,5 +361,6 @@ Global {8A30B42B-6897-4218-9932-AA348D4A4983} = {F5F87A9D-C304-4833-B107-D666317F6931} {D56D47F6-2C26-42D2-BA00-C39824CFAF55} = {F5F87A9D-C304-4833-B107-D666317F6931} {62452255-1DE7-4D37-BB01-A690EC7E3156} = {F5F87A9D-C304-4833-B107-D666317F6931} + {BDF16A97-6269-4CA1-8D67-785DDD357B30} = {F5F87A9D-C304-4833-B107-D666317F6931} EndGlobalSection EndGlobal diff --git a/RobustToolbox b/RobustToolbox index 6038483..6506171 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 6038483b1e956f54d5ec72058af8ce06367bd84c +Subproject commit 6506171ea04a9c4a4781fa3991f630e9cb35981b