tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

explicit interface go brrrr

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs
View File

@@ -24,6 +24,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.ComponentDependencies;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Serialization;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
@@ -282,7 +283,7 @@ namespace Content.Server.GameObjects.Components.Interactable
[UsedImplicitly]
public class ToggleLightAction : IToggleItemAction
{
public void ExposeData(ObjectSerializer serializer) {}
void IExposeData.ExposeData(ObjectSerializer serializer) {}
public bool DoToggleAction(ToggleItemActionEventArgs args)
{

6
Content.Server/GameObjects/Components/Interactable/MatchboxComponent.cs
View File

@@ -12,9 +12,9 @@ namespace Content.Server.GameObjects.Components.Interactable
{
public override string Name => "Matchbox";
public int Priority => 1;
int IInteractUsing.Priority => 1;
public async Task<bool> InteractUsing(InteractUsingEventArgs eventArgs)
async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
{
if (eventArgs.Using.TryGetComponent<MatchstickComponent>(out var matchstick)
&& matchstick.CurrentState == SharedBurningStates.Unlit)
@@ -26,4 +26,4 @@ namespace Content.Server.GameObjects.Components.Interactable
return false;
}
}
}
}

4
Content.Server/GameObjects/Components/Interactable/MatchstickComponent.cs
View File

@@ -89,7 +89,7 @@ namespace Content.Server.GameObjects.Components.Interactable
Owner.SpawnTimer(_duration * 1000, () => CurrentState = SharedBurningStates.Burnt);
}
public async Task<bool> InteractUsing(InteractUsingEventArgs eventArgs)
async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
{
if (eventArgs.Target.TryGetComponent<IHotItem>(out var hotItem)
&& hotItem.IsCurrentlyHot()
@@ -102,4 +102,4 @@ namespace Content.Server.GameObjects.Components.Interactable
return false;
}
}
}
}

4
Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs
View File

@@ -34,7 +34,7 @@ namespace Content.Server.GameObjects.Components.Interactable
public string SoundCollection => _soundCollection;
public string ChangeSound => _changeSound;
public void ExposeData(ObjectSerializer serializer)
void IExposeData.ExposeData(ObjectSerializer serializer)
{
serializer.DataField(this, x => x.Behavior, "behavior", ToolQuality.None);
serializer.DataField(ref _state, "state", string.Empty);
@@ -104,7 +104,7 @@ namespace Content.Server.GameObjects.Components.Interactable
serializer.DataField(ref _tools, "tools", new List<ToolEntry>());
}
public bool UseEntity(UseEntityEventArgs eventArgs)
bool IUse.UseEntity(UseEntityEventArgs eventArgs)
{
Cycle();
return true;

2
Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs
View File

@@ -21,7 +21,7 @@ namespace Content.Server.GameObjects.Components.Interactable
public override string Name => "TilePrying";
private bool _toolComponentNeeded = true;
public async Task AfterInteract(AfterInteractEventArgs eventArgs)
async Task IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)
{
TryPryTile(eventArgs.User, eventArgs.ClickLocation);
}

4
Content.Server/GameObjects/Components/Interactable/WelderComponent.cs
View File

@@ -213,7 +213,7 @@ namespace Content.Server.GameObjects.Components.Interactable
return true;
}
public bool UseEntity(UseEntityEventArgs eventArgs)
bool IUse.UseEntity(UseEntityEventArgs eventArgs)
{
return ToggleWelderStatus(eventArgs.User);
}
@@ -257,7 +257,7 @@ namespace Content.Server.GameObjects.Components.Interactable
}
public SuicideKind Suicide(IEntity victim, IChatManager chat)
SuicideKind ISuicideAct.Suicide(IEntity victim, IChatManager chat)
{
string othersMessage;
string selfMessage;