Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Movement/Systems/SharedJetpackSystem.cs
View File

@@ -62,14 +62,14 @@ public abstract class SharedJetpackSystem : EntitySystem
if (args.Current is not JetpackUserComponentState state)
return;
component.Jetpack = state.Jetpack;
component.Jetpack = EnsureEntity<JetpackUserComponent>(state.Jetpack, uid);
}
private void OnJetpackUserGetState(EntityUid uid, JetpackUserComponent component, ref ComponentGetState args)
{
args.State = new JetpackUserComponentState()
{
Jetpack = component.Jetpack,
Jetpack = GetNetEntity(component.Jetpack),
};
}
@@ -198,7 +198,7 @@ public abstract class SharedJetpackSystem : EntitySystem
[Serializable, NetSerializable]
protected sealed class JetpackUserComponentState : ComponentState
{
public EntityUid Jetpack;
public NetEntity Jetpack;
}
}

38
Content.Shared/Movement/Systems/SharedMoverController.Input.cs
View File

@@ -87,7 +87,7 @@ namespace Content.Shared.Movement.Systems
component.RelativeRotation = state.RelativeRotation;
component.TargetRelativeRotation = state.TargetRelativeRotation;
component.RelativeEntity = state.RelativeEntity;
component.RelativeEntity = EnsureEntity<InputMoverComponent>(state.RelativeEntity, uid);
component.LerpTarget = state.LerpAccumulator;
}
@@ -98,7 +98,7 @@ namespace Content.Shared.Movement.Systems
component.CanMove,
component.RelativeRotation,
component.TargetRelativeRotation,
component.RelativeEntity,
GetNetEntity(component.RelativeEntity),
component.LerpTarget);
}
@@ -493,11 +493,11 @@ namespace Content.Shared.Movement.Systems
_angle = direction.ToAngle();
}
public override bool HandleCmdMessage(ICommonSession? session, InputCmdMessage message)
public override bool HandleCmdMessage(IEntityManager entManager, ICommonSession? session, IFullInputCmdMessage message)
{
if (message is not FullInputCmdMessage full || session?.AttachedEntity == null) return false;
if (session?.AttachedEntity == null) return false;
if (full.State != BoundKeyState.Up)
if (message.State != BoundKeyState.Up)
return false;
_controller.RotateCamera(session.AttachedEntity.Value, _angle);
@@ -514,11 +514,11 @@ namespace Content.Shared.Movement.Systems
_controller = controller;
}
public override bool HandleCmdMessage(ICommonSession? session, InputCmdMessage message)
public override bool HandleCmdMessage(IEntityManager entManager, ICommonSession? session, IFullInputCmdMessage message)
{
if (message is not FullInputCmdMessage full || session?.AttachedEntity == null) return false;
if (session?.AttachedEntity == null) return false;
if (full.State != BoundKeyState.Up)
if (message.State != BoundKeyState.Up)
return false;
_controller.ResetCamera(session.AttachedEntity.Value);
@@ -537,11 +537,11 @@ namespace Content.Shared.Movement.Systems
_dir = dir;
}
public override bool HandleCmdMessage(ICommonSession? session, InputCmdMessage message)
public override bool HandleCmdMessage(IEntityManager entManager, ICommonSession? session, IFullInputCmdMessage message)
{
if (message is not FullInputCmdMessage full || session?.AttachedEntity == null) return false;
if (session?.AttachedEntity == null) return false;
_controller.HandleDirChange(session.AttachedEntity.Value, _dir, message.SubTick, full.State == BoundKeyState.Down);
_controller.HandleDirChange(session.AttachedEntity.Value, _dir, message.SubTick, message.State == BoundKeyState.Down);
return false;
}
}
@@ -555,11 +555,11 @@ namespace Content.Shared.Movement.Systems
_controller = controller;
}
public override bool HandleCmdMessage(ICommonSession? session, InputCmdMessage message)
public override bool HandleCmdMessage(IEntityManager entManager, ICommonSession? session, IFullInputCmdMessage message)
{
if (message is not FullInputCmdMessage full || session?.AttachedEntity == null) return false;
if (session?.AttachedEntity == null) return false;
_controller.HandleRunChange(session.AttachedEntity.Value, full.SubTick, full.State == BoundKeyState.Down);
_controller.HandleRunChange(session.AttachedEntity.Value, message.SubTick, message.State == BoundKeyState.Down);
return false;
}
}
@@ -579,10 +579,10 @@ namespace Content.Shared.Movement.Systems
/// Target rotation relative to the <see cref="RelativeEntity"/>. Typically 0
/// </summary>
public Angle TargetRelativeRotation;
public EntityUid? RelativeEntity;
public NetEntity? RelativeEntity;
public TimeSpan LerpAccumulator;
public InputMoverComponentState(MoveButtons buttons, bool canMove, Angle relativeRotation, Angle targetRelativeRotation, EntityUid? relativeEntity, TimeSpan lerpTarget)
public InputMoverComponentState(MoveButtons buttons, bool canMove, Angle relativeRotation, Angle targetRelativeRotation, NetEntity? relativeEntity, TimeSpan lerpTarget)
{
Buttons = buttons;
CanMove = canMove;
@@ -604,11 +604,11 @@ namespace Content.Shared.Movement.Systems
_button = button;
}
public override bool HandleCmdMessage(ICommonSession? session, InputCmdMessage message)
public override bool HandleCmdMessage(IEntityManager entManager, ICommonSession? session, IFullInputCmdMessage message)
{
if (message is not FullInputCmdMessage full || session?.AttachedEntity == null) return false;
if (session?.AttachedEntity == null) return false;
_controller.HandleShuttleInput(session.AttachedEntity.Value, _button, full.SubTick, full.State == BoundKeyState.Down);
_controller.HandleShuttleInput(session.AttachedEntity.Value, _button, message.SubTick, message.State == BoundKeyState.Down);
return false;
}
}