From 7c004a50f05e7bf05b6505a77d166e72a13bdba4 Mon Sep 17 00:00:00 2001 From: MSWS Date: Fri, 26 Jan 2024 19:36:29 -0800 Subject: [PATCH] Basic draw manager --- Jailbreak.sln | 7 +++++ global.json | 2 +- mod/Jailbreak.Draw/DrawServiceExtension.cs | 5 ++++ mod/Jailbreak.Draw/Global/DrawManager.cs | 29 +++++++++++++++++++-- mod/Jailbreak.Draw/Jailbreak.Draw.csproj | 1 + src/Jailbreak/JailbreakServiceCollection.cs | 2 ++ 6 files changed, 43 insertions(+), 3 deletions(-) diff --git a/Jailbreak.sln b/Jailbreak.sln index 9570efb..108dcc1 100644 --- a/Jailbreak.sln +++ b/Jailbreak.sln @@ -22,6 +22,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lang", "lang", "{CDCDE44E-0 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jailbreak.English", "lang\Jailbreak.English\Jailbreak.English.csproj", "{FC2D6F50-BCFF-41E6-A965-6C73CC01C3BF}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jailbreak.Draw", "mod\Jailbreak.Draw\Jailbreak.Draw.csproj", "{E809B726-088D-4BC6-95C9-EE6A991C8AA9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -56,6 +58,10 @@ Global {FC2D6F50-BCFF-41E6-A965-6C73CC01C3BF}.Debug|Any CPU.Build.0 = Debug|Any CPU {FC2D6F50-BCFF-41E6-A965-6C73CC01C3BF}.Release|Any CPU.ActiveCfg = Release|Any CPU {FC2D6F50-BCFF-41E6-A965-6C73CC01C3BF}.Release|Any CPU.Build.0 = Release|Any CPU + {E809B726-088D-4BC6-95C9-EE6A991C8AA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E809B726-088D-4BC6-95C9-EE6A991C8AA9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E809B726-088D-4BC6-95C9-EE6A991C8AA9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E809B726-088D-4BC6-95C9-EE6A991C8AA9}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {9135CCC9-66C5-4A9C-AE3C-91475B5F0437} = {177DA48D-8306-4102-918D-992569878581} @@ -65,5 +71,6 @@ Global {28EE05E4-8FE3-4CC6-AA03-0C533EFBFBF2} = {36BA84C0-291C-4930-A7C6-97CDF8F7F0D7} {446E0B6F-E4FE-45E6-BD9B-BD943698327A} = {59311734-3648-43C2-B43C-385718B0D103} {FC2D6F50-BCFF-41E6-A965-6C73CC01C3BF} = {CDCDE44E-01D2-4B76-99DA-A57E1E956038} + {E809B726-088D-4BC6-95C9-EE6A991C8AA9} = {36BA84C0-291C-4930-A7C6-97CDF8F7F0D7} EndGlobalSection EndGlobal diff --git a/global.json b/global.json index aaac9e0..2ddda36 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.0", + "version": "8.0.0", "rollForward": "latestMinor", "allowPrerelease": false } diff --git a/mod/Jailbreak.Draw/DrawServiceExtension.cs b/mod/Jailbreak.Draw/DrawServiceExtension.cs index 29e2c13..97de42a 100644 --- a/mod/Jailbreak.Draw/DrawServiceExtension.cs +++ b/mod/Jailbreak.Draw/DrawServiceExtension.cs @@ -1,3 +1,8 @@ +using Jailbreak.Draw.Global; +using Jailbreak.Public.Extensions; +using Jailbreak.Public.Mod.Draw; +using Microsoft.Extensions.DependencyInjection; + namespace Jailbreak.Draw; public static class DrawServiceExtension diff --git a/mod/Jailbreak.Draw/Global/DrawManager.cs b/mod/Jailbreak.Draw/Global/DrawManager.cs index 3b4d853..8acc179 100644 --- a/mod/Jailbreak.Draw/Global/DrawManager.cs +++ b/mod/Jailbreak.Draw/Global/DrawManager.cs @@ -1,5 +1,30 @@ +using CounterStrikeSharp.API.Core; +using CounterStrikeSharp.API.Modules.Timers; +using Jailbreak.Public.Behaviors; +using Jailbreak.Public.Mod.Draw; + namespace Jailbreak.Draw.Global; -public class DrawManager : IPluginBehavior { - +public class DrawManager : IPluginBehavior, IDrawService +{ + private List shapes = new List(); + + public DrawManager(BasePlugin plugin) + { + plugin.AddTimer(1f, Tick, TimerFlags.REPEAT); + } + + private void Tick() + { + shapes.ForEach(s => s.Tick()); + } + + public void DrawShape(DrawableShape shape, float tickRate = 0f) + { + } + + public List GetShapes() + { + return shapes; + } } \ No newline at end of file diff --git a/mod/Jailbreak.Draw/Jailbreak.Draw.csproj b/mod/Jailbreak.Draw/Jailbreak.Draw.csproj index d809758..af27e9c 100644 --- a/mod/Jailbreak.Draw/Jailbreak.Draw.csproj +++ b/mod/Jailbreak.Draw/Jailbreak.Draw.csproj @@ -4,6 +4,7 @@ net7.0 enable enable + Jailbreak.Drawable diff --git a/src/Jailbreak/JailbreakServiceCollection.cs b/src/Jailbreak/JailbreakServiceCollection.cs index 3032261..9f84071 100644 --- a/src/Jailbreak/JailbreakServiceCollection.cs +++ b/src/Jailbreak/JailbreakServiceCollection.cs @@ -3,6 +3,7 @@ using CounterStrikeSharp.API.Core; using Jailbreak.Config; +using Jailbreak.Draw; using Jailbreak.English.Teams; using Jailbreak.English.Warden; using Jailbreak.Formatting.Languages; @@ -32,6 +33,7 @@ public class JailbreakServiceCollection : IPluginServiceCollection serviceCollection.AddJailbreakGeneric(); serviceCollection.AddJailbreakWarden(); serviceCollection.AddJailbreakTeams(); + serviceCollection.AddJailbreakDraw(); // Add in english localization serviceCollection.AddLanguage(config =>