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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Content.Server/Buckle/Components/BuckleComponent.cs
View File

@@ -1,3 +1,5 @@
using System;
using System.Diagnostics.CodeAnalysis;
using Content.Server.Alert;
using Content.Server.Hands.Components;
using Content.Server.Pulling;
@@ -20,8 +22,6 @@ using Robust.Shared.Player;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Timing;
using Robust.Shared.ViewVariables;
using System;
using System.Diagnostics.CodeAnalysis;
namespace Content.Server.Buckle.Components
{
@@ -115,8 +115,8 @@ namespace Content.Server.Buckle.Components
/// <param name="strap">The strap to reattach to.</param>
public void ReAttach(StrapComponent strap)
{
var ownTransform = _entityManager.GetComponent<TransformComponent>(OwnerUid);
var strapTransform = _entityManager.GetComponent<TransformComponent>(strap.OwnerUid);
var ownTransform = _entityManager.GetComponent<TransformComponent>(Owner);
var strapTransform = _entityManager.GetComponent<TransformComponent>(strap.Owner);
ownTransform.AttachParent(strapTransform);
ownTransform.LocalRotation = Angle.Zero;
@@ -126,10 +126,10 @@ namespace Content.Server.Buckle.Components
case StrapPosition.None:
break;
case StrapPosition.Stand:
EntitySystem.Get<StandingStateSystem>().Stand(OwnerUid);
EntitySystem.Get<StandingStateSystem>().Stand(Owner);
break;
case StrapPosition.Down:
EntitySystem.Get<StandingStateSystem>().Down(OwnerUid, false, false);
EntitySystem.Get<StandingStateSystem>().Down(Owner, false, false);
break;
}
@@ -157,10 +157,10 @@ namespace Content.Server.Buckle.Components
return false;
}
var strapUid = strap.OwnerUid;
bool Ignored(EntityUid entity) => entity == OwnerUid || entity == user || entity == strapUid;
var strapUid = strap.Owner;
bool Ignored(EntityUid entity) => entity == Owner || entity == user || entity == strapUid;
if (!OwnerUid.InRangeUnobstructed(strapUid, Range, predicate: Ignored, popup: true))
if (!Owner.InRangeUnobstructed(strapUid, Range, predicate: Ignored, popup: true))
{
return false;
}
@@ -184,7 +184,7 @@ namespace Content.Server.Buckle.Components
if (Buckled)
{
var message = Loc.GetString(OwnerUid == user
var message = Loc.GetString(Owner == user
? "buckle-component-already-buckled-message"
: "buckle-component-other-already-buckled-message", ("owner", Owner));
popupSystem.PopupEntity(message, user, Filter.Entities(user));
@@ -197,7 +197,7 @@ namespace Content.Server.Buckle.Components
{
if (parent == _entityManager.GetComponent<TransformComponent>(user))
{
var message = Loc.GetString(OwnerUid == user
var message = Loc.GetString(Owner == user
? "buckle-component-cannot-buckle-message"
: "buckle-component-other-cannot-buckle-message", ("owner", Owner));
popupSystem.PopupEntity(message, user, Filter.Entities(user));
@@ -210,7 +210,7 @@ namespace Content.Server.Buckle.Components
if (!strap.HasSpace(this))
{
var message = Loc.GetString(OwnerUid == user
var message = Loc.GetString(Owner == user
? "buckle-component-cannot-fit-message"
: "buckle-component-other-cannot-fit-message", ("owner", Owner));
popupSystem.PopupEntity(message, user, Filter.Entities(user));
@@ -233,7 +233,7 @@ namespace Content.Server.Buckle.Components
if (!strap.TryAdd(this))
{
var message = Loc.GetString(OwnerUid == user
var message = Loc.GetString(Owner == user
? "buckle-component-cannot-buckle-message"
: "buckle-component-other-cannot-buckle-message", ("owner", Owner));
popupSystem.PopupEntity(message, user, Filter.Entities(user));
@@ -245,16 +245,16 @@ namespace Content.Server.Buckle.Components
ReAttach(strap);
BuckledTo = strap;
LastEntityBuckledTo = BuckledTo.OwnerUid;
LastEntityBuckledTo = BuckledTo.Owner;
DontCollide = true;
UpdateBuckleStatus();
#pragma warning disable 618
SendMessage(new BuckleMessage(OwnerUid, to));
SendMessage(new BuckleMessage(Owner, to));
#pragma warning restore 618
if (_entityManager.TryGetComponent(OwnerUid, out SharedPullableComponent? ownerPullable))
if (_entityManager.TryGetComponent(Owner, out SharedPullableComponent? ownerPullable))
{
if (ownerPullable.Puller != null)
{
@@ -309,7 +309,7 @@ namespace Content.Server.Buckle.Components
return false;
}
if (!user.InRangeUnobstructed(oldBuckledTo.OwnerUid, Range, popup: true))
if (!user.InRangeUnobstructed(oldBuckledTo.Owner, Range, popup: true))
{
return false;
}
@@ -317,25 +317,25 @@ namespace Content.Server.Buckle.Components
BuckledTo = null;
if (_entityManager.GetComponent<TransformComponent>(OwnerUid).Parent == _entityManager.GetComponent<TransformComponent>(oldBuckledTo.OwnerUid))
if (_entityManager.GetComponent<TransformComponent>(Owner).Parent == _entityManager.GetComponent<TransformComponent>(oldBuckledTo.Owner))
{
_entityManager.GetComponent<TransformComponent>(OwnerUid).AttachParentToContainerOrGrid();
_entityManager.GetComponent<TransformComponent>(OwnerUid).WorldRotation = _entityManager.GetComponent<TransformComponent>(oldBuckledTo.OwnerUid).WorldRotation;
_entityManager.GetComponent<TransformComponent>(Owner).AttachParentToContainerOrGrid();
_entityManager.GetComponent<TransformComponent>(Owner).WorldRotation = _entityManager.GetComponent<TransformComponent>(oldBuckledTo.Owner).WorldRotation;
}
Appearance?.SetData(BuckleVisuals.Buckled, false);
if (IoCManager.Resolve<IEntityManager>().HasComponent<KnockedDownComponent>(OwnerUid)
if (IoCManager.Resolve<IEntityManager>().HasComponent<KnockedDownComponent>(Owner)
|| (_mobState?.IsIncapacitated() ?? false))
{
EntitySystem.Get<StandingStateSystem>().Down(OwnerUid);
EntitySystem.Get<StandingStateSystem>().Down(Owner);
}
else
{
EntitySystem.Get<StandingStateSystem>().Stand(OwnerUid);
EntitySystem.Get<StandingStateSystem>().Stand(Owner);
}
_mobState?.CurrentState?.EnterState(OwnerUid, IoCManager.Resolve<IEntityManager>());
_mobState?.CurrentState?.EnterState(Owner, IoCManager.Resolve<IEntityManager>());
UpdateBuckleStatus();
@@ -343,7 +343,7 @@ namespace Content.Server.Buckle.Components
SoundSystem.Play(Filter.Pvs(Owner), oldBuckledTo.UnbuckleSound.GetSound(), Owner);
#pragma warning disable 618
SendMessage(new UnbuckleMessage(OwnerUid, oldBuckledTo.OwnerUid));
SendMessage(new UnbuckleMessage(Owner, oldBuckledTo.Owner));
#pragma warning restore 618
return true;
@@ -365,7 +365,7 @@ namespace Content.Server.Buckle.Components
/// <returns>true if the buckling status was changed, false otherwise.</returns>
public bool ToggleBuckle(EntityUid user, EntityUid to, bool force = false)
{
if (BuckledTo?.OwnerUid == to)
if (BuckledTo?.Owner == to)
{
return TryUnbuckle(user, force);
}
@@ -382,7 +382,7 @@ namespace Content.Server.Buckle.Components
protected override void Shutdown()
{
BuckledTo?.Remove(this);
TryUnbuckle(OwnerUid, true);
TryUnbuckle(Owner, true);
_buckleTime = default;
UpdateBuckleStatus();
@@ -395,7 +395,7 @@ namespace Content.Server.Buckle.Components
int? drawDepth = null;
if (BuckledTo != null &&
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(BuckledTo.OwnerUid).LocalRotation.GetCardinalDir() == Direction.North &&
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(BuckledTo.Owner).LocalRotation.GetCardinalDir() == Direction.North &&
BuckledTo.SpriteComponent != null)
{
drawDepth = BuckledTo.SpriteComponent.DrawDepth - 1;
@@ -414,7 +414,7 @@ namespace Content.Server.Buckle.Components
if (!IsOnStrapEntityThisFrame && DontCollide)
{
DontCollide = false;
TryUnbuckle(OwnerUid);
TryUnbuckle(Owner);
Dirty();
}

6
Content.Server/Buckle/Components/StrapComponent.cs
View File

@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Content.Shared.ActionBlocker;
using Content.Shared.Acts;
using Content.Shared.Alert;
using Content.Shared.Buckle.Components;
@@ -10,7 +9,6 @@ using Content.Shared.Sound;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Players;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
@@ -23,7 +21,7 @@ namespace Content.Server.Buckle.Components
{
[ComponentDependency] public readonly SpriteComponent? SpriteComponent = null;
private readonly HashSet<IEntity> _buckledEntities = new();
private readonly HashSet<EntityUid> _buckledEntities = new();
/// <summary>
/// The angle in degrees to rotate the player by when they get strapped
@@ -40,7 +38,7 @@ namespace Content.Server.Buckle.Components
/// <summary>
/// The entity that is currently buckled here, synced from <see cref="BuckleComponent.BuckledTo"/>
/// </summary>
public IReadOnlyCollection<IEntity> BuckledEntities => _buckledEntities;
public IReadOnlyCollection<EntityUid> BuckledEntities => _buckledEntities;
/// <summary>
/// The change in position to the strapped mob

23
Content.Server/Buckle/Systems/StrapSystem.cs
View File

@@ -1,14 +1,11 @@
using Content.Server.Buckle.Components;
using Content.Server.Interaction;
using Content.Shared.Hands.Components;
using Content.Shared.Interaction.Helpers;
using Content.Shared.Verbs;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using System.Collections.Generic;
namespace Content.Server.Buckle.Systems
{
@@ -39,7 +36,7 @@ namespace Content.Server.Buckle.Systems
// Add unstrap verbs for every strapped entity.
foreach (var entity in component.BuckledEntities)
{
var buckledComp = IoCManager.Resolve<IEntityManager>().GetComponent<BuckleComponent>(entity);
var buckledComp = EntityManager.GetComponent<BuckleComponent>(entity);
if (!_interactionSystem.InRangeUnobstructed(args.User, args.Target, range: buckledComp.Range))
continue;
@@ -50,7 +47,7 @@ namespace Content.Server.Buckle.Systems
if (entity == args.User)
verb.Text = Loc.GetString("verb-self-target-pronoun");
else
verb.Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityName;
verb.Text = EntityManager.GetComponent<MetaDataComponent>(entity).EntityName;
// In the event that you have more than once entity with the same name strapped to the same object,
// these two verbs will be identical according to Verb.CompareTo, and only one with actually be added to
@@ -61,7 +58,7 @@ namespace Content.Server.Buckle.Systems
}
// Add a verb to buckle the user.
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<BuckleComponent?>(args.User, out var buckle) &&
if (EntityManager.TryGetComponent<BuckleComponent?>(args.User, out var buckle) &&
buckle.BuckledTo != component &&
args.User != component.Owner &&
component.HasSpace(buckle) &&
@@ -75,24 +72,24 @@ namespace Content.Server.Buckle.Systems
}
// If the user is currently holding/pulling an entity that can be buckled, add a verb for that.
if (args.Using != null &&
IoCManager.Resolve<IEntityManager>().TryGetComponent<BuckleComponent?>(args.Using, out var usingBuckle) &&
if (args.Using is {Valid: true} @using &&
EntityManager.TryGetComponent<BuckleComponent?>(@using, out var usingBuckle) &&
component.HasSpace(usingBuckle) &&
_interactionSystem.InRangeUnobstructed(args.Using, args.Target, range: usingBuckle.Range))
_interactionSystem.InRangeUnobstructed(@using, args.Target, range: usingBuckle.Range))
{
// Check that the entity is unobstructed from the target (ignoring the user).
bool Ignored(IEntity entity) => entity == args.User || entity == args.Target || entity == args.Using;
if (!_interactionSystem.InRangeUnobstructed(args.Using, args.Target, usingBuckle.Range, predicate: Ignored))
bool Ignored(EntityUid entity) => entity == args.User || entity == args.Target || entity == @using;
if (!_interactionSystem.InRangeUnobstructed(@using, args.Target, usingBuckle.Range, predicate: Ignored))
return;
Verb verb = new();
verb.Act = () => usingBuckle.TryBuckle(args.User, args.Target);
verb.Category = VerbCategory.Buckle;
verb.Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(args.Using).EntityName;
verb.Text = EntityManager.GetComponent<MetaDataComponent>(@using).EntityName;
// If the used entity is a person being pulled, prioritize this verb. Conversely, if it is
// just a held object, the user is probably just trying to sit down.
verb.Priority = IoCManager.Resolve<IEntityManager>().HasComponent<ActorComponent>(args.Using) ? 1 : -1;
verb.Priority = EntityManager.HasComponent<ActorComponent>(@using) ? 1 : -1;
args.Verbs.Add(verb);
}