From dca3ff674c3d5a6e3e120800dc9280b105dea69c Mon Sep 17 00:00:00 2001 From: Oscar <29248751+oscar-wos@users.noreply.github.com> Date: Sat, 16 Nov 2024 01:46:25 +0000 Subject: [PATCH] feat: use submodule for shared lib --- .gitmodules | 3 +++ Retakes-Zones.sln | 2 +- RetakesPluginShared/.gitignore | 3 --- RetakesPluginShared/Enums/Bombsite.cs | 7 ------- RetakesPluginShared/Events/AllocateEvent.cs | 3 --- .../Events/AnnounceBombsiteEvent.cs | 5 ----- .../Events/IRetakesPluginEvent.cs | 3 --- .../IRetakesPluginEventSender.cs | 9 --------- RetakesPluginShared/RetakesPluginShared.csproj | 18 ------------------ cs2-retakes | 1 + src/Zones.csproj | 2 +- 11 files changed, 6 insertions(+), 50 deletions(-) create mode 100644 .gitmodules delete mode 100644 RetakesPluginShared/.gitignore delete mode 100644 RetakesPluginShared/Enums/Bombsite.cs delete mode 100644 RetakesPluginShared/Events/AllocateEvent.cs delete mode 100644 RetakesPluginShared/Events/AnnounceBombsiteEvent.cs delete mode 100644 RetakesPluginShared/Events/IRetakesPluginEvent.cs delete mode 100644 RetakesPluginShared/IRetakesPluginEventSender.cs delete mode 100644 RetakesPluginShared/RetakesPluginShared.csproj create mode 160000 cs2-retakes diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1b5218a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "cs2-retakes"] + path = cs2-retakes + url = https://github.com/B3none/cs2-retakes diff --git a/Retakes-Zones.sln b/Retakes-Zones.sln index 5eea0be..7df003d 100644 --- a/Retakes-Zones.sln +++ b/Retakes-Zones.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.10.34928.147 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zones", "src\Zones.csproj", "{281D1A18-97D7-494A-9EA2-322AF4BC7057}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RetakesPluginShared", "RetakesPluginShared\RetakesPluginShared.csproj", "{17DC10DD-4F4F-4D66-953A-29D641390D4B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RetakesPluginShared", "cs2-retakes\RetakesPluginShared\RetakesPluginShared.csproj", "{17DC10DD-4F4F-4D66-953A-29D641390D4B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/RetakesPluginShared/.gitignore b/RetakesPluginShared/.gitignore deleted file mode 100644 index 9283908..0000000 --- a/RetakesPluginShared/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -**/obj/ -**/obj/**/*.nuget.cache -**/bin/ diff --git a/RetakesPluginShared/Enums/Bombsite.cs b/RetakesPluginShared/Enums/Bombsite.cs deleted file mode 100644 index d9ab2cb..0000000 --- a/RetakesPluginShared/Enums/Bombsite.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace RetakesPluginShared.Enums; - -public enum Bombsite -{ - A = 0, - B = 1 -} diff --git a/RetakesPluginShared/Events/AllocateEvent.cs b/RetakesPluginShared/Events/AllocateEvent.cs deleted file mode 100644 index 19d1985..0000000 --- a/RetakesPluginShared/Events/AllocateEvent.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace RetakesPluginShared.Events; - -public record AllocateEvent() : IRetakesPluginEvent; diff --git a/RetakesPluginShared/Events/AnnounceBombsiteEvent.cs b/RetakesPluginShared/Events/AnnounceBombsiteEvent.cs deleted file mode 100644 index 3d1630f..0000000 --- a/RetakesPluginShared/Events/AnnounceBombsiteEvent.cs +++ /dev/null @@ -1,5 +0,0 @@ -using RetakesPluginShared.Enums; - -namespace RetakesPluginShared.Events; - -public record AnnounceBombsiteEvent(Bombsite Bombsite) : IRetakesPluginEvent; diff --git a/RetakesPluginShared/Events/IRetakesPluginEvent.cs b/RetakesPluginShared/Events/IRetakesPluginEvent.cs deleted file mode 100644 index d3e7db7..0000000 --- a/RetakesPluginShared/Events/IRetakesPluginEvent.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace RetakesPluginShared.Events; - -public interface IRetakesPluginEvent { } diff --git a/RetakesPluginShared/IRetakesPluginEventSender.cs b/RetakesPluginShared/IRetakesPluginEventSender.cs deleted file mode 100644 index 0d96b2b..0000000 --- a/RetakesPluginShared/IRetakesPluginEventSender.cs +++ /dev/null @@ -1,9 +0,0 @@ -using RetakesPluginShared.Events; - -namespace RetakesPluginShared; - -public interface IRetakesPluginEventSender -{ - public event EventHandler RetakesPluginEventHandlers; - public void TriggerEvent(IRetakesPluginEvent @event); -} diff --git a/RetakesPluginShared/RetakesPluginShared.csproj b/RetakesPluginShared/RetakesPluginShared.csproj deleted file mode 100644 index 0b4a6fe..0000000 --- a/RetakesPluginShared/RetakesPluginShared.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - RetakesPluginShared - RetakesPluginShared - - This library is made to run alongside https://github.com/b3none/cs2-retakes - - B3none - - 2.0.0 - - net8.0 - enable - enable - RetakesPluginShared - true - - diff --git a/cs2-retakes b/cs2-retakes new file mode 160000 index 0000000..0331814 --- /dev/null +++ b/cs2-retakes @@ -0,0 +1 @@ +Subproject commit 033181463ef99f56297c2032114956a2be8b6e86 diff --git a/src/Zones.csproj b/src/Zones.csproj index 7b156b3..2f76c6a 100644 --- a/src/Zones.csproj +++ b/src/Zones.csproj @@ -8,7 +8,7 @@ - + \ No newline at end of file