explicit interface go brrrr

This commit is contained in:
Paul
2021-02-04 17:44:49 +01:00
parent 5f6d2d50ba
commit d5cd82de60
148 changed files with 285 additions and 206 deletions

View File

@@ -80,7 +80,7 @@ namespace Content.Shared.GameObjects.Components.Buckle
return args.Target.HasComponent<SharedStrapComponent>();
}
public bool Drop(DragDropEventArgs args)
bool IDraggable.Drop(DragDropEventArgs args)
{
return TryBuckle(args.User, args.Target);
}

View File

@@ -468,7 +468,7 @@ namespace Content.Shared.GameObjects.Components.Damage
Dirty();
}
public void RadiationAct(float frameTime, SharedRadiationPulseComponent radiation)
void IRadiationAct.RadiationAct(float frameTime, SharedRadiationPulseComponent radiation)
{
var totalDamage = Math.Max((int)(frameTime * radiation.RadsPerSecond), 1);

View File

@@ -59,7 +59,7 @@ namespace Content.Shared.GameObjects.Components.Materials
public object Key;
public string Value;
public void ExposeData(ObjectSerializer serializer)
void IExposeData.ExposeData(ObjectSerializer serializer)
{
if (serializer.Writing)
{

View File

@@ -80,7 +80,7 @@ namespace Content.Shared.GameObjects.Components.Medical
}
public bool CanDragDropOn(DragDropEventArgs eventArgs)
bool IDragDropOn.CanDragDropOn(DragDropEventArgs eventArgs)
{
return eventArgs.Dragged.HasComponent<IBody>();
}

View File

@@ -181,7 +181,7 @@ namespace Content.Shared.GameObjects.Components.Mobs
GrantOrUpdate(actionType, toggleOn: toggleOn);
}
public void EquippedHand(EquippedHandEventArgs eventArgs)
void IEquippedHand.EquippedHand(EquippedHandEventArgs eventArgs)
{
// this entity cannot be granted actions if no actions component
if (!eventArgs.User.TryGetComponent<SharedActionsComponent>(out var actionsComponent))
@@ -193,7 +193,7 @@ namespace Content.Shared.GameObjects.Components.Mobs
GrantOrUpdateAllToHolder();
}
public void Equipped(EquippedEventArgs eventArgs)
void IEquipped.Equipped(EquippedEventArgs eventArgs)
{
// this entity cannot be granted actions if no actions component
if (!eventArgs.User.TryGetComponent<SharedActionsComponent>(out var actionsComponent))
@@ -205,7 +205,7 @@ namespace Content.Shared.GameObjects.Components.Mobs
GrantOrUpdateAllToHolder();
}
public void Unequipped(UnequippedEventArgs eventArgs)
void IUnequipped.Unequipped(UnequippedEventArgs eventArgs)
{
RevokeAllFromHolder();
Holder = null;
@@ -215,7 +215,7 @@ namespace Content.Shared.GameObjects.Components.Mobs
}
public void UnequippedHand(UnequippedHandEventArgs eventArgs)
void IUnequippedHand.UnequippedHand(UnequippedHandEventArgs eventArgs)
{
RevokeAllFromHolder();
Holder = null;
@@ -236,7 +236,7 @@ namespace Content.Shared.GameObjects.Components.Mobs
/// </summary>
public bool Enabled { get; private set; }
public void ExposeData(ObjectSerializer serializer)
void IExposeData.ExposeData(ObjectSerializer serializer)
{
serializer.DataField(this, x => x.ActionType, "actionType", ItemActionType.Error);
if (ActionType == ItemActionType.Error)

View File

@@ -106,7 +106,7 @@ namespace Content.Shared.GameObjects.Components.Sound
/// </summary>
public bool Play = true;
public void ExposeData(ObjectSerializer serializer)
void IExposeData.ExposeData(ObjectSerializer serializer)
{
if (serializer.Writing)
return;

View File

@@ -25,13 +25,13 @@ namespace Content.Shared.GameObjects.Components.Storage
/// <returns>True if no longer in storage, false otherwise</returns>
public abstract bool Remove(IEntity entity);
public bool CanDrop(CanDropEventArgs args)
bool IDraggable.CanDrop(CanDropEventArgs args)
{
return args.Target.TryGetComponent(out SharedPlaceableSurfaceComponent? placeable) &&
placeable.IsPlaceable;
}
public bool Drop(DragDropEventArgs eventArgs)
bool IDraggable.Drop(DragDropEventArgs eventArgs)
{
if (!ActionBlockerSystem.CanInteract(eventArgs.User))
{

View File

@@ -33,7 +33,7 @@ namespace Content.Shared.GameObjects.Components.Strap
public sealed override uint? NetID => ContentNetIDs.STRAP;
public virtual bool CanDragDropOn(DragDropEventArgs eventArgs)
bool IDragDropOn.CanDragDropOn(DragDropEventArgs eventArgs)
{
if (!eventArgs.Dragged.TryGetComponent(out SharedBuckleComponent buckleComponent)) return false;
bool Ignored(IEntity entity) => entity == eventArgs.User || entity == eventArgs.Dragged || entity == eventArgs.Target;