Merge remote-tracking branch 'LaryNevesPR/EE-Andromeda' into CanvasUp…

…date

.github/workflows/build-docfx.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 8.0.100
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/build-map-renderer.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 8.0.100
 
       - name: Install dependencies
         run: dotnet restore

.github/workflows/build-test-debug.yml

@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 8.0.100
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/publish.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 8.0.100
 
     - name: Get Engine Tag
       run: |

.github/workflows/test-packaging.yml

@@ -51,7 +51,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 8.0.100
 
       - name: Install dependencies
         run: dotnet restore

.github/workflows/yaml-linter.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 8.0.100
       - name: Install dependencies
         run: dotnet restore
       - name: Build

Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs

@@ -35,7 +35,7 @@ await server.WaitAssertion(() =>
             {
                 playerUid = serverPlayerManager.Sessions.Single().AttachedEntity.GetValueOrDefault();
 #pragma warning disable NUnit2045 // Interdependent assertions.
-                Assert.That(playerUid, Is.Not.EqualTo(default(EntityUid)));
+                Assert.That(playerUid, Is.Not.EqualTo(default));
                 // Making sure it exists
                 Assert.That(entManager.HasComponent<AlertsComponent>(playerUid));
 #pragma warning restore NUnit2045

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -8,13 +8,15 @@
 using Content.Server.Spawners.Components;
 using Content.Server.Station.Components;
 using Content.Shared.CCVar;
+using Content.Shared.Roles;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Prototypes;
+using FastAccessors;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 
@@ -63,8 +65,7 @@ public sealed class PostMapInitTest
             "Submarine", //DeltaV
             "Gax",
             "Rad",
-            "Europa",
-            "Meta"
+            "Europa"
         };
 
         /// <summary>

Content.PatreonParser/Content.PatreonParser.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
       <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

Content.Server/Animals/Components/UdderComponent.cs

@@ -29,7 +29,7 @@ internal sealed partial class UdderComponent : Component
         /// <summary>
         ///     The solution to add reagent to.
         /// </summary>
-        [ViewVariables]
+        [DataField]
         public Entity<SolutionComponent>? Solution = null;
 
         /// <summary>

Content.Server/Animals/Components/WoolyComponent.cs

@@ -29,7 +29,7 @@ public sealed partial class WoolyComponent : Component
     /// <summary>
     ///     The solution to add reagent to.
     /// </summary>
-    [ViewVariables(VVAccess.ReadOnly)]
+    [DataField]
     public Entity<SolutionComponent>? Solution;
 
     /// <summary>

Content.Server/Anomaly/Components/ReagentProducerAnomalyComponent.cs

@@ -97,6 +97,6 @@ public sealed partial class ReagentProducerAnomalyComponent : Component
     /// <summary>
     /// Solution where the substance is generated
     /// </summary>
-    [ViewVariables]
+    [DataField("solutionRef")]
     public Entity<SolutionComponent>? Solution = null;
 }

Content.Server/Atmos/Piping/Unary/Components/GasCondenserComponent.cs

@@ -25,7 +25,7 @@ public sealed partial class GasCondenserComponent : Component
     /// <summary>
     /// The solution that gases are condensed into.
     /// </summary>
-    [ViewVariables]
+    [DataField]
     public Entity<SolutionComponent>? Solution = null;
 
     /// <summary>

Content.Server/Body/Components/BloodstreamComponent.cs

@@ -160,22 +160,22 @@ public sealed partial class BloodstreamComponent : Component
         /// <summary>
         ///     Internal solution for blood storage
         /// </summary>
-        [ViewVariables]
-        public Entity<SolutionComponent>? BloodSolution;
+        [DataField]
+        public Entity<SolutionComponent>? BloodSolution = null;
 
         /// <summary>
         ///     Internal solution for reagent storage
         /// </summary>
-        [ViewVariables]
-        public Entity<SolutionComponent>? ChemicalSolution;
+        [DataField]
+        public Entity<SolutionComponent>? ChemicalSolution = null;
 
         /// <summary>
         ///     Temporary blood solution.
         ///     When blood is lost, it goes to this solution, and when this
         ///     solution hits a certain cap, the blood is actually spilled as a puddle.
         /// </summary>
-        [ViewVariables]
-        public Entity<SolutionComponent>? TemporarySolution;
+        [DataField]
+        public Entity<SolutionComponent>? TemporarySolution = null;
 
         /// <summary>
         /// Variable that stores the amount of status time added by having a low blood level.

Content.Server/Body/Components/LungComponent.cs

@@ -26,7 +26,7 @@ public sealed partial class LungComponent : Component
     /// <summary>
     /// The solution on this entity that these lungs act on.
     /// </summary>
-    [ViewVariables]
+    [DataField]
     public Entity<SolutionComponent>? Solution = null;
 
     /// <summary>

Content.Server/Body/Components/StomachComponent.cs

@@ -25,8 +25,8 @@ public sealed partial class StomachComponent : Component
         /// <summary>
         ///     The solution inside of this stomach this transfers reagents to the body.
         /// </summary>
-        [ViewVariables]
-        public Entity<SolutionComponent>? Solution;
+        [DataField]
+        public Entity<SolutionComponent>? Solution = null;
 
         /// <summary>
         ///     What solution should this stomach push reagents into, on the body?

Content.Server/Botany/Components/PlantHolderComponent.cs

@@ -92,6 +92,6 @@ public sealed partial class PlantHolderComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField("solution")]
     public string SoilSolutionName = "soil";
 
-    [ViewVariables]
+    [DataField]
     public Entity<SolutionComponent>? SoilSolution = null;
 }

Content.Server/Botany/Systems/MutationSystem.cs

@@ -5,6 +5,7 @@
 using Content.Shared.Chemistry.Reagent;
 using System.Linq;
 using Content.Shared.Atmos;
+using FastAccessors;
 
 namespace Content.Server.Botany;
 

Content.Server/Cargo/Systems/PricingSystem.cs

@@ -424,7 +424,7 @@ public record struct PriceCalculationEvent()
 [ByRefEvent]
 public record struct EstimatedPriceCalculationEvent()
 {
-    public required EntityPrototype Prototype;
+    public EntityPrototype Prototype;
 
     /// <summary>
     /// The total price of the entity.

Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs

@@ -20,8 +20,8 @@ public sealed partial class SolutionRegenerationComponent : Component
     /// <summary>
     /// The solution to add reagents to.
     /// </summary>
-    [ViewVariables]
-    public Entity<SolutionComponent>? SolutionRef = null;
+    [DataField("solutionRef")]
+    public Entity<SolutionComponent>? Solution = null;
 
     /// <summary>
     /// The reagent(s) to be regenerated in the solution.

Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs

@@ -24,7 +24,7 @@ public override void Update(float frameTime)
 
             // timer ignores if its full, it's just a fixed cycle
             regen.NextRegenTime = _timing.CurTime + regen.Duration;
-            if (_solutionContainer.ResolveSolution((uid, manager), regen.SolutionName, ref regen.SolutionRef, out var solution))
+            if (_solutionContainer.ResolveSolution((uid, manager), regen.SolutionName, ref regen.Solution, out var solution))
             {
                 var amount = FixedPoint2.Min(solution.AvailableVolume, regen.Generated.Volume);
                 if (amount <= FixedPoint2.Zero)
@@ -41,7 +41,7 @@ public override void Update(float frameTime)
                     generated = regen.Generated.Clone().SplitSolution(amount);
                 }
 
-                _solutionContainer.TryAddSolution(regen.SolutionRef.Value, generated);
+                _solutionContainer.TryAddSolution(regen.Solution.Value, generated);
             }
         }
     }

Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs

@@ -29,7 +29,7 @@ public sealed partial class ChemicalFuelGeneratorAdapterComponent : Component
     /// <summary>
     /// The solution on the <see cref="SolutionContainerManagerComponent"/> to use.
     /// </summary>
-    [ViewVariables]
+    [DataField("solutionRef")]
     public Entity<SolutionComponent>? Solution = null;
 
     /// <summary>

Content.Shared/Actions/Events/AnomalyPowerActionEvent.cs

@@ -74,7 +74,7 @@ public sealed partial class AnomalyPowerActionEvent : InstantActionEvent
 [DataRecord]
 public partial record struct AnomalyPowerSettings()
 {
-    public string PowerName = string.Empty;
+    public string PowerName;
 
     public float ManaCost;
 

Content.Shared/Announcements/Systems/SharedAnnouncerSystem.cs

@@ -66,7 +66,7 @@ public string GetAnnouncementPath(string announcementId, AnnouncerPrototype anno
     public string GetAnnouncementId(string announcementId, bool ended = false)
     {
         // Replace the first letter with lowercase
-        var id = OopsConcat(char.ToLowerInvariant(announcementId[0]).ToString(), announcementId[1..]);
+        var id = char.ToLowerInvariant(announcementId[0]) + announcementId[1..];
 
         // If the event has ended, add "Complete" to the end
         if (ended)
@@ -75,12 +75,6 @@ public string GetAnnouncementId(string announcementId, bool ended = false)
         return id;
     }
 
-    private string OopsConcat(string a, string b)
-    {
-        // This exists to prevent Roslyn being clever and compiling something that fails sandbox checks.
-        return a + b;
-    }
-
 
     /// <summary>
     ///     Gets audio params from the announcer

Content.Shared/Chemistry/Components/SmokeComponent.cs

@@ -16,7 +16,7 @@ public sealed partial class SmokeComponent : Component
     /// <summary>
     /// The solution on the entity with touch and ingestion reactions.
     /// </summary>
-    [ViewVariables]
+    [DataField]
     public Entity<SolutionComponent>? Solution = null;
 
     /// <summary>

Content.Shared/Chemistry/Components/SolutionContainerMixerComponent.cs

@@ -33,7 +33,7 @@ public sealed partial class SolutionContainerMixerComponent : Component
     [DataField, AutoNetworkedField]
     public SoundSpecifier? MixingSound;
 
-    [ViewVariables]
+    [DataField]
     public Entity<AudioComponent>? MixingSoundEntity;
 }
 

Content.Shared/Execution/DoafterEvent.cs

@@ -0,0 +1,9 @@
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Execution;
+
+[Serializable, NetSerializable]
+public sealed partial class ExecutionDoAfterEvent : SimpleDoAfterEvent
+{
+}

Content.Shared/Fluids/Components/DrainComponent.cs

@@ -20,7 +20,7 @@ public sealed partial class DrainComponent : Component
     [ValidatePrototypeId<TagPrototype>]
     public const string PlungerTag = "Plunger";
 
-    [ViewVariables]
+    [DataField]
     public Entity<SolutionComponent>? Solution = null;
 
     [DataField("accumulator")]

Content.Shared/Fluids/Components/PuddleComponent.cs

@@ -19,7 +19,7 @@ public sealed partial class PuddleComponent : Component
 
         [DataField("solution")] public string SolutionName = "puddle";
 
-        [ViewVariables]
+        [DataField("solutionRef")]
         public Entity<SolutionComponent>? Solution;
     }
 }

Content.Shared/Footprint/FootPrintComponent.cs

@@ -18,6 +18,6 @@ public sealed partial class FootPrintComponent : Component
     [DataField]
     public string SolutionName = "step";
 
-    [ViewVariables]
+    [DataField]
     public Entity<SolutionComponent>? Solution;
 }

Content.Shared/Mind/MindComponent.cs

@@ -46,9 +46,9 @@ public sealed partial class MindComponent : Component
         ///     The first entity that this mind controlled. Used for round end information.
         ///     Might be relevant if the player has ghosted since.
         /// </summary>
-        [AutoNetworkedField]
-        public NetEntity? OriginalOwnedEntity; // TODO WeakEntityReference make this a Datafield again
-        // This is a net entity, because this field currently does not get set to null when this entity is deleted.
+        [DataField, AutoNetworkedField]
+        public NetEntity? OriginalOwnedEntity;
+        // This is a net entity, because this field currently ddoes not get set to null when this entity is deleted.
         // This is a lazy way to ensure that people check that the entity still exists.
         // TODO MIND Fix this properly by adding an OriginalMindContainerComponent or something like that.
 

Content.Shared/Prototypes/LocalizedPrototype.cs

@@ -26,16 +26,10 @@ public string ToLocalizationString(string field)
             ((PrototypeAttribute?) Attribute.GetCustomAttribute(GetType(), typeof(PrototypeAttribute)))?.Type
             ?? GetType().Name.Remove(GetType().Name.Length - 9);
         // Lowercase the first letter
-        type = OopsConcat(char.ToLowerInvariant(type[0]).ToString(), type[1..]);
+        type = char.ToLowerInvariant(type[0]) + type[1..];
         // Replace every uppercase letter with a dash and the lowercase letter
-        type = type.Aggregate("", (current, c) => current + (char.IsUpper(c) ? OopsConcat("-", char.ToLowerInvariant(c).ToString()) : c.ToString()));
+        type = type.Aggregate("", (current, c) => current + (char.IsUpper(c) ? "-" + char.ToLowerInvariant(c) : c.ToString()));
 
         return string.Format(LocFormat, type, ID, field);
     }
-
-    private static string OopsConcat(string a, string b)
-    {
-        // This exists to prevent Roslyn being clever and compiling something that fails sandbox checks.
-        return a + b;
-    }
 }

Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs

@@ -278,7 +278,7 @@ private bool IsCorner(
     /// </summary>
     private record struct SeedJob() : IRobustJob
     {
-        public required StationAiVisionSystem System;
+        public StationAiVisionSystem System;
 
         public Entity<MapGridComponent> Grid;
         public Box2 ExpandedBounds;
@@ -293,14 +293,14 @@ private record struct ViewJob() : IParallelRobustJob
     {
         public int BatchSize => 1;
 
-        public required IEntityManager EntManager;
-        public required SharedMapSystem Maps;
-        public required StationAiVisionSystem System;
+        public IEntityManager EntManager;
+        public SharedMapSystem Maps;
+        public StationAiVisionSystem System;
 
         public Entity<MapGridComponent> Grid;
         public List<Entity<StationAiVisionComponent>> Data = new();
 
-        public HashSet<Vector2i> VisibleTiles = new();
+        public HashSet<Vector2i> VisibleTiles;
 
         public readonly List<Dictionary<Vector2i, int>> Vis1 = new();
         public readonly List<Dictionary<Vector2i, int>> Vis2 = new();