Cleanup warnings: CS0067, CS8509, CS8073 (#39770)
* Cleanup * Bonus --------- Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
This commit is contained in:
@@ -33,6 +33,7 @@ namespace Content.Client.Actions
|
|||||||
[Dependency] private readonly IPrototypeManager _proto = default!;
|
[Dependency] private readonly IPrototypeManager _proto = default!;
|
||||||
[Dependency] private readonly IResourceManager _resources = default!;
|
[Dependency] private readonly IResourceManager _resources = default!;
|
||||||
[Dependency] private readonly MetaDataSystem _metaData = default!;
|
[Dependency] private readonly MetaDataSystem _metaData = default!;
|
||||||
|
[Dependency] private readonly ISerializationManager _serialization = default!;
|
||||||
|
|
||||||
public event Action<EntityUid>? OnActionAdded;
|
public event Action<EntityUid>? OnActionAdded;
|
||||||
public event Action<EntityUid>? OnActionRemoved;
|
public event Action<EntityUid>? OnActionRemoved;
|
||||||
@@ -286,8 +287,27 @@ namespace Content.Client.Actions
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (assignmentNode is SequenceDataNode sequenceAssignments)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var nodeAssignments = _serialization.Read<List<(byte Hotbar, byte Slot)>>(sequenceAssignments, notNullableOverride: true);
|
||||||
|
|
||||||
|
foreach (var index in nodeAssignments)
|
||||||
|
{
|
||||||
|
assignments.Add(new SlotAssignment(index.Hotbar, index.Slot, actionId));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Log.Error($"Failed to parse action assignments: {ex}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
AddActionDirect((user, actions), actionId);
|
AddActionDirect((user, actions), actionId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AssignSlot?.Invoke(assignments);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnWorldTargetAttempt(Entity<WorldTargetActionComponent> ent, ref ActionTargetAttemptEvent args)
|
private void OnWorldTargetAttempt(Entity<WorldTargetActionComponent> ent, ref ActionTargetAttemptEvent args)
|
||||||
@@ -309,10 +329,10 @@ namespace Content.Client.Actions
|
|||||||
// this is the actual entity-world targeting magic
|
// this is the actual entity-world targeting magic
|
||||||
EntityUid? targetEnt = null;
|
EntityUid? targetEnt = null;
|
||||||
if (TryComp<EntityTargetActionComponent>(ent, out var entity) &&
|
if (TryComp<EntityTargetActionComponent>(ent, out var entity) &&
|
||||||
args.Input.EntityUid != null &&
|
args.Input.EntityUid is { Valid: true } entityUid &&
|
||||||
ValidateEntityTarget(user, args.Input.EntityUid, (uid, entity)))
|
ValidateEntityTarget(user, entityUid, (uid, entity)))
|
||||||
{
|
{
|
||||||
targetEnt = args.Input.EntityUid;
|
targetEnt = entityUid;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (action.ClientExclusive)
|
if (action.ClientExclusive)
|
||||||
|
|||||||
@@ -66,7 +66,8 @@ namespace Content.Client.UserInterface.Controls
|
|||||||
Viewport.StretchMode = filterMode switch
|
Viewport.StretchMode = filterMode switch
|
||||||
{
|
{
|
||||||
"nearest" => ScalingViewportStretchMode.Nearest,
|
"nearest" => ScalingViewportStretchMode.Nearest,
|
||||||
"bilinear" => ScalingViewportStretchMode.Bilinear
|
"bilinear" => ScalingViewportStretchMode.Bilinear,
|
||||||
|
_ => ScalingViewportStretchMode.Nearest
|
||||||
};
|
};
|
||||||
Viewport.IgnoreDimension = verticalFit ? ScalingViewportIgnoreDimension.Horizontal : ScalingViewportIgnoreDimension.None;
|
Viewport.IgnoreDimension = verticalFit ? ScalingViewportIgnoreDimension.Horizontal : ScalingViewportIgnoreDimension.None;
|
||||||
|
|
||||||
|
|||||||
@@ -840,7 +840,7 @@ public abstract partial class SharedActionsSystem : EntitySystem
|
|||||||
|
|
||||||
if (!_actionsQuery.Resolve(performer, ref performer.Comp, false))
|
if (!_actionsQuery.Resolve(performer, ref performer.Comp, false))
|
||||||
{
|
{
|
||||||
DebugTools.Assert(performer == null || TerminatingOrDeleted(performer));
|
DebugTools.Assert(TerminatingOrDeleted(performer));
|
||||||
ent.Comp.AttachedEntity = null;
|
ent.Comp.AttachedEntity = null;
|
||||||
// TODO: should this delete the action since it's now orphaned?
|
// TODO: should this delete the action since it's now orphaned?
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ namespace Content.Shared.Clothing;
|
|||||||
public sealed class SharedMagbootsSystem : EntitySystem
|
public sealed class SharedMagbootsSystem : EntitySystem
|
||||||
{
|
{
|
||||||
[Dependency] private readonly AlertsSystem _alerts = default!;
|
[Dependency] private readonly AlertsSystem _alerts = default!;
|
||||||
[Dependency] private readonly InventorySystem _inventory = default!;
|
|
||||||
[Dependency] private readonly ItemToggleSystem _toggle = default!;
|
[Dependency] private readonly ItemToggleSystem _toggle = default!;
|
||||||
[Dependency] private readonly SharedContainerSystem _container = default!;
|
[Dependency] private readonly SharedContainerSystem _container = default!;
|
||||||
[Dependency] private readonly SharedGravitySystem _gravity = default!;
|
[Dependency] private readonly SharedGravitySystem _gravity = default!;
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ using Content.Shared.CCVar;
|
|||||||
using Content.Shared.Construction.Components;
|
using Content.Shared.Construction.Components;
|
||||||
using Content.Shared.Database;
|
using Content.Shared.Database;
|
||||||
using Content.Shared.Friction;
|
using Content.Shared.Friction;
|
||||||
using Content.Shared.Gravity;
|
|
||||||
using Content.Shared.Projectiles;
|
using Content.Shared.Projectiles;
|
||||||
using Robust.Shared.Configuration;
|
using Robust.Shared.Configuration;
|
||||||
using Robust.Shared.Map;
|
using Robust.Shared.Map;
|
||||||
@@ -30,7 +29,6 @@ public sealed class ThrowingSystem : EntitySystem
|
|||||||
private float _airDamping;
|
private float _airDamping;
|
||||||
|
|
||||||
[Dependency] private readonly IGameTiming _gameTiming = default!;
|
[Dependency] private readonly IGameTiming _gameTiming = default!;
|
||||||
[Dependency] private readonly SharedGravitySystem _gravity = default!;
|
|
||||||
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
|
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
|
||||||
[Dependency] private readonly SharedTransformSystem _transform = default!;
|
[Dependency] private readonly SharedTransformSystem _transform = default!;
|
||||||
[Dependency] private readonly ThrownItemSystem _thrownSystem = default!;
|
[Dependency] private readonly ThrownItemSystem _thrownSystem = default!;
|
||||||
|
|||||||
Reference in New Issue
Block a user