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

Rename and clean up interaction events (#4044)

Browse Source 
* Rename and clean up interaction events

* Fix hand equip events
This commit is contained in:
ShadowCommander
2021-05-22 21:06:40 -07:00
committed by GitHub
parent d97021d3a0
commit acb102f978
62 changed files with 273 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/GameObjects/Components/Body/BodyComponent.cs
View File

@@ -8,12 +8,12 @@ namespace Content.Client.GameObjects.Components.Body
[ComponentReference(typeof(IBody))]
public class BodyComponent : SharedBodyComponent, IDraggable
{
bool IDraggable.CanStartDrag(StartDragDropEventArgs args)
bool IDraggable.CanStartDrag(StartDragDropEvent args)
{
return true;
}
bool IDraggable.CanDrop(CanDropEventArgs args)
bool IDraggable.CanDrop(CanDropEvent args)
{
return true;
}

2
Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs
View File

@@ -8,7 +8,7 @@ namespace Content.Client.GameObjects.Components.Disposal
[ComponentReference(typeof(SharedDisposalMailingUnitComponent))]
public class DisposalMailingUnitComponent : SharedDisposalMailingUnitComponent
{
public override bool DragDropOn(DragDropEventArgs eventArgs)
public override bool DragDropOn(DragDropEvent eventArgs)
{
return false;
}

2
Content.Client/GameObjects/Components/Disposal/DisposalUnitComponent.cs
View File

@@ -8,7 +8,7 @@ namespace Content.Client.GameObjects.Components.Disposal
[ComponentReference(typeof(SharedDisposalUnitComponent))]
public class DisposalUnitComponent : SharedDisposalUnitComponent
{
public override bool DragDropOn(DragDropEventArgs eventArgs)
public override bool DragDropOn(DragDropEvent eventArgs)
{
return false;
}

2
Content.Client/GameObjects/Components/GUI/StrippableComponent.cs
View File

@@ -8,7 +8,7 @@ namespace Content.Client.GameObjects.Components.GUI
[ComponentReference(typeof(SharedStrippableComponent))]
public class StrippableComponent : SharedStrippableComponent
{
public override bool Drop(DragDropEventArgs args)
public override bool Drop(DragDropEvent args)
{
// TODO: Prediction
return false;

2
Content.Client/GameObjects/Components/Kitchen/KitchenSpikeComponent.cs
View File

@@ -8,7 +8,7 @@ namespace Content.Client.GameObjects.Components.Kitchen
[RegisterComponent]
internal sealed class KitchenSpikeComponent : SharedKitchenSpikeComponent
{
public override bool DragDropOn(DragDropEventArgs eventArgs)
public override bool DragDropOn(DragDropEvent eventArgs)
{
return true;
}

2
Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerComponent.cs
View File

@@ -8,7 +8,7 @@ namespace Content.Client.GameObjects.Components.MedicalScanner
[ComponentReference(typeof(SharedMedicalScannerComponent))]
public class MedicalScannerComponent : SharedMedicalScannerComponent
{
public override bool DragDropOn(DragDropEventArgs eventArgs)
public override bool DragDropOn(DragDropEvent eventArgs)
{
return false;
}

4
Content.Client/GameObjects/Components/Movement/ClimbableComponent.cs
View File

@@ -9,7 +9,7 @@ namespace Content.Client.GameObjects.Components.Movement
[ComponentReference(typeof(IClimbable))]
public class ClimbableComponent : SharedClimbableComponent
{
public override bool CanDragDropOn(DragDropEventArgs eventArgs)
public override bool CanDragDropOn(DragDropEvent eventArgs)
{
if (!base.CanDragDropOn(eventArgs))
return false;
@@ -22,7 +22,7 @@ namespace Content.Client.GameObjects.Components.Movement
return user.InRangeUnobstructed(target, Range, predicate: Ignored) && user.InRangeUnobstructed(dragged, Range, predicate: Ignored);
}
public override bool DragDropOn(DragDropEventArgs eventArgs)
public override bool DragDropOn(DragDropEvent eventArgs)
{
return false;
}

2
Content.Client/GameObjects/Components/Strap/StrapComponent.cs
View File

@@ -8,7 +8,7 @@ namespace Content.Client.GameObjects.Components.Strap
[ComponentReference(typeof(SharedStrapComponent))]
public class StrapComponent : SharedStrapComponent
{
public override bool DragDropOn(DragDropEventArgs eventArgs)
public override bool DragDropOn(DragDropEvent eventArgs)
{
return false;
}

10
Content.Client/GameObjects/EntitySystems/DragDropSystem.cs
View File

@@ -145,7 +145,7 @@ namespace Content.Client.GameObjects.EntitySystems
var canDrag = false;
foreach (var draggable in entity.GetAllComponents<IDraggable>())
{
var dragEventArgs = new StartDragDropEventArgs(dragger, entity);
var dragEventArgs = new StartDragDropEvent(dragger, entity);
if (!draggable.CanStartDrag(dragEventArgs))
{
@@ -315,7 +315,7 @@ namespace Content.Client.GameObjects.EntitySystems
if (entity == _dragDropHelper.Dragged) continue;
// check if it's able to be dropped on by current dragged entity
var dropArgs = new DragDropEventArgs(_dragger, args.Coordinates, _dragDropHelper.Dragged, entity);
var dropArgs = new DragDropEvent(_dragger, args.Coordinates, _dragDropHelper.Dragged, entity);
// TODO: Cache valid CanDragDrops
if (ValidDragDrop(dropArgs) != true) continue;
@@ -331,7 +331,7 @@ namespace Content.Client.GameObjects.EntitySystems
if (!draggable.CanDrop(dropArgs)) continue;
// tell the server about the drop attempt
RaiseNetworkEvent(new DragDropMessage(args.Coordinates, _dragDropHelper.Dragged!.Uid,
RaiseNetworkEvent(new DragDropRequestEvent(args.Coordinates, _dragDropHelper.Dragged!.Uid,
entity.Uid));
draggable.Drop(dropArgs);
@@ -380,7 +380,7 @@ namespace Content.Client.GameObjects.EntitySystems
pvsEntity == _dragDropHelper.Dragged) continue;
// check if it's able to be dropped on by current dragged entity
var dropArgs = new DragDropEventArgs(_dragger!, pvsEntity.Transform.Coordinates, _dragDropHelper.Dragged, pvsEntity);
var dropArgs = new DragDropEvent(_dragger!, pvsEntity.Transform.Coordinates, _dragDropHelper.Dragged, pvsEntity);
var valid = ValidDragDrop(dropArgs);
if (valid == null) continue;
@@ -414,7 +414,7 @@ namespace Content.Client.GameObjects.EntitySystems
/// </summary>
/// <param name="eventArgs"></param>
/// <returns>null if the target doesn't support IDragDropOn</returns>
private bool? ValidDragDrop(DragDropEventArgs eventArgs)
private bool? ValidDragDrop(DragDropEvent eventArgs)
{
bool? valid = null;