Moved temperature to shared #31249

Jezithyr · 2024-08-21T04:04:38Z

About the PR

Moved Temperature component, ThermalRegulator component and most of the implementation of temperature, thermal regulation and heater systems to Content.Shared. This will allow shared content to interact with TemperatureComponent without requiring a ServerSide implementation. This does not implement predicted temperature, it only networks the component states.

Why / Balance

No visible changes for players. This was done to make working with temperature in shared systems easier.

Technical details

Simply moved temperature, thermal regulation and heater systems to shared along with their associated components. I also networked the components to make sure that the data is accessible on the client as well. I did not implement prediction since temperature interacts with atmospherics which is a purely server-side system and would make prediction more difficult. Values on temperature related components are calculated on the server and then networked to the clients.

Media

Requirements

I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Namespace changes:

ThermalRegulatorComponent: Content.Server.Body.Systems -> Content.Shared.Body.Systems
ChangeTemperatureOnCollideComponent: Content.Server.Temperature -> Content.Shared.Temperature
ContainerTemperatureDamageThresholdsComponent: Content.Server.Temperature -> Content.Shared.Temperature
EntityHeaterComponent: Content.Server.Temperature -> Content.Shared.Temperature
InternalTemperatureComponent: Content.Server.Temperature -> Content.Shared.Temperature
TemperatureComponent: Content.Server.Temperature -> Content.Shared.Temperature
TemperatureProtectionComponent: Content.Server.Temperature -> Content.Shared.Temperature

Obsolete methods (will be removed in the future):

public void ForceChangeTemperature(EntityUid target, float temp, TemperatureComponent? temperature = null)
public float GetHeatCapacity(EntityUid uid, TemperatureComponent? comp = null, PhysicsComponent? physics = null)
public void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false, TemperatureComponent? temperature = null)

Changelog

slarticodefast · 2024-08-21T09:42:44Z

I think this one is a duplicate of #30511
Not sure if it includes all the same files though.

deltanedas · 2024-08-21T12:11:52Z

crusher dagger disgustingly op

Jezithyr · 2024-08-22T03:39:27Z

I think this one is a duplicate of #30511 Not sure if it includes all the same files though.

I totally forgot about that one 😅
That said, this implementation puts less networking load on the server (Temperature components aren't being dirtied every tick only when they actually get changed)

metalgearsloth · 2024-08-22T09:50:23Z

Content.Server/Temperature/Systems/EntityHeaterSystem.cs

+        heater.Comp2.Load = SettingPower(setting, heater.Comp1!.Power);
+        Appearance.SetData(heater, EntityHeaterVisuals.Setting, setting);


Sussy null suppression because this can cause nullrefs and isn't guaranteed to exist.

metalgearsloth · 2024-08-22T09:51:10Z

Content.Shared/Temperature/Components/EntityHeaterComponent.cs

+[RegisterComponent, Access(typeof(SharedEntityHeaterSystem))]
 public sealed partial class EntityHeaterComponent : Component


Needs NetworkedComponent also it's being dirtied but there's nothing actually being synced.

metalgearsloth · 2024-08-22T09:51:12Z

Content.Shared/Temperature/Components/InternalTemperatureComponent.cs

+[RegisterComponent, Access(typeof(SharedTemperatureSystem))]
 public sealed partial class InternalTemperatureComponent : Component


Needs NetworkedComponent

metalgearsloth · 2024-08-22T09:51:28Z

Content.Shared/Temperature/Components/TemperatureComponent.cs

+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
    public float CurrentTemperature = Atmospherics.T20C;

-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]


VVRW unnecessary on datafields.

metalgearsloth · 2024-08-22T09:54:34Z

Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs

+
+    private void UpdateDamage(float frameTime)
+    {
+        _accumulatedFrametime += frameTime;
+
+        if (_accumulatedFrametime < UpdateInterval)
+            return;
+        _accumulatedFrametime -= UpdateInterval;
+
+        if (!ShouldUpdateDamage.Any())
+            return;
+
+        foreach (var comp in ShouldUpdateDamage)
+        {
+            MetaDataComponent? metaData = null;
+
+            var uid = comp.Owner;
+            if (Deleted(uid, metaData) || Paused(uid, metaData))
+                continue;
+
+            ChangeDamage(uid, comp);
+        }
+
+        ShouldUpdateDamage.Clear();
+    }
+


Was going to comment this breaks persistence but it was already like this so.

metalgearsloth · 2024-08-22T09:57:19Z

Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs

+    {
+        var temperatureQuery = GetEntityQuery<TemperatureComponent>();
+        var transformQuery = GetEntityQuery<TransformComponent>();
+        var thresholdsQuery = GetEntityQuery<ContainerTemperatureDamageThresholdsComponent>();


Can move these to the system.

metalgearsloth · 2024-08-22T09:57:32Z

Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs

+        RecursiveThresholdUpdate(uid, GetEntityQuery<TemperatureComponent>(), GetEntityQuery<TransformComponent>(),
+            GetEntityQuery<ContainerTemperatureDamageThresholdsComponent>());


Same just use it on the system.

github-actions · 2024-08-25T12:24:06Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-08-25T12:24:06Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Mishics · 2024-10-15T12:20:11Z

Hey, when will you continue working? Or someone on vacation... Just wondering, nothing more

a-person5660 · 2024-10-22T00:49:58Z

are you still working on this?

Jezithyr added 2 commits August 20, 2024 20:48

Moved temperature to shared

6443f74

Fixed missing clientside system

58c8199

Jezithyr requested review from Partmedia and EmoGarbage404 as code owners August 21, 2024 04:04

github-actions bot added the Status: Needs Review This PR requires new reviews before it can be merged. label Aug 21, 2024

Jezithyr mentioned this pull request Aug 21, 2024

Chemistry Refactor Pt.1 #30254

Draft

1 task

metalgearsloth requested changes Aug 22, 2024

View reviewed changes

github-actions bot added Merge Conflict This PR currently has conflicts that need to be addressed. labels Aug 25, 2024

metalgearsloth added Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. and removed Status: Needs Review This PR requires new reviews before it can be merged. labels Aug 25, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Moved temperature to shared #31249

Moved temperature to shared #31249

Jezithyr commented Aug 21, 2024 •

edited

Loading

slarticodefast commented Aug 21, 2024

deltanedas commented Aug 21, 2024

Jezithyr commented Aug 22, 2024

metalgearsloth Aug 22, 2024

metalgearsloth Aug 22, 2024

metalgearsloth Aug 22, 2024

metalgearsloth Aug 22, 2024

metalgearsloth Aug 22, 2024

metalgearsloth Aug 22, 2024

metalgearsloth Aug 22, 2024

github-actions bot commented Aug 25, 2024

github-actions bot commented Aug 25, 2024

Mishics commented Oct 15, 2024

a-person5660 commented Oct 22, 2024

		heater.Comp2.Load = SettingPower(setting, heater.Comp1!.Power);
		Appearance.SetData(heater, EntityHeaterVisuals.Setting, setting);

		[RegisterComponent, Access(typeof(SharedEntityHeaterSystem))]
		public sealed partial class EntityHeaterComponent : Component

		[RegisterComponent, Access(typeof(SharedTemperatureSystem))]
		public sealed partial class InternalTemperatureComponent : Component

		RecursiveThresholdUpdate(uid, GetEntityQuery<TemperatureComponent>(), GetEntityQuery<TransformComponent>(),
		GetEntityQuery<ContainerTemperatureDamageThresholdsComponent>());

Moved temperature to shared #31249

Are you sure you want to change the base?

Moved temperature to shared #31249

Conversation

Jezithyr commented Aug 21, 2024 • edited Loading

About the PR

Why / Balance

Technical details

Media

Requirements

Breaking changes

slarticodefast commented Aug 21, 2024

deltanedas commented Aug 21, 2024

Jezithyr commented Aug 22, 2024

metalgearsloth Aug 22, 2024

Choose a reason for hiding this comment

metalgearsloth Aug 22, 2024

Choose a reason for hiding this comment

metalgearsloth Aug 22, 2024

Choose a reason for hiding this comment

metalgearsloth Aug 22, 2024

Choose a reason for hiding this comment

metalgearsloth Aug 22, 2024

Choose a reason for hiding this comment

metalgearsloth Aug 22, 2024

Choose a reason for hiding this comment

metalgearsloth Aug 22, 2024

Choose a reason for hiding this comment

github-actions bot commented Aug 25, 2024

github-actions bot commented Aug 25, 2024

Mishics commented Oct 15, 2024

a-person5660 commented Oct 22, 2024

Jezithyr commented Aug 21, 2024 •

edited

Loading