move GameMapPrototype and GameMapCondition to shared (#41742)

* move GameMapPrototype and GameMapCondition to shared

* fix

diff --git a/Content.Benchmarks/MapLoadBenchmark.cs b/Content.Benchmarks/MapLoadBenchmark.cs
index 3d527953b8310363555266671913b94c0a0b3a60..261d408aacf56877151251b6a1b41f191c1386bc 100644 (file)
--- a/Content.Benchmarks/MapLoadBenchmark.cs
+++ b/Content.Benchmarks/MapLoadBenchmark.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
-using Content.Server.Maps;
+using Content.Shared.Maps;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
 using Robust.Shared.EntitySerialization.Systems;

diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index f75c84837700d3a32f08788fd60c724d891a56fc..03502d1bfb8484d31c7e741a15190f5be7beb399 100644 (file)
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -5,12 +5,12 @@ using System.Text.RegularExpressions;
 using YamlDotNet.RepresentationModel;
 using Content.Server.Administration.Systems;
 using Content.Server.GameTicking;
-using Content.Server.Maps;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Spawners.Components;
 using Content.Server.Station.Components;
 using Content.Shared.CCVar;
+using Content.Shared.Maps;
 using Content.Shared.Roles;
 using Content.Shared.Station.Components;
 using Robust.Shared.Configuration;

diff --git a/Content.IntegrationTests/Tests/Power/StationPowerTests.cs b/Content.IntegrationTests/Tests/Power/StationPowerTests.cs
index a2231ce60f1eb112cc5e308f648b82f633938467..542a4645c65af03041082421d155d71130c49b7e 100644 (file)
--- a/Content.IntegrationTests/Tests/Power/StationPowerTests.cs
+++ b/Content.IntegrationTests/Tests/Power/StationPowerTests.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameTicking;
-using Content.Server.Maps;
 using Content.Server.Power.Components;
 using Content.Server.Power.NodeGroups;
 using Content.Server.Power.Pow3r;
+using Content.Shared.Maps;
 using Content.Shared.Power.Components;
 using Content.Shared.NodeContainer;
 using Robust.Server.GameObjects;

diff --git a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
index 3fee4a146ce0f5c97dd8a3dad8bccc78e890969a..4abd32bda0d5a9159fa1a348f24ef91c898043e4 100644 (file)
--- a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
+++ b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.Maps;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
+using Content.Shared.Maps;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Shared.GameObjects;

diff --git a/Content.MapRenderer/Program.cs b/Content.MapRenderer/Program.cs
index 534b12565c10d44b608f794c08d4cf4337b14c2d..90f97a57869ad45d27a7f97d1bf7ad45b9fe1e9c 100644 (file)
--- a/Content.MapRenderer/Program.cs
+++ b/Content.MapRenderer/Program.cs
@@ -7,7 +7,7 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using Content.IntegrationTests;
 using Content.MapRenderer.Painters;
-using Content.Server.Maps;
+using Content.Shared.Maps;
 using Robust.Shared.Prototypes;
 using Robust.UnitTesting.Pool;
 using SixLabors.ImageSharp;

diff --git a/Content.MapRenderer/RenderMap.cs b/Content.MapRenderer/RenderMap.cs
index 4ebf4ee5d4bca0e8a7477c410269b0f3cc11f98d..8d6087ec7ab1ff99fc785b1150b005f76010d75a 100644 (file)
--- a/Content.MapRenderer/RenderMap.cs
+++ b/Content.MapRenderer/RenderMap.cs
@@ -1,5 +1,5 @@
 using System.IO;
-using Content.Server.Maps;
+using Content.Shared.Maps;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 

diff --git a/Content.Server/Administration/Commands/LoadGameMapCommand.cs b/Content.Server/Administration/Commands/LoadGameMapCommand.cs
index dfe18ea5bca95390be5bc5938940b7818af2fb2a..dc82fccd1e4d0d58505992f32d95077bec49acd9 100644 (file)
--- a/Content.Server/Administration/Commands/LoadGameMapCommand.cs
+++ b/Content.Server/Administration/Commands/LoadGameMapCommand.cs
@@ -1,7 +1,7 @@
 using System.Numerics;
 using Content.Server.GameTicking;
-using Content.Server.Maps;
 using Content.Shared.Administration;
+using Content.Shared.Maps;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;

diff --git a/Content.Server/GameTicking/Commands/ForceMapCommand.cs b/Content.Server/GameTicking/Commands/ForceMapCommand.cs
index 577464acadb129d322e01147b57caa948e41b5a5..f8553a9244fe25632a7a1e6da02c49ae78908aaa 100644 (file)
--- a/Content.Server/GameTicking/Commands/ForceMapCommand.cs
+++ b/Content.Server/GameTicking/Commands/ForceMapCommand.cs
@@ -3,6 +3,7 @@ using Content.Server.Administration;
 using Content.Server.Maps;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
+using Content.Shared.Maps;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;

diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs
index 1973daa5a113c17d97ce1d7eb5766a34f78bcb53..4634b7820bc6d05aa5581a423cdb666429cfaacc 100644 (file)
--- a/Content.Server/GameTicking/GameTicker.GamePreset.cs
+++ b/Content.Server/GameTicking/GameTicker.GamePreset.cs
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Content.Server.GameTicking.Presets;
 using Content.Server.Maps;
 using Content.Shared.CCVar;
+using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.Player;
 

diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 1dadca4c038b11d88bd02cf7c580f0aa1e0f1cc0..6d2f3fac5208f2df7efe24be598e6ffa54eefdb5 100644 (file)
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -8,6 +8,7 @@ using Content.Server.Roles;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.GameTicking;
+using Content.Shared.Maps;
 using Content.Shared.Mind;
 using Content.Shared.Players;
 using Content.Shared.Preferences;

diff --git a/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs
index f1bd1e5eef48f54fdea04a709a4b7f2f16362bda..f85a5b8e851fc856981452a415906c803dd62511 100644 (file)
--- a/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs
@@ -1,6 +1,5 @@
-using Content.Server.GameTicking.Rules;
-using Content.Server.Maps;
 using Content.Shared.GridPreloader.Prototypes;
+using Content.Shared.Maps;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 

diff --git a/Content.Server/Maps/Conditions/HolidayMapCondition.cs b/Content.Server/Maps/Conditions/HolidayMapCondition.cs
index da971c78f321f50962bc3ab103db211824349b5d..b7edc3f6c28ea7b99fcc92393c625b33a09d8632 100644 (file)
--- a/Content.Server/Maps/Conditions/HolidayMapCondition.cs
+++ b/Content.Server/Maps/Conditions/HolidayMapCondition.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Server.Holiday;
+using Content.Shared.Maps;
 
 namespace Content.Server.Maps.Conditions;
 

diff --git a/Content.Server/Maps/GameMapManager.cs b/Content.Server/Maps/GameMapManager.cs
index 9638dffaa7c4cf879419064b6cd49f0d2cf88cec..9914b7bde2b54ce546208f2208d013b8f5b6b10a 100644 (file)
--- a/Content.Server/Maps/GameMapManager.cs
+++ b/Content.Server/Maps/GameMapManager.cs
@@ -3,6 +3,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.GameTicking;
 using Content.Shared.CCVar;
+using Content.Shared.Maps;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;

diff --git a/Content.Server/Maps/GameMapPoolPrototype.cs b/Content.Server/Maps/GameMapPoolPrototype.cs
index b2ba64a50c66f0dd6659200c6f8969d79d73540d..831dea556d87524596ca7dbcb1eae8403a3f5b35 100644 (file)
--- a/Content.Server/Maps/GameMapPoolPrototype.cs
+++ b/Content.Server/Maps/GameMapPoolPrototype.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;

diff --git a/Content.Server/Maps/IGameMapManager.cs b/Content.Server/Maps/IGameMapManager.cs
index 02433c7b792af7aedc7d3417a4ba0083cdbbb615..d05c42a78c91188a8df927c08c3a77a7bf7140db 100644 (file)
--- a/Content.Server/Maps/IGameMapManager.cs
+++ b/Content.Server/Maps/IGameMapManager.cs
@@ -1,3 +1,5 @@
+using Content.Shared.Maps;
+
 namespace Content.Server.Maps;
 
 /// <summary>

diff --git a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
index 0dd1540933e7b610c125a36db166469f3c0463cd..614a54e0f6f832d03f9603b5ece65c41257b84a2 100644 (file)
--- a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
+++ b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
@@ -6,12 +6,12 @@ using Content.Server.Administration.Managers;
 using Content.Server.Discord.WebhookMessages;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Presets;
-using Content.Server.Maps;
 using Content.Server.Roles;
 using Content.Server.RoundEnd;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Database;
+using Content.Shared.Maps;
 using Content.Shared.Players;
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Voting;

diff --git a/Content.Server/Maps/GameMapCondition.cs b/Content.Shared/Maps/GameMapCondition.cs
similarity index 87%
rename from Content.Server/Maps/GameMapCondition.cs
rename to Content.Shared/Maps/GameMapCondition.cs
index 78c5323777c75e8bfcf699c8d37293a7ac19e98e..b5d625ffca851cf668286f574ac4e4d4371bc333 100644 (file)
--- a/Content.Server/Maps/GameMapCondition.cs
+++ b/Content.Shared/Maps/GameMapCondition.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Maps;
+namespace Content.Shared.Maps;
 
 [ImplicitDataDefinitionForInheritors]
 public abstract partial class GameMapCondition

diff --git a/Content.Server/Maps/GameMapPrototype.MapSelection.cs b/Content.Shared/Maps/GameMapPrototype.MapSelection.cs
similarity index 96%
rename from Content.Server/Maps/GameMapPrototype.MapSelection.cs
rename to Content.Shared/Maps/GameMapPrototype.MapSelection.cs
index ff8fd357171027b0e6403a2e1b2dfd29a3db4a22..c79d8be5b1e9bb78432603bad21b3831a71d611a 100644 (file)
--- a/Content.Server/Maps/GameMapPrototype.MapSelection.cs
+++ b/Content.Shared/Maps/GameMapPrototype.MapSelection.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Maps;
+namespace Content.Shared.Maps;
 
 public sealed partial class GameMapPrototype
 {

diff --git a/Content.Server/Maps/GameMapPrototype.cs b/Content.Shared/Maps/GameMapPrototype.cs
similarity index 98%
rename from Content.Server/Maps/GameMapPrototype.cs
rename to Content.Shared/Maps/GameMapPrototype.cs
index df9046652b276c67467b24c04652e3d28bed2564..fc9737641204cafac825289c0f7c70c481d3b9e7 100644 (file)
--- a/Content.Server/Maps/GameMapPrototype.cs
+++ b/Content.Shared/Maps/GameMapPrototype.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Utility;
 using System.Diagnostics;
 using Content.Shared.Station;
 
-namespace Content.Server.Maps;
+namespace Content.Shared.Maps;
 
 /// <summary>
 /// Prototype data for a game map.